From 3e3ccc3c815c9b8da03ade7bdeb71c1bb0cdad67 Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Mon, 19 Sep 2022 10:15:35 -0600 Subject: [PATCH 001/184] Node 18 --- .circleci/config.yml | 16 +- .nvmrc | 2 +- README-dev.md | 6 +- dockerfiles/attestation-service/Dockerfile | 4 +- dockerfiles/celotool/Dockerfile | 2 +- .../Dockerfile | 9 +- dockerfiles/metadata-crawler/Dockerfile | 2 +- dockerfiles/phone-number-privacy/Dockerfile | 2 +- package.json | 76 +- packages/attestation-service/package.json | 4 +- packages/attestation-service/src/metrics.ts | 3 +- .../src/requestHandlers/attestation.ts | 5 +- packages/celotool/package.json | 5 +- packages/celotool/src/cmds/links.ts | 4 +- packages/celotool/src/lib/cmd-utils.ts | 2 +- packages/celotool/src/lib/fullnodes.ts | 19 +- packages/celotool/src/lib/generate_utils.ts | 7 +- packages/celotool/src/lib/prometheus.ts | 10 +- packages/cli/package.json | 8 +- .../cli/src/commands/account/claims.test.ts | 2 +- .../src/commands/grandamento/execute.test.ts | 2 +- packages/cli/src/utils/checks.ts | 5 +- packages/cli/src/utils/exec.ts | 2 +- packages/dev-utils/src/ganache-setup.ts | 23 +- packages/env-tests/src/shared/attestation.ts | 5 +- packages/env-tests/src/tests/granda-mento.ts | 4 +- packages/metadata-crawler/package.json | 4 +- .../combiner/package.json | 5 +- .../test/signing/bls-signature.test.ts | 26 +- .../phone-number-privacy/common/package.json | 4 +- .../common/src/domains/domains.test.ts | 4 +- .../common/src/interfaces/responses.ts | 26 +- .../common/src/utils/authentication.ts | 3 +- .../common/test/interfaces/requests.test.ts | 14 +- .../phone-number-privacy/monitor/package.json | 2 +- .../phone-number-privacy/signer/package.json | 4 +- .../signer/src/common/metrics.ts | 28 +- packages/protocol/lib/test-utils.ts | 141 +- packages/protocol/migrations/02_registry.ts | 2 +- packages/protocol/migrations/08_reserve.ts | 9 +- .../migrations/09_01_stableToken_EUR.ts | 15 +- .../migrations/09_02_stableToken_BRL.ts | 15 +- .../migrations/09_0_stabletoken_USD.ts | 15 +- packages/protocol/migrations/28_governance.ts | 9 +- packages/protocol/package.json | 19 +- packages/protocol/runTests.js | 2 +- packages/protocol/scripts/bash/ganache.sh | 4 +- packages/protocol/scripts/devchain.ts | 34 +- .../protocol/scripts/truffle/make-release.ts | 2 +- packages/protocol/scripts/truffle/revoke.ts | 6 +- packages/protocol/test/common/accounts.ts | 30 +- .../addresssortedlinkedlistwithmedian.ts | 5 +- .../test/common/metatransactionwallet.ts | 5 +- .../common/metatransactionwalletdeployer.ts | 5 +- .../test/compatibility/verify-bytecode.ts | 2 +- .../protocol/test/identity/attestations.ts | 30 +- packages/protocol/test/identity/escrow.ts | 5 +- .../test/identity/federatedattestations.ts | 149 +- .../test/identity/identityproxyhub.ts | 2 +- .../protocol/test/stability/stabletoken.ts | 8 +- packages/protocol/truffle-config.js | 1 + .../sdk/connect/src/celo-provider.test.ts | 2 +- packages/sdk/connect/src/connection.ts | 2 +- .../src/utils/tx-params-normalizer.test.ts | 20 +- packages/sdk/contractkit/package.json | 6 +- .../contractkit/src/identity/claims/claim.ts | 6 +- .../contractkit/src/identity/metadata.test.ts | 4 +- .../contractkit/src/wrappers/Accounts.test.ts | 12 +- .../contractkit/src/wrappers/Attestations.ts | 23 +- .../contractkit/src/wrappers/Election.test.ts | 28 +- .../sdk/contractkit/src/wrappers/Election.ts | 30 +- .../src/wrappers/Validators.test.ts | 12 +- .../contractkit/src/wrappers/Validators.ts | 18 +- packages/sdk/cryptographic-utils/package.json | 13 +- .../sdk/cryptographic-utils/src/account.ts | 4 +- .../sdk/encrypted-backup/src/odis.mock.ts | 14 +- packages/sdk/identity/package.json | 8 +- .../identity/src/odis/circuit-breaker.mock.ts | 7 +- .../sdk/identity/src/odis/circuit-breaker.ts | 2 - packages/sdk/identity/src/offchain/utils.ts | 2 +- packages/sdk/keystores/src/keystore-base.ts | 6 +- .../src/genesis-block-utils.test.ts | 3 +- .../src/static-node-utils.test.ts | 8 +- .../sdk/phone-utils/src/countries.test.ts | 54 +- packages/sdk/transactions-uri/package.json | 4 +- packages/sdk/transactions-uri/src/tx-uri.ts | 2 +- packages/sdk/utils/package.json | 5 +- packages/sdk/utils/src/istanbul.test.ts | 3 +- .../utils/src/sign-typed-data-utils.test.ts | 3 +- .../wallets/wallet-base/src/signing-utils.ts | 10 +- .../wallet-hsm-aws/src/aws-hsm-wallet.test.ts | 3 +- .../wallet-remote/src/remote-wallet.ts | 3 +- .../sdk/wallets/wallet-rpc/src/rpc-signer.ts | 2 +- yarn.lock | 22609 +++++++++------- 94 files changed, 13193 insertions(+), 10599 deletions(-) rename dockerfiles/circleci/{circleci-node12 => circleci-node18}/Dockerfile (64%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 051a28fa2b0..4f9dfa7fbb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ reference: defaults: &defaults working_directory: ~/app docker: - - image: us.gcr.io/celo-testnet/circleci-node12:1.0.0 + - image: us.gcr.io/celo-testnet/circleci-node18:1.0.0 environment: # To avoid ENOMEM problem when running node NODE_OPTIONS: '--max-old-space-size=4096' @@ -76,6 +76,9 @@ commands: - run: name: Install dependencies command: | + # node-gyp needs to know where python is at when installed + yarn config set python $(which python3) + if [ ! -e ~/.tmp/yarn_deps_have_changed ]; then # Though `yarn install` is instantaneous with up-to-date node_modules which is the case when we've restored cached node_modules, # there's currently a bug with the generated node_modules/.yarn-integrity file which is apparently not entirely stable @@ -89,7 +92,6 @@ commands: yarn run postinstall exit 0 fi - # Deals with yarn install flakiness which can come due to yarnpkg.com being # unreliable. For example, https://circleci.com/gh/celo-org/celo-monorepo/82685 yarn install || yarn install || yarn install @@ -151,7 +153,7 @@ jobs: # Verify that following commands work, they are later called in the incremental testing script # There output does not matter here, the fact that they finish successfully does. git rev-parse --abbrev-ref HEAD - git fetch --all --tags + git fetch --all --tags -f - attach_workspace: at: ~/app @@ -727,7 +729,7 @@ jobs: test-typescript-npm-package-install: working_directory: ~/app docker: - - image: us.gcr.io/celo-testnet/circleci-node12:1.0.0 + - image: us.gcr.io/celo-testnet/circleci-node18:1.0.0 steps: - run: name: Check if the test should run @@ -740,7 +742,7 @@ jobs: test-utils-npm-package-install: working_directory: ~/app docker: - - image: us.gcr.io/celo-testnet/circleci-node12:1.0.0 + - image: us.gcr.io/celo-testnet/circleci-node18:1.0.0 steps: - run: name: Check if the test should run @@ -753,7 +755,7 @@ jobs: test-contractkit-npm-package-install: working_directory: ~/app docker: - - image: us.gcr.io/celo-testnet/circleci-node12:1.0.0 + - image: us.gcr.io/celo-testnet/circleci-node18:1.0.0 steps: - run: name: Check if the test should run @@ -769,7 +771,7 @@ jobs: test-celocli-npm-package-install: working_directory: ~/app docker: - - image: us.gcr.io/celo-testnet/circleci-node12:1.0.0 + - image: us.gcr.io/celo-testnet/circleci-node18:1.0.0 steps: - run: name: Check if the test should run diff --git a/.nvmrc b/.nvmrc index d8ff873d1ac..f7e67778bb4 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -12.22.7 +18.9.0 diff --git a/README-dev.md b/README-dev.md index 5f46fe63ae7..4ffc9d6cfb6 100644 --- a/README-dev.md +++ b/README-dev.md @@ -63,7 +63,7 @@ This confirms that it is locally installable and does not have implicit dependen ``` # Specify the package to test. e.g. celocli, contractkit, utils celo-monorepo $ PACKAGE=cli -celo-monorepo $ docker run --rm -v $PWD/packages/${PACKAGE}:/tmp/npm_package -it --entrypoint bash gcr.io/celo-testnet/circleci-node12:1.0.0 +celo-monorepo $ docker run --rm -v $PWD/packages/${PACKAGE}:/tmp/npm_package -it --entrypoint bash gcr.io/celo-testnet/circleci-node18:1.0.0 circleci@e0d56700584f:/# mkdir /tmp/tmp1 && cd /tmp/tmp1 circleci@e0d56700584f:/tmp/tmp1# npm install /tmp/npm_package/ ``` @@ -97,7 +97,7 @@ Once you publish do some manual tests, for example, after publishing `celocli` ``` # Docker for an isolated environment again -celo-monorepo $ docker run --rm -it --entrypoint bash gcr.io/celo-testnet/circleci-node12:1.0.0 +celo-monorepo $ docker run --rm -it --entrypoint bash gcr.io/celo-testnet/circleci-node18:1.0.0 circleci@7040a7660754:/$ mkdir /tmp/tmp1 && cd /tmp/tmp1 circleci@7040a7660754:/tmp/tmp1$ npm install @celo/celocli@0.0.48 ... @@ -105,7 +105,7 @@ circleci@7040a7660754:/tmp/tmp1$ ./node_modules/.bin/celocli CLI Tool for transacting with the Celo protocol VERSION - @celo/celocli/0.0.48 linux-x64 node-v12.21.0 + @celo/celocli/1.6.3 linux-x64 node-v18.9.0 USAGE $ celocli [COMMAND] diff --git a/dockerfiles/attestation-service/Dockerfile b/dockerfiles/attestation-service/Dockerfile index db54854ddbf..d5106f6f22d 100644 --- a/dockerfiles/attestation-service/Dockerfile +++ b/dockerfiles/attestation-service/Dockerfile @@ -1,7 +1,7 @@ -FROM node:12-alpine +FROM node:18-alpine WORKDIR /celo-monorepo -RUN apk update && apk add python2 git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev bash +RUN apk update && apk add python3 git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev bash # ensure yarn.lock is evaluated by kaniko cache diff COPY lerna.json package.json yarn.lock ./ diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile index 57d53a9c66a..84be0b5db5c 100644 --- a/dockerfiles/celotool/Dockerfile +++ b/dockerfiles/celotool/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12 +FROM node:18 WORKDIR /celo-monorepo # Needed for gsutil diff --git a/dockerfiles/circleci/circleci-node12/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile similarity index 64% rename from dockerfiles/circleci/circleci-node12/Dockerfile rename to dockerfiles/circleci/circleci-node18/Dockerfile index 49b25486082..4c925c6affa 100644 --- a/dockerfiles/circleci/circleci-node12/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,4 +1,4 @@ -FROM circleci/node:12 +FROM cimg/node:18.9 RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y @@ -10,9 +10,8 @@ RUN sudo apt-get install -y apt-transport-https && \ sudo apt-get update && \ sudo apt-get install -y kubectl -RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ - echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ - curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ - sudo apt-get update -y && sudo apt-get install google-cloud-sdk -y +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ + curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \ + sudo apt-get update && sudo apt-get install google-cloud-cli CMD ["/bin/sh"] diff --git a/dockerfiles/metadata-crawler/Dockerfile b/dockerfiles/metadata-crawler/Dockerfile index 79f4f5be5f6..0724dd26f80 100644 --- a/dockerfiles/metadata-crawler/Dockerfile +++ b/dockerfiles/metadata-crawler/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12 +FROM node:18 WORKDIR /celo-monorepo RUN apt-get update && \ diff --git a/dockerfiles/phone-number-privacy/Dockerfile b/dockerfiles/phone-number-privacy/Dockerfile index ca64ce0b0ec..7427f46b509 100644 --- a/dockerfiles/phone-number-privacy/Dockerfile +++ b/dockerfiles/phone-number-privacy/Dockerfile @@ -25,7 +25,7 @@ COPY packages/sdk/wallets/wallet-local packages/sdk/wallets/wallet-local COPY packages/sdk/wallets/wallet-remote packages/sdk/wallets/wallet-remote ##### Main stage -FROM node:12 +FROM node:18 WORKDIR /celo-phone-number-privacy/ diff --git a/package.json b/package.json index b62fa4837c9..01a5d25b5be 100644 --- a/package.json +++ b/package.json @@ -54,29 +54,29 @@ "devDependencies": { "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", - "@types/jest": "^26.0.21", - "@types/node": "10.17.0", + "@types/jest": "^29.1.1", + "@types/node": "18.7.16", "@types/prompt": "1.1.1", "@types/semver": "7.3.8", - "babel-jest": "^26.6.3", + "babel-jest": "^29.1.2", "codecov": "^3.6.5", "colors": "1.4.0", "husky": "^3.1.0", - "jest": "^26.6.3", - "jest-circus": "^26.6.3", - "jest-junit": "^10.0.0", - "jest-snapshot": "^26.1.0", - "lerna": "^3.16.0", + "jest": "^29.0.2", + "jest-circus": "^29.0.2", + "jest-junit": "^14.0.1", + "jest-snapshot": "^29.0.2", + "lerna": "^5.5.0", "patch-package": "^6.2.2", - "prettier": "^2.2.1", - "prettier-plugin-java": "^0.6.0", + "prettier": "^2.7.1", + "prettier-plugin-java": "^1.6.2", "prettier-plugin-solidity": "1.0.0-alpha.35", "pretty-quick": "^2.0.1", "prompt": "1.2.0", "semver": "7.3.5", "solc": "0.5.8", - "ts-jest": "^26.5.4", - "ts-node": "^8.3.0", + "ts-jest": "^29.0.0", + "ts-node": "^10.9.1", "tsconfig-paths": "^3.8.0", "tslint": "^5.20.0", "typescript": "4.7.4", @@ -84,53 +84,9 @@ }, "resolutions": { "@celo/ganache-core": "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b", - "@grpc/grpc-js": "^1.1.8", - "@types/prettier": "^2.2.1", - "**/axios": "0.21.1", - "**/cross-fetch": "^3.0.2", - "**/deep-extend": "^0.5.1", - "**/extend": "^3.0.2", - "**/truffle/mocha": "^6.2.2", - "**/truffle-security/mocha": "^6.2.2", - "bignumber.js": "9.0.0", - "bl": "^4.0.3", - "cryptiles": "^4.1.3", - "decompress": "^4.2.1", - "dot-prop": "^5.2.0", - "elliptic": "^6.5.4", - "eslint-utils": "^1.4.1", - "ganache-core": "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b", - "handlebars": "^4.7.7", - "https-proxy-agent": "^5.0.0", - "hoek": "^6.1.3", - "jest-environment-jsdom": "^26.0.1", - "json-bigint": "^1.0.0", - "js-yaml": "^3.13.1", - "lodash": "^4.17.21", - "logkitty": "^0.7.1", - "mathjs": "^7.5.1", - "minimist": "^1.2.5", - "mixin-deep": "^2.0.1", - "node-forge": "^0.10.0", - "node-gyp": "5.0.1", - "node-libs-react-native": "^1.2.0", - "node-notifier": "^8.0.2", - "normalize-url": "4.5.1", - "npm": "^5.10.0", - "npmi": "^4.0.0", - "object-path": "^0.11.5", - "prettier": "^2.2.1", - "randomatic": "^3.1.1", - "react-native-flipper": "^0.70.0", - "react-native-ntp-client": "^1.0.0", - "set-value": "^3.0.2", - "sha3": "1.2.3", - "tar": "4.4.15", - "ua-parser-js": "0.7.28", - "underscore": "^1.12.1", - "url-parse": "^1.5.0", - "web3-eth-contract": "1.3.6", - "websocket-extensions": "^0.1.4", - "y18n": "^5.0.5" + "ganache-core": "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" + }, + "dependencies": { + "@celo/ganache-core": "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" } } diff --git a/packages/attestation-service/package.json b/packages/attestation-service/package.json index 16ed79d0ed9..b2cd796c3eb 100644 --- a/packages/attestation-service/package.json +++ b/packages/attestation-service/package.json @@ -63,7 +63,7 @@ "yargs": "13.3.0" }, "devDependencies": { - "@types/bunyan": "1.8.4", + "@types/bunyan": "1.8.8", "@types/debug": "^4.1.5", "@types/dotenv": "^8.2.0", "@types/express": "^4.17.12", @@ -80,4 +80,4 @@ "engines": { "node": ">=8.13.0" } -} \ No newline at end of file +} diff --git a/packages/attestation-service/src/metrics.ts b/packages/attestation-service/src/metrics.ts index 65d724ac5ff..67ef33262e4 100644 --- a/packages/attestation-service/src/metrics.ts +++ b/packages/attestation-service/src/metrics.ts @@ -15,8 +15,7 @@ export const Counters = { }), attestationRequestsWOIncompleteAttestation: new Counter({ name: 'attestation_requests_without_incomplete_attestation', - help: - 'Counter for the number of attestation requests for which no incomplete attestations could be found', + help: 'Counter for the number of attestation requests for which no incomplete attestations could be found', }), attestationRequestsValid: new Counter({ name: 'attestation_requests_valid', diff --git a/packages/attestation-service/src/requestHandlers/attestation.ts b/packages/attestation-service/src/requestHandlers/attestation.ts index 366795d46e0..9e014f899d4 100644 --- a/packages/attestation-service/src/requestHandlers/attestation.ts +++ b/packages/attestation-service/src/requestHandlers/attestation.ts @@ -26,8 +26,9 @@ const ATTESTATION_ERROR = 'Valid attestation could not be provided' const NO_INCOMPLETE_ATTESTATION_FOUND_ERROR = 'No incomplete attestation found' export const INVALID_SIGNATURE_ERROR = 'Signature is invalid' -const odisPubKey = OdisUtils.Query.getServiceContext(fetchEnvOrDefault('NETWORK', 'mainnet')) - .odisPubKey +const odisPubKey = OdisUtils.Query.getServiceContext( + fetchEnvOrDefault('NETWORK', 'mainnet') +).odisPubKey const thresholdBls = require('blind-threshold-bls') function toBase64(str: string) { diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 8ed6041e4e9..e4f7cd368ed 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -22,7 +22,7 @@ "@google-cloud/secret-manager": "3.0.0", "@google-cloud/storage": "^2.4.3", "bignumber.js": "^9.0.0", - "bip32": "2.0.5", + "bip32": "3.1.0", "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", "bunyan": "1.8.12", "bunyan-gke-stackdriver": "0.1.2", @@ -39,6 +39,7 @@ "read-last-lines": "^1.7.2", "sleep-promise": "^8.0.1", "string-hash": "^1.1.3", + "tiny-secp256k1": "2.2.1", "twilio": "^3.57.0", "web3": "1.3.6", "web3-eth-admin": "1.0.0-beta.55", @@ -48,7 +49,7 @@ "@celo/dev-utils": "0.0.1-dev", "@celo/flake-tracker": "0.0.1-dev", "@celo/protocol": "*", - "@types/bunyan": "1.8.4", + "@types/bunyan": "1.8.8", "@types/chai": "^4.1.3", "@types/dotenv": "^8.2.0", "@types/mocha": "^7.0.2", diff --git a/packages/celotool/src/cmds/links.ts b/packages/celotool/src/cmds/links.ts index c18fbfe2dc4..14291bf2050 100644 --- a/packages/celotool/src/cmds/links.ts +++ b/packages/celotool/src/cmds/links.ts @@ -33,7 +33,7 @@ export const builder = (yargs: Argv) => { }) .command('all', 'prints out all links', {}, async (rawArgs: Arguments) => { commands.forEach(async (cmd) => { - const argv = (rawArgs as any) as LinkArgEnv + const argv = rawArgs as any as LinkArgEnv const url = cmd.url(argv) console.info(`$ celotooljs links ${cmd.command}\n`) @@ -51,7 +51,7 @@ export const builder = (yargs: Argv) => { return commands.reduce((pYargs: Argv, cmd) => { return pYargs.command(cmd.command, cmd.description, {}, async (rawArgs: Arguments) => { - const argv = (rawArgs as any) as LinkArgEnv + const argv = rawArgs as any as LinkArgEnv const url = cmd.url(argv) if (argv.explanation) { console.info(cmd.explanation) diff --git a/packages/celotool/src/lib/cmd-utils.ts b/packages/celotool/src/lib/cmd-utils.ts index 0603c9a7fbb..65a575c15a8 100644 --- a/packages/celotool/src/lib/cmd-utils.ts +++ b/packages/celotool/src/lib/cmd-utils.ts @@ -48,7 +48,7 @@ export function spawnCmd( args: string[], options?: SpawnOptions & { silent?: boolean } ) { - return new Promise(async (resolve, reject) => { + return new Promise(async (resolve, reject) => { const { silent, ...spawnOptions } = options || { silent: false } if (!silent) { console.debug('$ ' + [cmd].concat(args).join(' ')) diff --git a/packages/celotool/src/lib/fullnodes.ts b/packages/celotool/src/lib/fullnodes.ts index 9fe7c0a67cf..824a094bb4e 100644 --- a/packages/celotool/src/lib/fullnodes.ts +++ b/packages/celotool/src/lib/fullnodes.ts @@ -67,10 +67,10 @@ export function getFullNodeDeployerForContext( if (cloudProvider !== CloudProvider.GCP) { throw Error('Cannot create NEG for cloud providers other than GCP') } - deploymentConfig = ({ + deploymentConfig = { ...deploymentConfig, createNEG: true, - } as unknown) as GCPFullNodeDeploymentConfig // make typescript happy + } as unknown as GCPFullNodeDeploymentConfig // make typescript happy } return getFullNodeDeployer(cloudProvider, celoEnv, deploymentConfig) } @@ -166,9 +166,8 @@ function getFullNodeDeploymentConfig(context: string): BaseFullNodeDeploymentCon * For a given context, returns the appropriate AksFullNodeDeploymentConfig */ function getAksFullNodeDeploymentConfig(context: string): AksFullNodeDeploymentConfig { - const fullNodeDeploymentConfig: BaseFullNodeDeploymentConfig = getFullNodeDeploymentConfig( - context - ) + const fullNodeDeploymentConfig: BaseFullNodeDeploymentConfig = + getFullNodeDeploymentConfig(context) return { ...fullNodeDeploymentConfig, clusterConfig: getAksClusterConfig(context), @@ -179,9 +178,8 @@ function getAksFullNodeDeploymentConfig(context: string): AksFullNodeDeploymentC * For a given context, returns the appropriate AwsFullNodeDeploymentConfig */ function getAwsFullNodeDeploymentConfig(context: string): AwsFullNodeDeploymentConfig { - const fullNodeDeploymentConfig: BaseFullNodeDeploymentConfig = getFullNodeDeploymentConfig( - context - ) + const fullNodeDeploymentConfig: BaseFullNodeDeploymentConfig = + getFullNodeDeploymentConfig(context) return { ...fullNodeDeploymentConfig, clusterConfig: getAwsClusterConfig(context), @@ -192,9 +190,8 @@ function getAwsFullNodeDeploymentConfig(context: string): AwsFullNodeDeploymentC * For a given context, returns the appropriate getGCPFullNodeDeploymentConfig */ function getGCPFullNodeDeploymentConfig(context: string): GCPFullNodeDeploymentConfig { - const fullNodeDeploymentConfig: BaseFullNodeDeploymentConfig = getFullNodeDeploymentConfig( - context - ) + const fullNodeDeploymentConfig: BaseFullNodeDeploymentConfig = + getFullNodeDeploymentConfig(context) return { ...fullNodeDeploymentConfig, clusterConfig: getGCPClusterConfig(context), diff --git a/packages/celotool/src/lib/generate_utils.ts b/packages/celotool/src/lib/generate_utils.ts index 576f67962cb..9df5242b2a2 100644 --- a/packages/celotool/src/lib/generate_utils.ts +++ b/packages/celotool/src/lib/generate_utils.ts @@ -2,7 +2,8 @@ import * as bls12377js from '@celo/bls12377js' import { blsPrivateKeyToProcessedPrivateKey } from '@celo/cryptographic-utils/lib/bls' import BigNumber from 'bignumber.js' -import * as bip32 from 'bip32' +import { BIP32Factory, BIP32Interface } from 'bip32' +import * as ecc from 'tiny-secp256k1' import * as bip39 from 'bip39' import fs from 'fs' import { merge, range, repeat } from 'lodash' @@ -26,6 +27,8 @@ import { getIndexForLoadTestThread } from './geth' import { GenesisConfig } from './interfaces/genesis-config' import { ensure0x, strip0x } from './utils' +const bip32 = BIP32Factory(ecc) + export enum AccountType { VALIDATOR = 0, LOAD_TESTING_ACCOUNT = 1, @@ -117,7 +120,7 @@ export const generateOraclePrivateKey = ( export const generatePrivateKeyWithDerivations = (mnemonic: string, derivations: number[]) => { const seed = bip39.mnemonicToSeedSync(mnemonic) const node = bip32.fromSeed(seed) - const newNode = derivations.reduce((n: bip32.BIP32Interface, derivation: number) => { + const newNode = derivations.reduce((n: BIP32Interface, derivation: number) => { return n.derive(derivation) }, node) return newNode.privateKey!.toString('hex') diff --git a/packages/celotool/src/lib/prometheus.ts b/packages/celotool/src/lib/prometheus.ts index 0c8c056de4e..0d3462a8225 100644 --- a/packages/celotool/src/lib/prometheus.ts +++ b/packages/celotool/src/lib/prometheus.ts @@ -142,14 +142,8 @@ function getRemoteWriteParameters(context?: string): string[] { } async function helmParameters(context?: string, clusterConfig?: BaseClusterConfig) { - const [ - cloudProvider, - clusterName, - gcloudProject, - gcloudRegion, - stackdriverDisabled, - usingGCP, - ] = getK8sContextVars(clusterConfig, context) + const [cloudProvider, clusterName, gcloudProject, gcloudRegion, stackdriverDisabled, usingGCP] = + getK8sContextVars(clusterConfig, context) const params = [ `--set namespace=${kubeNamespace}`, diff --git a/packages/cli/package.json b/packages/cli/package.json index d2d1cfd4fe4..a3438c7fd48 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -18,7 +18,7 @@ "celo-cli" ], "engines": { - "node": ">=8.0.0" + "node": ">=14" }, "scripts": { "clean": "tsc -b . --clean", @@ -45,7 +45,7 @@ "@celo/wallet-hsm-azure": "2.2.1-dev", "@celo/wallet-ledger": "2.2.1-dev", "@celo/wallet-local": "2.2.1-dev", - "@ledgerhq/hw-transport-node-hid": "~5.11.0", + "@ledgerhq/hw-transport-node-hid": "^6.27.4", "@oclif/command": "^1.6.0", "@oclif/config": "^1.6.0", "@oclif/plugin-autocomplete": "^0.1.5", @@ -55,7 +55,7 @@ "@oclif/plugin-warn-if-update-available": "^1.7.0", "@types/command-exists": "^1.2.0", "@oclif/plugin-plugins": "^1.9.4", - "bip32": "2.0.5", + "bip32": "3.1.0", "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", "chalk": "^2.4.2", "cli-table": "^0.3.1", @@ -86,7 +86,7 @@ "@types/inquirer": "^6.5.0", "@types/ledgerhq__hw-transport-node-hid": "^4.22.2", "@types/mocha": "^7.0.2", - "@types/node": "^10", + "@types/node": "^18.7.16", "@types/web3": "^1.0.18", "globby": "^8", "prettier": "1.19.1", diff --git a/packages/cli/src/commands/account/claims.test.ts b/packages/cli/src/commands/account/claims.test.ts index 87ce4492de4..721b8c7eeb5 100644 --- a/packages/cli/src/commands/account/claims.test.ts +++ b/packages/cli/src/commands/account/claims.test.ts @@ -26,7 +26,7 @@ testWithGanache('account metadata cmds', (web3: Web3) => { describe('Modifying the metadata file', () => { const emptyFilePath = `${tmpdir()}/metadata.json` const generateEmptyMetadataFile = () => { - writeFileSync(emptyFilePath, IdentityMetadataWrapper.fromEmpty(account)) + writeFileSync(emptyFilePath, IdentityMetadataWrapper.fromEmpty(account).toString()) } const readFile = async () => { diff --git a/packages/cli/src/commands/grandamento/execute.test.ts b/packages/cli/src/commands/grandamento/execute.test.ts index f2d0bd1200a..184237a7ce8 100644 --- a/packages/cli/src/commands/grandamento/execute.test.ts +++ b/packages/cli/src/commands/grandamento/execute.test.ts @@ -45,7 +45,7 @@ testWithGanache('grandamento:execute cmd', (web3: Web3) => { const timeTravelDateAndChain = async (seconds: number) => { await timeTravel(seconds, web3) - jest.useFakeTimers('modern').setSystemTime(dateNowOriginal() + seconds * 1000) + jest.useFakeTimers().setSystemTime(dateNowOriginal() + seconds * 1000) // Otherwise contractkit complains there is a difference between Date.now() // and the timestamp of the last block process.env.NO_SYNCCHECK = 'true' diff --git a/packages/cli/src/utils/checks.ts b/packages/cli/src/utils/checks.ts index c3952eaed24..6fcd55c75e8 100644 --- a/packages/cli/src/utils/checks.ts +++ b/packages/cli/src/utils/checks.ts @@ -444,9 +444,8 @@ class CheckBuilder { return this.addCheck( `Enough time has passed since the account was removed from a validator group`, this.withValidators(async (validators, _signer, account) => { - const { - lastRemovedFromGroupTimestamp, - } = await validators.getValidatorMembershipHistoryExtraData(account) + const { lastRemovedFromGroupTimestamp } = + await validators.getValidatorMembershipHistoryExtraData(account) const { duration } = await validators.getValidatorLockedGoldRequirements() return duration.toNumber() + lastRemovedFromGroupTimestamp < Date.now() / 1000 }) diff --git a/packages/cli/src/utils/exec.ts b/packages/cli/src/utils/exec.ts index 3513724ff4f..8081093b2f1 100644 --- a/packages/cli/src/utils/exec.ts +++ b/packages/cli/src/utils/exec.ts @@ -6,7 +6,7 @@ export function execCmd( args: string[], options?: SpawnOptions & { silent?: boolean } ) { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { const { silent, ...spawnOptions } = options || { silent: false } if (!silent) { console.debug('$ ' + [cmd].concat(args).join(' ')) diff --git a/packages/dev-utils/src/ganache-setup.ts b/packages/dev-utils/src/ganache-setup.ts index f4e65995d83..61ada9b995e 100644 --- a/packages/dev-utils/src/ganache-setup.ts +++ b/packages/dev-utils/src/ganache-setup.ts @@ -1,5 +1,5 @@ // @ts-ignore -import * as ganache from '@celo/ganache-cli' +import * as ganache from 'ganache' import * as fs from 'fs-extra' import * as path from 'path' import * as targz from 'targz' @@ -78,25 +78,24 @@ async function launchServer(opts: { verbose?: boolean; from_targz?: boolean }, c allowUnlimitedContractSize: true, }) - await new Promise((resolve, reject) => { - server.listen(8545, (err: any, blockchain: any) => { + await new Promise((resolve, reject) => { + server.listen(8545, async (err: any) => { if (err) { reject(err) } else { - resolve(blockchain) + resolve() } }) }) return () => - new Promise((resolve, reject) => { - server.close((err: any) => { - if (err) { - reject(err) - } else { - resolve() - } - }) + new Promise(async (resolve, reject) => { + try { + await server.close() + resolve() + } catch (e) { + reject(e) + } }) } diff --git a/packages/env-tests/src/shared/attestation.ts b/packages/env-tests/src/shared/attestation.ts index 91d62f36bd8..e7bd7b8847e 100644 --- a/packages/env-tests/src/shared/attestation.ts +++ b/packages/env-tests/src/shared/attestation.ts @@ -127,9 +127,8 @@ async function findValidCode( if (!attestationCodeDeepLink) { continue } - attestationCode = AttestationUtils.extractAttestationCodeFromMessage( - attestationCodeDeepLink - ) + attestationCode = + AttestationUtils.extractAttestationCodeFromMessage(attestationCodeDeepLink) } else { attestationCode = AttestationUtils.extractAttestationCodeFromMessage(message) } diff --git a/packages/env-tests/src/tests/granda-mento.ts b/packages/env-tests/src/tests/granda-mento.ts index 1381445dd7a..81ef0b2d7c9 100644 --- a/packages/env-tests/src/tests/granda-mento.ts +++ b/packages/env-tests/src/tests/granda-mento.ts @@ -102,8 +102,8 @@ export function runGrandaMentoTest(context: EnvTestContext, stableTokensToTest: }) // Some flakiness has been observed after proposing, so we sleep await sleep(5000) - const proposalId = creationReceipt.events!.ExchangeProposalCreated.returnValues - .proposalId + const proposalId = + creationReceipt.events!.ExchangeProposalCreated.returnValues.proposalId logger.debug( { diff --git a/packages/metadata-crawler/package.json b/packages/metadata-crawler/package.json index b407bf8124d..d7442c3cd21 100644 --- a/packages/metadata-crawler/package.json +++ b/packages/metadata-crawler/package.json @@ -23,7 +23,7 @@ "web3": "1.3.6" }, "devDependencies": { - "@types/bunyan": "1.8.4", + "@types/bunyan": "1.8.8", "@types/dotenv": "^8.2.0", "bunyan-debug-stream": "^2.0.0" }, @@ -34,4 +34,4 @@ "clean:all": "yarn clean && rm -rf lib" }, "private": true -} \ No newline at end of file +} diff --git a/packages/phone-number-privacy/combiner/package.json b/packages/phone-number-privacy/combiner/package.json index 5ff7ff5e8f2..9559dc0228d 100644 --- a/packages/phone-number-privacy/combiner/package.json +++ b/packages/phone-number-privacy/combiner/package.json @@ -34,6 +34,7 @@ "@celo/identity": "2.2.1-dev", "@celo/phone-number-privacy-common": "1.0.39", "@celo/utils": "2.2.1-dev", + "@types/bunyan": "^1.8.8", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", "firebase-admin": "^9.12.0", "firebase-functions": "^3.15.7", @@ -53,6 +54,6 @@ "@celo/flake-tracker": "0.0.1-dev" }, "engines": { - "node": "12" + "node": ">=14" } -} \ No newline at end of file +} diff --git a/packages/phone-number-privacy/combiner/test/signing/bls-signature.test.ts b/packages/phone-number-privacy/combiner/test/signing/bls-signature.test.ts index 85f56f0250d..e728c76ce1f 100644 --- a/packages/phone-number-privacy/combiner/test/signing/bls-signature.test.ts +++ b/packages/phone-number-privacy/combiner/test/signing/bls-signature.test.ts @@ -57,7 +57,7 @@ describe(`BLS service computes signature`, () => { const blsCryptoClient = new BLSCryptographyClient() for (let i = 0; i < signatures.length; i++) { - await blsCryptoClient.addSignature(signatures[i]) + blsCryptoClient.addSignature(signatures[i]) if (i >= 2) { expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() } else { @@ -105,8 +105,8 @@ describe(`BLS service computes signature`, () => { const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') const blsCryptoClient = new BLSCryptographyClient() - await signatures.forEach(async (signature) => { - await blsCryptoClient.addSignature(signature) + signatures.forEach(async (signature) => { + blsCryptoClient.addSignature(signature) }) const actual = await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) expect(actual).toEqual(COMBINED_SIGNATURE) @@ -148,8 +148,8 @@ describe(`BLS service computes signature`, () => { const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') const blsCryptoClient = new BLSCryptographyClient() - await signatures.forEach(async (signature) => { - await blsCryptoClient.addSignature(signature) + signatures.forEach(async (signature) => { + blsCryptoClient.addSignature(signature) }) try { await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) @@ -189,11 +189,11 @@ describe(`BLS service computes signature`, () => { const blsCryptoClient = new BLSCryptographyClient() // Add sigs one-by-one and verify intermediary states - await blsCryptoClient.addSignature(signatures[0]) + blsCryptoClient.addSignature(signatures[0]) expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() - await blsCryptoClient.addSignature(signatures[1]) + blsCryptoClient.addSignature(signatures[1]) expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() - await blsCryptoClient.addSignature(signatures[2]) + blsCryptoClient.addSignature(signatures[2]) expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() // Should fail since 1/3 sigs are invalid try { @@ -204,7 +204,7 @@ describe(`BLS service computes signature`, () => { // Should be false, now that the invalid signature has been removed expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() - await blsCryptoClient.addSignature(signatures[3]) + blsCryptoClient.addSignature(signatures[3]) expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() const actual = await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) expect(actual).toEqual(COMBINED_SIGNATURE) @@ -247,11 +247,11 @@ describe(`BLS service computes signature`, () => { const blsCryptoClient = new BLSCryptographyClient() // Add sigs one-by-one and verify intermediary states - await blsCryptoClient.addSignature(signatures[0]) + blsCryptoClient.addSignature(signatures[0]) expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() - await blsCryptoClient.addSignature(signatures[1]) + blsCryptoClient.addSignature(signatures[1]) expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() - await blsCryptoClient.addSignature(signatures[2]) + blsCryptoClient.addSignature(signatures[2]) expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() // Should fail since signature from url3 was generated with the wrong key version try { @@ -263,7 +263,7 @@ describe(`BLS service computes signature`, () => { // Should be false, now that the invalid partial signature has been removed expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() - await blsCryptoClient.addSignature(signatures[3]) + blsCryptoClient.addSignature(signatures[3]) expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() const actual = await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) expect(actual).toEqual(COMBINED_SIGNATURE) diff --git a/packages/phone-number-privacy/common/package.json b/packages/phone-number-privacy/common/package.json index d5b8fe747ec..984a80ef0b0 100644 --- a/packages/phone-number-privacy/common/package.json +++ b/packages/phone-number-privacy/common/package.json @@ -21,6 +21,7 @@ "@celo/base": "2.2.1-dev", "@celo/contractkit": "2.2.1-dev", "@celo/utils": "2.2.1-dev", + "@types/bunyan": "1.8.8", "bignumber.js": "^9.0.0", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", "btoa": "1.2.1", @@ -36,7 +37,6 @@ "@celo/poprf": "^0.1.6", "@celo/wallet-local": "2.2.1-dev", "@types/btoa": "^1.2.3", - "@types/bunyan": "1.8.4", "@types/elliptic": "^6.4.12", "@types/express": "^4.17.6", "@types/is-base64": "^1.1.0", @@ -45,4 +45,4 @@ "engines": { "node": ">=10" } -} \ No newline at end of file +} diff --git a/packages/phone-number-privacy/common/src/domains/domains.test.ts b/packages/phone-number-privacy/common/src/domains/domains.test.ts index 08e70cfb216..73741a04ab5 100644 --- a/packages/phone-number-privacy/common/src/domains/domains.test.ts +++ b/packages/phone-number-privacy/common/src/domains/domains.test.ts @@ -11,10 +11,10 @@ import { Domain, domainEIP712, DomainOptions } from './domains' import { SequentialDelayDomain } from './sequential-delay' // Compile-time check that Domain can be cast to type EIP712Object -export const TEST_DOMAIN_IS_EIP712: EIP712Object = ({} as unknown) as Domain +export const TEST_DOMAIN_IS_EIP712: EIP712Object = {} as unknown as Domain // Compile-time check that DomainOptions can be cast to type EIP712Object -export const TEST_DOMAIN_OPTIONS_ARE_EIP712: EIP712Object = ({} as unknown) as DomainOptions +export const TEST_DOMAIN_OPTIONS_ARE_EIP712: EIP712Object = {} as unknown as DomainOptions describe('domainEIP712()', () => { it('should generate the correct type data for SequentialDelayDomain instance', () => { diff --git a/packages/phone-number-privacy/common/src/interfaces/responses.ts b/packages/phone-number-privacy/common/src/interfaces/responses.ts index 8d5d0e36727..828bc540377 100644 --- a/packages/phone-number-privacy/common/src/interfaces/responses.ts +++ b/packages/phone-number-privacy/common/src/interfaces/responses.ts @@ -85,18 +85,17 @@ export interface DisableDomainResponseFailure { export type DisableDomainResponse = DisableDomainResponseSuccess | DisableDomainResponseFailure -export type DomainResponse< - R extends DomainRequest = DomainRequest -> = R extends DomainRestrictedSignatureRequest - ? DomainRestrictedSignatureResponse - : never | R extends DomainQuotaStatusRequest - ? DomainQuotaStatusResponse - : never | R extends DisableDomainRequest - ? DisableDomainResponse - : never - -export const DomainRestrictedSignatureResponseSchema: t.Type = t.union( - [ +export type DomainResponse = + R extends DomainRestrictedSignatureRequest + ? DomainRestrictedSignatureResponse + : never | R extends DomainQuotaStatusRequest + ? DomainQuotaStatusResponse + : never | R extends DisableDomainRequest + ? DisableDomainResponse + : never + +export const DomainRestrictedSignatureResponseSchema: t.Type = + t.union([ t.type({ success: t.literal(true), version: t.string, @@ -107,8 +106,7 @@ export const DomainRestrictedSignatureResponseSchema: t.Type( state: t.Type> diff --git a/packages/phone-number-privacy/common/src/utils/authentication.ts b/packages/phone-number-privacy/common/src/utils/authentication.ts index b12d29113b6..449bb8bbee0 100644 --- a/packages/phone-number-privacy/common/src/utils/authentication.ts +++ b/packages/phone-number-privacy/common/src/utils/authentication.ts @@ -137,7 +137,8 @@ export async function isVerified( try { const res = await retryAsyncWithBackOffAndTimeout( async () => { - const attestationsWrapper: AttestationsWrapper = await contractKit.contracts.getAttestations() + const attestationsWrapper: AttestationsWrapper = + await contractKit.contracts.getAttestations() const { isVerified: _isVerified, completed, diff --git a/packages/phone-number-privacy/common/test/interfaces/requests.test.ts b/packages/phone-number-privacy/common/test/interfaces/requests.test.ts index 32b27aacae4..3386c461312 100644 --- a/packages/phone-number-privacy/common/test/interfaces/requests.test.ts +++ b/packages/phone-number-privacy/common/test/interfaces/requests.test.ts @@ -30,18 +30,20 @@ import { // Compile-time check that DomainRestrictedSignatureRequest can be cast to type EIP712Object. export let TEST_DOMAIN_RESTRICTED_SIGNATURE_REQUEST_IS_EIP712: EIP712Object -TEST_DOMAIN_RESTRICTED_SIGNATURE_REQUEST_IS_EIP712 = ({} as unknown) as DomainRestrictedSignatureRequest -TEST_DOMAIN_RESTRICTED_SIGNATURE_REQUEST_IS_EIP712 = ({} as unknown) as DomainRestrictedSignatureRequest +TEST_DOMAIN_RESTRICTED_SIGNATURE_REQUEST_IS_EIP712 = + {} as unknown as DomainRestrictedSignatureRequest +TEST_DOMAIN_RESTRICTED_SIGNATURE_REQUEST_IS_EIP712 = + {} as unknown as DomainRestrictedSignatureRequest // Compile-time check that DomainQuotaStatusRequest can be cast to type EIP712Object. export let TEST_DOMAIN_QUOTA_STATUS_REQUEST_IS_EIP712: EIP712Object -TEST_DOMAIN_QUOTA_STATUS_REQUEST_IS_EIP712 = ({} as unknown) as DomainQuotaStatusRequest -TEST_DOMAIN_QUOTA_STATUS_REQUEST_IS_EIP712 = ({} as unknown) as DomainQuotaStatusRequest +TEST_DOMAIN_QUOTA_STATUS_REQUEST_IS_EIP712 = {} as unknown as DomainQuotaStatusRequest +TEST_DOMAIN_QUOTA_STATUS_REQUEST_IS_EIP712 = {} as unknown as DomainQuotaStatusRequest // Compile-time check that DomainQuotaStatusRequest can be cast to type EIP712Object. export let TEST_DISABLE_DOMAIN_REQUEST_IS_EIP712: EIP712Object -TEST_DISABLE_DOMAIN_REQUEST_IS_EIP712 = ({} as unknown) as DisableDomainRequest -TEST_DISABLE_DOMAIN_REQUEST_IS_EIP712 = ({} as unknown) as DisableDomainRequest +TEST_DISABLE_DOMAIN_REQUEST_IS_EIP712 = {} as unknown as DisableDomainRequest +TEST_DISABLE_DOMAIN_REQUEST_IS_EIP712 = {} as unknown as DisableDomainRequest describe('domainRestrictedSignatureRequestEIP712()', () => { it('should generate the correct type data for request with SequentialDelayDomain', () => { diff --git a/packages/phone-number-privacy/monitor/package.json b/packages/phone-number-privacy/monitor/package.json index fbb22e89bf2..984f40e5d0c 100644 --- a/packages/phone-number-privacy/monitor/package.json +++ b/packages/phone-number-privacy/monitor/package.json @@ -35,6 +35,6 @@ "firebase-tools": "9.20.0" }, "engines": { - "node": "12" + "node": ">=14" } } \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/package.json b/packages/phone-number-privacy/signer/package.json index b2d8f24b6c9..a09ea6eddf1 100644 --- a/packages/phone-number-privacy/signer/package.json +++ b/packages/phone-number-privacy/signer/package.json @@ -36,8 +36,7 @@ "@celo/utils": "2.2.1-dev", "@celo/wallet-hsm-azure": "2.2.1-dev", "@google-cloud/secret-manager": "3.0.0", - "@types/bunyan": "^1.8.6", - "@types/promise.allsettled": "^1.0.3", + "@types/bunyan": "^1.8.8", "aws-sdk": "^2.705.0", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", "dotenv": "^8.2.0", @@ -52,6 +51,7 @@ "devDependencies": { "@types/btoa": "^1.2.3", "@types/express": "^4.17.6", + "@types/promise.allsettled": "^1.0.3", "@types/supertest": "^2.0.9", "supertest": "^4.0.2", "ts-mockito": "^2.6.1", diff --git a/packages/phone-number-privacy/signer/src/common/metrics.ts b/packages/phone-number-privacy/signer/src/common/metrics.ts index 809fcf5b153..e6aa69e2674 100644 --- a/packages/phone-number-privacy/signer/src/common/metrics.ts +++ b/packages/phone-number-privacy/signer/src/common/metrics.ts @@ -49,8 +49,7 @@ export const Counters = { }), requestsWithUnverifiedAccountWithMinBalance: new Counter({ name: 'requests_with_unverified_account_with_min_balance', - help: - 'Counter for the number of requests in which the account is not verified but meets min balance', + help: 'Counter for the number of requests in which the account is not verified but meets min balance', }), testQuotaBypassedRequests: new Counter({ name: 'test_quota_bypassed_requests', @@ -62,29 +61,8 @@ export const Counters = { }), } const buckets = [ - 0.001, - 0.01, - 0.1, - 0.2, - 0.3, - 0.5, - 0.6, - 0.7, - 0.8, - 0.9, - 1, - 1.2, - 1.4, - 1.6, - 1.8, - 2, - 2.3, - 2.6, - 2.9, - 3.5, - 4, - 5, - 10, + 0.001, 0.01, 0.1, 0.2, 0.3, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.2, 1.4, 1.6, 1.8, 2, 2.3, 2.6, 2.9, 3.5, + 4, 5, 10, ] export const Histograms = { diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 1194eb77751..d7eb127c883 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -6,12 +6,20 @@ import { config } from '@celo/protocol/migrationsConfig' import { AttestationUtils } from '@celo/utils' import { privateKeyToAddress } from '@celo/utils/lib/address' import { soliditySha3 } from '@celo/utils/lib/solidity' +import assert from 'assert' import BigNumber from 'bignumber.js' import chai from 'chai' import chaiSubset from 'chai-subset' import { spawn, SpawnOptions } from 'child_process' import { keccak256 } from 'ethereumjs-util' -import { GovernanceApproverMultiSigInstance, GovernanceInstance, LockedGoldInstance, ProxyInstance, RegistryInstance, UsingRegistryInstance } from 'types' +import { + GovernanceApproverMultiSigInstance, + GovernanceInstance, + LockedGoldInstance, + ProxyInstance, + RegistryInstance, + UsingRegistryInstance, +} from 'types' import Web3 from 'web3' // tslint:disable-next-line: ordered-imports @@ -22,8 +30,6 @@ const isNumber = (x: any) => chai.use(chaiSubset) -const assert = chai.assert - // hard coded in ganache export const EPOCH = 100 @@ -124,7 +130,7 @@ export const assertThrowsAsync = async (promise: any, errorMessage: string = '') failed = true } - assert.isTrue(failed, errorMessage) + assert.equal(true, failed, errorMessage) } export async function assertRevertWithReason(promise: any, expectedRevertReason: string = '') { @@ -139,7 +145,7 @@ export async function assertRevertWithReason(promise: any, expectedRevertReason: // `Returned error: VM Exception while processing transaction: revert ${revertMessage} -- Reason given: ${revertMessage}.` // Therefore we try to parse the first instance of `${revertMessage}`. const foundRevertReason = error.message - .split(" -- Reason given: ")[0] + .split(' -- Reason given: ')[0] .split('Returned error: VM Exception while processing transaction: revert ')[1] assert.equal(foundRevertReason, expectedRevertReason, 'Incorrect revert message') } @@ -153,9 +159,10 @@ export async function assertRevert(promise: any, errorMessage: string = '') { await promise assert.fail('Expected transaction to revert') } catch (error) { - const revertFound = + const revertFound: boolean = error.message.search('VM Exception while processing transaction: revert') >= 0 - const msg = errorMessage === '' ? `Expected "revert", got ${error} instead` : errorMessage + const msg: string = + errorMessage === '' ? `Expected "revert", got ${error} instead` : errorMessage assert(revertFound, msg) } } @@ -264,13 +271,7 @@ export const assertFloatEquality = ( errorMessage: string, epsilon = new BigNumber(0.00000001) ) => { - assert( - a - .minus(b) - .abs() - .comparedTo(epsilon) === -1, - errorMessage - ) + assert(a.minus(b).abs().comparedTo(epsilon) === -1, errorMessage) } export function assertLogMatches2( @@ -294,7 +295,7 @@ export function assertLogMatches( export function assertObjectWithBNEqual( actual: object, expected: Record, - fieldErrorMsg: (field?: string) => string, + fieldErrorMsg: (field?: string) => string ) { const objectFields = Object.keys(actual) .filter((k) => k !== '__length__' && isNaN(parseInt(k, 10))) @@ -308,8 +309,7 @@ export function assertObjectWithBNEqual( assertEqualBN(actual[k], expected[k], fieldErrorMsg(k)) } else if (Array.isArray(actual[k])) { assert.deepEqual(actual[k], expected[k], fieldErrorMsg(k)) - } - else { + } else { assert.equal(actual[k], expected[k], fieldErrorMsg(k)) } } @@ -332,10 +332,7 @@ export function assertAlmostEqualBN( margin: number | BN | BigNumber, msg?: string ) { - const diff = web3.utils - .toBN(actual) - .sub(web3.utils.toBN(expected)) - .abs() + const diff = web3.utils.toBN(actual).sub(web3.utils.toBN(expected)).abs() assert( web3.utils.toBN(margin).gte(diff), `expected ${expected.toString(10)} to be within ${margin.toString(10)} of ${actual.toString( @@ -374,8 +371,9 @@ export function assertGteBN( ) { assert( web3.utils.toBN(value).gte(web3.utils.toBN(expected)), - `expected ${value.toString()} to be greater than or equal to ${expected.toString()}. ${msg || - ''}` + `expected ${value.toString()} to be greater than or equal to ${expected.toString()}. ${ + msg || '' + }` ) } @@ -465,50 +463,58 @@ enum VoteValue { Yes, } -export async function assumeOwnership(contractsToOwn: string[], to: string, proposalId: number = 1, dequeuedIndex: number = 0) { - const governance: GovernanceInstance = await getDeployedProxiedContract('Governance', artifacts) - const lockedGold: LockedGoldInstance = await getDeployedProxiedContract('LockedGold', artifacts) - const multiSig: GovernanceApproverMultiSigInstance = await getDeployedProxiedContract( - 'GovernanceApproverMultiSig', - artifacts - ) - const registry: RegistryInstance = await getDeployedProxiedContract('Registry', artifacts) +export async function assumeOwnership( + contractsToOwn: string[], + to: string, + proposalId: number = 1, + dequeuedIndex: number = 0 +) { + const governance: GovernanceInstance = await getDeployedProxiedContract('Governance', artifacts) + const lockedGold: LockedGoldInstance = await getDeployedProxiedContract('LockedGold', artifacts) + const multiSig: GovernanceApproverMultiSigInstance = await getDeployedProxiedContract( + 'GovernanceApproverMultiSig', + artifacts + ) + const registry: RegistryInstance = await getDeployedProxiedContract('Registry', artifacts) // Enough to pass the governance proposal unilaterally (and then some). const tenMillionCELO = '10000000000000000000000000' - // @ts-ignore - await lockedGold.lock({ value: tenMillionCELO }) + // @ts-ignore + await lockedGold.lock({ value: tenMillionCELO }) // Any contract's `transferOwnership` function will work here as the function signatures are all the same. - // @ts-ignore - const transferOwnershipData = Buffer.from(stripHexEncoding(registry.contract.methods.transferOwnership(to).encodeABI()), 'hex') - const proposalTransactions = await Promise.all( - contractsToOwn.map(async (contractName: string) => { - return { - value: 0, - destination: (await getDeployedProxiedContract(contractName, artifacts)).address, - data: transferOwnershipData, - } - }) - ) - await governance.propose( - proposalTransactions.map((tx: any) => tx.value), - proposalTransactions.map((tx: any) => tx.destination), - // @ts-ignore - Buffer.concat(proposalTransactions.map((tx: any) => tx.data)), - proposalTransactions.map((tx: any) => tx.data.length), - 'URL', - // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails - { value: web3.utils.toWei(config.governance.minDeposit.toString(), 'ether') } - ) - - await governance.upvote(proposalId, 0, 0) - await timeTravel(config.governance.dequeueFrequency, web3) - // @ts-ignore - const txData = governance.contract.methods.approve(proposalId, dequeuedIndex).encodeABI() - await multiSig.submitTransaction(governance.address, 0, txData) - await timeTravel(config.governance.approvalStageDuration, web3) - await governance.vote(proposalId, dequeuedIndex, VoteValue.Yes) - await timeTravel(config.governance.referendumStageDuration, web3) - await governance.execute(proposalId, dequeuedIndex) + // @ts-ignore + const transferOwnershipData = Buffer.from( + stripHexEncoding(registry.contract.methods.transferOwnership(to).encodeABI()), + 'hex' + ) + const proposalTransactions = await Promise.all( + contractsToOwn.map(async (contractName: string) => { + return { + value: 0, + destination: (await getDeployedProxiedContract(contractName, artifacts)).address, + data: transferOwnershipData, + } + }) + ) + await governance.propose( + proposalTransactions.map((tx: any) => tx.value), + proposalTransactions.map((tx: any) => tx.destination), + // @ts-ignore + Buffer.concat(proposalTransactions.map((tx: any) => tx.data)), + proposalTransactions.map((tx: any) => tx.data.length), + 'URL', + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: web3.utils.toWei(config.governance.minDeposit.toString(), 'ether') } + ) + + await governance.upvote(proposalId, 0, 0) + await timeTravel(config.governance.dequeueFrequency, web3) + // @ts-ignore + const txData = governance.contract.methods.approve(proposalId, dequeuedIndex).encodeABI() + await multiSig.submitTransaction(governance.address, 0, txData) + await timeTravel(config.governance.approvalStageDuration, web3) + await governance.vote(proposalId, dequeuedIndex, VoteValue.Yes) + await timeTravel(config.governance.referendumStageDuration, web3) + await governance.execute(proposalId, dequeuedIndex) } /* @@ -552,7 +558,12 @@ export const getDerivedKey = (offset: number, address: string, accounts: string[ return '0x' + aKey.toString('hex') } -export const unlockAndAuthorizeKey = async (offset: number, authorizeFn: any, account: string, accounts: string[]) => { +export const unlockAndAuthorizeKey = async ( + offset: number, + authorizeFn: any, + account: string, + accounts: string[] +) => { const key = getDerivedKey(offset, account, accounts) const addr = privateKeyToAddress(key) // @ts-ignore diff --git a/packages/protocol/migrations/02_registry.ts b/packages/protocol/migrations/02_registry.ts index cdc657ec8d3..e81da75621c 100644 --- a/packages/protocol/migrations/02_registry.ts +++ b/packages/protocol/migrations/02_registry.ts @@ -2,7 +2,7 @@ import { build_directory, config } from '@celo/protocol/migrationsConfig' import { RegistryInstance } from 'types' import { setInitialProxyImplementation } from '../lib/web3-utils' -const Artifactor = require('truffle-artifactor') +const Artifactor = require('@truffle/artifactor') const name = 'Registry' const Contract = artifacts.require(name) diff --git a/packages/protocol/migrations/08_reserve.ts b/packages/protocol/migrations/08_reserve.ts index 686eab930f0..1e0b97fdb18 100644 --- a/packages/protocol/migrations/08_reserve.ts +++ b/packages/protocol/migrations/08_reserve.ts @@ -67,10 +67,11 @@ module.exports = deploymentForCoreContract( } } - const reserveSpenderMultiSig: ReserveSpenderMultiSigInstance = await getDeployedProxiedContract( - CeloContractName.ReserveSpenderMultiSig, - artifacts - ) + const reserveSpenderMultiSig: ReserveSpenderMultiSigInstance = + await getDeployedProxiedContract( + CeloContractName.ReserveSpenderMultiSig, + artifacts + ) console.info(`Marking ${reserveSpenderMultiSig.address} as a reserve spender`) await reserve.addSpender(reserveSpenderMultiSig.address) } diff --git a/packages/protocol/migrations/09_01_stableToken_EUR.ts b/packages/protocol/migrations/09_01_stableToken_EUR.ts index 44ddde512e1..020252a402e 100644 --- a/packages/protocol/migrations/09_01_stableToken_EUR.ts +++ b/packages/protocol/migrations/09_01_stableToken_EUR.ts @@ -47,10 +47,8 @@ module.exports = deploymentForCoreContract( ) await freezer.freeze(stableToken.address) } - const sortedOracles: SortedOraclesInstance = await getDeployedProxiedContract( - 'SortedOracles', - artifacts - ) + const sortedOracles: SortedOraclesInstance = + await getDeployedProxiedContract('SortedOracles', artifacts) for (const oracle of config.stableTokenEUR.oracles) { console.info(`Adding ${oracle} as an Oracle for StableToken (EUR)`) @@ -83,10 +81,11 @@ module.exports = deploymentForCoreContract( } console.info('Whitelisting StableToken (EUR) as a fee currency') - const feeCurrencyWhitelist: FeeCurrencyWhitelistInstance = await getDeployedProxiedContract( - 'FeeCurrencyWhitelist', - artifacts - ) + const feeCurrencyWhitelist: FeeCurrencyWhitelistInstance = + await getDeployedProxiedContract( + 'FeeCurrencyWhitelist', + artifacts + ) await feeCurrencyWhitelist.addToken(stableToken.address) } ) diff --git a/packages/protocol/migrations/09_02_stableToken_BRL.ts b/packages/protocol/migrations/09_02_stableToken_BRL.ts index 562bc170db9..cd6aa5aee2b 100644 --- a/packages/protocol/migrations/09_02_stableToken_BRL.ts +++ b/packages/protocol/migrations/09_02_stableToken_BRL.ts @@ -47,10 +47,8 @@ module.exports = deploymentForCoreContract( ) await freezer.freeze(stableToken.address) } - const sortedOracles: SortedOraclesInstance = await getDeployedProxiedContract( - 'SortedOracles', - artifacts - ) + const sortedOracles: SortedOraclesInstance = + await getDeployedProxiedContract('SortedOracles', artifacts) for (const oracle of config.stableTokenBRL.oracles) { console.info(`Adding ${oracle} as an Oracle for StableToken (BRL)`) @@ -83,10 +81,11 @@ module.exports = deploymentForCoreContract( } console.info('Whitelisting StableToken (BRL) as a fee currency') - const feeCurrencyWhitelist: FeeCurrencyWhitelistInstance = await getDeployedProxiedContract( - 'FeeCurrencyWhitelist', - artifacts - ) + const feeCurrencyWhitelist: FeeCurrencyWhitelistInstance = + await getDeployedProxiedContract( + 'FeeCurrencyWhitelist', + artifacts + ) await feeCurrencyWhitelist.addToken(stableToken.address) } ) diff --git a/packages/protocol/migrations/09_0_stabletoken_USD.ts b/packages/protocol/migrations/09_0_stabletoken_USD.ts index cb5a47a8f5d..4d0fe908b6b 100644 --- a/packages/protocol/migrations/09_0_stabletoken_USD.ts +++ b/packages/protocol/migrations/09_0_stabletoken_USD.ts @@ -47,10 +47,8 @@ module.exports = deploymentForCoreContract( await freezer.freeze(stableToken.address) } - const sortedOracles: SortedOraclesInstance = await getDeployedProxiedContract( - 'SortedOracles', - artifacts - ) + const sortedOracles: SortedOraclesInstance = + await getDeployedProxiedContract('SortedOracles', artifacts) for (const oracle of config.stableToken.oracles) { console.info(`Adding ${oracle} as an Oracle for StableToken (USD)`) @@ -83,10 +81,11 @@ module.exports = deploymentForCoreContract( } console.info('Whitelisting StableToken (USD) as a fee currency') - const feeCurrencyWhitelist: FeeCurrencyWhitelistInstance = await getDeployedProxiedContract( - 'FeeCurrencyWhitelist', - artifacts - ) + const feeCurrencyWhitelist: FeeCurrencyWhitelistInstance = + await getDeployedProxiedContract( + 'FeeCurrencyWhitelist', + artifacts + ) await feeCurrencyWhitelist.addToken(stableToken.address) } ) diff --git a/packages/protocol/migrations/28_governance.ts b/packages/protocol/migrations/28_governance.ts index c2c638267f7..7c3095ab63b 100644 --- a/packages/protocol/migrations/28_governance.ts +++ b/packages/protocol/migrations/28_governance.ts @@ -13,10 +13,11 @@ import { toFixed } from '@celo/utils/lib/fixidity' import { GovernanceApproverMultiSigInstance, GovernanceInstance } from 'types' const initializeArgs = async (networkName: string): Promise => { - const governanceApproverMultiSig: GovernanceApproverMultiSigInstance = await getDeployedProxiedContract( - CeloContractName.GovernanceApproverMultiSig, - artifacts - ) + const governanceApproverMultiSig: GovernanceApproverMultiSigInstance = + await getDeployedProxiedContract( + CeloContractName.GovernanceApproverMultiSig, + artifacts + ) const networkFrom: string = require('@celo/protocol/truffle-config.js').networks[networkName].from const approver: string = config.governanceApproverMultiSig.useMultiSig ? governanceApproverMultiSig.address diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 6df4f792d17..d1a7a275d7c 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -54,11 +54,15 @@ "@celo/base": "2.2.1-dev", "@celo/bls12377js": "0.1.1", "@celo/connect": "2.2.1-dev", - "@celo/ganache-cli": "git+https://github.com/celo-org/ganache-cli.git#e933297", "@celo/utils": "2.2.1-dev", "@celo/cryptographic-utils": "2.2.1-dev", "@openzeppelin/upgrades": "^2.8.0", + "@truffle/artifactor": "4.0.171", + "@truffle/contract": "4.6.3", + "@truffle/resolver": "9.0.18", "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", + "bignumber.js": "9.1.0", + "chai": "^4.3.6", "chai-subset": "^1.6.0", "csv-parser": "^2.0.0", "csv-stringify": "^4.3.1", @@ -68,6 +72,7 @@ "ethereumjs-vm": "^4.2.0", "ethereumjs-wallet": "^0.6.3", "fs-extra": "^5.0.0", + "ganache": "^7.4.4", "glob-fs": "^0.1.7", "graphql": "^14.1.1", "j6": "^1.0.2", @@ -78,11 +83,8 @@ "prompts": "^2.0.1", "solhint": "^2.3.1", "solidity-bytes-utils": "0.0.7", - "truffle": "5.1.18", - "truffle-artifactor": "^4.0.30", - "truffle-contract": "^4.0.31", - "truffle-resolver": "^5.0.16", - "truffle-security": "^1.7.1", + "truffle": "5.6.1", + "truffle-security": "^1.7.3", "twilio": "^3.57.0", "weak-map": "^1.0.5", "web3": "1.3.6", @@ -96,8 +98,9 @@ "@celo/phone-utils": "2.2.1-dev", "@celo/typechain-target-web3-v1-celo": "0.2.0", "@celo/typescript": "0.0.1", - "@types/bn.js": "^4.11.0", + "@types/bn.js": "4.11.6", "@types/chai": "^4.1.3", + "@types/chai-subset": "1.3.3", "@types/mathjs": "^4.4.1", "@types/mocha": "^7.0.2", "@types/targz": "^1.0.0", @@ -115,4 +118,4 @@ "typechain-target-truffle": "1.0.2", "yargs": "^14.0.0" } -} \ No newline at end of file +} diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index 0e50888bbf1..64cc9149f4b 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -1,4 +1,4 @@ -const ganache = require('@celo/ganache-cli') +const ganache = require('ganache') const glob = require('glob-fs')({ gitignore: false, }) diff --git a/packages/protocol/scripts/bash/ganache.sh b/packages/protocol/scripts/bash/ganache.sh index 8cfb036f790..041428e2485 100755 --- a/packages/protocol/scripts/bash/ganache.sh +++ b/packages/protocol/scripts/bash/ganache.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash set -euo pipefail -# Runs ganache-cli with the mnemonic used in our tests. +# Runs ganache with the mnemonic used in our tests. -yarn run ganache-cli \ +yarn run ganache \ --deterministic \ --mnemonic 'concert load couple harbor equip island argue ramp clarify fence smart topic' \ --gasPrice 0 \ diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 5daaabd2d85..848cb0b3029 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -1,4 +1,4 @@ -import ganache from '@celo/ganache-cli' +import ganache from 'ganache' import chalk from 'chalk' import { spawn, SpawnOptions } from 'child_process' import fs from 'fs-extra' @@ -110,11 +110,7 @@ yargs (args) => exitOnError(compressChain(args.datadir, args.filename)) ).argv -async function startGanache( - datadir: string, - opts: { verbose?: boolean }, - chainCopy?: tmp.DirResult -) { +async function startGanache(datadir: string, opts: { verbose?: boolean }) { const logFn = opts.verbose ? // tslint:disable-next-line: no-console (...args: any[]) => console.log(...args) @@ -134,31 +130,27 @@ async function startGanache( allowUnlimitedContractSize: true, }) - await new Promise((resolve, reject) => { - server.listen(8545, (err, blockchain) => { + await new Promise((resolve, reject) => { + server.listen(8545, async (err) => { if (err) { reject(err) } else { // tslint:disable-next-line: no-console console.log(chalk.red('Ganache STARTED')) // console.log(blockchain) - resolve(blockchain) + resolve() } }) }) return () => - new Promise((resolve, reject) => { - server.close((err) => { - if (chainCopy) { - chainCopy.removeCallback() - } - if (err) { - reject(err) - } else { - resolve() - } - }) + new Promise(async (resolve, reject) => { + try { + await server.close() + resolve() + } catch (e) { + reject(e) + } }) } @@ -251,7 +243,7 @@ async function runDevChainFromTar(filename: string) { await decompressChain(filename, chainCopy.name) - const stopGanache = await startGanache(chainCopy.name, { verbose: true }, chainCopy) + const stopGanache = await startGanache(chainCopy.name, { verbose: true }) return stopGanache } diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index ce6b2c538eb..e35355da41d 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -7,7 +7,7 @@ import { CeloContractName, celoRegistryAddress } from '@celo/protocol/lib/regist import { Address, eqAddress, NULL_ADDRESS } from '@celo/utils/lib/address' import { readdirSync, readJsonSync, writeJsonSync } from 'fs-extra' import { basename, join } from 'path' -import { TruffleContract } from 'truffle-contract' +import { TruffleContract } from '@truffle/contract' import { RegistryInstance } from 'types' /* diff --git a/packages/protocol/scripts/truffle/revoke.ts b/packages/protocol/scripts/truffle/revoke.ts index 927a5eb8295..bd65fc307f9 100644 --- a/packages/protocol/scripts/truffle/revoke.ts +++ b/packages/protocol/scripts/truffle/revoke.ts @@ -22,10 +22,8 @@ module.exports = async (callback: (error?: any) => number) => { const phoneNumber: string = argv.phone // @ts-ignore soliditySha3 can take an object const phoneHash: string = web3.utils.soliditySha3({ type: 'string', value: phoneNumber }) - const attestations: AttestationsInstance = await getDeployedProxiedContract( - 'Attestations', - artifacts - ) + const attestations: AttestationsInstance = + await getDeployedProxiedContract('Attestations', artifacts) const currentAccounts = await attestations.lookupAccountsForIdentifier(phoneHash) const account = (await web3.eth.getAccounts())[0] diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index 7257b2ffbef..64b4247a87e 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -359,7 +359,7 @@ contract('Accounts', (accounts: string[]) => { const [stringLengths, data] = await accountsInstance.batchGetMetadataURL(accounts) const strings = parseSolidityStringArray( stringLengths.map((x) => x.toNumber()), - (data as unknown) as string + data as unknown as string ) for (let i = 0; i < accounts.length; i++) { assert.equal(strings[i], randomStrings[i]) @@ -824,20 +824,22 @@ contract('Accounts', (accounts: string[]) => { let getSignature beforeEach(async () => { - const authorizeSignerFactory = (role: string) => async (signer, v, r, s, ...rest) => { - const result1 = await accountsInstance.authorizeSignerWithSignature( - signer, - role, - v, - r, - s, - ...rest - ) - const result2 = await accountsInstance.setIndexedSigner(signer, role, ...rest) - return { - logs: [...result1.logs, ...result2.logs], + const authorizeSignerFactory = + (role: string) => + async (signer, v, r, s, ...rest) => { + const result1 = await accountsInstance.authorizeSignerWithSignature( + signer, + role, + v, + r, + s, + ...rest + ) + const result2 = await accountsInstance.setIndexedSigner(signer, role, ...rest) + return { + logs: [...result1.logs, ...result2.logs], + } } - } getSignature = (_account, signer) => { if (genericWrite) { diff --git a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts index 07d5c656f3b..1492a0cfc84 100644 --- a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts +++ b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts @@ -6,9 +6,8 @@ import { AddressSortedLinkedListWithMedianTestInstance, } from 'types' -const AddressSortedLinkedListWithMedianTest: AddressSortedLinkedListWithMedianTestContract = artifacts.require( - 'AddressSortedLinkedListWithMedianTest' -) +const AddressSortedLinkedListWithMedianTest: AddressSortedLinkedListWithMedianTestContract = + artifacts.require('AddressSortedLinkedListWithMedianTest') // @ts-ignore // TODO(mcortesi): Use BN diff --git a/packages/protocol/test/common/metatransactionwallet.ts b/packages/protocol/test/common/metatransactionwallet.ts index ceed1da3113..6e09a782393 100644 --- a/packages/protocol/test/common/metatransactionwallet.ts +++ b/packages/protocol/test/common/metatransactionwallet.ts @@ -7,9 +7,8 @@ import { assertEqualBN, assertLogMatches2, assertRevert } from '@celo/protocol/l import { ensureLeading0x, trimLeading0x } from '@celo/utils/lib/address' import { MetaTransactionWalletContract, MetaTransactionWalletInstance } from 'types' -const MetaTransactionWallet: MetaTransactionWalletContract = artifacts.require( - 'MetaTransactionWallet' -) +const MetaTransactionWallet: MetaTransactionWalletContract = + artifacts.require('MetaTransactionWallet') contract('MetaTransactionWallet', (accounts: string[]) => { let wallet: MetaTransactionWalletInstance diff --git a/packages/protocol/test/common/metatransactionwalletdeployer.ts b/packages/protocol/test/common/metatransactionwalletdeployer.ts index 1ee8f8ca687..7866974f51c 100644 --- a/packages/protocol/test/common/metatransactionwalletdeployer.ts +++ b/packages/protocol/test/common/metatransactionwalletdeployer.ts @@ -10,9 +10,8 @@ const MetaTransactionWalletDeployer: MetaTransactionWalletDeployerContract = art 'MetaTransactionWalletDeployer' ) -const MetaTransactionWallet: MetaTransactionWalletContract = artifacts.require( - 'MetaTransactionWallet' -) +const MetaTransactionWallet: MetaTransactionWalletContract = + artifacts.require('MetaTransactionWallet') const Proxy: ProxyContract = artifacts.require('Proxy') diff --git a/packages/protocol/test/compatibility/verify-bytecode.ts b/packages/protocol/test/compatibility/verify-bytecode.ts index 74602240415..e69c64755b5 100644 --- a/packages/protocol/test/compatibility/verify-bytecode.ts +++ b/packages/protocol/test/compatibility/verify-bytecode.ts @@ -12,7 +12,7 @@ import { NULL_ADDRESS } from '@celo/utils/lib/address' import { assert } from 'chai' import { RegistryInstance } from 'types' -import truffleContract = require('truffle-contract') +import truffleContract = require('@truffle/contract') const Registry = artifacts.require('Registry') const Proxy = artifacts.require('Proxy') diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index d10ebf5eedd..ce04f91764e 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -296,11 +296,8 @@ contract('Attestations', (accounts: string[]) => { await attestations.request(phoneHash, attestationsRequested, mockERC20Token.address) const requestBlock = await web3.eth.getBlock('latest') - const [ - blockNumber, - actualAttestationsRequested, - actualAttestationRequestFeeToken, - ] = await attestations.getUnselectedRequest(phoneHash, caller) + const [blockNumber, actualAttestationsRequested, actualAttestationRequestFeeToken] = + await attestations.getUnselectedRequest(phoneHash, caller) assertEqualBN(blockNumber, requestBlock.number) assertEqualBN(attestationsRequested, actualAttestationsRequested) @@ -456,16 +453,12 @@ contract('Attestations', (accounts: string[]) => { ) ) await attestations.selectIssuers(phoneHash) - const [ - attestationBlockNumbers, - attestationIssuers, - stringLengths, - stringData, - ] = await attestations.getCompletableAttestations(phoneHash, caller) + const [attestationBlockNumbers, attestationIssuers, stringLengths, stringData] = + await attestations.getCompletableAttestations(phoneHash, caller) const urls = parseSolidityStringArray( stringLengths.map((x) => x.toNumber()), - (stringData as unknown) as string + stringData as unknown as string ) assert.lengthOf(attestationBlockNumbers, attestationsRequested) @@ -485,10 +478,8 @@ contract('Attestations', (accounts: string[]) => { it('should delete the unselected request', async () => { await attestations.selectIssuers(phoneHash) - const [ - blockNumber, - actualAttestationsRequested, - ] = await attestations.getUnselectedRequest(phoneHash, caller) + const [blockNumber, actualAttestationsRequested] = + await attestations.getUnselectedRequest(phoneHash, caller) assertEqualBN(blockNumber, 0) assertEqualBN(actualAttestationsRequested, 0) }) @@ -629,11 +620,8 @@ contract('Attestations', (accounts: string[]) => { const expectedBlock = await web3.eth.getBlock('latest') - const [ - status, - completionBlock, - actualAttestationRequestFeeToken, - ] = await attestations.getAttestationState(phoneHash, caller, issuer) + const [status, completionBlock, actualAttestationRequestFeeToken] = + await attestations.getAttestationState(phoneHash, caller, issuer) assert.equal(status.toNumber(), 2) assert.equal(completionBlock.toNumber(), expectedBlock.number) diff --git a/packages/protocol/test/identity/escrow.ts b/packages/protocol/test/identity/escrow.ts index 06f21d8f9b2..04475d73789 100644 --- a/packages/protocol/test/identity/escrow.ts +++ b/packages/protocol/test/identity/escrow.ts @@ -28,9 +28,8 @@ import { getParsedSignatureOfAddress } from '../../lib/signing-utils' const Escrow: EscrowContract = artifacts.require('Escrow') const MockERC20Token: MockERC20TokenContract = artifacts.require('MockERC20Token') const MockAttestations: MockAttestationsContract = artifacts.require('MockAttestations') -const FederatedAttestations: FederatedAttestationsContract = artifacts.require( - 'FederatedAttestations' -) +const FederatedAttestations: FederatedAttestationsContract = + artifacts.require('FederatedAttestations') const NULL_BYTES32 = '0x0000000000000000000000000000000000000000000000000000000000000000' const NULL_ESCROWED_PAYMENT: EscrowedPayment = { diff --git a/packages/protocol/test/identity/federatedattestations.ts b/packages/protocol/test/identity/federatedattestations.ts index 2daf598cfe1..0a47a417c21 100644 --- a/packages/protocol/test/identity/federatedattestations.ts +++ b/packages/protocol/test/identity/federatedattestations.ts @@ -26,9 +26,8 @@ import { import { encodePacked, keccak256 } from 'web3-utils' const Accounts: AccountsContract = artifacts.require('Accounts') -const FederatedAttestations: FederatedAttestationsContract = artifacts.require( - 'FederatedAttestations' -) +const FederatedAttestations: FederatedAttestationsContract = + artifacts.require('FederatedAttestations') contract('FederatedAttestations', (accounts: string[]) => { let accountsInstance: AccountsInstance @@ -238,13 +237,8 @@ contract('FederatedAttestations', (accounts: string[]) => { describe('#lookupAttestations', () => { describe('when identifier has not been registered', () => { it('should return empty list', async () => { - const [ - countsPerIssuer, - addresses, - signers, - issuedOns, - publishedOns, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer1]) + const [countsPerIssuer, addresses, signers, issuedOns, publishedOns] = + await federatedAttestations.lookupAttestations(identifier1, [issuer1]) checkAgainstExpectedAttestations( [0], [], @@ -313,13 +307,8 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should return empty count and list if no issuers specified', async () => { - const [ - countsPerIssuer, - addresses, - signers, - issuedOns, - publishedOns, - ] = await federatedAttestations.lookupAttestations(identifier1, []) + const [countsPerIssuer, addresses, signers, issuedOns, publishedOns] = + await federatedAttestations.lookupAttestations(identifier1, []) checkAgainstExpectedAttestations( [], [], @@ -333,13 +322,8 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should return all attestations from one issuer', async () => { - const [ - countsPerIssuer, - addresses, - signers, - issuedOns, - publishedOns, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer1]) + const [countsPerIssuer, addresses, signers, issuedOns, publishedOns] = + await federatedAttestations.lookupAttestations(identifier1, [issuer1]) checkAgainstExpectedAttestations( [issuer1Attestations.length], issuer1Attestations, @@ -353,13 +337,8 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should return empty list if no attestations exist for an issuer', async () => { - const [ - countsPerIssuer, - addresses, - signers, - issuedOns, - publishedOns, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer3]) + const [countsPerIssuer, addresses, signers, issuedOns, publishedOns] = + await federatedAttestations.lookupAttestations(identifier1, [issuer3]) checkAgainstExpectedAttestations( [0], [], @@ -375,13 +354,8 @@ contract('FederatedAttestations', (accounts: string[]) => { it('should return attestations from multiple issuers in correct order', async () => { const expectedAttestations = issuer2Attestations.concat(issuer1Attestations) const expectedCountsPerIssuer = [0, issuer2Attestations.length, issuer1Attestations.length] - const [ - countsPerIssuer, - addresses, - signers, - issuedOns, - publishedOns, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer3, issuer2, issuer1]) + const [countsPerIssuer, addresses, signers, issuedOns, publishedOns] = + await federatedAttestations.lookupAttestations(identifier1, [issuer3, issuer2, issuer1]) checkAgainstExpectedAttestations( expectedCountsPerIssuer, expectedAttestations, @@ -402,13 +376,8 @@ contract('FederatedAttestations', (accounts: string[]) => { }) }) it('should return empty list', async () => { - const [ - countsPerIssuer, - addresses, - signers, - issuedOns, - publishedOns, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer1]) + const [countsPerIssuer, addresses, signers, issuedOns, publishedOns] = + await federatedAttestations.lookupAttestations(identifier1, [issuer1]) checkAgainstExpectedAttestations( [0], [], @@ -444,10 +413,8 @@ contract('FederatedAttestations', (accounts: string[]) => { describe('when address has not been registered', () => { it('should return empty list', async () => { - const [ - actualCountsPerIssuer, - actualIdentifiers, - ] = await federatedAttestations.lookupIdentifiers(account1, [issuer1]) + const [actualCountsPerIssuer, actualIdentifiers] = + await federatedAttestations.lookupIdentifiers(account1, [issuer1]) checkAgainstExpectedIdCases([0], [], actualCountsPerIssuer, actualIdentifiers) }) }) @@ -499,18 +466,14 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should return empty count if no issuers specified', async () => { - const [ - actualCountsPerIssuer, - actualIdentifiers, - ] = await federatedAttestations.lookupIdentifiers(account1, []) + const [actualCountsPerIssuer, actualIdentifiers] = + await federatedAttestations.lookupIdentifiers(account1, []) checkAgainstExpectedIdCases([], [], actualCountsPerIssuer, actualIdentifiers) }) it('should return all identifiers from one issuer', async () => { - const [ - actualCountsPerIssuer, - actualIdentifiers, - ] = await federatedAttestations.lookupIdentifiers(account1, [issuer1]) + const [actualCountsPerIssuer, actualIdentifiers] = + await federatedAttestations.lookupIdentifiers(account1, [issuer1]) checkAgainstExpectedIdCases( [issuer1IdCases.length], issuer1IdCases, @@ -520,20 +483,16 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should return empty list if no identifiers exist for an (issuer,address)', async () => { - const [ - actualCountsPerIssuer, - actualIdentifiers, - ] = await federatedAttestations.lookupIdentifiers(account1, [issuer3]) + const [actualCountsPerIssuer, actualIdentifiers] = + await federatedAttestations.lookupIdentifiers(account1, [issuer3]) checkAgainstExpectedIdCases([0], [], actualCountsPerIssuer, actualIdentifiers) }) it('should return identifiers from multiple issuers in correct order', async () => { const expectedIdCases = issuer2IdCases.concat(issuer1IdCases) const expectedCountsPerIssuer = [0, issuer2IdCases.length, issuer1IdCases.length] - const [ - actualCountsPerIssuer, - actualIdentifiers, - ] = await federatedAttestations.lookupIdentifiers(account1, [issuer3, issuer2, issuer1]) + const [actualCountsPerIssuer, actualIdentifiers] = + await federatedAttestations.lookupIdentifiers(account1, [issuer3, issuer2, issuer1]) checkAgainstExpectedIdCases( expectedCountsPerIssuer, expectedIdCases, @@ -550,10 +509,8 @@ contract('FederatedAttestations', (accounts: string[]) => { }) }) it('should return empty list', async () => { - const [ - actualCountsPerIssuer, - actualIdentifiers, - ] = await federatedAttestations.lookupIdentifiers(account1, [issuer1]) + const [actualCountsPerIssuer, actualIdentifiers] = + await federatedAttestations.lookupIdentifiers(account1, [issuer1]) checkAgainstExpectedIdCases([0], [], actualCountsPerIssuer, actualIdentifiers) }) }) @@ -1112,13 +1069,8 @@ contract('FederatedAttestations', (accounts: string[]) => { [account1, account2], { from: issuer1 } ) - const [ - countsPerIssuer1, - addresses1, - signers1, - issuedOns1, - publishedOns1, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer1]) + const [countsPerIssuer1, addresses1, signers1, issuedOns1, publishedOns1] = + await federatedAttestations.lookupAttestations(identifier1, [issuer1]) checkAgainstExpectedAttestations( [1], [{ account: account2, issuedOn: nowUnixTime, signer: signer2 }], @@ -1129,13 +1081,8 @@ contract('FederatedAttestations', (accounts: string[]) => { issuedOns1, publishedOns1 ) - const [ - countsPerIssuer2, - addresses2, - signers2, - issuedOns2, - publishedOns2, - ] = await federatedAttestations.lookupAttestations(identifier2, [issuer1]) + const [countsPerIssuer2, addresses2, signers2, issuedOns2, publishedOns2] = + await federatedAttestations.lookupAttestations(identifier2, [issuer1]) checkAgainstExpectedAttestations( [0], [], @@ -1155,13 +1102,8 @@ contract('FederatedAttestations', (accounts: string[]) => { [account2, account1], { from: issuer1 } ) - const [ - countsPerIssuer1, - addresses1, - signers1, - issuedOns1, - publishedOns1, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer1]) + const [countsPerIssuer1, addresses1, signers1, issuedOns1, publishedOns1] = + await federatedAttestations.lookupAttestations(identifier1, [issuer1]) checkAgainstExpectedAttestations( [1], [{ account: account2, issuedOn: nowUnixTime, signer: signer2 }], @@ -1172,13 +1114,8 @@ contract('FederatedAttestations', (accounts: string[]) => { issuedOns1, publishedOns1 ) - const [ - countsPerIssuer2, - addresses2, - signers2, - issuedOns2, - publishedOns2, - ] = await federatedAttestations.lookupAttestations(identifier2, [issuer1]) + const [countsPerIssuer2, addresses2, signers2, issuedOns2, publishedOns2] = + await federatedAttestations.lookupAttestations(identifier2, [issuer1]) checkAgainstExpectedAttestations( [0], [], @@ -1198,13 +1135,8 @@ contract('FederatedAttestations', (accounts: string[]) => { [account2, account1], { from: signer1 } ) - const [ - countsPerIssuer1, - addresses1, - signers1, - issuedOns1, - publishedOns1, - ] = await federatedAttestations.lookupAttestations(identifier1, [issuer1]) + const [countsPerIssuer1, addresses1, signers1, issuedOns1, publishedOns1] = + await federatedAttestations.lookupAttestations(identifier1, [issuer1]) checkAgainstExpectedAttestations( [1], [{ account: account2, issuedOn: nowUnixTime, signer: signer2 }], @@ -1215,13 +1147,8 @@ contract('FederatedAttestations', (accounts: string[]) => { issuedOns1, publishedOns1 ) - const [ - countsPerIssuer2, - addresses2, - signers2, - issuedOns2, - publishedOns2, - ] = await federatedAttestations.lookupAttestations(identifier2, [issuer1]) + const [countsPerIssuer2, addresses2, signers2, issuedOns2, publishedOns2] = + await federatedAttestations.lookupAttestations(identifier2, [issuer1]) checkAgainstExpectedAttestations( [0], [], diff --git a/packages/protocol/test/identity/identityproxyhub.ts b/packages/protocol/test/identity/identityproxyhub.ts index 8ffd8c0576a..b9e7023ee98 100644 --- a/packages/protocol/test/identity/identityproxyhub.ts +++ b/packages/protocol/test/identity/identityproxyhub.ts @@ -153,7 +153,7 @@ contract('IdentityProxyHub', (accounts: string[]) => { const txData = identityProxyTest.contract.methods.payMe().encodeABI() // @ts-ignore await identityProxyHub.makeCall(identifier, identityProxyTest.address, txData, { - value: 100, + value: '100', }) const proxyBalance = await web3.eth.getBalance(address) const balanceAfter = await web3.eth.getBalance(identityProxyTest.address) diff --git a/packages/protocol/test/stability/stabletoken.ts b/packages/protocol/test/stability/stabletoken.ts index 785929b1b8e..594ad8fa87d 100644 --- a/packages/protocol/test/stability/stabletoken.ts +++ b/packages/protocol/test/stability/stabletoken.ts @@ -82,12 +82,8 @@ contract('StableToken', (accounts: string[]) => { }) it('should have set the inflation rate parameters', async () => { - const [ - rate, - factor, - updatePeriod, - factorLastUpdated, - ] = await stableToken.getInflationParameters() + const [rate, factor, updatePeriod, factorLastUpdated] = + await stableToken.getInflationParameters() assert.isTrue(rate.eq(fixed1)) assert.isTrue(factor.eq(fixed1)) assert.equal(updatePeriod.toNumber(), SECONDS_IN_A_WEEK) diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index 98db1afe31c..fee564ffe9b 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -70,6 +70,7 @@ const networks = { gasPrice: 0, gas: gasLimit, defaultBalance: 200000000, + maxFeePerGas: 875000000, mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic', }, rc0: { diff --git a/packages/sdk/connect/src/celo-provider.test.ts b/packages/sdk/connect/src/celo-provider.test.ts index ee83a61118c..f86a9d033d4 100644 --- a/packages/sdk/connect/src/celo-provider.test.ts +++ b/packages/sdk/connect/src/celo-provider.test.ts @@ -97,7 +97,7 @@ describe('CeloProvider', () => { const web3 = new Web3() web3.setProvider(mockProvider as any) const connection = new Connection(web3, new MockWallet()) - celoProvider = (connection.web3.currentProvider as any) as CeloProvider + celoProvider = connection.web3.currentProvider as any as CeloProvider }) describe("when celo provider don't have any local account", () => { diff --git a/packages/sdk/connect/src/connection.ts b/packages/sdk/connect/src/connection.ts index 3b14d40edd7..3ca1de6ee0c 100644 --- a/packages/sdk/connect/src/connection.ts +++ b/packages/sdk/connect/src/connection.ts @@ -384,7 +384,7 @@ export class Connection { } getAbiCoder(): AbiCoder { - return (this.web3.eth.abi as unknown) as AbiCoder + return this.web3.eth.abi as unknown as AbiCoder } estimateGasWithInflationFactor = async ( diff --git a/packages/sdk/connect/src/utils/tx-params-normalizer.test.ts b/packages/sdk/connect/src/utils/tx-params-normalizer.test.ts index ad2560d3694..2bfa4b0710e 100644 --- a/packages/sdk/connect/src/utils/tx-params-normalizer.test.ts +++ b/packages/sdk/connect/src/utils/tx-params-normalizer.test.ts @@ -23,17 +23,15 @@ describe('TxParamsNormalizer class', () => { } beforeEach(() => { - mockRpcCall = jest.fn( - (method: string, _params: any[]): Promise => { - return new Promise((resolve, _reject) => - resolve({ - jsonrpc: '2.0', - id: 1, - result: method === 'net_version' ? '27' : '0x27', - }) - ) - } - ) + mockRpcCall = jest.fn((method: string, _params: any[]): Promise => { + return new Promise((resolve, _reject) => + resolve({ + jsonrpc: '2.0', + id: 1, + result: method === 'net_version' ? '27' : '0x27', + }) + ) + }) const rpcMock: RpcCaller = { call: mockRpcCall, // tslint:disable-next-line: no-empty diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 9cdb88caf5f..55989ac2ff4 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -32,7 +32,7 @@ "@celo/connect": "2.2.1-dev", "@celo/utils": "2.2.1-dev", "@celo/wallet-local": "2.2.1-dev", - "@types/bn.js": "^5.1.0", + "@types/bn.js": "4.11.6", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", "cross-fetch": "^3.0.6", @@ -46,10 +46,10 @@ "@celo/phone-utils": "2.2.1-dev", "@celo/dev-utils": "0.0.1-dev", "@celo/flake-tracker": "0.0.1-dev", - "@celo/ganache-cli": "git+https://github.com/celo-org/ganache-cli.git#21652da", "@celo/protocol": "1.0.0", "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", + "ganache": "^7.4.4", "jest": "^26.6.3", "ts-node": "8.3.0", "typedoc": "^0.19.2", @@ -65,4 +65,4 @@ "browser": { "child_process": false } -} \ No newline at end of file +} diff --git a/packages/sdk/contractkit/src/identity/claims/claim.ts b/packages/sdk/contractkit/src/identity/claims/claim.ts index 82648cbb2bc..08809ca713e 100644 --- a/packages/sdk/contractkit/src/identity/claims/claim.ts +++ b/packages/sdk/contractkit/src/identity/claims/claim.ts @@ -75,8 +75,10 @@ export type ClaimPayload = K extends typeof ClaimTypes.DOM : StorageClaim /** @internal */ -export const isOfType = (type: K) => (data: Claim): data is ClaimPayload => - data.type === type +export const isOfType = + (type: K) => + (data: Claim): data is ClaimPayload => + data.type === type /** * Validates a claim made by an account, i.e. whether the claim is usable diff --git a/packages/sdk/contractkit/src/identity/metadata.test.ts b/packages/sdk/contractkit/src/identity/metadata.test.ts index 922f70b4084..f75fe02e83b 100644 --- a/packages/sdk/contractkit/src/identity/metadata.test.ts +++ b/packages/sdk/contractkit/src/identity/metadata.test.ts @@ -45,7 +45,9 @@ testWithGanache('Metadata', (web3) => { if (action === 'vote') { await (await accounts.authorizeVoteSigner(signer, pop)).send({ from: address }) } else if (action === 'validator') { - await (await accounts.authorizeValidatorSigner(signer, pop, validator)).send({ + await ( + await accounts.authorizeValidatorSigner(signer, pop, validator) + ).send({ from: address, }) } else if (action === 'attestation') { diff --git a/packages/sdk/contractkit/src/wrappers/Accounts.test.ts b/packages/sdk/contractkit/src/wrappers/Accounts.test.ts index 2f7888ba582..4f36ae967f3 100644 --- a/packages/sdk/contractkit/src/wrappers/Accounts.test.ts +++ b/packages/sdk/contractkit/src/wrappers/Accounts.test.ts @@ -70,7 +70,9 @@ testWithGanache('Accounts Wrapper', (web3) => { const signer = accounts[1] await accountsInstance.createAccount().sendAndWaitForReceipt({ from: account }) const sig = await getParsedSignatureOfAddress(account, signer) - await (await accountsInstance.authorizeAttestationSigner(signer, sig)).sendAndWaitForReceipt({ + await ( + await accountsInstance.authorizeAttestationSigner(signer, sig) + ).sendAndWaitForReceipt({ from: account, }) const attestationSigner = await accountsInstance.getAttestationSigner(account) @@ -82,14 +84,18 @@ testWithGanache('Accounts Wrapper', (web3) => { const signer = accounts[1] await accountsInstance.createAccount().sendAndWaitForReceipt({ from: account }) const sig = await getParsedSignatureOfAddress(account, signer) - await (await accountsInstance.authorizeAttestationSigner(signer, sig)).sendAndWaitForReceipt({ + await ( + await accountsInstance.authorizeAttestationSigner(signer, sig) + ).sendAndWaitForReceipt({ from: account, }) let attestationSigner = await accountsInstance.getAttestationSigner(account) expect(attestationSigner).toEqual(signer) - await (await accountsInstance.removeAttestationSigner()).sendAndWaitForReceipt({ + await ( + await accountsInstance.removeAttestationSigner() + ).sendAndWaitForReceipt({ from: account, }) diff --git a/packages/sdk/contractkit/src/wrappers/Attestations.ts b/packages/sdk/contractkit/src/wrappers/Attestations.ts index d806c40d681..74588f840ef 100644 --- a/packages/sdk/contractkit/src/wrappers/Attestations.ts +++ b/packages/sdk/contractkit/src/wrappers/Attestations.ts @@ -111,14 +111,12 @@ interface GetCompletableAttestationsResponse { function parseGetCompletableAttestations(response: GetCompletableAttestationsResponse) { const metadataURLs = parseSolidityStringArray( response[2].map(valueToInt), - (response[3] as unknown) as string + response[3] as unknown as string ) - return zip3( - response[0].map(valueToInt), - response[1], - metadataURLs - ).map(([blockNumber, issuer, metadataURL]) => ({ blockNumber, issuer, metadataURL })) + return zip3(response[0].map(valueToInt), response[1], metadataURLs).map( + ([blockNumber, issuer, metadataURL]) => ({ blockNumber, issuer, metadataURL }) + ) } interface ContractsForAttestation { @@ -245,14 +243,11 @@ export class AttestationsWrapper extends BaseWrapper { * @param identifier Attestation identifier (e.g. phone hash) * @param account Address of the account */ - getAttestationStat: ( - identifier: string, - account: Address - ) => Promise = proxyCall( - this.contract.methods.getAttestationStats, - undefined, - (stat) => ({ completed: valueToInt(stat[0]), total: valueToInt(stat[1]) }) - ) + getAttestationStat: (identifier: string, account: Address) => Promise = + proxyCall(this.contract.methods.getAttestationStats, undefined, (stat) => ({ + completed: valueToInt(stat[0]), + total: valueToInt(stat[1]), + })) /** * Returns the verified status of an identifier/account pair indicating whether the attestation diff --git a/packages/sdk/contractkit/src/wrappers/Election.test.ts b/packages/sdk/contractkit/src/wrappers/Election.test.ts index a106675f01d..97067bb0b6a 100644 --- a/packages/sdk/contractkit/src/wrappers/Election.test.ts +++ b/packages/sdk/contractkit/src/wrappers/Election.test.ts @@ -62,7 +62,9 @@ testWithGanache('Election Wrapper', (web3) => { const setupGroup = async (groupAccount: string) => { await registerAccountWithLockedGold(groupAccount, new BigNumber(minLockedGoldValue).toFixed()) - await (await validators.registerValidatorGroup(GROUP_COMMISSION)).sendAndWaitForReceipt({ + await ( + await validators.registerValidatorGroup(GROUP_COMMISSION) + ).sendAndWaitForReceipt({ from: groupAccount, }) } @@ -85,7 +87,9 @@ testWithGanache('Election Wrapper', (web3) => { await setupGroup(groupAccount) await setupValidator(validatorAccount) await validators.affiliate(groupAccount).sendAndWaitForReceipt({ from: validatorAccount }) - await (await validators.addMember(groupAccount, validatorAccount)).sendAndWaitForReceipt({ + await ( + await validators.addMember(groupAccount, validatorAccount) + ).sendAndWaitForReceipt({ from: groupAccount, }) } @@ -122,7 +126,9 @@ testWithGanache('Election Wrapper', (web3) => { describe('#vote', () => { test('SBAT vote', async () => { - await (await election.vote(groupAccount, ONE_HUNDRED_GOLD)).sendAndWaitForReceipt({ + await ( + await election.vote(groupAccount, ONE_HUNDRED_GOLD) + ).sendAndWaitForReceipt({ from: userAccount, }) @@ -134,7 +140,9 @@ testWithGanache('Election Wrapper', (web3) => { describe('#activate', () => { test('SBAT activate vote', async () => { - await (await election.vote(groupAccount, ONE_HUNDRED_GOLD)).sendAndWaitForReceipt({ + await ( + await election.vote(groupAccount, ONE_HUNDRED_GOLD) + ).sendAndWaitForReceipt({ from: userAccount, }) await mineToNextEpoch(web3) @@ -168,7 +176,9 @@ testWithGanache('Election Wrapper', (web3) => { describe('#revokePending', () => { test('SBAT revoke pending', async () => { - await (await election.vote(groupAccount, ONE_HUNDRED_GOLD)).sendAndWaitForReceipt({ + await ( + await election.vote(groupAccount, ONE_HUNDRED_GOLD) + ).sendAndWaitForReceipt({ from: userAccount, }) await ( @@ -184,7 +194,9 @@ testWithGanache('Election Wrapper', (web3) => { describe('#revoke', () => { test('SBAT revoke active and pending votes', async () => { await activateAndVote(groupAccount, userAccount, TWO_HUNDRED_GOLD) - await (await election.vote(groupAccount, ONE_HUNDRED_GOLD)).sendAndWaitForReceipt({ + await ( + await election.vote(groupAccount, ONE_HUNDRED_GOLD) + ).sendAndWaitForReceipt({ from: userAccount, }) const revokeTransactionsList = await election.revoke( @@ -235,7 +247,9 @@ testWithGanache('Election Wrapper', (web3) => { }) test('Validator groups should be in the correct order', async () => { - await (await election.vote(groupAccountA, ONE_HUNDRED_GOLD)).sendAndWaitForReceipt({ + await ( + await election.vote(groupAccountA, ONE_HUNDRED_GOLD) + ).sendAndWaitForReceipt({ from: userAccount, }) const revokeTransactionsList = await election.revoke( diff --git a/packages/sdk/contractkit/src/wrappers/Election.ts b/packages/sdk/contractkit/src/wrappers/Election.ts index d45218f0c5b..d5d919d93b1 100644 --- a/packages/sdk/contractkit/src/wrappers/Election.ts +++ b/packages/sdk/contractkit/src/wrappers/Election.ts @@ -95,10 +95,8 @@ export class ElectionWrapper extends BaseWrapperForGoverning { * @param blockNumber Block number to retrieve the validator set from. * @return Address of validator at the requested index. */ - validatorSignerAddressFromSet: ( - signerIndex: number, - blockNumber: number - ) => Promise
= proxyCall(this.contract.methods.validatorSignerAddressFromSet) + validatorSignerAddressFromSet: (signerIndex: number, blockNumber: number) => Promise
= + proxyCall(this.contract.methods.validatorSignerAddressFromSet) /** * Gets a validator address from the current validator set. @@ -528,25 +526,23 @@ export class ElectionWrapper extends BaseWrapperForGoverning { voterShare || (await this.getVoterShare( address, - await (await this.contracts.getBlockchainParameters()).getLastBlockNumberForEpoch( - epochNumber - ) + await ( + await this.contracts.getBlockchainParameters() + ).getLastBlockNumberForEpoch(epochNumber) )) const groupVoterRewards = await this.getGroupVoterRewards(epochNumber, useBlockNumber) const voterRewards = groupVoterRewards.filter( (e: GroupVoterReward) => normalizeAddressWith0x(e.group.address) in activeVoteShare ) - return voterRewards.map( - (e: GroupVoterReward): VoterReward => { - const group = normalizeAddressWith0x(e.group.address) - return { - address, - addressPayment: e.groupVoterPayment.times(activeVoteShare[group]), - group: e.group, - epochNumber: e.epochNumber, - } + return voterRewards.map((e: GroupVoterReward): VoterReward => { + const group = normalizeAddressWith0x(e.group.address) + return { + address, + addressPayment: e.groupVoterPayment.times(activeVoteShare[group]), + group: e.group, + epochNumber: e.epochNumber, } - ) + }) } /** diff --git a/packages/sdk/contractkit/src/wrappers/Validators.test.ts b/packages/sdk/contractkit/src/wrappers/Validators.test.ts index f69f514040a..ec4f025a36f 100644 --- a/packages/sdk/contractkit/src/wrappers/Validators.test.ts +++ b/packages/sdk/contractkit/src/wrappers/Validators.test.ts @@ -48,7 +48,9 @@ testWithGanache('Validators Wrapper', (web3) => { groupAccount, new BigNumber(minLockedGoldValue).times(members).toFixed() ) - await (await validators.registerValidatorGroup(new BigNumber(0.1))).sendAndWaitForReceipt({ + await ( + await validators.registerValidatorGroup(new BigNumber(0.1)) + ).sendAndWaitForReceipt({ from: groupAccount, }) } @@ -82,7 +84,9 @@ testWithGanache('Validators Wrapper', (web3) => { await setupGroup(groupAccount) await setupValidator(validatorAccount) await validators.affiliate(groupAccount).sendAndWaitForReceipt({ from: validatorAccount }) - await (await validators.addMember(groupAccount, validatorAccount)).sendAndWaitForReceipt({ + await ( + await validators.addMember(groupAccount, validatorAccount) + ).sendAndWaitForReceipt({ from: groupAccount, }) @@ -138,7 +142,9 @@ testWithGanache('Validators Wrapper', (web3) => { for (const validator of [validator1, validator2]) { await setupValidator(validator) await validators.affiliate(groupAccount).sendAndWaitForReceipt({ from: validator }) - await (await validators.addMember(groupAccount, validator)).sendAndWaitForReceipt({ + await ( + await validators.addMember(groupAccount, validator) + ).sendAndWaitForReceipt({ from: groupAccount, }) } diff --git a/packages/sdk/contractkit/src/wrappers/Validators.ts b/packages/sdk/contractkit/src/wrappers/Validators.ts index f3211efe0f2..77a1db96c89 100644 --- a/packages/sdk/contractkit/src/wrappers/Validators.ts +++ b/packages/sdk/contractkit/src/wrappers/Validators.ts @@ -236,14 +236,12 @@ export class ValidatorsWrapper extends BaseWrapperForGoverning { * account address. 96 bytes. * @return True upon success. */ - updateBlsPublicKey: ( - blsPublicKey: string, - blsPop: string - ) => CeloTransactionObject = proxySend( - this.connection, - this.contract.methods.updateBlsPublicKey, - tupleParser(stringToSolidityBytes, stringToSolidityBytes) - ) + updateBlsPublicKey: (blsPublicKey: string, blsPop: string) => CeloTransactionObject = + proxySend( + this.connection, + this.contract.methods.updateBlsPublicKey, + tupleParser(stringToSolidityBytes, stringToSolidityBytes) + ) /** * Returns whether a particular account has a registered validator. @@ -294,8 +292,8 @@ export class ValidatorsWrapper extends BaseWrapperForGoverning { return { name, address, - ecdsaPublicKey: (res.ecdsaPublicKey as unknown) as string, - blsPublicKey: (res.blsPublicKey as unknown) as string, + ecdsaPublicKey: res.ecdsaPublicKey as unknown as string, + blsPublicKey: res.blsPublicKey as unknown as string, affiliation: res.affiliation, score: fromFixed(new BigNumber(res.score)), signer: res.signer, diff --git a/packages/sdk/cryptographic-utils/package.json b/packages/sdk/cryptographic-utils/package.json index 8d054468382..084137cba5e 100644 --- a/packages/sdk/cryptographic-utils/package.json +++ b/packages/sdk/cryptographic-utils/package.json @@ -25,20 +25,21 @@ "@celo/utils": "2.2.1-dev", "@celo/bls12377js": "0.1.1", "@celo/base": "2.2.1-dev", - "@types/bn.js": "^5.1.0", + "@types/bn.js": "4.11.6", "@types/elliptic": "^6.4.9", "@types/ethereumjs-util": "^5.2.0", - "@types/node": "^10.12.18", + "@types/node": "^18.7.16", "@types/randombytes": "^2.0.0", - "bigi": "^1.1.0", - "bip32": "^2.0.6", + "bigi": "^1.4.2", + "bip32": "^3.1.0", "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", "buffer-reverse": "^1.0.1", "elliptic": "^6.5.4", - "ethereumjs-util": "^5.2.0" + "ethereumjs-util": "^5.2.0", + "tiny-secp256k1": "2.2.1" }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", "@celo/typescript": "0.0.1" } -} \ No newline at end of file +} diff --git a/packages/sdk/cryptographic-utils/src/account.ts b/packages/sdk/cryptographic-utils/src/account.ts index 94435935b8a..9b9d9a851cc 100644 --- a/packages/sdk/cryptographic-utils/src/account.ts +++ b/packages/sdk/cryptographic-utils/src/account.ts @@ -8,10 +8,11 @@ import { import { normalizeAccents } from '@celo/base/lib/string' import { privateKeyToAddress } from '@celo/utils/lib/address' import { levenshteinDistance } from '@celo/utils/lib/levenshtein' -import * as bip32 from 'bip32' +import BIP32Factory from 'bip32' import * as bip39 from 'bip39' import { keccak256 } from 'ethereumjs-util' import randomBytes from 'randombytes' +import * as ecc from 'tiny-secp256k1' // Exports moved to @celo/base, forwarding them // here for backwards compatibility export { @@ -21,6 +22,7 @@ export { MnemonicStrength, RandomNumberGenerator, } from '@celo/base/lib/account' +const bip32 = BIP32Factory(ecc) function defaultGenerateMnemonic( strength?: number, diff --git a/packages/sdk/encrypted-backup/src/odis.mock.ts b/packages/sdk/encrypted-backup/src/odis.mock.ts index cb24c660dbb..9cc2b04582f 100644 --- a/packages/sdk/encrypted-backup/src/odis.mock.ts +++ b/packages/sdk/encrypted-backup/src/odis.mock.ts @@ -31,9 +31,10 @@ export class MockOdis { readonly state: Record = {} readonly poprf = new PoprfServer(MOCK_ODIS_KEYPAIR.privateKey) - quota( - req: DomainQuotaStatusRequest - ): { status: number; body: DomainQuotaStatusResponse } { + quota(req: DomainQuotaStatusRequest): { + status: number + body: DomainQuotaStatusResponse + } { const authorized = verifyDomainQuotaStatusRequestSignature(req) if (!authorized) { return { @@ -58,9 +59,10 @@ export class MockOdis { } } - sign( - req: DomainRestrictedSignatureRequest - ): { status: number; body: DomainRestrictedSignatureResponse } { + sign(req: DomainRestrictedSignatureRequest): { + status: number + body: DomainRestrictedSignatureResponse + } { const authorized = verifyDomainRestrictedSignatureRequestSignature(req) if (!authorized) { return { diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json index 22361ba7882..e175fa8371d 100644 --- a/packages/sdk/identity/package.json +++ b/packages/sdk/identity/package.json @@ -41,12 +41,12 @@ "devDependencies": { "@celo/dev-utils": "0.0.1-dev", "@celo/wallet-local": "2.2.1-dev", - "fetch-mock": "9.10.4", - "@types/elliptic": "^6.4.12", "@celo/flake-tracker": "0.0.1-dev", - "@celo/ganache-cli": "git+https://github.com/celo-org/ganache-cli.git#21652da" + "@types/elliptic": "^6.4.12", + "fetch-mock": "9.10.4", + "ganache": "^7.4.4" }, "engines": { "node": ">=12.9.0" } -} \ No newline at end of file +} diff --git a/packages/sdk/identity/src/odis/circuit-breaker.mock.ts b/packages/sdk/identity/src/odis/circuit-breaker.mock.ts index 4ee8a3c9460..a4629f3f166 100644 --- a/packages/sdk/identity/src/odis/circuit-breaker.mock.ts +++ b/packages/sdk/identity/src/odis/circuit-breaker.mock.ts @@ -59,9 +59,10 @@ export class MockCircuitBreaker { } } - unwrapKey( - req: CircuitBreakerUnwrapKeyRequest - ): { status: number; body: CircuitBreakerUnwrapKeyResponse } { + unwrapKey(req: CircuitBreakerUnwrapKeyRequest): { + status: number + body: CircuitBreakerUnwrapKeyResponse + } { const { ciphertext } = req if (!ciphertext) { return { diff --git a/packages/sdk/identity/src/odis/circuit-breaker.ts b/packages/sdk/identity/src/odis/circuit-breaker.ts index 2ce989d2072..58084724db1 100644 --- a/packages/sdk/identity/src/odis/circuit-breaker.ts +++ b/packages/sdk/identity/src/odis/circuit-breaker.ts @@ -195,9 +195,7 @@ export class CircuitBreakerClient { ciphertext = crypto.publicEncrypt( { key: this.environment.publicKey, - // @ts-ignore support for OAEP hash option, was added in Node 12.9.0. oaepHash: 'sha256', - encoding: 'pem', }, plaintext ) diff --git a/packages/sdk/identity/src/offchain/utils.ts b/packages/sdk/identity/src/offchain/utils.ts index 6bd84c4dd58..53c8bfadab9 100644 --- a/packages/sdk/identity/src/offchain/utils.ts +++ b/packages/sdk/identity/src/offchain/utils.ts @@ -328,7 +328,7 @@ export const buildEIP712TypedData = async ( ], } message = { - payload: (data as unknown) as EIP712Object, + payload: data as unknown as EIP712Object, } } diff --git a/packages/sdk/keystores/src/keystore-base.ts b/packages/sdk/keystores/src/keystore-base.ts index 358cf6056a2..6e0fc44126e 100644 --- a/packages/sdk/keystores/src/keystore-base.ts +++ b/packages/sdk/keystores/src/keystore-base.ts @@ -132,9 +132,9 @@ export abstract class KeystoreBase { async changeKeystorePassphrase(address: string, oldPassphrase: string, newPassphrase: string) { const keystoreName = await this.getKeystoreName(address) const rawKeystore = this.getRawKeystore(keystoreName) - const newKeystore = await (await Wallet.fromV3(rawKeystore, oldPassphrase)).toV3String( - newPassphrase - ) + const newKeystore = await ( + await Wallet.fromV3(rawKeystore, oldPassphrase) + ).toV3String(newPassphrase) this.persistKeystore(keystoreName, newKeystore) } diff --git a/packages/sdk/network-utils/src/genesis-block-utils.test.ts b/packages/sdk/network-utils/src/genesis-block-utils.test.ts index 4a57621aa81..007820cfae1 100644 --- a/packages/sdk/network-utils/src/genesis-block-utils.test.ts +++ b/packages/sdk/network-utils/src/genesis-block-utils.test.ts @@ -131,8 +131,7 @@ const mockGenesisBlock = { balance: '100000000000000000000', }, '000000000000000000000000000000000000ce10': { - code: - '0x60806040526004361061004a5760003560e01c806303386ba3146101e757806342404e0714610280578063bb913f41146102d7578063d29d44ee14610328578063f7e6af8014610379575b6000600160405180807f656970313936372e70726f78792e696d706c656d656e746174696f6e00000000815250601c019050604051809103902060001c0360001b9050600081549050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415610136576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4e6f20496d706c656d656e746174696f6e20736574000000000000000000000081525060200191505060405180910390fd5b61013f816103d0565b6101b1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f496e76616c696420636f6e74726163742061646472657373000000000000000081525060200191505060405180910390fd5b60405136810160405236600082376000803683855af43d604051818101604052816000823e82600081146101e3578282f35b8282fd5b61027e600480360360408110156101fd57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019064010000000081111561023a57600080fd5b82018360208201111561024c57600080fd5b8035906020019184600183028401116401000000008311171561026e57600080fd5b909192939192939050505061041b565b005b34801561028c57600080fd5b506102956105c1565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156102e357600080fd5b50610326600480360360208110156102fa57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061060d565b005b34801561033457600080fd5b506103776004803603602081101561034b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506107bd565b005b34801561038557600080fd5b5061038e610871565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60008060007fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47060001b9050833f915080821415801561041257506000801b8214155b92505050919050565b610423610871565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146104c3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f73656e64657220776173206e6f74206f776e657200000000000000000000000081525060200191505060405180910390fd5b6104cc8361060d565b600060608473ffffffffffffffffffffffffffffffffffffffff168484604051808383808284378083019250505092505050600060405180830381855af49150503d8060008114610539576040519150601f19603f3d011682016040523d82523d6000602084013e61053e565b606091505b508092508193505050816105ba576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601e8152602001807f696e697469616c697a6174696f6e2063616c6c6261636b206661696c6564000081525060200191505060405180910390fd5b5050505050565b600080600160405180807f656970313936372e70726f78792e696d706c656d656e746174696f6e00000000815250601c019050604051809103902060001c0360001b9050805491505090565b610615610871565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146106b5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f73656e64657220776173206e6f74206f776e657200000000000000000000000081525060200191505060405180910390fd5b6000600160405180807f656970313936372e70726f78792e696d706c656d656e746174696f6e00000000815250601c019050604051809103902060001c0360001b9050610701826103d0565b610773576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f496e76616c696420636f6e74726163742061646472657373000000000000000081525060200191505060405180910390fd5b8181558173ffffffffffffffffffffffffffffffffffffffff167fab64f92ab780ecbf4f3866f57cee465ff36c89450dcce20237ca7a8d81fb7d1360405160405180910390a25050565b6107c5610871565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610865576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f73656e64657220776173206e6f74206f776e657200000000000000000000000081525060200191505060405180910390fd5b61086e816108bd565b50565b600080600160405180807f656970313936372e70726f78792e61646d696e000000000000000000000000008152506013019050604051809103902060001c0360001b9050805491505090565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415610960576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f6f776e65722063616e6e6f74206265203000000000000000000000000000000081525060200191505060405180910390fd5b6000600160405180807f656970313936372e70726f78792e61646d696e000000000000000000000000008152506013019050604051809103902060001c0360001b90508181558173ffffffffffffffffffffffffffffffffffffffff167f50146d0e3c60aa1d17a70635b05494f864e86144a2201275021014fbf08bafe260405160405180910390a2505056fea165627a7a723058202dbb6037e4381b4ad95015ed99441a23345cc2ae52ef27e2e91d34fb0acd277b0029', + code: '0x60806040526004361061004a5760003560e01c806303386ba3146101e757806342404e0714610280578063bb913f41146102d7578063d29d44ee14610328578063f7e6af8014610379575b6000600160405180807f656970313936372e70726f78792e696d706c656d656e746174696f6e00000000815250601c019050604051809103902060001c0360001b9050600081549050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415610136576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4e6f20496d706c656d656e746174696f6e20736574000000000000000000000081525060200191505060405180910390fd5b61013f816103d0565b6101b1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f496e76616c696420636f6e74726163742061646472657373000000000000000081525060200191505060405180910390fd5b60405136810160405236600082376000803683855af43d604051818101604052816000823e82600081146101e3578282f35b8282fd5b61027e600480360360408110156101fd57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019064010000000081111561023a57600080fd5b82018360208201111561024c57600080fd5b8035906020019184600183028401116401000000008311171561026e57600080fd5b909192939192939050505061041b565b005b34801561028c57600080fd5b506102956105c1565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156102e357600080fd5b50610326600480360360208110156102fa57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061060d565b005b34801561033457600080fd5b506103776004803603602081101561034b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506107bd565b005b34801561038557600080fd5b5061038e610871565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60008060007fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47060001b9050833f915080821415801561041257506000801b8214155b92505050919050565b610423610871565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146104c3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f73656e64657220776173206e6f74206f776e657200000000000000000000000081525060200191505060405180910390fd5b6104cc8361060d565b600060608473ffffffffffffffffffffffffffffffffffffffff168484604051808383808284378083019250505092505050600060405180830381855af49150503d8060008114610539576040519150601f19603f3d011682016040523d82523d6000602084013e61053e565b606091505b508092508193505050816105ba576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601e8152602001807f696e697469616c697a6174696f6e2063616c6c6261636b206661696c6564000081525060200191505060405180910390fd5b5050505050565b600080600160405180807f656970313936372e70726f78792e696d706c656d656e746174696f6e00000000815250601c019050604051809103902060001c0360001b9050805491505090565b610615610871565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146106b5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f73656e64657220776173206e6f74206f776e657200000000000000000000000081525060200191505060405180910390fd5b6000600160405180807f656970313936372e70726f78792e696d706c656d656e746174696f6e00000000815250601c019050604051809103902060001c0360001b9050610701826103d0565b610773576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f496e76616c696420636f6e74726163742061646472657373000000000000000081525060200191505060405180910390fd5b8181558173ffffffffffffffffffffffffffffffffffffffff167fab64f92ab780ecbf4f3866f57cee465ff36c89450dcce20237ca7a8d81fb7d1360405160405180910390a25050565b6107c5610871565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610865576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f73656e64657220776173206e6f74206f776e657200000000000000000000000081525060200191505060405180910390fd5b61086e816108bd565b50565b600080600160405180807f656970313936372e70726f78792e61646d696e000000000000000000000000008152506013019050604051809103902060001c0360001b9050805491505090565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415610960576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f6f776e65722063616e6e6f74206265203000000000000000000000000000000081525060200191505060405180910390fd5b6000600160405180807f656970313936372e70726f78792e61646d696e000000000000000000000000008152506013019050604051809103902060001c0360001b90508181558173ffffffffffffffffffffffffffffffffffffffff167f50146d0e3c60aa1d17a70635b05494f864e86144a2201275021014fbf08bafe260405160405180910390a2505056fea165627a7a723058202dbb6037e4381b4ad95015ed99441a23345cc2ae52ef27e2e91d34fb0acd277b0029', storage: { '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103': '456f41406B32c45D59E539e4BBA3D7898c3584dA', diff --git a/packages/sdk/network-utils/src/static-node-utils.test.ts b/packages/sdk/network-utils/src/static-node-utils.test.ts index 49ec34e3a47..ca66961a9fd 100644 --- a/packages/sdk/network-utils/src/static-node-utils.test.ts +++ b/packages/sdk/network-utils/src/static-node-utils.test.ts @@ -10,8 +10,8 @@ const mockStaticNodes = [ 'enode://af5677afe5bf99a00bdb86d0f80f948b2e25f8978867b38cba8e860a6426507cbc37e15900f798305ceff6b7ac7f4057195827274d6b5f6a7e547ce512ff26ba@35.230.21.97:30303', ] -describe(StaticNodeUtils, () => { - describe(StaticNodeUtils.getStaticNodesAsync, () => { +describe('StaticNodeUtils', () => { + describe('StaticNodeUtils.getStaticNodesAsync', () => { afterEach(() => { fetchMock.reset() _testSetTimezoneOverride(undefined) @@ -30,7 +30,7 @@ describe(StaticNodeUtils, () => { }) }) - describe(StaticNodeUtils.getRegionalStaticNodesAsync, () => { + describe('StaticNodeUtils.getRegionalStaticNodesAsync', () => { afterEach(() => { fetchMock.reset() _testSetTimezoneOverride(undefined) @@ -61,7 +61,7 @@ describe(StaticNodeUtils, () => { }) }) - describe(StaticNodeUtils.getStaticNodeRegion, () => { + describe('StaticNodeUtils.getStaticNodeRegion', () => { const cases = [ { timezone: 'America/Chicago', diff --git a/packages/sdk/phone-utils/src/countries.test.ts b/packages/sdk/phone-utils/src/countries.test.ts index 4ccecf71660..1ae03ebb5e3 100644 --- a/packages/sdk/phone-utils/src/countries.test.ts +++ b/packages/sdk/phone-utils/src/countries.test.ts @@ -27,28 +27,28 @@ describe('countries', () => { const country = countries.getCountry('taiwan') expect(country).toMatchInlineSnapshot(` - Object { + { "alpha2": "TW", "alpha3": "TWN", "countryCallingCode": "+886", - "countryCallingCodes": Array [ + "countryCallingCodes": [ "+886", ], - "countryPhonePlaceholder": Object { + "countryPhonePlaceholder": { "national": "00 0000 0000", }, - "currencies": Array [ + "currencies": [ "TWD", ], "displayName": "Taiwan", "displayNameNoDiacritics": "taiwan", "emoji": "🇹🇼", "ioc": "TPE", - "languages": Array [ + "languages": [ "zho", ], "name": "Taiwan", - "names": Object { + "names": { "en-us": "Taiwan", "es-419": "Taiwán", }, @@ -63,29 +63,29 @@ describe('countries', () => { const results = countries.getFilteredCountries('taiwan') expect(results).toMatchInlineSnapshot(` - Array [ - Object { + [ + { "alpha2": "TW", "alpha3": "TWN", "countryCallingCode": "+886", - "countryCallingCodes": Array [ + "countryCallingCodes": [ "+886", ], - "countryPhonePlaceholder": Object { + "countryPhonePlaceholder": { "national": "00 0000 0000", }, - "currencies": Array [ + "currencies": [ "TWD", ], "displayName": "Taiwan", "displayNameNoDiacritics": "taiwan", "emoji": "🇹🇼", "ioc": "TPE", - "languages": Array [ + "languages": [ "zho", ], "name": "Taiwan", - "names": Object { + "names": { "en-us": "Taiwan", "es-419": "Taiwán", }, @@ -99,29 +99,29 @@ describe('countries', () => { const results = countries.getFilteredCountries('49') expect(results).toMatchInlineSnapshot(` - Array [ - Object { + [ + { "alpha2": "DE", "alpha3": "DEU", "countryCallingCode": "+49", - "countryCallingCodes": Array [ + "countryCallingCodes": [ "+49", ], - "countryPhonePlaceholder": Object { + "countryPhonePlaceholder": { "national": "000 000000", }, - "currencies": Array [ + "currencies": [ "EUR", ], "displayName": "Germany", "displayNameNoDiacritics": "germany", "emoji": "🇩🇪", "ioc": "GER", - "languages": Array [ + "languages": [ "deu", ], "name": "Germany", - "names": Object { + "names": { "en-us": "Germany", "es-419": "Alemania", }, @@ -135,25 +135,25 @@ describe('countries', () => { const results = countries.getFilteredCountries('gb') expect(results).toMatchInlineSnapshot(` - Array [ - Object { + [ + { "alpha2": "GB", "alpha3": "GBR", "countryCallingCode": "+44", - "countryCallingCodes": Array [ + "countryCallingCodes": [ "+44", ], - "countryPhonePlaceholder": Object { + "countryPhonePlaceholder": { "national": "0000 000 0000", }, - "currencies": Array [ + "currencies": [ "GBP", ], "displayName": "United Kingdom", "displayNameNoDiacritics": "united kingdom", "emoji": "🇬🇧", "ioc": "GBR", - "languages": Array [ + "languages": [ "eng", "cor", "gle", @@ -161,7 +161,7 @@ describe('countries', () => { "cym", ], "name": "United Kingdom", - "names": Object { + "names": { "en-us": "United Kingdom", "es-419": "Reino Unido", }, diff --git a/packages/sdk/transactions-uri/package.json b/packages/sdk/transactions-uri/package.json index 14cc815133b..04fa383627c 100644 --- a/packages/sdk/transactions-uri/package.json +++ b/packages/sdk/transactions-uri/package.json @@ -28,7 +28,7 @@ "@types/qrcode": "^1.3.4", "@celo/base": "2.2.1-dev", "@celo/connect": "2.2.1-dev", - "bn.js": "^4.11.8", + "bn.js": "4.11.9", "qrcode": "^1.4.4", "web3-eth-abi": "1.3.6" }, @@ -41,4 +41,4 @@ "engines": { "node": ">=8.13.0" } -} \ No newline at end of file +} diff --git a/packages/sdk/transactions-uri/src/tx-uri.ts b/packages/sdk/transactions-uri/src/tx-uri.ts index 9903c9aaa5a..780c556cf10 100644 --- a/packages/sdk/transactions-uri/src/tx-uri.ts +++ b/packages/sdk/transactions-uri/src/tx-uri.ts @@ -6,7 +6,7 @@ import qrcode from 'qrcode' import querystring from 'querystring' import abiWeb3 from 'web3-eth-abi' -const abi = (abiWeb3 as unknown) as AbiCoder +const abi = abiWeb3 as unknown as AbiCoder // see https://solidity.readthedocs.io/en/v0.5.3/abi-spec.html#function-selector-and-argument-encoding const ABI_TYPE_REGEX = '(u?int(8|16|32|64|128|256)|address|bool|bytes(4|32)?|string)(\\[\\])?' diff --git a/packages/sdk/utils/package.json b/packages/sdk/utils/package.json index b814daabf80..6b500923169 100644 --- a/packages/sdk/utils/package.json +++ b/packages/sdk/utils/package.json @@ -23,7 +23,7 @@ ], "dependencies": { "@celo/base": "2.2.1-dev", - "@types/bn.js": "^5.1.0", + "@types/bn.js": "4.11.6", "@types/elliptic": "^6.4.9", "@types/ethereumjs-util": "^5.2.0", "@types/node": "^10.12.18", @@ -39,9 +39,10 @@ "@celo/typescript": "0.0.1" }, "resolutions": { + "@types/bn.js": "4.11.6", "bn.js": "4.11.9", "elliptic/bn.js": "bn.js@4.11.9", "web3-utils/bn.js": "bn.js@4.11.9", "@ethereumjs/bn.js": "bn.js@4.11.9" } -} \ No newline at end of file +} diff --git a/packages/sdk/utils/src/istanbul.test.ts b/packages/sdk/utils/src/istanbul.test.ts index 9b8a89cd1f7..a8a9f254978 100644 --- a/packages/sdk/utils/src/istanbul.test.ts +++ b/packages/sdk/utils/src/istanbul.test.ts @@ -19,8 +19,7 @@ describe('Istanbul utilities', () => { '0x4fa3f67fc913878b068d1fa1cdddc54913d3bf988dbe5a36a20fa888f20d4894c408a6773f3d7bde11154f2a3076b700d345a42fd25a0e5e83f4db5586ac7979ac2053cd95d8f2efd3e959571ceccaa743e02cf4be3f5d7aaddb0b06fc9aff00', ], removedValidators: new BigNumber(1), - seal: - '0x88022a71c12a801a4318e27eeb5c82aa923160632c63b0eae4457ed120356ddb549fb7c4e4865728478aa61c19b9abe10ec7db34c8662b003b139188e99edcd400', + seal: '0x88022a71c12a801a4318e27eeb5c82aa923160632c63b0eae4457ed120356ddb549fb7c4e4865728478aa61c19b9abe10ec7db34c8662b003b139188e99edcd400', aggregatedSeal: { bitmap: new BigNumber(13), signature: diff --git a/packages/sdk/utils/src/sign-typed-data-utils.test.ts b/packages/sdk/utils/src/sign-typed-data-utils.test.ts index b6785995380..93801395e9c 100644 --- a/packages/sdk/utils/src/sign-typed-data-utils.test.ts +++ b/packages/sdk/utils/src/sign-typed-data-utils.test.ts @@ -14,7 +14,8 @@ import { } from './sign-typed-data-utils' // Compile-time check that Domain can be cast to type EIP712Object -export const TEST_OPTIONAL_IS_EIP712: EIP712Object = ({} as unknown) as EIP712Optional +export const TEST_OPTIONAL_IS_EIP712: EIP712Object = + {} as unknown as EIP712Optional interface EIP712TestCase { primaryType: string diff --git a/packages/sdk/wallets/wallet-base/src/signing-utils.ts b/packages/sdk/wallets/wallet-base/src/signing-utils.ts index 63f6bcfac71..3f7e3b7e259 100644 --- a/packages/sdk/wallets/wallet-base/src/signing-utils.ts +++ b/packages/sdk/wallets/wallet-base/src/signing-utils.ts @@ -47,11 +47,11 @@ function makeEven(hex: string) { return hex } -function signatureFormatter(signature: { - v: number - r: Buffer - s: Buffer -}): { v: string; r: string; s: string } { +function signatureFormatter(signature: { v: number; r: Buffer; s: Buffer }): { + v: string + r: string + s: string +} { return { v: stringNumberToHex(signature.v), r: makeEven(trimLeadingZero(ensureLeading0x(signature.r.toString('hex')))), diff --git a/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts b/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts index 4c654e168ef..7052c9f427f 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts +++ b/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts @@ -110,7 +110,8 @@ describe('AwsHsmWallet class', () => { }), getPublicKey: ({ KeyId }: { KeyId: string }) => ({ promise: async () => { - const isGuid = /[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/ + const isGuid = + /[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/ if (!KeyId.match(isGuid)) { throw new Error(`Invalid keyId ${KeyId}`) } diff --git a/packages/sdk/wallets/wallet-remote/src/remote-wallet.ts b/packages/sdk/wallets/wallet-remote/src/remote-wallet.ts index ccc79808a76..c1f7451cfaa 100644 --- a/packages/sdk/wallets/wallet-remote/src/remote-wallet.ts +++ b/packages/sdk/wallets/wallet-remote/src/remote-wallet.ts @@ -8,7 +8,8 @@ import { WalletBase } from '@celo/wallet-base' */ export abstract class RemoteWallet extends WalletBase - implements ReadOnlyWallet { + implements ReadOnlyWallet +{ private setupFinished = false private setupLocked = false private INIT_TIMEOUT_IN_MS = 10 * 1000 diff --git a/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts b/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts index 69c9dacc479..be0968f3c98 100644 --- a/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts +++ b/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts @@ -8,7 +8,7 @@ import BN from 'bn.js' const INCORRECT_PASSWORD_ERROR = 'could not decrypt key with given password' const currentTimeInSeconds = () => Math.floor(Date.now() / 1000) -const toRpcHex = (val: string | number | BigNumber | BN | undefined) => { +const toRpcHex = (val: string | number | BN | undefined) => { if (typeof val === 'number' || val instanceof BigNumber) { return ensureLeading0x(val.toString(16)) } else if (typeof val === 'string') { diff --git a/yarn.lock b/yarn.lock index 5fde5e954c8..476d187caf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,58 +2,58 @@ # yarn lockfile v1 -"@0x/assert@^2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-2.1.5.tgz#f29c7cb243507379242b608e904de9f232cb98ce" - integrity sha512-5hnawNxXq4bB5A1QTNrLIjatE+DBGEy/KyaST5Ghu5Mj1N6ot2WpnyE9P1NZmnXPy+jBjZ/mHMRfoVx3Sr9UWw== +"@0x/assert@^2.1.6": + version "2.1.6" + resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-2.1.6.tgz#61c5854b555bca1f1f0503754f2fd0169bee0ef1" + integrity sha512-Gu8eBnFdEuIAH2GubWYOSVz/BIoRccKof68AziduYDHxh4nSPM6NUH52xtfUGk4nXljiOXU1XHZJhcjTObI+8Q== dependencies: - "@0x/json-schemas" "^4.0.1" - "@0x/typescript-typings" "^4.2.5" - "@0x/utils" "^4.5.1" + "@0x/json-schemas" "^4.0.2" + "@0x/typescript-typings" "^4.3.0" + "@0x/utils" "^4.5.2" lodash "^4.17.11" valid-url "^1.0.9" -"@0x/dev-utils@^2.3.2": - version "2.3.2" - resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-2.3.2.tgz#f622f9e4def8f9f02e4a2baa2e8cba07e24227cf" - integrity sha512-fSXPQY9UBoev/WShCEp8Wkfi2HbAaKMUmKsi0p5BBNrzr2HRgBKDi0d3PZ32LV+rquIuRuyWlHJIrjgj5n8i1w== - dependencies: - "@0x/subproviders" "^5.0.3" - "@0x/types" "^2.4.2" - "@0x/typescript-typings" "^4.2.5" - "@0x/utils" "^4.5.1" - "@0x/web3-wrapper" "^6.0.12" +"@0x/dev-utils@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-2.3.3.tgz#9b6df00fea357fa6da02b35ca93fc89d100e1992" + integrity sha512-Pi664W/jj1U6WU+kHEPyKpflBnmKRsclB69RaL7wpnvOOFjAPhFV2/0FvIZ25w62rMzKEpfD1/1NcZ7NjAk7OQ== + dependencies: + "@0x/subproviders" "^5.0.4" + "@0x/types" "^2.4.3" + "@0x/typescript-typings" "^4.3.0" + "@0x/utils" "^4.5.2" + "@0x/web3-wrapper" "^6.0.13" "@types/web3-provider-engine" "^14.0.0" chai "^4.0.1" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" lodash "^4.17.11" -"@0x/json-schemas@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-4.0.1.tgz#8cf679184f7adfeda005febe295346aa90720920" - integrity sha512-WWem6mGFZoA2ntsMvrjrzDYcXNxXp0EfBVgGrV2K05/IM9bte6tKoa9nDzndXuUikYDx+/glQaHueAEHt06Emw== +"@0x/json-schemas@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-4.0.2.tgz#6f7c1dcde04d3acc3e8ca2f24177b9705c10e772" + integrity sha512-JHOwESZeWKAzT5Z42ZNvOvQUQ5vuRIFQWS0FNjYwV8Cv4/dRlLHd7kwxxsvlm9NxgXnOW0ddEDBbVGxhVSYNIg== dependencies: - "@0x/typescript-typings" "^4.2.5" + "@0x/typescript-typings" "^4.3.0" "@types/node" "*" jsonschema "^1.2.0" lodash.values "^4.3.0" -"@0x/sol-compiler@^3.1.11", "@0x/sol-compiler@^3.1.14": - version "3.1.14" - resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-3.1.14.tgz#c5f2c672db8a647607684b0d5d11c66644c48cc5" - integrity sha512-5T1J2bLEnrz7asYEpSQh1mkDVt0gI+tJxsFOfc9ciOYE1fnhrGDXL/BlayjnuIzJEGAIBkFyfzt4ZuOrgL251g== - dependencies: - "@0x/assert" "^2.1.5" - "@0x/json-schemas" "^4.0.1" - "@0x/sol-resolver" "^2.0.10" - "@0x/types" "^2.4.2" - "@0x/typescript-typings" "^4.2.5" - "@0x/utils" "^4.5.1" - "@0x/web3-wrapper" "^6.0.12" +"@0x/sol-compiler@^3.1.11", "@0x/sol-compiler@^3.1.15": + version "3.1.15" + resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-3.1.15.tgz#aaaad55008dddd69ad1e3226aa4a2832e0dd13b3" + integrity sha512-IobhcQ/whFRL942/ykKc0fV6/YstHhvnQJ0noUZ9GabMDtaBlW6k5vAerSkXZU/YyOd8sD9nw7QSm295D6HoTA== + dependencies: + "@0x/assert" "^2.1.6" + "@0x/json-schemas" "^4.0.2" + "@0x/sol-resolver" "^2.0.11" + "@0x/types" "^2.4.3" + "@0x/typescript-typings" "^4.3.0" + "@0x/utils" "^4.5.2" + "@0x/web3-wrapper" "^6.0.13" "@types/yargs" "^11.0.0" chalk "^2.3.0" chokidar "^3.0.2" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" ethereumjs-util "^5.1.1" lodash "^4.17.11" mkdirp "^0.5.1" @@ -66,72 +66,72 @@ yargs "^10.0.3" "@0x/sol-coverage@^3.0.8": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-3.0.11.tgz#247b01d91d95af8314ba1b80a6762cd9c6beb491" - integrity sha512-9hygoFS4IlYvqSmGDFP+ngfgmTdNZXBcKGr1kXbHbDIvxeZ2zZ34iLTLnGBGfhYgCDa9Sqvb4oRIFpztwflIPA== + version "3.0.12" + resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-3.0.12.tgz#4ca602495f7bcc4f045854850cd7f20fdf64e984" + integrity sha512-V4Iq8LU8HWNctVCt+gMHKcZ0moiawpna7bd3SWQuiQIig0iNpXBBCQl9SEIwpboTcv4Xhzo4cZuCGsWwKAQSpw== dependencies: - "@0x/sol-tracing-utils" "^6.0.18" - "@0x/subproviders" "^5.0.3" - "@0x/typescript-typings" "^4.2.5" + "@0x/sol-tracing-utils" "^6.0.19" + "@0x/subproviders" "^5.0.4" + "@0x/typescript-typings" "^4.3.0" "@types/minimatch" "^3.0.3" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" lodash "^4.17.11" minimatch "^3.0.4" web3-provider-engine "14.0.6" "@0x/sol-profiler@^3.0.0": - version "3.1.13" - resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-3.1.13.tgz#531edaaac5b3677d78372c3f3b5f160c58f40fa0" - integrity sha512-nrNpph3qQ59Y5SKbHIPj/52chB7DZw3pYDryd8yDIHoS8rcLXDANL0XIkKqT2c+OWZOccvitsmqwueqDPIhhXQ== - dependencies: - "@0x/sol-tracing-utils" "^6.0.18" - "@0x/subproviders" "^5.0.3" - "@0x/typescript-typings" "^4.2.5" - "@0x/utils" "^4.5.1" - ethereum-types "^2.1.5" + version "3.1.14" + resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-3.1.14.tgz#5cbdb20b0f55a521791b977750c19939e0cda726" + integrity sha512-XGBNgG6p5il8d831jrm9Xt3BQgjZxcywX1r5TOquHlBnfae9RFf/klNA60w8dW3GygugnIc9PzKtgR1EgWN3Ng== + dependencies: + "@0x/sol-tracing-utils" "^6.0.19" + "@0x/subproviders" "^5.0.4" + "@0x/typescript-typings" "^4.3.0" + "@0x/utils" "^4.5.2" + ethereum-types "^2.1.6" ethereumjs-util "^5.1.1" lodash "^4.17.11" web3-provider-engine "14.0.6" -"@0x/sol-resolver@^2.0.10": - version "2.0.10" - resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-2.0.10.tgz#f6bfde6bede217fe1267fcf3ebfbc92d161f69fe" - integrity sha512-+d0MFSZUBMG23TK1fgR0uwwnkSo6tGD9vbuDHPS+ARmqjUujSC0w5SAEK2cySG3mm78XwZDP3pLguEPcD3omWw== +"@0x/sol-resolver@^2.0.11": + version "2.0.11" + resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-2.0.11.tgz#282d545a423baf0d478c498fd3adf607339d5504" + integrity sha512-TGvkuWoEMghPB4OZaPz49OJ/J0cw/I3yV7VLbE/OeN0K/J2P8uOkzhNgWLOVSi8EK3hcJ1JVc0iDSkCnzGj4xQ== dependencies: - "@0x/types" "^2.4.2" - "@0x/typescript-typings" "^4.2.5" + "@0x/types" "^2.4.3" + "@0x/typescript-typings" "^4.3.0" lodash "^4.17.11" "@0x/sol-trace@^2.0.16": - version "2.0.19" - resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-2.0.19.tgz#a4efea5568fd63ec68899f1d8d151b6d1a98be0e" - integrity sha512-TiqzF1F/GQRyrWeDnKmBLZhU7d60bQoBE6CvltHPmIPgx7nu9U77jGi2hnzGfbI/6urGRzRKVqwSDsVE2ODMMA== + version "2.0.20" + resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-2.0.20.tgz#4c14af3f5c30ab50882e9667926ca9533446711d" + integrity sha512-lkw+8l+InqXKoyVFPCxdLA0oZnLLPvmpFm+lIJwEkPjrbwIyhvQbwSwyzPW/1XUWj0wIwWOpq6PSyofWZgt4KA== dependencies: - "@0x/sol-tracing-utils" "^6.0.18" - "@0x/subproviders" "^5.0.3" - "@0x/typescript-typings" "^4.2.5" + "@0x/sol-tracing-utils" "^6.0.19" + "@0x/subproviders" "^5.0.4" + "@0x/typescript-typings" "^4.3.0" chalk "^2.3.0" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" ethereumjs-util "^5.1.1" lodash "^4.17.11" loglevel "^1.6.1" web3-provider-engine "14.0.6" -"@0x/sol-tracing-utils@^6.0.18": - version "6.0.18" - resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-6.0.18.tgz#4bb1437d015998d71afa6c7d358261e34d8979b6" - integrity sha512-if6R3v5YYg7qe/kOn9eedCPlgqDYaopLtp3Oi04+QERWLvs7CBWqbcVAQwix0O0DUbTiGEtqGcyKYtvW9pfUZQ== - dependencies: - "@0x/dev-utils" "^2.3.2" - "@0x/sol-compiler" "^3.1.14" - "@0x/sol-resolver" "^2.0.10" - "@0x/subproviders" "^5.0.3" - "@0x/typescript-typings" "^4.2.5" - "@0x/utils" "^4.5.1" - "@0x/web3-wrapper" "^6.0.12" +"@0x/sol-tracing-utils@^6.0.19": + version "6.0.19" + resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-6.0.19.tgz#3c119c7e5b6d2bd1c94663985b7641aec85ef625" + integrity sha512-5tQOEo+dUYWiclT7UDy5IRm/EPEwDzCqAY3J8l0ecIsssBk0r2YLKKf/ugWkdwASGeAxiepjYpC+mxcxOT6yDA== + dependencies: + "@0x/dev-utils" "^2.3.3" + "@0x/sol-compiler" "^3.1.15" + "@0x/sol-resolver" "^2.0.11" + "@0x/subproviders" "^5.0.4" + "@0x/typescript-typings" "^4.3.0" + "@0x/utils" "^4.5.2" + "@0x/web3-wrapper" "^6.0.13" "@types/solidity-parser-antlr" "^0.2.3" chalk "^2.3.0" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" ethereumjs-util "^5.1.1" ethers "~4.0.4" glob "^7.1.2" @@ -144,23 +144,23 @@ solc "^0.5.5" solidity-parser-antlr "^0.4.2" -"@0x/subproviders@^5.0.0", "@0x/subproviders@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-5.0.3.tgz#ed2d2a6cf91dc5f5b28186c2ba760cd8713546df" - integrity sha512-u6s0xhMqNkEaN6epotKgs06dBzHncxv73RtcKHCJ1uoEslEVyRN6S19wm3EvgAvTorSct3Yi0n9XN5sc+ESuuQ== - dependencies: - "@0x/assert" "^2.1.5" - "@0x/types" "^2.4.2" - "@0x/typescript-typings" "^4.2.5" - "@0x/utils" "^4.5.1" - "@0x/web3-wrapper" "^6.0.12" +"@0x/subproviders@^5.0.0", "@0x/subproviders@^5.0.4": + version "5.0.4" + resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-5.0.4.tgz#e4b165634ef6a50c4bd41baacf0dbd2a9390c2f8" + integrity sha512-1LiGcOXkP5eUOl/0JRqkrqYtCvIL4NJj1GbbLIRq4TvkfqrRbF7zJM2SaayxPo3Z48zVsqk0ZE5+RrNAdK/Rrg== + dependencies: + "@0x/assert" "^2.1.6" + "@0x/types" "^2.4.3" + "@0x/typescript-typings" "^4.3.0" + "@0x/utils" "^4.5.2" + "@0x/web3-wrapper" "^6.0.13" "@ledgerhq/hw-app-eth" "^4.3.0" "@ledgerhq/hw-transport-u2f" "4.24.0" "@types/hdkey" "^0.7.0" "@types/web3-provider-engine" "^14.0.0" bip39 "^2.5.0" bn.js "^4.11.8" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" ethereumjs-tx "^1.3.5" ethereumjs-util "^5.1.1" ganache-core "^2.6.0" @@ -172,59 +172,67 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^4.3.0" -"@0x/types@^2.4.2": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@0x/types/-/types-2.4.2.tgz#1d6dd85d9ac20f267a1206b477caf55e90522879" - integrity sha512-Thp9QoH8wZ8LPaOrUAY57u9AKheA0QwvuAinv8uPPlU2+vmIaJyZamMPg18/X21x0JHuuoJ4PWLqEXhMRJUQ5A== +"@0x/types@^2.4.3": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@0x/types/-/types-2.4.3.tgz#ea014889789e9013fdf48ce97b79f2c016e10fb3" + integrity sha512-3z4ca9fb9pyTu9lJhTSll5EuEthkA3tLAayyZixCoCnwi4ok6PJ83PnMMsSxlRY2iXr7QGbrQr6nU64YWk2WjA== dependencies: "@types/node" "*" bignumber.js "~8.0.2" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" -"@0x/typescript-typings@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-4.2.5.tgz#3ceebadd60377abc6e4d2e86c2585ddaf857abef" - integrity sha512-mCuOVKpgQkDvlcP6ZnD2kk+vt8OH6xa6uTxPgBZci2rnLiJLKMk1bsHLvFcbwNO5J/tO8DpZnHEwSx2FKaCviw== +"@0x/typescript-typings@^4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-4.3.0.tgz#4813a996ac5101841d1c22f4aa1738ab56168857" + integrity sha512-6IH2JyKyl33+40tJ5rEhaMPTS2mVuRvoNmoXlCd/F0GPYSsDHMGObIXOkx+Qsw5SyCmqNs/3CTLeeCCqiSUdaw== dependencies: "@types/bn.js" "^4.11.0" "@types/react" "*" bignumber.js "~8.0.2" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" popper.js "1.14.3" -"@0x/utils@^4.5.1": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-4.5.1.tgz#0a5e474eefa5676f22ebdf0cf1e4bef375f26146" - integrity sha512-rWFY/abdXPEMf3Ulq6sbVfahjuopiY/ppGTmGGHlhvoQkS7Tl6hEClwof6ISwn3R4V9oIzJayi2FNOP2qoJmNw== +"@0x/utils@^4.5.2": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-4.5.2.tgz#6cc89f2d0dda341e0fb4e76049a35abfb67a4ac5" + integrity sha512-NWfNcvyiOhouk662AWxX0ZVe4ednBZJS9WZT/by3DBCY/WvN7WHMpEy9M5rBCxO+JJndLYeB5eBztDp7W+Ytkw== dependencies: - "@0x/types" "^2.4.2" - "@0x/typescript-typings" "^4.2.5" + "@0x/types" "^2.4.3" + "@0x/typescript-typings" "^4.3.0" "@types/node" "*" abortcontroller-polyfill "^1.1.9" bignumber.js "~8.0.2" chalk "^2.3.0" detect-node "2.0.3" - ethereum-types "^2.1.5" + ethereum-types "^2.1.6" ethereumjs-util "^5.1.1" ethers "~4.0.4" isomorphic-fetch "2.2.1" js-sha3 "^0.7.0" lodash "^4.17.11" -"@0x/web3-wrapper@^6.0.12": - version "6.0.12" - resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-6.0.12.tgz#979731dd87bc99d58e3d62a5c471cb1129017393" - integrity sha512-sTRyb5oxXfkY2Wln9hpF2uFOAJeaERhevwKwjcVdjIfHU4gm+JoYgcIJsMhnO/L4LtRcPlMVplvC6V49eKzVRw== - dependencies: - "@0x/assert" "^2.1.5" - "@0x/json-schemas" "^4.0.1" - "@0x/typescript-typings" "^4.2.5" - "@0x/utils" "^4.5.1" - ethereum-types "^2.1.5" +"@0x/web3-wrapper@^6.0.13": + version "6.0.13" + resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-6.0.13.tgz#2e666221bd44ceebe02762028214d4aa41ad7247" + integrity sha512-LQjKBCCNdkJuhcJld+/sy+G0+sJu5qp9VDNNwJGLDxWIJpgoshhUpBPi7vUnZ79UY4SYuNcC4yM9yI61cs7ZiA== + dependencies: + "@0x/assert" "^2.1.6" + "@0x/json-schemas" "^4.0.2" + "@0x/typescript-typings" "^4.3.0" + "@0x/utils" "^4.5.2" + ethereum-types "^2.1.6" ethereumjs-util "^5.1.1" ethers "~4.0.4" lodash "^4.17.11" +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + dependencies: + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@apidevtools/json-schema-ref-parser@^9.0.3": version "9.0.9" resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#d720f9256e3609621280584f2b47ae165359268b" @@ -235,629 +243,586 @@ call-me-maybe "^1.0.1" js-yaml "^4.1.0" -"@azure/abort-controller@^1.0.0": +"@apollo/protobufjs@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.6.tgz#d601e65211e06ae1432bf5993a1a0105f2862f27" + integrity sha512-Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + "@types/node" "^10.1.0" + long "^4.0.0" + +"@apollo/utils.dropunuseddefinitions@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929" + integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg== + +"@apollo/utils.keyvaluecache@^1.0.1": version "1.0.1" - resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.1.tgz#8510935b25ac051e58920300e9d7b511ca6e656a" - integrity sha512-wP2Jw6uPp8DEDy0n4KNidvwzDjyVV2xnycEIq7nPzj1rHyb/r+t3OPeNT1INZePP2wy5ZqlwyuyOMTi0ePyY1A== + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.1.tgz#46f310f859067efe9fa126156c6954f8381080d2" + integrity sha512-nLgYLomqjVimEzQ4cdvVQkcryi970NDvcRVPfd0OPeXhBfda38WjBq+WhQFk+czSHrmrSp34YHBxpat0EtiowA== dependencies: - tslib "^1.9.3" + "@apollo/utils.logger" "^1.0.0" + lru-cache "^7.10.1" -"@azure/core-asynciterator-polyfill@^1.0.0": +"@apollo/utils.logger@^1.0.0": version "1.0.0" - resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz#dcccebb88406e5c76e0e1d52e8cc4c43a68b3ee7" - integrity sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg== + resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.0.tgz#6e3460a2250c2ef7c2c3b0be6b5e148a1596f12b" + integrity sha512-dx9XrjyisD2pOa+KsB5RcDbWIAdgC91gJfeyLCgy0ctJMjQe7yZK5kdWaWlaOoCeX0z6YI9iYlg7vMPyMpQF3Q== -"@azure/core-auth@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.1.3.tgz#94e7bbc207010e7a2fdba61565443e4e1cf1e131" - integrity sha512-A4xigW0YZZpkj1zK7dKuzbBpGwnhEcRk6WWuIshdHC32raR3EQ1j6VA9XZqE+RFsUgH6OAmIK5BWIz+mZjnd6Q== +"@apollo/utils.printwithreducedwhitespace@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30" + integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q== + +"@apollo/utils.removealiases@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1" + integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A== + +"@apollo/utils.sortast@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07" + integrity sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA== dependencies: - "@azure/abort-controller" "^1.0.0" - "@azure/core-tracing" "1.0.0-preview.8" - "@opentelemetry/api" "^0.6.1" - tslib "^2.0.0" + lodash.sortby "^4.7.0" -"@azure/core-auth@^1.1.4": +"@apollo/utils.stripsensitiveliterals@^1.2.0": version "1.2.0" - resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.2.0.tgz#a5a181164e99f8446a3ccf9039345ddc9bb63bb9" - integrity sha512-KUl+Nwn/Sm6Lw5d3U90m1jZfNSL087SPcqHLxwn2T6PupNKmcgsEbDjHB25gDvHO4h7pBsTlrdJAY7dz+Qk8GA== + resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28" + integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w== + +"@apollo/utils.usagereporting@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.0.tgz#b81df180f4ca78b91a22cb49105174a7f070db1e" + integrity sha512-5PL7hJMkTPmdo3oxPtigRrIyPxDk/ddrUryHPDaezL1lSFExpNzsDd2f1j0XJoHOg350GRd3LyD64caLA2PU1w== + dependencies: + "@apollo/utils.dropunuseddefinitions" "^1.1.0" + "@apollo/utils.printwithreducedwhitespace" "^1.1.0" + "@apollo/utils.removealiases" "1.0.0" + "@apollo/utils.sortast" "^1.1.0" + "@apollo/utils.stripsensitiveliterals" "^1.2.0" + apollo-reporting-protobuf "^3.3.1" + +"@apollographql/apollo-tools@^0.5.3": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c" + integrity sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw== + +"@apollographql/graphql-playground-html@1.6.29": + version "1.6.29" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" + integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA== + dependencies: + xss "^1.0.8" + +"@azure/abort-controller@^1.0.0", "@azure/abort-controller@^1.0.4": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249" + integrity sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw== + dependencies: + tslib "^2.2.0" + +"@azure/core-auth@^1.1.4", "@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.4.0.tgz#6fa9661c1705857820dbc216df5ba5665ac36a9e" + integrity sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ== dependencies: "@azure/abort-controller" "^1.0.0" - tslib "^2.0.0" + tslib "^2.2.0" -"@azure/core-http@^1.1.1", "@azure/core-http@^1.1.6": - version "1.1.6" - resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-1.1.6.tgz#9d76bc569c9907e3224bd09c09b4ac08bde9faf8" - integrity sha512-/C+qNzhwlLKt0F6SjaBEyY2pwZvwL2LviyS5PHlCh77qWuTF1sETmYAINM88BCN+kke+UlECK4YOQaAjJwyHvQ== +"@azure/core-client@^1.0.0", "@azure/core-client@^1.3.0", "@azure/core-client@^1.5.0": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.6.1.tgz#a1aad3f7c69b6e5d9dddb39fabaeba013eac9313" + integrity sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-auth" "^1.1.3" - "@azure/core-tracing" "1.0.0-preview.9" + "@azure/core-auth" "^1.4.0" + "@azure/core-rest-pipeline" "^1.9.1" + "@azure/core-tracing" "^1.0.0" + "@azure/core-util" "^1.0.0" "@azure/logger" "^1.0.0" - "@opentelemetry/api" "^0.10.2" - "@types/node-fetch" "^2.5.0" - "@types/tunnel" "^0.0.1" - form-data "^3.0.0" - node-fetch "^2.6.0" - process "^0.11.10" - tough-cookie "^4.0.0" - tslib "^2.0.0" - tunnel "^0.0.6" - uuid "^8.1.0" - xml2js "^0.4.19" + tslib "^2.2.0" -"@azure/core-lro@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-1.0.2.tgz#b7b51ff7b84910b7eb152a706b0531d020864f31" - integrity sha512-Yr0JD7GKryOmbcb5wHCQoQ4KCcH5QJWRNorofid+UvudLaxnbCfvKh/cUfQsGUqRjO9L/Bw4X7FP824DcHdMxw== +"@azure/core-http-compat@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@azure/core-http-compat/-/core-http-compat-1.3.0.tgz#bf3d8ae1e310103f2b82550f36fd2a99c9b4d3f4" + integrity sha512-ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA== + dependencies: + "@azure/abort-controller" "^1.0.4" + "@azure/core-client" "^1.3.0" + "@azure/core-rest-pipeline" "^1.3.0" + +"@azure/core-lro@^2.2.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.3.0.tgz#f972e42f58db570ff67abc919695be8517b985d3" + integrity sha512-n53pk9Gs450rv1zDr9H7aPmMkYHMu9Bwks9qFlK+P46b4virATRf3TNuBZH7DIGVs8ePjtRCNYhcM4D+/Gyn6A== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-http" "^1.1.1" - events "^3.0.0" - tslib "^1.10.0" + "@azure/logger" "^1.0.0" + tslib "^2.2.0" "@azure/core-paging@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.1.1.tgz#9639d2d5b6631d481d81040504e0e26c003f47b1" - integrity sha512-hqEJBEGKan4YdOaL9ZG/GRG6PXaFd/Wb3SSjQW4LWotZzgl6xqG00h6wmkrpd2NNkbBkD1erLHBO3lPHApv+iQ== + version "1.3.0" + resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.3.0.tgz#ebf6520a931be7d5ff1cf58bc4fe6c14d6a3080d" + integrity sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg== dependencies: - "@azure/core-asynciterator-polyfill" "^1.0.0" + tslib "^2.2.0" -"@azure/core-tracing@1.0.0-preview.8": - version "1.0.0-preview.8" - resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.8.tgz#1e0ff857e855edb774ffd33476003c27b5bb2705" - integrity sha512-ZKUpCd7Dlyfn7bdc+/zC/sf0aRIaNQMDuSj2RhYRFe3p70hVAnYGp3TX4cnG2yoEALp/LTj/XnZGQ8Xzf6Ja/Q== +"@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.3.0", "@azure/core-rest-pipeline@^1.8.0", "@azure/core-rest-pipeline@^1.9.1": + version "1.9.2" + resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.2.tgz#47ee72ca96e2b82e3d1362c29fd7688dc7464527" + integrity sha512-8rXI6ircjenaLp+PkOFpo37tQ1PQfztZkfVj97BIF3RPxHAsoVSgkJtu3IK/bUEWcb7HzXSoyBe06M7ODRkRyw== dependencies: - "@opencensus/web-types" "0.0.7" - "@opentelemetry/api" "^0.6.1" - tslib "^1.10.0" + "@azure/abort-controller" "^1.0.0" + "@azure/core-auth" "^1.4.0" + "@azure/core-tracing" "^1.0.1" + "@azure/core-util" "^1.0.0" + "@azure/logger" "^1.0.0" + form-data "^4.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + tslib "^2.2.0" + uuid "^8.3.0" -"@azure/core-tracing@1.0.0-preview.9": - version "1.0.0-preview.9" - resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.9.tgz#84f3b85572013f9d9b85e1e5d89787aa180787eb" - integrity sha512-zczolCLJ5QG42AEPQ+Qg9SRYNUyB+yZ5dzof4YEc+dyWczO9G2sBqbAjLB7IqrsdHN2apkiB2oXeDKCsq48jug== +"@azure/core-tracing@1.0.0-preview.12": + version "1.0.0-preview.12" + resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.12.tgz#f53ff452c0742ad981c244f97d93d37ca2b5e139" + integrity sha512-nvo2Wc4EKZGN6eFu9n3U7OXmASmL8VxoPIH7xaD6OlQqi44bouF0YIi9ID5rEsKLiAU59IYx6M297nqWVMWPDg== dependencies: - "@opencensus/web-types" "0.0.7" - "@opentelemetry/api" "^0.10.2" - tslib "^2.0.0" + "@opentelemetry/api" "^1.0.0" + tslib "^2.2.0" -"@azure/identity@^1.1.0": +"@azure/core-tracing@^1.0.0", "@azure/core-tracing@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.1.tgz#352a38cbea438c4a83c86b314f48017d70ba9503" + integrity sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw== + dependencies: + tslib "^2.2.0" + +"@azure/core-util@^1.0.0": version "1.1.0" - resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-1.1.0.tgz#e7c9a99d0408c7f8776d4f268a343d645971c662" - integrity sha512-S4jYqegLWXIwVnkiArFlcTA7KOZmv+LMhQeQJhnmYy/CxrJHyIAEQyJ7qsrSt58bSyDZI2NkmKUBKaYGZU3/5g== + resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.1.0.tgz#36736b274e9abee4b6cc6e4d162683b4e1e3db52" + integrity sha512-+i93lNJNA3Pl3KSuC6xKP2jTL4YFeDfO6VNOaYdk0cppZcLCxt811gS878VsqsCisaltdhl9lhMzK5kbxCiF4w== + dependencies: + tslib "^2.2.0" + +"@azure/identity@^1.1.0": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-1.5.2.tgz#09da6aa8e14f2dace3dd8f66de7d7d56bfee5db7" + integrity sha512-vqyeRbd2i0h9F4mqW5JbkP1xfabqKQ21l/81osKhpOQ2LtwaJW6nw4+0PsVYnxcbPHFCIZt6EWAk74a3OGYZJA== dependencies: - "@azure/core-http" "^1.1.6" - "@azure/core-tracing" "1.0.0-preview.9" + "@azure/core-auth" "^1.3.0" + "@azure/core-client" "^1.0.0" + "@azure/core-rest-pipeline" "^1.1.0" + "@azure/core-tracing" "1.0.0-preview.12" "@azure/logger" "^1.0.0" - "@opentelemetry/api" "^0.10.2" + "@azure/msal-node" "1.0.0-beta.6" + "@types/stoppable" "^1.1.0" + axios "^0.21.1" events "^3.0.0" jws "^4.0.0" msal "^1.0.2" + open "^7.0.0" qs "^6.7.0" + stoppable "^1.1.0" tslib "^2.0.0" - uuid "^8.1.0" + uuid "^8.3.0" optionalDependencies: - keytar "^5.4.0" + keytar "^7.3.0" "@azure/keyvault-keys@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@azure/keyvault-keys/-/keyvault-keys-4.1.0.tgz#3a55d819370bfe6bb6e6588125b0cf6734c18528" - integrity sha512-xdz7nkYulWSo2+CsBRxaOe2JrGWQP3WxEjPLdIzZNHyaYBuLlnKHL3XWYH5j0UUVoDcmQClZUlZ2P/kdOiy/aQ== + version "4.5.0" + resolved "https://registry.yarnpkg.com/@azure/keyvault-keys/-/keyvault-keys-4.5.0.tgz#28f03eb974fdd0f9b2694f42ce7eaf0630d28319" + integrity sha512-F+0qpUrIxp1/uuQ3sFsAf4rTXErFwmuVLoXlD2e3ebrONrmYjqszwmlN4tBqAag1W9wGuZTL0jE8X8b+LB83ow== dependencies: - "@azure/core-http" "^1.1.6" - "@azure/core-lro" "^1.0.2" + "@azure/abort-controller" "^1.0.0" + "@azure/core-auth" "^1.3.0" + "@azure/core-client" "^1.5.0" + "@azure/core-http-compat" "^1.3.0" + "@azure/core-lro" "^2.2.0" "@azure/core-paging" "^1.1.1" - "@azure/core-tracing" "1.0.0-preview.9" + "@azure/core-rest-pipeline" "^1.8.0" + "@azure/core-tracing" "^1.0.0" + "@azure/core-util" "^1.0.0" "@azure/logger" "^1.0.0" - "@opentelemetry/api" "^0.10.2" - tslib "^2.0.0" + tslib "^2.2.0" "@azure/keyvault-secrets@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@azure/keyvault-secrets/-/keyvault-secrets-4.1.0.tgz#47f30639344eefe6ac9e5b558347ea1f626163ef" - integrity sha512-26ARU97svPkv8q6QbIdwdky8ntn+Q5mxTTCjpp9FUIyA2LTXmEL0wZDPBeM3mxZLHKnMEXQxEo+KYutrJW5xPQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/@azure/keyvault-secrets/-/keyvault-secrets-4.5.1.tgz#0a06a0c279bfaddaf53e9cddcf307932eeb54822" + integrity sha512-DTfEC/fflo8AcvLb0P6Qhu1B3uxQiX5+dZ7HISc3hZMp3caDKvXae+gTCDDE1piTaA3AnYglAgzRnIE5vdbS4g== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-http" "^1.1.6" - "@azure/core-lro" "^1.0.2" + "@azure/core-auth" "^1.3.0" + "@azure/core-client" "^1.5.0" + "@azure/core-http-compat" "^1.3.0" + "@azure/core-lro" "^2.2.0" "@azure/core-paging" "^1.1.1" - "@azure/core-tracing" "1.0.0-preview.9" + "@azure/core-rest-pipeline" "^1.8.0" + "@azure/core-tracing" "^1.0.0" + "@azure/core-util" "^1.0.0" "@azure/logger" "^1.0.0" - "@opentelemetry/api" "^0.10.2" - tslib "^2.0.0" + tslib "^2.2.0" "@azure/logger@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.0.tgz#48b371dfb34288c8797e5c104f6c4fb45bf1772c" - integrity sha512-g2qLDgvmhyIxR3JVS8N67CyIOeFRKQlX/llxYJQr1OSGQqM3HTpVP8MjmjcEKbL/OIt2N9C9UFaNQuKOw1laOA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96" + integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g== dependencies: - tslib "^1.9.3" + tslib "^2.2.0" -"@azure/ms-rest-azure-env@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-1.1.2.tgz#8505873afd4a1227ec040894a64fdd736b4a101f" - integrity sha512-l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA== +"@azure/ms-rest-azure-env@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz#45809f89763a480924e21d3c620cd40866771625" + integrity sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw== -"@azure/ms-rest-js@^1.8.7": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz#e83d512b102c302425da5ff03a6d76adf2aa4ae6" - integrity sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ== +"@azure/ms-rest-js@^2.0.4": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz#185a9d643ea55c696134af76a5c6026c94e26217" + integrity sha512-0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg== dependencies: "@azure/core-auth" "^1.1.4" - axios "^0.21.1" - form-data "^2.3.2" - tough-cookie "^2.4.3" - tslib "^1.9.2" + abort-controller "^3.0.0" + form-data "^2.5.0" + node-fetch "^2.6.7" + tough-cookie "^3.0.1" + tslib "^1.10.0" tunnel "0.0.6" - uuid "^3.2.1" + uuid "^8.3.2" xml2js "^0.4.19" -"@azure/ms-rest-nodeauth@2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-2.0.2.tgz#037e29540c5625eaec718b8fcc178dd7ad5dfb96" - integrity sha512-KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ== +"@azure/ms-rest-nodeauth@^3.0.10": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz#2624222f0685ae580801d6f1abeab20923814693" + integrity sha512-UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA== dependencies: - "@azure/ms-rest-azure-env" "^1.1.2" - "@azure/ms-rest-js" "^1.8.7" - adal-node "^0.1.28" + "@azure/ms-rest-azure-env" "^2.0.0" + "@azure/ms-rest-js" "^2.0.4" + adal-node "^0.2.2" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== +"@azure/msal-common@^4.0.0": + version "4.5.1" + resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-4.5.1.tgz#f35af8b634ae24aebd0906deb237c0db1afa5826" + integrity sha512-/i5dXM+QAtO+6atYd5oHGBAx48EGSISkXNXViheliOQe+SIFMDo3gSq3lL54W0suOSAsVPws3XnTaIHlla0PIQ== dependencies: - "@babel/highlight" "^7.10.4" + debug "^4.1.1" -"@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== +"@azure/msal-node@1.0.0-beta.6": + version "1.0.0-beta.6" + resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.0.0-beta.6.tgz#da6bc3a3a861057c85586055960e069f162548ee" + integrity sha512-ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ== dependencies: - "@babel/highlight" "^7.12.13" - -"@babel/compat-data@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6" - integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog== + "@azure/msal-common" "^4.0.0" + axios "^0.21.1" + jsonwebtoken "^8.5.1" + uuid "^8.3.0" -"@babel/core@^7.0.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.8.tgz#c191d9c5871788a591d69ea1dc03e5843a3680fb" - integrity sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-compilation-targets" "^7.13.8" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helpers" "^7.13.0" - "@babel/parser" "^7.13.4" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + dependencies: + "@babel/highlight" "^7.18.6" + +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.0.tgz#2a592fd89bacb1fcde68de31bee4f2f2dacb0e86" + integrity sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw== + +"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.0.tgz#d2f5f4f2033c00de8096be3c9f45772563e150c3" + integrity sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.19.0" + "@babel/helper-compilation-targets" "^7.19.0" + "@babel/helper-module-transforms" "^7.19.0" + "@babel/helpers" "^7.19.0" + "@babel/parser" "^7.19.0" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.0" + "@babel/types" "^7.19.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" - lodash "^4.17.19" + json5 "^2.2.1" semver "^6.3.0" - source-map "^0.5.0" - -"@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@^7.8.4": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" - integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.7" - "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.9" - "@babel/types" "^7.12.7" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" -"@babel/generator@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" - integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== +"@babel/generator@^7.19.0", "@babel/generator@^7.5.0", "@babel/generator@^7.7.2": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a" + integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg== dependencies: - "@babel/types" "^7.12.5" + "@babel/types" "^7.19.0" + "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" - source-map "^0.5.0" -"@babel/generator@^7.13.0", "@babel/generator@^7.5.0": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39" - integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw== +"@babel/helper-annotate-as-pure@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" + integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== dependencies: - "@babel/types" "^7.13.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/helper-annotate-as-pure@^7.10.1", "@babel/helper-annotate-as-pure@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" - integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz#4e9012d6701bef0030348d7f9c808209bd3e8687" - integrity sha512-lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.10.3" - "@babel/types" "^7.10.3" - -"@babel/helper-builder-react-jsx-experimental@^7.10.1": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz#9a7d58ad184d3ac3bafb1a452cec2bad7e4a0bc8" - integrity sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/helper-module-imports" "^7.10.1" - "@babel/types" "^7.10.1" + "@babel/types" "^7.18.6" -"@babel/helper-builder-react-jsx@^7.10.3": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.3.tgz#62c4b7bb381153a0a5f8d83189b94b9fb5384fc5" - integrity sha512-vkxmuFvmovtqTZknyMGj9+uQAZzz5Z9mrbnkJnPkaYGfKTaSsYcjQdXP0lgrWLVh8wU6bCjOmXOpx+kqUi+S5Q== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" + integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/types" "^7.10.3" + "@babel/helper-explode-assignable-expression" "^7.18.6" + "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz#02bdb22783439afb11b2f009814bdd88384bd468" - integrity sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz#537ec8339d53e806ed422f1e06c8f17d55b96bb0" + integrity sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA== dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" + "@babel/compat-data" "^7.19.0" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.20.2" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.10.1": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.3.tgz#2783daa6866822e3d5ed119163b50f0fc3ae4b35" - integrity sha512-iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ== - dependencies: - "@babel/helper-function-name" "^7.10.3" - "@babel/helper-member-expression-to-functions" "^7.10.3" - "@babel/helper-optimise-call-expression" "^7.10.3" - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/helper-replace-supers" "^7.10.1" - "@babel/helper-split-export-declaration" "^7.10.1" - -"@babel/helper-create-class-features-plugin@^7.13.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz#0367bd0a7505156ce018ca464f7ac91ba58c1a04" - integrity sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" - -"@babel/helper-create-regexp-features-plugin@^7.10.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8" - integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-regex" "^7.10.4" - regexpu-core "^4.7.1" - -"@babel/helper-define-map@^7.10.3": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz#d27120a5e57c84727b30944549b2dfeca62401a8" - integrity sha512-bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ== - dependencies: - "@babel/helper-function-name" "^7.10.3" - "@babel/types" "^7.10.3" - lodash "^4.17.13" - -"@babel/helper-explode-assignable-expression@^7.10.3": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz#9dc14f0cfa2833ea830a9c8a1c742b6e7461b05e" - integrity sha512-0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw== - dependencies: - "@babel/traverse" "^7.10.3" - "@babel/types" "^7.10.3" - -"@babel/helper-function-name@^7.10.1", "@babel/helper-function-name@^7.10.3", "@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== - dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" - integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== - dependencies: - "@babel/helper-get-function-arity" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/helper-get-function-arity@^7.10.1", "@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-get-function-arity@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" - integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-member-expression-to-functions@^7.10.3", "@babel/helper-member-expression-to-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c" - integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ== - dependencies: - "@babel/types" "^7.12.1" - -"@babel/helper-member-expression-to-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091" - integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ== - dependencies: - "@babel/types" "^7.13.0" - -"@babel/helper-module-imports@^7.10.1", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.8.3": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" - integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== - dependencies: - "@babel/types" "^7.12.5" - -"@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-module-transforms@^7.10.1", "@babel/helper-module-transforms@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" - integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== - dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-simple-access" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/helper-validator-identifier" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - lodash "^4.17.19" - -"@babel/helper-module-transforms@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1" - integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - lodash "^4.17.19" - -"@babel/helper-optimise-call-expression@^7.10.3", "@babel/helper-optimise-call-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" - integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.10.3", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" - integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== - -"@babel/helper-regex@^7.10.1", "@babel/helper-regex@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0" - integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg== - dependencies: - lodash "^4.17.19" - -"@babel/helper-replace-supers@^7.10.1", "@babel/helper-replace-supers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9" - integrity sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24" - integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helper-simple-access@^7.10.1", "@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" - integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== - dependencies: - "@babel/types" "^7.12.1" - -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-split-export-declaration@^7.10.1", "@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== - dependencies: - "@babel/types" "^7.11.0" - -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b" + integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw== dependencies: - "@babel/types" "^7.12.13" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== - -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - -"@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== - -"@babel/helpers@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" - integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== - dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" - -"@babel/helpers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0" - integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/helper-create-regexp-features-plugin@^7.18.6": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b" + integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - chalk "^2.0.0" - js-tokens "^4.0.0" + "@babel/helper-annotate-as-pure" "^7.18.6" + regexpu-core "^5.1.0" -"@babel/highlight@^7.12.13": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.8.tgz#10b2dac78526424dfc1f47650d0e415dfd9dc481" - integrity sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw== +"@babel/helper-define-polyfill-provider@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073" + integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-plugin-utils" "^7.16.7" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" + +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-explode-assignable-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" + integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== + dependencies: + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" + +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-member-expression-to-functions@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" + integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== + dependencies: + "@babel/types" "^7.18.9" + +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30" + integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.18.6" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.0" + "@babel/types" "^7.19.0" + +"@babel/helper-optimise-call-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" + integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" + integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw== + +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" + integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/traverse" "^7.18.9" + "@babel/types" "^7.18.9" + +"@babel/helper-simple-access@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" + integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" + integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw== + dependencies: + "@babel/types" "^7.18.9" + +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" + integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== + +"@babel/helper-validator-identifier@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" + integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g== + +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + +"@babel/helpers@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18" + integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg== + dependencies: + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.0" + "@babel/types" "^7.19.0" + +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.4": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.9.tgz#ca34cb95e1c2dd126863a84465ae8ef66114be99" - integrity sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw== - -"@babel/parser@^7.1.0", "@babel/parser@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" - integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" + integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== "@babel/plugin-external-helpers@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.12.13.tgz#65ef9f4576297250dc601d2aa334769790d9966d" - integrity sha512-ClvAsk4RqpE6iacYUjdU9PtvIwC9yAefZENsPfGeG5FckX3jFZLDlWPuyv5gi9/9C2VgwX6H8q1ukBifC0ha+Q== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.18.6.tgz#58f2a6eca8ad05bc130de8cec569c43dc19b6deb" + integrity sha512-wNqc87qjLvsD1PIMQBzLn1bMuTlGzqLzM/1VGQ22Wm51cbCWS9k71ydp5iZS4hjwQNuTWSn/xbZkkusNENwtZg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-proposal-class-properties@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01" - integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" + integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-proposal-export-default-from@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.0.0.tgz#a057bbfd4649facfe39f33a537e18554bdd2b5da" - integrity sha512-cWhkx6SyjZ4caFOanoPmDNgQCuYYTmou4QXy886JsyLTw/vhWQbop2gLKsWyyswrJkKTB7fSNxVYbP/oEsoySA== + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.18.10.tgz#091f4794dbce4027c03cf4ebc64d3fb96b75c206" + integrity sha512-5H2N3R2aQFxkV4PIBUR/i7PUSwgTZjouJKzI8eKswfIjT0PhvzkPn0t0wIS5zn6maQuvtT0t1oHtMUz61LOuow== dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-export-default-from" "^7.0.0" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-syntax-export-default-from" "^7.18.6" "@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78" - integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" + integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-proposal-object-rest-spread@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz#b8d0d22f70afa34ad84b7a200ff772f9b9fce474" - integrity sha512-ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7" + integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.10.1" + "@babel/compat-data" "^7.18.8" + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.18.8" "@babel/plugin-proposal-optional-catch-binding@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2" - integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" + integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-proposal-optional-chaining@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz#9a726f94622b653c0a3a7a59cdce94730f526f7c" - integrity sha512-yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993" + integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w== dependencies: - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -873,20 +838,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.0.0": +"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-syntax-class-properties@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c" - integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-dynamic-import@^7.0.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" @@ -894,19 +852,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-export-default-from@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.0.0.tgz#084b639bce3d42f3c5bf3f68ccb42220bb2d729d" - integrity sha512-HNnjg/fFFbnuLAqr/Ocp1Y3GB4AjmXcu1xxn3ql3bS2kGrB/qi+Povshb8i3hOkE5jNozzh8r/0/lq1w8oOWbQ== +"@babel/plugin-syntax-export-default-from@^7.0.0", "@babel/plugin-syntax-export-default-from@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.18.6.tgz#8df076711a4818c4ce4f23e61d622b0ba2ff84bc" + integrity sha512-Kr//z3ujSVNx6E9z9ih5xXXMqK07VVTuqPmqGe6Mss/zW5XPeLZeSDZoP9ab/hT4wPKqAgjl2PnhPrcpk8Seew== dependencies: - "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c" - integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg== +"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.18.6", "@babel/plugin-syntax-flow@^7.2.0": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1" + integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A== dependencies: - "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -922,19 +880,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" - integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-jsx@^7.10.1": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz#0ae371134a42b91d5418feb3c8c8d43e1565d2da" - integrity sha512-+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ== +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.7.2": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" + integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -943,7 +894,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": +"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== @@ -951,27 +902,27 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-numeric-separator@^7.8.3": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99" - integrity sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg== + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": +"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3": +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": +"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== @@ -979,339 +930,309 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362" - integrity sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" - integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== +"@babel/plugin-syntax-typescript@^7.18.6", "@babel/plugin-syntax-typescript@^7.7.2": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285" + integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-arrow-functions@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b" - integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe" + integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-block-scoped-functions@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" - integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" + integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-block-scoping@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e" - integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d" + integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - lodash "^4.17.13" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-transform-classes@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz#8d9a656bc3d01f3ff69e1fccb354b0f9d72ac544" - integrity sha512-irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/helper-define-map" "^7.10.3" - "@babel/helper-function-name" "^7.10.3" - "@babel/helper-optimise-call-expression" "^7.10.3" - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/helper-replace-supers" "^7.10.1" - "@babel/helper-split-export-declaration" "^7.10.1" + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20" + integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-compilation-targets" "^7.19.0" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz#d3aa6eef67cb967150f76faff20f0abbf553757b" - integrity sha512-GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e" + integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw== dependencies: - "@babel/helper-plugin-utils" "^7.10.3" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-transform-destructuring@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907" - integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA== + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5" + integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-transform-exponentiation-operator@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3" - integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" + integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-flow-strip-types@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01" - integrity sha512-WhXUNb4It5a19RsgKKbQPrjmy4yWOY1KynpEbNw7bnd1QTcrT/EIl3MJvnGgpgvrKyKbqX7nUNOJfkpLOnoDKA== + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz#e9e8606633287488216028719638cbbb2f2dde8f" + integrity sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg== dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.0.0" + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/plugin-syntax-flow" "^7.18.6" "@babel/plugin-transform-for-of@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5" - integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w== + version "7.18.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" + integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-function-name@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d" - integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" + integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== dependencies: - "@babel/helper-function-name" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-transform-literals@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a" - integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" + integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-transform-member-expression-literals@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" - integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" + integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-modules-commonjs@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301" - integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883" + integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q== dependencies: - "@babel/helper-module-transforms" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/helper-simple-access" "^7.10.1" + "@babel/helper-module-transforms" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-simple-access" "^7.18.6" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-object-assign@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.0.0.tgz#fca6d7500d9675c42868b8f3882979201b9a5ad8" - integrity sha512-Dag8mxx7/03oj8F8PkNso8GEMhwGfeT0TL6KfMsa9Brjx4IpwZVl3WBvEmYks8BMhPmrvM5NQ/tjaMbwEj5ijA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.18.6.tgz#7830b4b6f83e1374a5afb9f6111bcfaea872cdd2" + integrity sha512-mQisZ3JfqWh2gVXvfqYCAAyRs6+7oev+myBsTwW5RnPhYXOTuCEw2oe3YgxlXMViXUS53lG8koulI7mJ+8JE+A== dependencies: - "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-object-super@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" - integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" + integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.6" -"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.10.1": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd" - integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg== +"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.18.8": + version "7.18.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a" + integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg== dependencies: - "@babel/helper-get-function-arity" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-property-literals@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" - integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" + integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-display-name@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.3.tgz#e3c246e1b4f3e52cc7633e237ad9194c0ec482e7" - integrity sha512-dOV44bnSW5KZ6kYF6xSHBth7TFiHHZReYXH/JH3XnFNV+soEL1F5d8JT7AJ3ZBncd19Qul7SN4YpBnyWOnQ8KA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" + integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== dependencies: - "@babel/helper-plugin-utils" "^7.10.3" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-jsx-self@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz#422d99d122d592acab9c35ea22a6cfd9bf189f60" - integrity sha512-FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz#3849401bab7ae8ffa1e3e5687c94a753fc75bda7" + integrity sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-jsx-source@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz#30db3d4ee3cdebbb26a82a9703673714777a4273" - integrity sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.18.6.tgz#06e9ae8a14d2bc19ce6e3c447d842032a50598fc" + integrity sha512-utZmlASneDfdaMh0m/WausbjUjEdGrQJz0vFK93d7wD3xf5wBtX219+q6IlCNZeguIcxS2f/CvLZrlLSvSHQXw== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/plugin-syntax-jsx" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-jsx@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.3.tgz#c07ad86b7c159287c89b643f201f59536231048e" - integrity sha512-Y21E3rZmWICRJnvbGVmDLDZ8HfNDIwjGF3DXYHx1le0v0mIHCs0Gv5SavyW5Z/jgAHLaAoJPiwt+Dr7/zZKcOQ== + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9" + integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg== dependencies: - "@babel/helper-builder-react-jsx" "^7.10.3" - "@babel/helper-builder-react-jsx-experimental" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/plugin-syntax-jsx" "^7.10.1" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/plugin-syntax-jsx" "^7.18.6" + "@babel/types" "^7.19.0" "@babel/plugin-transform-regenerator@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz#6ec680f140a5ceefd291c221cb7131f6d7e8cb6d" - integrity sha512-H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73" + integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ== dependencies: - regenerator-transform "^0.14.2" + "@babel/helper-plugin-utils" "^7.18.6" + regenerator-transform "^0.15.0" "@babel/plugin-transform-runtime@^7.0.0", "@babel/plugin-transform-runtime@^7.5.5": - version "7.9.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd" - integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w== - dependencies: - "@babel/helper-module-imports" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - resolve "^1.8.1" - semver "^5.5.1" + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f" + integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ== + dependencies: + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.9" + babel-plugin-polyfill-corejs2 "^0.3.2" + babel-plugin-polyfill-corejs3 "^0.5.3" + babel-plugin-polyfill-regenerator "^0.4.0" + semver "^6.3.0" "@babel/plugin-transform-shorthand-properties@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3" - integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" + integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-spread@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8" - integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw== + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6" + integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" "@babel/plugin-transform-sticky-regex@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00" - integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" + integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/helper-regex" "^7.10.1" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-template-literals@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz#69d39b3d44b31e7b4864173322565894ce939b25" - integrity sha512-yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" + integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.3" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-transform-typescript@^7.5.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853" - integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ== + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.0.tgz#50c3a68ec8efd5e040bde2cd764e8e16bc0cbeaf" + integrity sha512-DOOIywxPpkQHXijXv+s9MDAyZcLp12oYRl3CMWZ6u7TjSoCBq/KqHR/nNFR3+i2xqheZxoF0H2XyL7B6xeSRuA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-typescript" "^7.12.13" + "@babel/helper-create-class-features-plugin" "^7.19.0" + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/plugin-syntax-typescript" "^7.18.6" "@babel/plugin-transform-unicode-regex@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f" - integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw== + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" + integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/register@^7.0.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.13.8.tgz#d9051dc6820cb4e86375cc0e2d55a4862b31184f" - integrity sha512-yCVtABcmvQjRsX2elcZFUV5Q5kDDpHdtXKKku22hNDma60lYuhKmtp1ykZ/okRCPLT2bR5S+cA1kvtBdAFlDTQ== + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.18.9.tgz#1888b24bc28d5cc41c412feb015e9ff6b96e439c" + integrity sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw== dependencies: + clone-deep "^4.0.1" find-cache-dir "^2.0.0" - lodash "^4.17.19" make-dir "^2.1.0" - pirates "^4.0.0" + pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/runtime@^7.0.0": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.9.tgz#97dbe2116e2630c489f22e0656decd60aaa1fcee" - integrity sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259" + integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA== dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": - version "7.11.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" - integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== +"@babel/runtime@^7.12.1", "@babel/runtime@^7.15.4", "@babel/runtime@^7.6.3", "@babel/runtime@^7.9.2": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78" + integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.0.0", "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" - -"@babel/template@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc" - integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.0" - "@babel/types" "^7.13.0" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.19" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.3", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" - integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" +"@babel/template@^7.0.0", "@babel/template@^7.18.10", "@babel/template@^7.3.3": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" + integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.18.10" + "@babel/types" "^7.18.10" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0", "@babel/traverse@^7.7.2": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.0.tgz#eb9c561c7360005c592cc645abafe0c3c4548eed" + integrity sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.19.0" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.19.0" + "@babel/types" "^7.19.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" - -"@babel/types@^7.0.0", "@babel/types@^7.10.1", "@babel/types@^7.10.3", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" - integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== - dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.19" - to-fast-properties "^2.0.0" -"@babel/types@^7.12.13", "@babel/types@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80" - integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA== +"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600" + integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" + "@babel/helper-string-parser" "^7.18.10" + "@babel/helper-validator-identifier" "^7.18.6" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1369,22 +1290,6 @@ semver "^7.3.5" web3 "1.3.6" -"@celo/ganache-cli@git+https://github.com/celo-org/ganache-cli.git#21652da": - version "6.6.1" - resolved "git+https://github.com/celo-org/ganache-cli.git#21652da953de1a7217c0cb86b596e94d22c2cc76" - dependencies: - ethereumjs-util "6.1.0" - source-map-support "0.5.12" - yargs "13.2.4" - -"@celo/ganache-cli@git+https://github.com/celo-org/ganache-cli.git#e933297": - version "6.6.1" - resolved "git+https://github.com/celo-org/ganache-cli.git#e93329707efbe899ac2f32a30ccf2badbbec8bdf" - dependencies: - ethereumjs-util "6.1.0" - source-map-support "0.5.12" - yargs "13.2.4" - "@celo/ganache-core@git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b", ganache-core@^2.6.0, "ganache-core@git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b": version "2.10.3" resolved "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" @@ -1438,9 +1343,9 @@ io-ts "2.0.1" "@celo/poprf@^0.1.6": - version "0.1.6" - resolved "https://registry.yarnpkg.com/@celo/poprf/-/poprf-0.1.6.tgz#f8960a454b027910741595ecd3fcc067838c16e1" - integrity sha512-zWcChteh5tcNr2s85gDNnz6hGvVF3NK1c5qlMPrMn70KWiy7d0YzXzkNYCjL99OQn1SUx+SD9RtZ2l48ByAtKw== + version "0.1.9" + resolved "https://registry.yarnpkg.com/@celo/poprf/-/poprf-0.1.9.tgz#38c514ce0f572b80edeb9dc280b6cf5e9d7c2a75" + integrity sha512-+993EA/W+TBCZyY5G0B2EVdXnPX6t2AldgRAIMaT9WIqTwZKi/TcdJDUQl8mj7HEHMPHlpgCBOVgaHkUcwo/5A== "@celo/typechain-target-web3-v1-celo@0.2.0": version "0.2.0" @@ -1535,409 +1440,464 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@ethersproject/abi@5.0.0-beta.142": - version "5.0.0-beta.142" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.142.tgz#cde0ced7daa2fbc98e35a2c31203331907e84a39" - integrity sha512-vJ2V9fPNzi+8iutY4sjy6mgogkJtiGsd9hmpa1bjnGW6qnHOEkAV1fzVpvT002LlnjFgqgtzuLBDZob6oU7i8w== - dependencies: - "@ethersproject/address" ">=5.0.0-beta.128" - "@ethersproject/bignumber" ">=5.0.0-beta.130" - "@ethersproject/bytes" ">=5.0.0-beta.129" - "@ethersproject/constants" ">=5.0.0-beta.128" - "@ethersproject/hash" ">=5.0.0-beta.128" - "@ethersproject/keccak256" ">=5.0.0-beta.127" - "@ethersproject/logger" ">=5.0.0-beta.129" - "@ethersproject/properties" ">=5.0.0-beta.131" - "@ethersproject/strings" ">=5.0.0-beta.130" - -"@ethersproject/abi@5.0.0-beta.153": - version "5.0.0-beta.153" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz#43a37172b33794e4562999f6e2d555b7599a8eee" - integrity sha512-aXweZ1Z7vMNzJdLpR1CZUAIgnwjrZeUSvN9syCwlBaEBUFJmFY+HHnfuTI5vIhVs/mRkfJVrbEyl51JZQqyjAg== - dependencies: - "@ethersproject/address" ">=5.0.0-beta.128" - "@ethersproject/bignumber" ">=5.0.0-beta.130" - "@ethersproject/bytes" ">=5.0.0-beta.129" - "@ethersproject/constants" ">=5.0.0-beta.128" - "@ethersproject/hash" ">=5.0.0-beta.128" - "@ethersproject/keccak256" ">=5.0.0-beta.127" - "@ethersproject/logger" ">=5.0.0-beta.129" - "@ethersproject/properties" ">=5.0.0-beta.131" - "@ethersproject/strings" ">=5.0.0-beta.130" - -"@ethersproject/abi@5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" - integrity sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw== - dependencies: - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/hash" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/strings" "^5.0.4" - -"@ethersproject/abstract-provider@^5.0.8": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.10.tgz#a533aed39a5f27312745c8c4c40fa25fc884831c" - integrity sha512-OSReY5iz94iIaPlRvLiJP8YVIvQLx4aUvMMnHWSaA/vTU8QHZmgNlt4OBdYV1+aFY8Xl+VRYiWBHq72ZDKXXCQ== - dependencies: - "@ethersproject/bignumber" "^5.0.13" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/networks" "^5.0.7" - "@ethersproject/properties" "^5.0.7" - "@ethersproject/transactions" "^5.0.9" - "@ethersproject/web" "^5.0.12" - -"@ethersproject/abstract-signer@^5.0.10": - version "5.0.14" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.14.tgz#30ef912b0f86599d90fdffc65c110452e7b55cf1" - integrity sha512-JztBwVO7o5OHLh2vyjordlS4/1EjRyaECtc8vPdXTF1i4dXN+J0coeRoPN6ZFbBvi/YbaB6br2fvqhst1VQD/g== - dependencies: - "@ethersproject/abstract-provider" "^5.0.8" - "@ethersproject/bignumber" "^5.0.13" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" - -"@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.4.tgz#8669bcbd02f4b64f4cede0a10e84df6d964ec9d3" - integrity sha512-CIjAeG6zNehbpJTi0sgwUvaH2ZICiAV9XkCBaFy5tjuEVFpQNeqd6f+B7RowcNO7Eut+QbhcQ5CVLkmP5zhL9A== - dependencies: - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/rlp" "^5.0.3" - bn.js "^4.4.0" - -"@ethersproject/address@^5.0.9": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.11.tgz#12022e8c590c33939beb5ab18b401ecf585eac59" - integrity sha512-Et4GBdD8/tsBGjCEOKee9upN29qjL5kbRcmJifb4Penmiuh9GARXL2/xpXvEp5EW+EIW/rfCHFJrkYBgoQFQBw== - dependencies: - "@ethersproject/bignumber" "^5.0.13" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/keccak256" "^5.0.7" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/rlp" "^5.0.7" - -"@ethersproject/base64@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.9.tgz#bb1f35d3dba92082a574d5e2418f9202a0a1a7e6" - integrity sha512-37RBz5LEZ9SlTNGiWCYFttnIN9J7qVs9Xo2EbqGqDH5LfW9EIji66S+YDMpXVo1zWDax1FkEldAoatxHK2gfgA== - dependencies: - "@ethersproject/bytes" "^5.0.9" - -"@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.7.tgz#720b3e3df3e125a99669ee869478106d0afe7b76" - integrity sha512-wwKgDJ+KA7IpgJwc8Fc0AjKIRuDskKA2cque29/+SgII9/1K/38JpqVNPKIovkLwTC2DDofIyzHcxeaKpMFouQ== - dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - bn.js "^4.4.0" - -"@ethersproject/bignumber@^5.0.13": - version "5.0.15" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.15.tgz#b089b3f1e0381338d764ac1c10512f0c93b184ed" - integrity sha512-MTADqnyacvdRwtKh7o9ujwNDSM1SDJjYDMYAzjIgjoi9rh6TY4suMbhCa3i2vh3SUXiXSICyTI8ui+NPdrZ9Lw== - dependencies: - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - bn.js "^4.4.0" - -"@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.4.tgz#328d9d929a3e970964ecf5d62e12568a187189f1" - integrity sha512-9R6A6l9JN8x1U4s1dJCR+9h3MZTT3xQofr/Xx8wbDvj6NnY4CbBB0o8ZgHXvR74yV90pY2EzCekpkMBJnRzkSw== - dependencies: - "@ethersproject/logger" "^5.0.5" - -"@ethersproject/bytes@^5.0.9": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.11.tgz#21118e75b1d00db068984c15530e316021101276" - integrity sha512-D51plLYY5qF05AsoVQwIZVLqlBkaTPVHVP/1WmmBIWyHB0cRW0C9kh0kx5Exo51rB63Hk8PfHxc7SmpoaQFEyg== - dependencies: - "@ethersproject/logger" "^5.0.8" - -"@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.4.tgz#9ddaa5f3c738a94e5adc4b3f71b36206fa5cdf88" - integrity sha512-Df32lcXDHPgZRPgp1dgmByNbNe4Ki1QoXR+wU61on5nggQGTqWR1Bb7pp9VtI5Go9kyE/JflFc4Te6o9MvYt8A== - dependencies: - "@ethersproject/bignumber" "^5.0.7" - -"@ethersproject/constants@^5.0.8": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.10.tgz#eb0c604fbc44c53ba9641eed31a1d0c9e1ebcadc" - integrity sha512-OSo8jxkHLDXieCy8bgOFR7lMfgPxEzKvSDdP+WAWHCDM8+orwch0B6wzkTmiQFgryAtIctrBt5glAdJikZ3hGw== - dependencies: - "@ethersproject/bignumber" "^5.0.13" - -"@ethersproject/hash@>=5.0.0-beta.128": - version "5.0.0-beta.133" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.0-beta.133.tgz#bda0c74454a82359642033f27c5157963495fcdf" - integrity sha512-tfF11QxFlJCy92rMtUZ0kImchWhlYXkN5Gj5cYfTcCdWEUKwNq1LljDnlrjV2JabO6s5enb8uiUj4RBTo2+Rgw== - dependencies: - "@ethersproject/bytes" ">=5.0.0-beta.129" - "@ethersproject/keccak256" ">=5.0.0-beta.127" - "@ethersproject/logger" ">=5.0.0-beta.129" - "@ethersproject/strings" ">=5.0.0-beta.130" - -"@ethersproject/hash@^5.0.4": - version "5.0.12" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.12.tgz#1074599f7509e2ca2bb7a3d4f4e39ab3a796da42" - integrity sha512-kn4QN+fhNFbUgX3XZTZUaQixi0oyfIEY+hfW+KtkHu+rq7dV76oAIvaLEEynu1/4npOL38E4X4YI42gGZk+C0Q== - dependencies: - "@ethersproject/abstract-signer" "^5.0.10" - "@ethersproject/address" "^5.0.9" - "@ethersproject/bignumber" "^5.0.13" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/keccak256" "^5.0.7" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" - "@ethersproject/strings" "^5.0.8" - -"@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.3.tgz#f094a8fca3bb913c044593c4f382be424292e588" - integrity sha512-VhW3mgZMBZlETV6AyOmjNeNG+Pg68igiKkPpat8/FZl0CKnfgQ+KZQZ/ee1vT+X0IUM8/djqnei6btmtbA27Ug== - dependencies: - "@ethersproject/bytes" "^5.0.4" - js-sha3 "0.5.7" - -"@ethersproject/keccak256@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.9.tgz#ca0d86e4af56c13b1ef25e533bde3e96d28f647d" - integrity sha512-zhdUTj6RGtCJSgU+bDrWF6cGbvW453LoIC1DSNWrTlXzC7WuH4a+EiPrgc7/kNoRxerKuA/cxYlI8GwNtVtDlw== - dependencies: - "@ethersproject/bytes" "^5.0.9" - js-sha3 "0.5.7" - -"@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.5.tgz#e3ba3d0bcf9f5be4da5f043b1e328eb98b80002f" - integrity sha512-gJj72WGzQhUtCk6kfvI8elTaPOQyMvrMghp/nbz0ivTo39fZ7IjypFh/ySDeUSdBNplAwhzWKKejQhdpyefg/w== - -"@ethersproject/logger@^5.0.8": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.10.tgz#fd884688b3143253e0356ef92d5f22d109d2e026" - integrity sha512-0y2T2NqykDrbPM3Zw9RSbPkDOxwChAL8detXaom76CfYoGxsOnRP/zTX8OUAV+x9LdwzgbWvWmeXrc0M7SuDZw== - -"@ethersproject/networks@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.9.tgz#ec5da11e4d4bfd69bec4eaebc9ace33eb9569279" - integrity sha512-L8+VCQwArBLGkxZb/5Ns/OH/OxP38AcaveXIxhUTq+VWpXYjrObG3E7RDQIKkUx1S1IcQl/UWTz5w4DK0UitJg== - dependencies: - "@ethersproject/logger" "^5.0.8" +"@colors/colors@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.3.tgz#991aef39a5f87d4645cee76cec4df868bfb08be6" - integrity sha512-wLCSrbywkQgTO6tIF9ZdKsH9AIxPEqAJF/z5xcPkz1DK4mMAZgAXRNw1MrKYhyb+7CqNHbj3vxenNKFavGY/IA== +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== dependencies: - "@ethersproject/logger" "^5.0.5" + "@jridgewell/trace-mapping" "0.3.9" -"@ethersproject/properties@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.9.tgz#d7aae634680760136ea522e25c3ef043ec15b5c2" - integrity sha512-ZCjzbHYTw+rF1Pn8FDCEmx3gQttwIHcm/6Xee8g/M3Ga3SfW4tccNMbs5zqnBH0E4RoOPaeNgyg1O68TaF0tlg== +"@dabh/diagnostics@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" + integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA== dependencies: - "@ethersproject/logger" "^5.0.8" + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" -"@ethersproject/rlp@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.3.tgz#841a5edfdf725f92155fe74424f5510c9043c13a" - integrity sha512-Hz4yyA/ilGafASAqtTlLWkA/YqwhQmhbDAq2LSIp1AJNx+wtbKWFAKSckpeZ+WG/xZmT+fw5OFKK7a5IZ4DR5g== +"@ensdomains/address-encoder@^0.1.7": + version "0.1.9" + resolved "https://registry.yarnpkg.com/@ensdomains/address-encoder/-/address-encoder-0.1.9.tgz#f948c485443d9ef7ed2c0c4790e931c33334d02d" + integrity sha512-E2d2gP4uxJQnDu2Kfg1tHNspefzbLT8Tyjrm5sEuim32UkU2sm5xL4VXtgc2X33fmPEw9+jUMpGs4veMbf+PYg== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" + bech32 "^1.1.3" + blakejs "^1.1.0" + bn.js "^4.11.8" + bs58 "^4.0.1" + crypto-addr-codec "^0.1.7" + nano-base32 "^1.0.1" + ripemd160 "^2.0.2" -"@ethersproject/rlp@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.9.tgz#da205bf8a34d3c3409eb73ddd237130a4b376aff" - integrity sha512-ns1U7ZMVeruUW6JXc4om+1w3w4ynHN/0fpwmeNTsAjwGKoF8SAUgue6ylKpHKWSti2idx7jDxbn8hNNFHk67CA== +"@ensdomains/ens@0.4.5": + version "0.4.5" + resolved "https://registry.yarnpkg.com/@ensdomains/ens/-/ens-0.4.5.tgz#e0aebc005afdc066447c6e22feb4eda89a5edbfc" + integrity sha512-JSvpj1iNMFjK6K+uVl4unqMoa9rf5jopb8cya5UGBWz23Nw8hSNT7efgUx4BTlAPAgpNlEioUfeTyQ6J9ZvTVw== dependencies: - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" + bluebird "^3.5.2" + eth-ens-namehash "^2.0.8" + solc "^0.4.20" + testrpc "0.0.1" + web3-utils "^1.0.0-beta.31" -"@ethersproject/signing-key@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.4.tgz#a5334ce8a52d4e9736dc8fb6ecc384704ecf8783" - integrity sha512-I6pJoga1IvhtjYK5yXzCjs4ZpxrVbt9ZRAlpEw0SW9UuV020YfJH5EIVEGR2evdRceS3nAQIggqbsXSkP8Y1Dg== +"@ensdomains/ensjs@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@ensdomains/ensjs/-/ensjs-2.1.0.tgz#0a7296c1f3d735ef019320d863a7846a0760c460" + integrity sha512-GRbGPT8Z/OJMDuxs75U/jUNEC0tbL0aj7/L/QQznGYKm/tiasp+ndLOaoULy9kKJFC0TBByqfFliEHDgoLhyog== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - elliptic "6.5.3" + "@babel/runtime" "^7.4.4" + "@ensdomains/address-encoder" "^0.1.7" + "@ensdomains/ens" "0.4.5" + "@ensdomains/resolver" "0.2.4" + content-hash "^2.5.2" + eth-ens-namehash "^2.0.8" + ethers "^5.0.13" + js-sha3 "^0.8.0" -"@ethersproject/signing-key@^5.0.8": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.11.tgz#19fc5c4597e18ad0a5efc6417ba5b74069fdd2af" - integrity sha512-Jfcru/BGwdkXhLxT+8WCZtFy7LL0TPFZw05FAb5asxB/MyVsEfNdNxGDtjVE9zXfmRSPe/EusXYY4K7wcygOyQ== - dependencies: - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" - elliptic "6.5.4" +"@ensdomains/resolver@0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" + integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA== -"@ethersproject/strings@>=5.0.0-beta.130": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.4.tgz#67cda604eee3ffcc004cb9f3bd03516e1c7b09a0" - integrity sha512-azXFHaNkDXzefhr4LVVzzDMFwj3kH9EOKlATu51HjxabQafuUyVLPFgmxRFmCynnAi0Bmmp7nr+qK1pVDgRDLQ== +"@ethereumjs/common@^2.5.0", "@ethereumjs/common@^2.6.4": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.5.tgz#0a75a22a046272579d91919cb12d84f2756e8d30" + integrity sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/logger" "^5.0.5" + crc-32 "^1.2.0" + ethereumjs-util "^7.1.5" -"@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.0.8": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.10.tgz#ddce1e9724f4ac4f3f67e0cac0b48748e964bfdb" - integrity sha512-KAeoS1tZ9/5ECXiIZA6S6hywbD0so2VmuW+Wfyo5EDXeyZ6Na1nxTPhTnW7voQmjbeYJffCrOc0qLFJeylyg7w== +"@ethereumjs/tx@^3.3.2": + version "3.5.2" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.5.2.tgz#197b9b6299582ad84f9527ca961466fce2296c1c" + integrity sha512-gQDNJWKrSDGu2w7w0PzVXVBNMzb7wwdDOmOqczmhNjqFxFuIbhVJDwiGEnxFNC2/b8ifcZzY7MLcluizohRzNw== dependencies: - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/constants" "^5.0.8" - "@ethersproject/logger" "^5.0.8" + "@ethereumjs/common" "^2.6.4" + ethereumjs-util "^7.1.5" -"@ethersproject/transactions@^5.0.0-beta.135": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.5.tgz#9a966f9ef4817b1752265d4efee0f1e9fd6aeaad" - integrity sha512-1Ga/QmbcB74DItggP8/DK1tggu4ErEvwTkIwIlUXUcvIAuRNXXE7kgQhlp+w1xA/SAQFhv56SqCoyqPiiLCvVA== +"@ethersproject/abi@5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" + integrity sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw== dependencies: "@ethersproject/address" "^5.0.4" "@ethersproject/bignumber" "^5.0.7" "@ethersproject/bytes" "^5.0.4" "@ethersproject/constants" "^5.0.4" + "@ethersproject/hash" "^5.0.4" "@ethersproject/keccak256" "^5.0.3" "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" - "@ethersproject/rlp" "^5.0.3" - "@ethersproject/signing-key" "^5.0.4" - -"@ethersproject/transactions@^5.0.9": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.11.tgz#b31df5292f47937136a45885d6ee6112477c13df" - integrity sha512-ftsRvR9+gQp7L63F6+XmstvsZ4w8GtWvQB08e/zB+oB86Fnhq8+i/tkgpJplSHC8I/qgiCisva+M3u2GVhDFPA== - dependencies: - "@ethersproject/address" "^5.0.9" - "@ethersproject/bignumber" "^5.0.13" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/constants" "^5.0.8" - "@ethersproject/keccak256" "^5.0.7" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" - "@ethersproject/rlp" "^5.0.7" - "@ethersproject/signing-key" "^5.0.8" - -"@ethersproject/web@^5.0.12": - version "5.0.14" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.14.tgz#6e7bebdd9fb967cb25ee60f44d9218dc0803bac4" - integrity sha512-QpTgplslwZ0Sp9oKNLoRuS6TKxnkwfaEk3gr7zd7XLF8XBsYejsrQO/03fNfnMx/TAT/RR6WEw/mbOwpRSeVRA== - dependencies: - "@ethersproject/base64" "^5.0.7" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" - "@ethersproject/strings" "^5.0.8" - -"@evocateur/libnpmaccess@^3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845" - integrity sha512-KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg== - dependencies: - "@evocateur/npm-registry-fetch" "^4.0.0" - aproba "^2.0.0" - figgy-pudding "^3.5.1" - get-stream "^4.0.0" - npm-package-arg "^6.1.0" - -"@evocateur/libnpmpublish@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz#55df09d2dca136afba9c88c759ca272198db9f1a" - integrity sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg== - dependencies: - "@evocateur/npm-registry-fetch" "^4.0.0" - aproba "^2.0.0" - figgy-pudding "^3.5.1" - get-stream "^4.0.0" - lodash.clonedeep "^4.5.0" - normalize-package-data "^2.4.0" - npm-package-arg "^6.1.0" - semver "^5.5.1" - ssri "^6.0.1" + "@ethersproject/strings" "^5.0.4" -"@evocateur/npm-registry-fetch@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz#8c4c38766d8d32d3200fcb0a83f064b57365ed66" - integrity sha512-k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g== - dependencies: - JSONStream "^1.3.4" - bluebird "^3.5.1" - figgy-pudding "^3.4.1" - lru-cache "^5.1.1" - make-fetch-happen "^5.0.0" - npm-package-arg "^6.1.0" - safe-buffer "^5.1.2" +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.0-beta.146", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" + integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== + dependencies: + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + +"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz#b0a8550f88b6bf9d51f90e4795d48294630cb9ef" + integrity sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/networks" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/web" "^5.7.0" + +"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2" + integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" + integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + +"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c" + integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ== + dependencies: + "@ethersproject/bytes" "^5.7.0" + +"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.7.0.tgz#97034dc7e8938a8ca943ab20f8a5e492ece4020b" + integrity sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" + integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + bn.js "^5.2.1" + +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" + integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== + dependencies: + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" + integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + +"@ethersproject/contracts@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.7.0.tgz#c305e775abd07e48aa590e1a877ed5c316f8bd1e" + integrity sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg== + dependencies: + "@ethersproject/abi" "^5.7.0" + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" + integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== + dependencies: + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/base64" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + +"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.7.0.tgz#e627ddc6b466bc77aebf1a6b9e47405ca5aef9cf" + integrity sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg== + dependencies: + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/basex" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/pbkdf2" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/signing-key" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/wordlists" "^5.7.0" + +"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz#5e3355287b548c32b368d91014919ebebddd5360" + integrity sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g== + dependencies: + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/hdnode" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/pbkdf2" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/random" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + aes-js "3.0.0" + scrypt-js "3.0.1" -"@evocateur/pacote@^9.6.3": - version "9.6.3" - resolved "https://registry.yarnpkg.com/@evocateur/pacote/-/pacote-9.6.3.tgz#bcd7adbd3c2ef303aa89bd24166f06dd9c080d89" - integrity sha512-ExqNqcbdHQprEgKnY/uQz7WRtyHRbQxRl4JnVkSkmtF8qffRrF9K+piZKNLNSkRMOT/3H0e3IP44QVCHaXMWOQ== +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" + integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== dependencies: - "@evocateur/npm-registry-fetch" "^4.0.0" - bluebird "^3.5.3" - cacache "^12.0.0" - figgy-pudding "^3.5.1" - get-stream "^4.1.0" - glob "^7.1.4" - lru-cache "^5.1.1" - make-fetch-happen "^5.0.0" - minimatch "^3.0.4" - minipass "^2.3.5" - mississippi "^3.0.0" - mkdirp "^0.5.1" - normalize-package-data "^2.5.0" - npm-package-arg "^6.1.0" - npm-packlist "^1.4.4" - npm-pick-manifest "^2.2.3" - osenv "^0.1.5" - promise-inflight "^1.0.1" - promise-retry "^1.1.1" - protoduck "^5.0.1" - rimraf "^2.6.3" - safe-buffer "^5.2.0" - semver "^5.7.0" - ssri "^6.0.1" - tar "^4.4.10" - unique-filename "^1.1.1" - which "^1.3.1" + "@ethersproject/bytes" "^5.7.0" + js-sha3 "0.8.0" -"@firebase/analytics-types@0.2.5": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.2.5.tgz#18f4400482a445504b69d6b64c7d98f11fd3ea5e" - integrity sha512-aa746gTiILMn9TPBJXaYhYqnCL4CQwd4aYTAZseI9RZ/hf117xJTNy9/ZTmG5gl2AqxV0LgtdHYqKAjRlNqPIQ== +"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.7.0.tgz#6ce9ae168e74fecf287be17062b590852c311892" + integrity sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig== + +"@ethersproject/networks@5.7.0", "@ethersproject/networks@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.0.tgz#df72a392f1a63a57f87210515695a31a245845ad" + integrity sha512-MG6oHSQHd4ebvJrleEQQ4HhVu8Ichr0RDYEfHzsVAVjHNM+w36x9wp9r+hf1JstMXtseXDtkiVoARAG6M959AA== + dependencies: + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz#d2267d0a1f6e123f3771007338c47cccd83d3102" + integrity sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + +"@ethersproject/properties@5.7.0", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.7.0.tgz#a6e12cb0439b878aaf470f1902a176033067ed30" + integrity sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw== + dependencies: + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/providers@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.0.tgz#a885cfc7650a64385e7b03ac86fe9c2d4a9c2c63" + integrity sha512-+TTrrINMzZ0aXtlwO/95uhAggKm4USLm1PbeCBR/3XZ7+Oey+3pMyddzZEyRhizHpy1HXV0FRWRMI1O3EGYibA== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/base64" "^5.7.0" + "@ethersproject/basex" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/networks" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/random" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/web" "^5.7.0" + bech32 "1.1.4" + ws "7.4.6" + +"@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" + integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" + integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" + integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + hash.js "1.1.7" + +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" + integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + bn.js "^5.2.1" + elliptic "6.5.4" + hash.js "1.1.7" + +"@ethersproject/solidity@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.7.0.tgz#5e9c911d8a2acce2a5ebb48a5e2e0af20b631cb8" + integrity sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" + integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" + integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== + dependencies: + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + "@ethersproject/signing-key" "^5.7.0" + +"@ethersproject/units@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.7.0.tgz#637b563d7e14f42deeee39245275d477aae1d8b1" + integrity sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/wallet@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.7.0.tgz#4e5d0790d96fe21d61d38fb40324e6c7ef350b2d" + integrity sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/hdnode" "^5.7.0" + "@ethersproject/json-wallets" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/random" "^5.7.0" + "@ethersproject/signing-key" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/wordlists" "^5.7.0" + +"@ethersproject/web@5.7.0", "@ethersproject/web@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.0.tgz#40850c05260edad8b54827923bbad23d96aac0bc" + integrity sha512-ApHcbbj+muRASVDSCl/tgxaH2LBkRMEYfLOLVa0COipx0+nlu0QKet7U2lEg0vdkh8XRSLf2nd1f1Uk9SrVSGA== + dependencies: + "@ethersproject/base64" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + +"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.7.0.tgz#8fb2c07185d68c3e09eb3bfd6e779ba2774627f5" + integrity sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + +"@firebase/analytics-types@0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.4.0.tgz#d6716f9fa36a6e340bc0ecfe68af325aa6f60508" + integrity sha512-Jj2xW+8+8XPfWGkv9HPv/uR+Qrmq37NPYT352wf7MvE9LrstpLVmFg3LqG6MCRr5miLAom5sen2gZ+iOhVDeRA== -"@firebase/analytics@0.2.12": - version "0.2.12" - resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.2.12.tgz#7bb6a1be2b385eede2a24170744be324ae9a903d" - integrity sha512-y/WwSNUOPJnAdYOxD+NCMwVbhfP/yrQrnGTn1zAAM1R8bBBmWay8HpHki7g5N3qQ+AQ+uMF6tKbp/JnJkini7A== +"@firebase/analytics@0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.6.0.tgz#49f508d3f9f419f08c503f1171ef5fa1c3ba52eb" + integrity sha512-6qYEOPUVYrMhqvJ46Z5Uf1S4uULd6d7vGpMP5Qz+u8kIWuOQGcPdJKQap+Hla6Rq164or9gC2HRXuYXKlgWfpw== dependencies: - "@firebase/analytics-types" "0.2.5" - "@firebase/component" "0.1.4" - "@firebase/installations" "0.4.1" - "@firebase/util" "0.2.39" - tslib "1.10.0" + "@firebase/analytics-types" "0.4.0" + "@firebase/component" "0.1.19" + "@firebase/installations" "0.4.17" + "@firebase/logger" "0.2.6" + "@firebase/util" "0.3.2" + tslib "^1.11.1" -"@firebase/app-types@0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.5.0.tgz#b9b51a37956ec166debc8784a2fb30b5ffc9e921" - integrity sha512-8j+vCXTpAkYGcFk86mPZ90V6HMFmn196RIEW9Opi0PN+VrPFC1l/eW0gptM8v7VXaQhECOxws3TN2g+dDaeSYA== +"@firebase/app-types@0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.6.1.tgz#dcbd23030a71c0c74fc95d4a3f75ba81653850e9" + integrity sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg== "@firebase/app-types@0.6.3": version "0.6.3" @@ -1949,83 +1909,83 @@ resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.7.0.tgz#c9e16d1b8bed1a991840b8d2a725fb58d0b5899f" integrity sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg== -"@firebase/app@0.5.3": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.5.3.tgz#62d3575c618c020d6bc9fc4f59e4988e9e7fe4b2" - integrity sha512-cQn8eQSJRMpyIRfBi2roIiw0weAorpdJ2Ssn7yDlkMo0ZSE56MgMSlX1mcDupXgNZtG+k3E+IEr+FfzD9SQBGg== +"@firebase/app@0.6.11": + version "0.6.11" + resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.6.11.tgz#f73f9e4571ba62f4029d8f9c9880a97e5a94eb1d" + integrity sha512-FH++PaoyTzfTAVuJ0gITNYEIcjT5G+D0671La27MU8Vvr6MTko+5YUZ4xS9QItyotSeRF4rMJ1KR7G8LSyySiA== dependencies: - "@firebase/app-types" "0.5.0" - "@firebase/component" "0.1.4" - "@firebase/logger" "0.1.34" - "@firebase/util" "0.2.39" + "@firebase/app-types" "0.6.1" + "@firebase/component" "0.1.19" + "@firebase/logger" "0.2.6" + "@firebase/util" "0.3.2" dom-storage "2.1.0" - tslib "1.10.0" + tslib "^1.11.1" xmlhttprequest "1.8.0" -"@firebase/auth-interop-types@0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.1.tgz#b3e1bc5ea8b2df1c376b5fc14aae8a3572dbcace" - integrity sha512-rNpCOyCspZvNDoQVQLQQgWAGBMB2ClCWKN1c8cEFgLNFgnMJrjVB+tcL7KW2q2UjKa7l8Mxgwys7szTiEDAcvA== +"@firebase/auth-interop-types@0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz#9fc9bd7c879f16b8d1bb08373a0f48c3a8b74557" + integrity sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw== "@firebase/auth-interop-types@0.1.6": version "0.1.6" resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz#5ce13fc1c527ad36f1bb1322c4492680a6cf4964" integrity sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g== -"@firebase/auth-types@0.9.4": - version "0.9.4" - resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.9.4.tgz#b0074830f0781f425148f4104fa4ddb8be3a9bc1" - integrity sha512-06ZrpYz1GaUfIJs7C3Yf4lARH8+2kzgKfgG/9B3FaGHFYLa5U7rLBGGaca4oiVI12jmhe9CV3+M8e3U2CRCr2w== +"@firebase/auth-types@0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.10.1.tgz#7815e71c9c6f072034415524b29ca8f1d1770660" + integrity sha512-/+gBHb1O9x/YlG7inXfxff/6X3BPZt4zgBv4kql6HEmdzNQCodIRlEYnI+/da+lN+dha7PjaFH7C7ewMmfV7rw== -"@firebase/auth@0.13.4": - version "0.13.4" - resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.13.4.tgz#77ce603403a7b638c0fa045b1f30f1f942f07fb2" - integrity sha512-dFDuLMHHmigs9ZH56h+UO78SMuvYkwRcPbEudaemYisGLXnYFa0pUKS2WfvA/9d/14X/VnzG8NGApAw5BylpvA== +"@firebase/auth@0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.15.0.tgz#45d6def6d6d9444432c005710df442991828275f" + integrity sha512-IFuzhxS+HtOQl7+SZ/Mhaghy/zTU7CENsJFWbC16tv2wfLZbayKF5jYGdAU3VFLehgC8KjlcIWd10akc3XivfQ== dependencies: - "@firebase/auth-types" "0.9.4" + "@firebase/auth-types" "0.10.1" -"@firebase/component@0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.1.4.tgz#ed348a3e2997918b1c4ea13103b7b3e216c12ab9" - integrity sha512-k3JZFUyHnSWC/7v+x+pIHLDNJPYA6xd7nqrQASOXH5TXhCR9meg0VsnJb+knD18491iRMKJnQWNSHdqPK9AX5w== +"@firebase/component@0.1.19": + version "0.1.19" + resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.1.19.tgz#bd2ac601652c22576b574c08c40da245933dbac7" + integrity sha512-L0S3g8eqaerg8y0zox3oOHSTwn/FE8RbcRHiurnbESvDViZtP5S5WnhuAPd7FnFxa8ElWK0z1Tr3ikzWDv1xdQ== dependencies: - "@firebase/util" "0.2.39" - tslib "1.10.0" + "@firebase/util" "0.3.2" + tslib "^1.11.1" -"@firebase/component@0.5.7": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.7.tgz#a50c5fbd14a2136a99ade6f59f53498729c0f174" - integrity sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg== +"@firebase/component@0.5.13": + version "0.5.13" + resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.13.tgz#65a382e83bddd109380c9aa1f280791b1b4567c4" + integrity sha512-hxhJtpD8Ppf/VU2Rlos6KFCEV77TGIGD5bJlkPK1+B/WUe0mC6dTjW7KhZtXTc+qRBp9nFHWcsIORnT8liHP9w== dependencies: - "@firebase/util" "1.4.0" + "@firebase/util" "1.5.2" tslib "^2.1.0" "@firebase/database-compat@^0.1.1": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.1.2.tgz#c65cd59e4e1b7ec6834de5a17238787249da1e19" - integrity sha512-sV32QIRSNIBj/6OYtpmPzA/SfQz1/NBZbhxg9dIhGaSt9e5HaMxXRuz2lImudX0Sd/v8DKdExrxa++K6rKrRtA== - dependencies: - "@firebase/component" "0.5.7" - "@firebase/database" "0.12.2" - "@firebase/database-types" "0.9.1" - "@firebase/logger" "0.3.0" - "@firebase/util" "1.4.0" + version "0.1.8" + resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.1.8.tgz#ab627f2bdbe94367f515d5bded880c86886bbd28" + integrity sha512-dhXr5CSieBuKNdU96HgeewMQCT9EgOIkfF1GNy+iRrdl7BWLxmlKuvLfK319rmIytSs/vnCzcD9uqyxTeU/A3A== + dependencies: + "@firebase/component" "0.5.13" + "@firebase/database" "0.12.8" + "@firebase/database-types" "0.9.7" + "@firebase/logger" "0.3.2" + "@firebase/util" "1.5.2" tslib "^2.1.0" -"@firebase/database-types@0.4.10": - version "0.4.10" - resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.4.10.tgz#baa10bc78cfb57dd6159e0264b8305994a8e24d0" - integrity sha512-66puLsckt5HASgRN3CfhLn2iuGrgCjfH3u17OL0f5MtEweYLx+yW2QW5d539Wx30xD4B+INEdaRetw6xEa9t7g== +"@firebase/database-types@0.5.2": + version "0.5.2" + resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.5.2.tgz#23bec8477f84f519727f165c687761e29958b63c" + integrity sha512-ap2WQOS3LKmGuVFKUghFft7RxXTyZTDr0Xd8y2aqmWsbJVjgozi0huL/EUMgTjGFrATAjcf2A7aNs8AKKZ2a8g== dependencies: - "@firebase/app-types" "0.5.0" + "@firebase/app-types" "0.6.1" -"@firebase/database-types@0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.1.tgz#0cab989e8154d812b535d80f23c1578b1d391f5f" - integrity sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ== +"@firebase/database-types@0.9.7": + version "0.9.7" + resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.7.tgz#c5ee0ea9bb2703a13c1c47fe880fc577d5ce7f33" + integrity sha512-EFhgL89Fz6DY3kkB8TzdHvdu8XaqqvzcF2DLVOXEnQ3Ms7L755p5EO42LfxXoJqb9jKFvgLpFmKicyJG25WFWw== dependencies: "@firebase/app-types" "0.7.0" - "@firebase/util" "1.4.0" + "@firebase/util" "1.5.2" "@firebase/database-types@^0.7.2": version "0.7.3" @@ -2034,209 +1994,215 @@ dependencies: "@firebase/app-types" "0.6.3" -"@firebase/database@0.12.2": - version "0.12.2" - resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.12.2.tgz#8c24ff4d79abcbef5896c2cdeae02ccc382db44b" - integrity sha512-Y1LZR1LIQM8YKMkeUPpAq3/e53hcfcXO+JEZ6vCzBeD6xRawqmpw6B5/DzePdCNNvjcqheXzSaR7T39eRZo/wA== +"@firebase/database@0.12.8": + version "0.12.8" + resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.12.8.tgz#11a1b6752ba0614892af15c71958e00ce16f5824" + integrity sha512-JBQVfFLzfhxlQbl4OU6ov9fdsddkytBQdtSSR49cz48homj38ccltAhK6seum+BI7f28cV2LFHF9672lcN+qxA== dependencies: "@firebase/auth-interop-types" "0.1.6" - "@firebase/component" "0.5.7" - "@firebase/logger" "0.3.0" - "@firebase/util" "1.4.0" + "@firebase/component" "0.5.13" + "@firebase/logger" "0.3.2" + "@firebase/util" "1.5.2" faye-websocket "0.11.4" tslib "^2.1.0" -"@firebase/database@0.5.20", "@firebase/database@^0.5.17": - version "0.5.20" - resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.5.20.tgz#f157e04409a94dda90ebb5493cc639310242cdea" - integrity sha512-31dNLqMW4nGrGzIDS5hh+1LFzkr/m1Kb+EcftQGC3NaGC3zHwGyG7ijn+Xo7gIWtXukvJvm1cFC7R+eOCPEejw== +"@firebase/database@0.6.13", "@firebase/database@^0.6.0": + version "0.6.13" + resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.6.13.tgz#b96fe0c53757dd6404ee085fdcb45c0f9f525c17" + integrity sha512-NommVkAPzU7CKd1gyehmi3lz0K78q0KOfiex7Nfy7MBMwknLm7oNqKovXSgQV1PCLvKXvvAplDSFhDhzIf9obA== dependencies: - "@firebase/auth-interop-types" "0.1.1" - "@firebase/component" "0.1.4" - "@firebase/database-types" "0.4.10" - "@firebase/logger" "0.1.34" - "@firebase/util" "0.2.39" + "@firebase/auth-interop-types" "0.1.5" + "@firebase/component" "0.1.19" + "@firebase/database-types" "0.5.2" + "@firebase/logger" "0.2.6" + "@firebase/util" "0.3.2" faye-websocket "0.11.3" - tslib "1.10.0" + tslib "^1.11.1" -"@firebase/firestore-types@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-1.9.0.tgz#078ebb2728eb7d3d87ff5785b1fbcda07a183d39" - integrity sha512-UOtneGMUTLr58P56Y0GT/c4ZyC39vOoRAzgwad4PIsyc7HlKShbHKJpyys/LdlUYIsQdy/2El3Qy1veiBQ+ZJg== +"@firebase/firestore-types@1.14.0": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-1.14.0.tgz#4516249d3c181849fd3c856831944dbd5c8c55fc" + integrity sha512-WF8IBwHzZDhwyOgQnmB0pheVrLNP78A8PGxk1nxb/Nrgh1amo4/zYvFMGgSsTeaQK37xMYS/g7eS948te/dJxw== -"@firebase/firestore@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-1.10.0.tgz#e630b3091cae1b60e3239a83c8b7be9a5132bcc1" - integrity sha512-m7RjiEmACg7BHZdAgWKEE5NGbXrc56cQeVqh1ptRNTjPZG0W0Ygtp4hmU5k9FuN9JogIZqBqcXRmRQcq9qOkNw== - dependencies: - "@firebase/component" "0.1.4" - "@firebase/firestore-types" "1.9.0" - "@firebase/logger" "0.1.34" - "@firebase/util" "0.2.39" - "@firebase/webchannel-wrapper" "0.2.35" +"@firebase/firestore@1.18.0": + version "1.18.0" + resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-1.18.0.tgz#3430e8c60d3e6be1d174b3a258838b1944c93a4d" + integrity sha512-maMq4ltkrwjDRusR2nt0qS4wldHQMp+0IDSfXIjC+SNmjnWY/t/+Skn9U3Po+dB38xpz3i7nsKbs+8utpDnPSw== + dependencies: + "@firebase/component" "0.1.19" + "@firebase/firestore-types" "1.14.0" + "@firebase/logger" "0.2.6" + "@firebase/util" "0.3.2" + "@firebase/webchannel-wrapper" "0.4.0" + "@grpc/grpc-js" "^1.0.0" "@grpc/proto-loader" "^0.5.0" - grpc "1.24.2" - tslib "1.10.0" + node-fetch "2.6.1" + tslib "^1.11.1" -"@firebase/functions-types@0.3.13": - version "0.3.13" - resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.3.13.tgz#f8fd6a3423abb32e2be1496268a514b500a547d1" - integrity sha512-wD075tCmZo+t/GHs5xMhi3irwjbc6SWnjXAIHjuNhVDKic5gQNkHH5QnxX930WPrPhD0RV9wuSP15fy9T1mvjw== - -"@firebase/functions@0.4.31": - version "0.4.31" - resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.4.31.tgz#d0b0cc21b47c52bcb34f4f361fdd57099ceaa163" - integrity sha512-6AiAoABRaFb0M0MMIHDXfbvNVduKNdLAGG+6FtMNuUzFbWiLLKsPgFy0jMkF874z7eIDT4XhZLNAasFVor/alw== - dependencies: - "@firebase/component" "0.1.4" - "@firebase/functions-types" "0.3.13" - "@firebase/messaging-types" "0.4.1" - isomorphic-fetch "2.2.1" - tslib "1.10.0" +"@firebase/functions-types@0.3.17": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.3.17.tgz#348bf5528b238eeeeeae1d52e8ca547b21d33a94" + integrity sha512-DGR4i3VI55KnYk4IxrIw7+VG7Q3gA65azHnZxo98Il8IvYLr2UTBlSh72dTLlDf25NW51HqvJgYJDKvSaAeyHQ== -"@firebase/installations-types@0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.3.0.tgz#5ceab44115ff33b611c60573d10a98e9961fd77c" - integrity sha512-1W82H1F4WfuWjftMiWLNUTy1w2SD7svn8/U8k6T/CJSnzkET6m+3pPt3Q4FDI6E2zOgU8ZVGWm9IZ4DK84mP/A== - -"@firebase/installations@0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.4.1.tgz#af43aed28ac1d64717046462c3ffc5719fe5a1e9" - integrity sha512-rZj3dce54YkKHLJpSvxtf+OWF1/yaQe3jRWt5Fy70XTTYv60RM5DkjbbjL7ItflBMzXZCVUTiBUogFWN4Y1LVg== - dependencies: - "@firebase/component" "0.1.4" - "@firebase/installations-types" "0.3.0" - "@firebase/util" "0.2.39" +"@firebase/functions@0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.5.1.tgz#fa0568bdcdf7dfa7e5f4f66c1e06e376dc7e25b6" + integrity sha512-yyjPZXXvzFPjkGRSqFVS5Hc2Y7Y48GyyMH+M3i7hLGe69r/59w6wzgXKqTiSYmyE1pxfjxU4a1YqBDHNkQkrYQ== + dependencies: + "@firebase/component" "0.1.19" + "@firebase/functions-types" "0.3.17" + "@firebase/messaging-types" "0.5.0" + node-fetch "2.6.1" + tslib "^1.11.1" + +"@firebase/installations-types@0.3.4": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.3.4.tgz#589a941d713f4f64bf9f4feb7f463505bab1afa2" + integrity sha512-RfePJFovmdIXb6rYwtngyxuEcWnOrzdZd9m7xAW0gRxDIjBT20n3BOhjpmgRWXo/DAxRmS7bRjWAyTHY9cqN7Q== + +"@firebase/installations@0.4.17": + version "0.4.17" + resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.4.17.tgz#1367b721e2c6c4880646bbc4f257e8616986a004" + integrity sha512-AE/TyzIpwkC4UayRJD419xTqZkKzxwk0FLht3Dci8WI2OEKHSwoZG9xv4hOBZebe+fDzoV2EzfatQY8c/6Avig== + dependencies: + "@firebase/component" "0.1.19" + "@firebase/installations-types" "0.3.4" + "@firebase/util" "0.3.2" idb "3.0.2" - tslib "1.10.0" + tslib "^1.11.1" -"@firebase/logger@0.1.34": - version "0.1.34" - resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.1.34.tgz#8fd52f73c9de02d2a96f3a88c692e3f9a25297f9" - integrity sha512-J2h6ylpd1IcuonRM3HBdXThitds6aQSIeoPYRPvApSFy82NhFPKRzJlflAhlQWjJOh59/jyQBGWJNxCL6fp4hw== +"@firebase/logger@0.2.6": + version "0.2.6" + resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.2.6.tgz#3aa2ca4fe10327cabf7808bd3994e88db26d7989" + integrity sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw== -"@firebase/logger@0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.0.tgz#a3992e40f62c10276dbfcb8b4ab376b7e25d7fd9" - integrity sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA== +"@firebase/logger@0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.2.tgz#5046ffa8295c577846d54b6ca95645a03809800e" + integrity sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA== dependencies: tslib "^2.1.0" -"@firebase/messaging-types@0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@firebase/messaging-types/-/messaging-types-0.4.1.tgz#1abb17d1472dd1e30061690444fd5820c1962c19" - integrity sha512-z2ki1nIE8TYH9LiXdozEzrPi9Cfckh9/x7HbDfj5KoVFYYvwLndUczstpKm2hvAUD3GuJF0JRUuxMHpJ6pwqzQ== +"@firebase/messaging-types@0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@firebase/messaging-types/-/messaging-types-0.5.0.tgz#c5d0ef309ced1758fda93ef3ac70a786de2e73c4" + integrity sha512-QaaBswrU6umJYb/ZYvjR5JDSslCGOH6D9P136PhabFAHLTR4TWjsaACvbBXuvwrfCXu10DtcjMxqfhdNIB1Xfg== -"@firebase/messaging@0.6.3": - version "0.6.3" - resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.6.3.tgz#a9a2648c12dc0c5339c35afcd4588b62c7fd76ed" - integrity sha512-PgkKsJwErLDsCqrcFSaLgFH/oXzMcwBbNN7HyAXTsWxUwhBbG7c5xtGRGd21F82EEmXcFl3VU/Y/kyYuXskrbQ== +"@firebase/messaging@0.7.1": + version "0.7.1" + resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.7.1.tgz#debbe7eb17c5b789231da6c166c506e19ecf1ed4" + integrity sha512-iev/ST9v0xd/8YpGYrZtDcqdD9J6ZWzSuceRn8EKy5vIgQvW/rk2eTQc8axzvDpQ36ZfphMYuhW6XuNrR3Pd2Q== dependencies: - "@firebase/component" "0.1.4" - "@firebase/installations" "0.4.1" - "@firebase/messaging-types" "0.4.1" - "@firebase/util" "0.2.39" + "@firebase/component" "0.1.19" + "@firebase/installations" "0.4.17" + "@firebase/messaging-types" "0.5.0" + "@firebase/util" "0.3.2" idb "3.0.2" - tslib "1.10.0" + tslib "^1.11.1" -"@firebase/performance-types@0.0.8": - version "0.0.8" - resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.0.8.tgz#2ed5510dd06d2cb5650382106272b6597187f5b4" - integrity sha512-3RK15Bct9PRdr0YBdbZV2KTi5yrPzscJVEsdnsLHuwXBntqlQaouQqwlCNFn25dtCMY0cgV/yiaFmuo13mbJ8A== - -"@firebase/performance@0.2.31": - version "0.2.31" - resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.2.31.tgz#6df2ee15f07db207e3316f630d05d7f43bffc125" - integrity sha512-vg60k0wnMeTRhW8myOiJPn8vuVHlusnhg2YlN0PlH2epvzUPUv9bAeYVC6/XESORxmBmqUzfMsAaD3oCAQ8boQ== - dependencies: - "@firebase/component" "0.1.4" - "@firebase/installations" "0.4.1" - "@firebase/logger" "0.1.34" - "@firebase/performance-types" "0.0.8" - "@firebase/util" "0.2.39" - tslib "1.10.0" - -"@firebase/polyfill@0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@firebase/polyfill/-/polyfill-0.3.31.tgz#e22c51b6e48195ad7886ebef25a900deb08660e4" - integrity sha512-7XItMz50tdba57tCOTCSH8REvHYbrTU7MBOksnNZ3td/J9W/RkCPcLVSSnFWNmn0Jv1aufpUevryX1J4DZ/oiw== - dependencies: - core-js "3.6.2" +"@firebase/performance-types@0.0.13": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.0.13.tgz#58ce5453f57e34b18186f74ef11550dfc558ede6" + integrity sha512-6fZfIGjQpwo9S5OzMpPyqgYAUZcFzZxHFqOyNtorDIgNXq33nlldTL/vtaUZA8iT9TT5cJlCrF/jthKU7X21EA== + +"@firebase/performance@0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.4.2.tgz#d5f134674b429d095ce0edfb50fcb4ab279c3cbe" + integrity sha512-irHTCVWJ/sxJo0QHg+yQifBeVu8ZJPihiTqYzBUz/0AGc51YSt49FZwqSfknvCN2+OfHaazz/ARVBn87g7Ex8g== + dependencies: + "@firebase/component" "0.1.19" + "@firebase/installations" "0.4.17" + "@firebase/logger" "0.2.6" + "@firebase/performance-types" "0.0.13" + "@firebase/util" "0.3.2" + tslib "^1.11.1" + +"@firebase/polyfill@0.3.36": + version "0.3.36" + resolved "https://registry.yarnpkg.com/@firebase/polyfill/-/polyfill-0.3.36.tgz#c057cce6748170f36966b555749472b25efdb145" + integrity sha512-zMM9oSJgY6cT2jx3Ce9LYqb0eIpDE52meIzd/oe/y70F+v9u1LDqk5kUF5mf16zovGBWMNFmgzlsh6Wj0OsFtg== + dependencies: + core-js "3.6.5" promise-polyfill "8.1.3" whatwg-fetch "2.0.4" -"@firebase/remote-config-types@0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.1.5.tgz#5f01f4d73a2c5869042316ef973fa6fa80e38d47" - integrity sha512-1JR0XGVN0dNKJlu5sMYh0qL0jC85xNgXfUquUGNHhy9lH3++t1gD91MeiDBgxI73oFQR7PEPeu+CTeDS0g8lWQ== +"@firebase/remote-config-types@0.1.9": + version "0.1.9" + resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.1.9.tgz#fe6bbe4d08f3b6e92fce30e4b7a9f4d6a96d6965" + integrity sha512-G96qnF3RYGbZsTRut7NBX0sxyczxt1uyCgXQuH/eAfUCngxjEGcZQnBdy6mvSdqdJh5mC31rWPO4v9/s7HwtzA== -"@firebase/remote-config@0.1.12": - version "0.1.12" - resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.1.12.tgz#db8584aef8826adda5b74e4bce46964fdbbe51f6" - integrity sha512-L8Qr2waj5NjgWYsjjhvMmSnUaav4LPdrshdz/l/QPBCkNpF5+hIxbeG2f8609D5brcQVnG7uR4lcWfkzl+zsfQ== +"@firebase/remote-config@0.1.28": + version "0.1.28" + resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.1.28.tgz#1c39916446f1ed82b4c07e556455bd232fcfd8e1" + integrity sha512-4zSdyxpt94jAnFhO8toNjG8oMKBD+xTuBIcK+Nw8BdQWeJhEamgXlupdBARUk1uf3AvYICngHH32+Si/dMVTbw== dependencies: - "@firebase/component" "0.1.4" - "@firebase/installations" "0.4.1" - "@firebase/logger" "0.1.34" - "@firebase/remote-config-types" "0.1.5" - "@firebase/util" "0.2.39" - tslib "1.10.0" + "@firebase/component" "0.1.19" + "@firebase/installations" "0.4.17" + "@firebase/logger" "0.2.6" + "@firebase/remote-config-types" "0.1.9" + "@firebase/util" "0.3.2" + tslib "^1.11.1" -"@firebase/storage-types@0.3.8": - version "0.3.8" - resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.3.8.tgz#3b5e16c9ae8b50f5cd4e7320fa5fc0933150e7d2" - integrity sha512-F0ED2WZaGjhjEdOk85c/1ikDQdWM1NiATFuTmRsaGYZyoERiwh/Mr6FnjqnLIeiJZqa6v2hk/aUgKosXjMWH/Q== +"@firebase/storage-types@0.3.13": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.3.13.tgz#cd43e939a2ab5742e109eb639a313673a48b5458" + integrity sha512-pL7b8d5kMNCCL0w9hF7pr16POyKkb3imOW7w0qYrhBnbyJTdVxMWZhb0HxCFyQWC0w3EiIFFmxoz8NTFZDEFog== -"@firebase/storage@0.3.25": - version "0.3.25" - resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.3.25.tgz#9fb584acb3029bbda59d16a47c26bba8d436c655" - integrity sha512-0dgfrbPuwFDMOsC3VeENSt4L5bTsLq/5spdDn/Cjj57T0lVRaXipmgD09y8CJ0/SYPfiRoxmMWKCMnVNeSDL/g== +"@firebase/storage@0.3.43": + version "0.3.43" + resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.3.43.tgz#107fb5db2eff2561b5c4e35ee4cbff48f28c7e77" + integrity sha512-Jp54jcuyimLxPhZHFVAhNbQmgTu3Sda7vXjXrNpPEhlvvMSq4yuZBR6RrZxe/OrNVprLHh/6lTCjwjOVSo3bWA== dependencies: - "@firebase/component" "0.1.4" - "@firebase/storage-types" "0.3.8" - "@firebase/util" "0.2.39" - tslib "1.10.0" + "@firebase/component" "0.1.19" + "@firebase/storage-types" "0.3.13" + "@firebase/util" "0.3.2" + tslib "^1.11.1" -"@firebase/util@0.2.39": - version "0.2.39" - resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.2.39.tgz#4387b12c315857081f595bba7229b0cabadb754f" - integrity sha512-hxbQJ9TkFzd6g8/ZcWBjdrxjxS0jYnR1EN3i1ah7i3KtvuxAtwNJ04YRf0QhKhCoitTkJ1Yn3cGb0kFnGtJVRA== +"@firebase/util@0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.3.2.tgz#87de27f9cffc2324651cabf6ec133d0a9eb21b52" + integrity sha512-Dqs00++c8rwKky6KCKLLY2T1qYO4Q+X5t+lF7DInXDNF4ae1Oau35bkD+OpJ9u7l1pEv7KHowP6CUKuySCOc8g== dependencies: - tslib "1.10.0" + tslib "^1.11.1" -"@firebase/util@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.4.0.tgz#81e985adba44b4d1f21ec9f5af9628d505891de8" - integrity sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A== +"@firebase/util@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.5.2.tgz#bdd2bc11c956a8a6a0fa25fbd752a13e033558bc" + integrity sha512-YvBH2UxFcdWG2HdFnhxZptPl2eVFlpOyTH66iDo13JPEYraWzWToZ5AMTtkyRHVmu7sssUpQlU9igy1KET7TOw== dependencies: tslib "^2.1.0" -"@firebase/webchannel-wrapper@0.2.35": - version "0.2.35" - resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.35.tgz#232e857698efb30cdda98b6f6a7a31a905d16147" - integrity sha512-7njiGBbFW0HCnuKNEJLcQt9EjfOzG8EJiXlFJwA3XfgiFxPVHmXrcF4d5yold2wfiwCwrXpeNTGZ854oRr6Hcw== +"@firebase/webchannel-wrapper@0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.4.0.tgz#becce788818d3f47f0ac1a74c3c061ac1dcf4f6d" + integrity sha512-8cUA/mg0S+BxIZ72TdZRsXKBP5n5uRcE3k29TZhZw6oIiHBt9JA7CTb/4pE1uKtE/q5NeTY2tBDcagoZ+1zjXQ== + +"@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@google-cloud/common@^0.31.0": - version "0.31.0" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-0.31.0.tgz#51a82d681043e2718bd32708586d3131b019d7a8" - integrity sha512-mO7WFavzqmr24btNb2zimUh+M3fGnIKGbkR1VT6ZG3yDV+S7BiZPmPiFHKRJVrxwi5sA9U6X6fpNpHgj7j2a2w== +"@google-cloud/common@^0.32.0": + version "0.32.1" + resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-0.32.1.tgz#6a32c340172cea3db6674d0e0e34e78740a0073f" + integrity sha512-bLdPzFvvBMtVkwsoBtygE9oUm3yrNmPa71gvOgucYI/GqvNP2tb6RYsDHPq98kvignhcgHGDI5wyNgxaCo8bKQ== dependencies: - "@google-cloud/projectify" "^0.3.2" - "@google-cloud/promisify" "^0.3.0" - "@types/duplexify" "^3.5.0" - "@types/request" "^2.47.0" - arrify "^1.0.1" + "@google-cloud/projectify" "^0.3.3" + "@google-cloud/promisify" "^0.4.0" + "@types/request" "^2.48.1" + arrify "^2.0.0" duplexify "^3.6.0" ent "^2.2.0" - extend "^3.0.1" - google-auth-library "^3.0.0" - pify "^4.0.0" + extend "^3.0.2" + google-auth-library "^3.1.1" + pify "^4.0.1" retry-request "^4.0.0" + teeny-request "^3.11.3" "@google-cloud/common@^2.1.1": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-2.3.0.tgz#492ddd3a163c9c335ce596d70f8821fa83603a64" - integrity sha512-nmIyi3q/FL2j6ZJ61xK/863DoJEZayI2/W/iCgwrCYUYsem277XO45MBTAimjgiKBCA0c9InmQyfT48h/IK4jg== + version "2.4.0" + resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-2.4.0.tgz#2783b7de8435024a31453510f2dab5a6a91a4c82" + integrity sha512-zWFjBS35eI9leAHhjfeOYlK5Plcuj/77EzstnrJIZbKgF/nkqjcQuGiMCpzCwOfPyUbz8ZaEOYgbHa759AKbjg== dependencies: "@google-cloud/projectify" "^1.0.0" "@google-cloud/promisify" "^1.0.0" @@ -2248,29 +2214,14 @@ retry-request "^4.0.0" teeny-request "^6.0.0" -"@google-cloud/common@^3.7.4": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-3.7.4.tgz#71acac3dfe19bbed42e4763c5d85b35acea7e368" - integrity sha512-JO4a8l/N6fkHZ+vWgNYgcNoZh1/m6kqv8F7+NpBkGqs7NzUtkmE9WdvHaNUwAOm1mIqbuX2wXKNfAZfqZr+vMg== - dependencies: - "@google-cloud/projectify" "^2.0.0" - "@google-cloud/promisify" "^2.0.0" - arrify "^2.0.1" - duplexify "^4.1.1" - ent "^2.2.0" - extend "^3.0.2" - google-auth-library "^7.9.2" - retry-request "^4.2.2" - teeny-request "^7.0.0" - "@google-cloud/firestore@^3.0.0": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-3.4.1.tgz#10bb1deaf518f622bd96cacd476d436816e16c09" - integrity sha512-k3PPcLvP9wr4yyA0djzfPdj2ZewburifhpcFACa0wiXvjXj3Ob68MORcPC3a3wyonX73TY72RsEGPk4Ult0Dyw== + version "3.8.6" + resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-3.8.6.tgz#9e6dea57323a5824563430a759244825fb01d834" + integrity sha512-ox80NbrM1MLJgvAAUd1quFLx/ie/nSjrk1PtscSicpoYDlKb9e6j7pHrVpbopBMyliyfNl3tLJWaDh+x+uCXqw== dependencies: deep-equal "^2.0.0" functional-red-black-tree "^1.0.1" - google-gax "^1.13.0" + google-gax "^1.15.3" readable-stream "^3.4.0" through2 "^3.0.0" @@ -2303,17 +2254,17 @@ stream-events "^1.0.4" "@google-cloud/paginator@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-2.0.1.tgz#89ca97933eecfdd7eaa07bd79ed01c9869c9531b" - integrity sha512-HZ6UTGY/gHGNriD7OCikYWL/Eu0sTEur2qqse2w6OVsz+57se3nTkqH14JIPxtf0vlEJ8IJN5w3BdZ22pjCB8g== + version "2.0.3" + resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-2.0.3.tgz#c7987ad05d1c3ebcef554381be80e9e8da4e4882" + integrity sha512-kp/pkb2p/p0d8/SKUu4mOq8+HGwF8NPzHWkj+VKrIPQPyMRw8deZtrO/OcSiy9C/7bpfU5Txah5ltUNfPkgEXg== dependencies: arrify "^2.0.0" extend "^3.0.2" -"@google-cloud/paginator@^3.0.0": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.6.tgz#02a59dccd348d515069779a4f77a4a4fd15594da" - integrity sha512-XCTm/GfQIlc1ZxpNtTSs/mnZxC2cePNhxU3X8EzHXKIJ2JFncmJj2Fcd2IP+gbmZaSZnY0juFxbUCkIeuu/2eQ== +"@google-cloud/paginator@^3.0.6", "@google-cloud/paginator@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b" + integrity sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ== dependencies: arrify "^2.0.0" extend "^3.0.2" @@ -2328,35 +2279,30 @@ resolved "https://registry.yarnpkg.com/@google-cloud/precise-date/-/precise-date-2.0.4.tgz#930b0cbf557ef3a4bfeeb121cfc6da341212a2cb" integrity sha512-nOB+mZdevI/1Si0QAfxWfzzIqFdc7wrO+DYePFvgbOoMtvX+XfFTINNt7e9Zg66AbDbWCPRnikU+6f5LTm9Wyg== -"@google-cloud/projectify@^0.3.0", "@google-cloud/projectify@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-0.3.2.tgz#ed54c98cae646dc03a742eac288184a13d33a4c2" - integrity sha512-t1bs5gE105IpgikX7zPCJZzVyXM5xZ/1kJomUPim2E2pNp4OUUFNyvKm/T2aM6GBP2F30o8abCD+/wbOhHWYYA== +"@google-cloud/projectify@^0.3.0", "@google-cloud/projectify@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-0.3.3.tgz#bde9103d50b20a3ea3337df8c6783a766e70d41d" + integrity sha512-7522YHQ4IhaafgSunsFF15nG0TGVmxgXidy9cITMe+256RgqfcrfWphiMufW+Ou4kqagW/u3yxwbzVEW3dk2Uw== "@google-cloud/projectify@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-1.0.1.tgz#f654c2ea9de923294ec814ff07c42891abf2d143" - integrity sha512-xknDOmsMgOYHksKc1GPbwDLsdej8aRNIA17SlSZgQdyrcC0lx0OGo4VZgYfwoEU1YS8oUxF9Y+6EzDOb0eB7Xg== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-1.0.4.tgz#28daabebba6579ed998edcadf1a8f3be17f3b5f0" + integrity sha512-ZdzQUN02eRsmTKfBj9FDL0KNDIFNjBn/d6tHQmA/+FImH5DO6ZV8E7FzxMgAUiVAUq41RFAkb25p1oHOZ8psfg== "@google-cloud/projectify@^2.0.0": version "2.1.1" resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-2.1.1.tgz#ae6af4fee02d78d044ae434699a630f8df0084ef" integrity sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ== -"@google-cloud/promisify@^0.3.0": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-0.3.1.tgz#f641e6d944a8e0a05ee0cb1091dfa60089becdba" - integrity sha512-QzB0/IMvB0eFxFK7Eqh+bfC8NLv3E9ScjWQrPOk6GgfNroxcVITdTlT8NRsRrcp5+QQJVPLkRqKG0PUdaWXmHw== - "@google-cloud/promisify@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-0.4.0.tgz#4fbfcf4d85bb6a2e4ccf05aa63d2b10d6c9aad9b" integrity sha512-4yAHDC52TEMCNcMzVC8WlqnKKKq+Ssi2lXoUg9zWWkZ6U6tq9ZBRYLHHCRdfU+EU9YJsVmivwGcKYCjRGjnf4Q== "@google-cloud/promisify@^1.0.0": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-1.0.2.tgz#e581aa79ff71fb6074acc1cc59e3d81bf84ce07b" - integrity sha512-7WfV4R/3YV5T30WRZW0lqmvZy9hE2/p9MvpI34WuKa2Wz62mLu5XplGTFEMK6uTbJCLWUxTcZ4J4IyClKucE5g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-1.0.4.tgz#ce86ffa94f9cfafa2e68f7b3e4a7fad194189723" + integrity sha512-VccZDcOql77obTnFh0TbNED/6ZbbmHDf8UMNnzO1d5g9V0Htfm4k5cllY8P1tJsRKC3zWYGRLaViiupcgVjBoQ== "@google-cloud/promisify@^2.0.0": version "2.0.4" @@ -2388,22 +2334,22 @@ protobufjs "^6.8.1" "@google-cloud/pubsub@^2.7.0": - version "2.18.1" - resolved "https://registry.yarnpkg.com/@google-cloud/pubsub/-/pubsub-2.18.1.tgz#c5afc769ab3186290e977083074c0f013f365692" - integrity sha512-L2ejjRPszBybsRXJMLHN19UimpchNLNrtE7hJtoZxcy4fhITQGIDk1Ba4LceJYgSMJGA/YatZMYNavgyYpxhvA== + version "2.19.4" + resolved "https://registry.yarnpkg.com/@google-cloud/pubsub/-/pubsub-2.19.4.tgz#6a52f2fe7458dc13064863024a4f9941567c0536" + integrity sha512-+aZxq6N5XGarQS3xGXjKSRFy4TB+3PMpI0CBmSrcC59g3TB5nmwps3pv/KkdLa0Cd+CPHDdfrEW1uSrGBMLICw== dependencies: - "@google-cloud/paginator" "^3.0.0" + "@google-cloud/paginator" "^3.0.6" "@google-cloud/precise-date" "^2.0.0" "@google-cloud/projectify" "^2.0.0" "@google-cloud/promisify" "^2.0.0" "@opentelemetry/api" "^1.0.0" - "@opentelemetry/semantic-conventions" "^0.24.0" + "@opentelemetry/semantic-conventions" "^1.0.0" "@types/duplexify" "^3.6.0" "@types/long" "^4.0.0" arrify "^2.0.0" extend "^3.0.2" google-auth-library "^7.0.0" - google-gax "^2.24.1" + google-gax "2.30.3" is-stream-ended "^0.1.4" lodash.snakecase "^4.1.1" p-defer "^3.0.0" @@ -2416,24 +2362,25 @@ google-gax "^2.0.1" "@google-cloud/storage@^2.4.3": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-2.4.3.tgz#d52a1937f3ea0ad3e13e947fab6154c76ab0d4ca" - integrity sha512-Ol0Ed1zYNYixq+wPPaFNIVjT5+KJldBI6vyRDXnrAu5Yu66PU4iMJvEztUVfckz6vsihwApBMeXxdDUyJzMM2w== + version "2.5.0" + resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-2.5.0.tgz#9dd3566d8155cf5ba0c212208f69f9ecd47fbd7e" + integrity sha512-q1mwB6RUebIahbA3eriRs8DbG2Ij81Ynb9k8hMqTPkmbd8/S6Z0d6hVvfPmnyvX9Ej13IcmEYIbymuq/RBLghA== dependencies: - "@google-cloud/common" "^0.31.0" + "@google-cloud/common" "^0.32.0" "@google-cloud/paginator" "^0.2.0" "@google-cloud/promisify" "^0.4.0" arrify "^1.0.0" async "^2.0.1" compressible "^2.0.12" concat-stream "^2.0.0" + date-and-time "^0.6.3" duplexify "^3.5.0" extend "^3.0.0" gcs-resumable-upload "^1.0.0" hash-stream-validation "^0.2.1" mime "^2.2.0" mime-types "^2.0.8" - once "^1.3.1" + onetime "^5.1.0" pumpify "^1.5.1" snakeize "^0.1.0" stream-events "^1.0.1" @@ -2442,9 +2389,9 @@ xdg-basedir "^3.0.0" "@google-cloud/storage@^4.1.2": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-4.3.0.tgz#90118c42817fb2c8b3b8663a0f2857b5b45dda78" - integrity sha512-ph0jsUsZ9FPtN40V5eIkKPLUmxnTpxqBDkWxStW/kbQZgoNVGW9vJcbsYSyE4ath7jQIpM4OHu6aqmPFX1OnGw== + version "4.7.2" + resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-4.7.2.tgz#37a21729fe4a2b27c816443808a55aa890ebc70d" + integrity sha512-nlXYhJyC6ErFQX34tMLruknJ9fljN3JepgXEC9MZlQ64/2h9Ee8MJ7FCowdBnTiZ863IkbvctWtNZRrSxfyqSQ== dependencies: "@google-cloud/common" "^2.1.1" "@google-cloud/paginator" "^2.0.0" @@ -2452,10 +2399,10 @@ arrify "^2.0.0" compressible "^2.0.12" concat-stream "^2.0.0" - date-and-time "^0.12.0" + date-and-time "^0.14.2" duplexify "^3.5.0" extend "^3.0.2" - gaxios "^2.0.1" + gaxios "^3.0.0" gcs-resumable-upload "^2.2.4" hash-stream-validation "^0.2.2" mime "^2.2.0" @@ -2470,38 +2417,149 @@ xdg-basedir "^4.0.0" "@google-cloud/storage@^5.3.0": - version "5.15.3" - resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-5.15.3.tgz#f97ff762c1985d78cc9bca3baaa4b3e413330ae8" - integrity sha512-a2Y+mvfbzznWorQiv6c+qdPDlBpe47tikV8tpQSnvYXz1Ed/rjin41k2nKUQUcAPGHtYeTzGfKnCNKC+lv8qRg== + version "5.20.5" + resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-5.20.5.tgz#1de71fc88d37934a886bc815722c134b162d335d" + integrity sha512-lOs/dCyveVF8TkVFnFSF7IGd0CJrTm91qiK6JLu+Z8qiT+7Ag0RyVhxZIWkhiACqwABo7kSHDm8FdH8p2wxSSw== dependencies: - "@google-cloud/common" "^3.7.4" - "@google-cloud/paginator" "^3.0.0" + "@google-cloud/paginator" "^3.0.7" + "@google-cloud/projectify" "^2.0.0" "@google-cloud/promisify" "^2.0.0" + abort-controller "^3.0.0" arrify "^2.0.0" - async-retry "^1.3.1" + async-retry "^1.3.3" compressible "^2.0.12" - date-and-time "^2.0.0" + configstore "^5.0.0" duplexify "^4.0.0" + ent "^2.2.0" extend "^3.0.2" - gcs-resumable-upload "^3.3.0" - get-stream "^6.0.0" + gaxios "^4.0.0" + google-auth-library "^7.14.1" hash-stream-validation "^0.2.2" - mime "^2.2.0" + mime "^3.0.0" mime-types "^2.0.8" p-limit "^3.0.1" pumpify "^2.0.0" - snakeize "^0.1.0" - stream-events "^1.0.1" + retry-request "^4.2.2" + stream-events "^1.0.4" + teeny-request "^7.1.3" + uuid "^8.0.0" xdg-basedir "^4.0.0" -"@grpc/grpc-js@^0.3.0", "@grpc/grpc-js@^1.1.8", "@grpc/grpc-js@~1.0.0", "@grpc/grpc-js@~1.0.3", "@grpc/grpc-js@~1.4.0": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.4.tgz#dd0237ad7df80a7a24766fe516d7e4a22cb4855e" - integrity sha512-+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw== +"@graphql-tools/batch-execute@8.5.1": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.1.tgz#fa3321d58c64041650be44250b1ebc3aab0ba7a9" + integrity sha512-hRVDduX0UDEneVyEWtc2nu5H2PxpfSfM/riUlgZvo/a/nG475uyehxR5cFGvTEPEQUKY3vGIlqvtRigzqTfCew== + dependencies: + "@graphql-tools/utils" "8.9.0" + dataloader "2.1.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/delegate@^8.4.3": + version "8.8.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.8.1.tgz#0653a72f38947f38ab7917dfac50ebf6a6b883e9" + integrity sha512-NDcg3GEQmdEHlnF7QS8b4lM1PSF+DKeFcIlLEfZFBvVq84791UtJcDj8734sIHLukmyuAxXMfA1qLd2l4lZqzA== + dependencies: + "@graphql-tools/batch-execute" "8.5.1" + "@graphql-tools/schema" "8.5.1" + "@graphql-tools/utils" "8.9.0" + dataloader "2.1.0" + tslib "~2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/merge@8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.1.tgz#06121942ad28982a14635dbc87b5d488a041d722" + integrity sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg== + dependencies: + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + +"@graphql-tools/merge@8.3.6": + version "8.3.6" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.6.tgz#97a936d4c8e8f935e58a514bb516c476437b5b2c" + integrity sha512-uUBokxXi89bj08P+iCvQk3Vew4vcfL5ZM6NTylWi8PIpoq4r5nJ625bRuN8h2uubEdRiH8ntN9M4xkd/j7AybQ== + dependencies: + "@graphql-tools/utils" "8.12.0" + tslib "^2.4.0" + +"@graphql-tools/mock@^8.1.2": + version "8.7.6" + resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.6.tgz#701d898f7fe6c22e40d6d80e25874e464359ce11" + integrity sha512-cQGPyY6dF4x28552zjAg9En2WWVury62u1/xzipCNUSCdKRVOsAupTNBcAGdMjsKPLcGzzk1cPA8dP0DUfNqzg== + dependencies: + "@graphql-tools/schema" "9.0.4" + "@graphql-tools/utils" "8.12.0" + fast-json-stable-stringify "^2.1.0" + tslib "^2.4.0" + +"@graphql-tools/schema@8.5.1", "@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.3.1": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.5.1.tgz#c2f2ff1448380919a330312399c9471db2580b58" + integrity sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg== + dependencies: + "@graphql-tools/merge" "8.3.1" + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/schema@9.0.4": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.4.tgz#1a74608b57abf90fae6fd929d25e5482c57bc05d" + integrity sha512-B/b8ukjs18fq+/s7p97P8L1VMrwapYc3N2KvdG/uNThSazRRn8GsBK0Nr+FH+mVKiUfb4Dno79e3SumZVoHuOQ== + dependencies: + "@graphql-tools/merge" "8.3.6" + "@graphql-tools/utils" "8.12.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/utils@8.12.0": + version "8.12.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.12.0.tgz#243bc4f5fc2edbc9e8fd1038189e57d837cbe31f" + integrity sha512-TeO+MJWGXjUTS52qfK4R8HiPoF/R7X+qmgtOYd8DTH0l6b+5Y/tlg5aGeUJefqImRq7nvi93Ms40k/Uz4D5CWw== + dependencies: + tslib "^2.4.0" + +"@graphql-tools/utils@8.9.0": + version "8.9.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.9.0.tgz#c6aa5f651c9c99e1aca55510af21b56ec296cdb7" + integrity sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg== + dependencies: + tslib "^2.4.0" + +"@grpc/grpc-js@^0.3.0": + version "0.3.6" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-0.3.6.tgz#d9b52043907170d38e06711d9477fde29ab46fa8" + integrity sha512-SmLNuPGlUur64bNS9aHZguqWDVQ8+Df1CGn+xsh7l6T2wiP5ArOMlywZ3TZo6z/rwKtGQgUJY9ZrPYUmHEXd/Q== + dependencies: + semver "^5.5.0" + +"@grpc/grpc-js@^1.0.0", "@grpc/grpc-js@~1.6.0": + version "1.6.12" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.12.tgz#20f710d8a8c5c396b2ae9530ba6c06b984614fdf" + integrity sha512-JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw== + dependencies: + "@grpc/proto-loader" "^0.7.0" + "@types/node" ">=12.12.47" + +"@grpc/grpc-js@~1.3.6": + version "1.3.8" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.8.tgz#0d7dce9de7aeb20702a28f0704e61b0bf34061c1" + integrity sha512-4qJqqn+CU/nBydz9ePJP+oa8dz0U42Ut/GejlbyaQ1xTkynCc+ndNHHnISlNeHawDsv4MOAyP3mV/EnDNUw2zA== dependencies: - "@grpc/proto-loader" "^0.6.4" "@types/node" ">=12.12.47" +"@grpc/proto-loader@0.6.9": + version "0.6.9" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz#4014eef366da733f8e04a9ddd7376fe8a58547b7" + integrity sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg== + dependencies: + "@types/long" "^4.0.1" + lodash.camelcase "^4.3.0" + long "^4.0.0" + protobufjs "^6.10.0" + yargs "^16.2.0" + "@grpc/proto-loader@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.4.0.tgz#a823a51eb2fde58369bef1deb5445fd808d70901" @@ -2511,43 +2569,35 @@ protobufjs "^6.8.6" "@grpc/proto-loader@^0.5.0", "@grpc/proto-loader@^0.5.1": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.2.tgz#c84f83be962f518bc303ca2d5e6ef2239439786c" - integrity sha512-eBKD/FPxQoY1x6QONW2nBd54QUEyzcFP9FenujmoeDPy1rutVSHki1s/wR68F6O1QfCNDx+ayBH1O2CVNMzyyw== + version "0.5.6" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" + integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== dependencies: lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.6.1": - version "0.6.6" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.6.tgz#d8e51ea808ec5fa54d9defbecbf859336fb2da71" - integrity sha512-cdMaPZ8AiFz6ua6PUbP+LKbhwJbFXnrQ/mlnKGUyzDUZ3wp7vPLksnmLCBX6SHgSmjX7CbNVNLFYD5GmmjO4GQ== +"@grpc/proto-loader@^0.6.12": + version "0.6.13" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc" + integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g== dependencies: "@types/long" "^4.0.1" lodash.camelcase "^4.3.0" long "^4.0.0" - protobufjs "^6.10.0" - yargs "^16.1.1" + protobufjs "^6.11.3" + yargs "^16.2.0" -"@grpc/proto-loader@^0.6.4": - version "0.6.9" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz#4014eef366da733f8e04a9ddd7376fe8a58547b7" - integrity sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg== +"@grpc/proto-loader@^0.7.0": + version "0.7.2" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.2.tgz#fa63178853afe1473c50cff89fe572f7c8b20154" + integrity sha512-jCdyLIT/tdQ1zhrbTQnJNK5nbDf0GoBpy5jVNywBzzMDF+Vs6uEaHnfz46dMtDxkvwrF2hzk5Z67goliceH0sA== dependencies: "@types/long" "^4.0.1" lodash.camelcase "^4.3.0" long "^4.0.0" - protobufjs "^6.10.0" + protobufjs "^7.0.0" yargs "^16.2.0" -"@gulp-sourcemaps/map-sources@1.X": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda" - integrity sha1-iQrnxdjId/bThIYCFazp1+yUW9o= - dependencies: - normalize-path "^2.0.1" - through2 "^2.0.3" - "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -2580,29 +2630,31 @@ dependencies: "@hapi/hoek" "^8.3.0" -"@iarna/cli@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@iarna/cli/-/cli-1.2.0.tgz#0f7af5e851afe895104583c4ca07377a8094d641" - integrity sha512-ukITQAqVs2n9HGmn3car/Ir7d3ta650iXhrG7pjr3EWdFmJuuOVWgYsu7ftsSe5VifEFFhjxVuX9+8F7L8hwcA== - dependencies: - signal-exit "^3.0.2" - update-notifier "^2.2.0" - yargs "^8.0.2" +"@hutson/parse-repository-url@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" + integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q== + +"@isaacs/string-locale-compare@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" + integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ== "@istanbuljs/load-nyc-config@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b" - integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== dependencies: camelcase "^5.3.1" find-up "^4.1.0" + get-package-type "^0.1.0" js-yaml "^3.13.1" resolve-from "^5.0.0" "@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jest/console@^24.9.0": version "24.9.0" @@ -2625,6 +2677,18 @@ jest-util "^26.6.2" slash "^3.0.0" +"@jest/console@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.0.2.tgz#3a02dccad4dd37c25fd30013df67ec50998402ce" + integrity sha512-Fv02ijyhF4D/Wb3DvZO3iBJQz5DnzpJEIDBDbvje8Em099N889tNMUnBw7SalmSuOI+NflNG40RA1iK71kImPw== + dependencies: + "@jest/types" "^29.0.2" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^29.0.2" + jest-util "^29.0.2" + slash "^3.0.0" + "@jest/core@^26.6.3": version "26.6.3" resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" @@ -2659,6 +2723,40 @@ slash "^3.0.0" strip-ansi "^6.0.0" +"@jest/core@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.0.2.tgz#7bf47ff6cd882678c47fbdea562bdf1ff03b6d33" + integrity sha512-imP5M6cdpHEOkmcuFYZuM5cTG1DAF7ZlVNCq1+F7kbqme2Jcl+Kh4M78hihM76DJHNkurbv4UVOnejGxBKEmww== + dependencies: + "@jest/console" "^29.0.2" + "@jest/reporters" "^29.0.2" + "@jest/test-result" "^29.0.2" + "@jest/transform" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + ci-info "^3.2.0" + exit "^0.1.2" + graceful-fs "^4.2.9" + jest-changed-files "^29.0.0" + jest-config "^29.0.2" + jest-haste-map "^29.0.2" + jest-message-util "^29.0.2" + jest-regex-util "^29.0.0" + jest-resolve "^29.0.2" + jest-resolve-dependencies "^29.0.2" + jest-runner "^29.0.2" + jest-runtime "^29.0.2" + jest-snapshot "^29.0.2" + jest-util "^29.0.2" + jest-validate "^29.0.2" + jest-watcher "^29.0.2" + micromatch "^4.0.4" + pretty-format "^29.0.2" + slash "^3.0.0" + strip-ansi "^6.0.0" + "@jest/environment@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" @@ -2669,6 +2767,38 @@ "@types/node" "*" jest-mock "^26.6.2" +"@jest/environment@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.0.2.tgz#9e4b6d4c9bce5bfced6f63945d8c8e571394f572" + integrity sha512-Yf+EYaLOrVCgts/aTS5nGznU4prZUPa5k9S63Yct8YSOKj2jkdS17hHSUKhk5jxDFMyCy1PXknypDw7vfgc/mA== + dependencies: + "@jest/fake-timers" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/node" "*" + jest-mock "^29.0.2" + +"@jest/expect-utils@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.0.2.tgz#00dfcb9e6fe99160c326ba39f7734b984543dea8" + integrity sha512-+wcQF9khXKvAEi8VwROnCWWmHfsJYCZAs5dmuMlJBKk57S6ZN2/FQMIlo01F29fJyT8kV/xblE7g3vkIdTLOjw== + dependencies: + jest-get-type "^29.0.0" + +"@jest/expect-utils@^29.1.2": + version "29.1.2" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.1.2.tgz#66dbb514d38f7d21456bc774419c9ae5cca3f88d" + integrity sha512-4a48bhKfGj/KAH39u0ppzNTABXQ8QPccWAFUFobWBaEMSMp+sB31Z2fK/l47c4a/Mu1po2ffmfAIPxXbVTXdtg== + dependencies: + jest-get-type "^29.0.0" + +"@jest/expect@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.0.2.tgz#641d151e1062ceb976c5ad1c23eba3bb1e188896" + integrity sha512-y/3geZ92p2/zovBm/F+ZjXUJ3thvT9IRzD6igqaWskFE2aR0idD+N/p5Lj/ZautEox/9RwEc6nqergebeh72uQ== + dependencies: + expect "^29.0.2" + jest-snapshot "^29.0.2" + "@jest/fake-timers@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93" @@ -2690,6 +2820,18 @@ jest-mock "^26.6.2" jest-util "^26.6.2" +"@jest/fake-timers@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.0.2.tgz#6f15f4d8eb1089d445e3f73473ddc434faa2f798" + integrity sha512-2JhQeWU28fvmM5r33lxg6BxxkTKaVXs6KMaJ6eXSM8ml/MaWkt2BvbIO8G9KWAJFMdBXWbn+2h9OK1/s5urKZA== + dependencies: + "@jest/types" "^29.0.2" + "@sinonjs/fake-timers" "^9.1.2" + "@types/node" "*" + jest-message-util "^29.0.2" + jest-mock "^29.0.2" + jest-util "^29.0.2" + "@jest/globals@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" @@ -2699,6 +2841,16 @@ "@jest/types" "^26.6.2" expect "^26.6.2" +"@jest/globals@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.0.2.tgz#605d3389ad0c6bfe17ad3e1359b5bc39aefd8b65" + integrity sha512-4hcooSNJCVXuTu07/VJwCWW6HTnjLtQdqlcGisK6JST7z2ixa8emw4SkYsOk7j36WRc2ZUEydlUePnOIOTCNXg== + dependencies: + "@jest/environment" "^29.0.2" + "@jest/expect" "^29.0.2" + "@jest/types" "^29.0.2" + jest-mock "^29.0.2" + "@jest/reporters@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" @@ -2731,6 +2883,44 @@ optionalDependencies: node-notifier "^8.0.0" +"@jest/reporters@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.0.2.tgz#5f927646b6f01029525c05ac108324eac7d7ad5c" + integrity sha512-Kr41qejRQHHkCgWHC9YwSe7D5xivqP4XML+PvgwsnRFaykKdNflDUb4+xLXySOU+O/bPkVdFpGzUpVNSJChCrw== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^29.0.2" + "@jest/test-result" "^29.0.2" + "@jest/transform" "^29.0.2" + "@jest/types" "^29.0.2" + "@jridgewell/trace-mapping" "^0.3.15" + "@types/node" "*" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.2.9" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^5.1.0" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.1.3" + jest-message-util "^29.0.2" + jest-util "^29.0.2" + jest-worker "^29.0.2" + slash "^3.0.0" + string-length "^4.0.1" + strip-ansi "^6.0.0" + terminal-link "^2.0.0" + v8-to-istanbul "^9.0.1" + +"@jest/schemas@^29.0.0": + version "29.0.0" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" + integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== + dependencies: + "@sinclair/typebox" "^0.24.1" + "@jest/source-map@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" @@ -2749,6 +2939,15 @@ graceful-fs "^4.2.4" source-map "^0.6.0" +"@jest/source-map@^29.0.0": + version "29.0.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.0.0.tgz#f8d1518298089f8ae624e442bbb6eb870ee7783c" + integrity sha512-nOr+0EM8GiHf34mq2GcJyz/gYFyLQ2INDhAylrZJ9mMWoW21mLBfZa0BUVPPMxVYrLjeiRe2Z7kWXOGnS0TFhQ== + dependencies: + "@jridgewell/trace-mapping" "^0.3.15" + callsites "^3.0.0" + graceful-fs "^4.2.9" + "@jest/test-result@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" @@ -2768,6 +2967,16 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" +"@jest/test-result@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.0.2.tgz#dde4922e6234dd311c85ddf1ec2b7f600a90295d" + integrity sha512-b5rDc0lLL6Kx73LyCx6370k9uZ8o5UKdCpMS6Za3ke7H9y8PtAU305y6TeghpBmf2In8p/qqi3GpftgzijSsNw== + dependencies: + "@jest/console" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + "@jest/test-sequencer@^26.6.3": version "26.6.3" resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" @@ -2779,6 +2988,16 @@ jest-runner "^26.6.3" jest-runtime "^26.6.3" +"@jest/test-sequencer@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.0.2.tgz#ae9b2d2c1694c7aa1a407713100e14dbfa79293e" + integrity sha512-fsyZqHBlXNMv5ZqjQwCuYa2pskXCO0DVxh5aaVCuAtwzHuYEGrhordyEncBLQNuCGQSYgElrEEmS+7wwFnnMKw== + dependencies: + "@jest/test-result" "^29.0.2" + graceful-fs "^4.2.9" + jest-haste-map "^29.0.2" + slash "^3.0.0" + "@jest/transform@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" @@ -2800,6 +3019,48 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" +"@jest/transform@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.0.2.tgz#eef90ebd939b68bf2c2508d9e914377871869146" + integrity sha512-lajVQx2AnsR+Pa17q2zR7eikz2PkPs1+g/qPbZkqQATeS/s6eT55H+yHcsLfuI/0YQ/4VSBepSu3bOX+44q0aA== + dependencies: + "@babel/core" "^7.11.6" + "@jest/types" "^29.0.2" + "@jridgewell/trace-mapping" "^0.3.15" + babel-plugin-istanbul "^6.1.1" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.1.0" + graceful-fs "^4.2.9" + jest-haste-map "^29.0.2" + jest-regex-util "^29.0.0" + jest-util "^29.0.2" + micromatch "^4.0.4" + pirates "^4.0.4" + slash "^3.0.0" + write-file-atomic "^4.0.1" + +"@jest/transform@^29.1.2": + version "29.1.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.1.2.tgz#20f814696e04f090421f6d505c14bbfe0157062a" + integrity sha512-2uaUuVHTitmkx1tHF+eBjb4p7UuzBG7SXIaA/hNIkaMP6K+gXYGxP38ZcrofzqN0HeZ7A90oqsOa97WU7WZkSw== + dependencies: + "@babel/core" "^7.11.6" + "@jest/types" "^29.1.2" + "@jridgewell/trace-mapping" "^0.3.15" + babel-plugin-istanbul "^6.1.1" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.1.0" + graceful-fs "^4.2.9" + jest-haste-map "^29.1.2" + jest-regex-util "^29.0.0" + jest-util "^29.1.2" + micromatch "^4.0.4" + pirates "^4.0.4" + slash "^3.0.0" + write-file-atomic "^4.0.1" + "@jest/types@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" @@ -2830,46 +3091,151 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@jest/types@^29.0.2": + version "29.0.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.0.2.tgz#5a5391fa7f7f41bf4b201d6d2da30e874f95b6c1" + integrity sha512-5WNMesBLmlkt1+fVkoCjHa0X3i3q8zc4QLTDkdHgCa2gyPZc7rdlZBWgVLqwS1860ZW5xJuCDwAzqbGaXIr/ew== + dependencies: + "@jest/schemas" "^29.0.0" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + +"@jest/types@^29.0.3": + version "29.0.3" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.0.3.tgz#0be78fdddb1a35aeb2041074e55b860561c8ef63" + integrity sha512-coBJmOQvurXjN1Hh5PzF7cmsod0zLIOXpP8KD161mqNlroMhLcwpODiEzi7ZsRl5Z/AIuxpeNm8DCl43F4kz8A== + dependencies: + "@jest/schemas" "^29.0.0" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + +"@jest/types@^29.1.2": + version "29.1.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.1.2.tgz#7442d32b16bcd7592d9614173078b8c334ec730a" + integrity sha512-DcXGtoTykQB5jiwCmVr8H4vdg2OJhQex3qPkG+ISyDO7xQXbt/4R6dowcRyPemRnkH7JoHvZuxPBdlq+9JxFCg== + dependencies: + "@jest/schemas" "^29.0.0" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + +"@josephg/resolvable@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb" + integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== + +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.15" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" + integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jsdevtools/ono@^7.1.3": version "7.1.3" resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796" integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg== -"@ledgerhq/devices@^4.64.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.64.0.tgz#4412f81338f5495f179017e5101273c3f0edaddf" - integrity sha512-OQ9zGINnljVT/VsI2GYvNDQwCEZjkdG8QECQ0VtqHQqzcjadiJxg5KwMddTX4FmEOtqSzs1MO0jafMaVSOahpg== +"@ledgerhq/devices@^4.78.0": + version "4.78.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.78.0.tgz#149b572f0616096e2bd5eb14ce14d0061c432be6" + integrity sha512-tWKS5WM/UU82czihnVjRwz9SXNTQzWjGJ/7+j/xZ70O86nlnGJ1aaFbs5/WTzfrVKpOKgj1ZoZkAswX67i/JTw== dependencies: - "@ledgerhq/errors" "^4.64.0" - "@ledgerhq/logs" "^4.64.0" - rxjs "^6.5.2" + "@ledgerhq/errors" "^4.78.0" + "@ledgerhq/logs" "^4.72.0" + rxjs "^6.5.3" -"@ledgerhq/devices@^5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-5.11.0.tgz#34c79e80539160df3116795ddb7d2aee904645e3" - integrity sha512-S+azwTA/L3g1l6ARN+rVYZeOu6b3uHxf6Ha5oj6UHbXxIdz1DyCVSUHz8SNrjDh0mUlbJugpAgaKBDdC2v9nNA== +"@ledgerhq/devices@^5.11.0", "@ledgerhq/devices@^5.51.1": + version "5.51.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-5.51.1.tgz#d741a4a5d8f17c2f9d282fd27147e6fe1999edb7" + integrity sha512-4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA== dependencies: - "@ledgerhq/errors" "^5.11.0" - "@ledgerhq/logs" "^5.11.0" - rxjs "^6.5.4" + "@ledgerhq/errors" "^5.50.0" + "@ledgerhq/logs" "^5.50.0" + rxjs "6" + semver "^7.3.5" + +"@ledgerhq/devices@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-7.0.1.tgz#c014fbb806ba3d48efb2fd757e8588c9300f54fc" + integrity sha512-LlAyDU5+GH0w+J1wscLU+Ga4z5a5ACKmMGQKILj5XscCtp63NjbtVdVt4oc/xrmoUdRqVehIw2Ui+e9nIF52yA== + dependencies: + "@ledgerhq/errors" "^6.10.2" + "@ledgerhq/logs" "^6.10.0" + rxjs "6" + semver "^7.3.5" -"@ledgerhq/errors@^4.64.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.64.0.tgz#fb9c74edb0ea434e659711d88ffcef315a44aeee" - integrity sha512-Wwu6mFvPsFJ4Dhix3G1SPjt2LzSe5iGWhSt8KftzWD9t05UNdJB9BimQnMcTn6/Cgpj/y1RdIgo/nd7hIsjvJg== +"@ledgerhq/errors@^4.78.0": + version "4.78.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.78.0.tgz#23daf3af54d03b1bda3e616002b555da1bdb705a" + integrity sha512-FX6zHZeiNtegBvXabK6M5dJ+8OV8kQGGaGtuXDeK/Ss5EmG4Ltxc6Lnhe8hiHpm9pCHtktOsnUVL7IFBdHhYUg== -"@ledgerhq/errors@^5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.11.0.tgz#722151b36ce1d53f555eeaae3e66f819c2362b28" - integrity sha512-o9Mx10+qZwuS6tKe6Z2mQJMClIvVtRNt/tdz4P/pNcGeT/0d6jdUfyF+J5P7RF3au0e9HTxG2LMCPFPZ2Tnibg== +"@ledgerhq/errors@^5.11.0", "@ledgerhq/errors@^5.50.0": + version "5.50.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.50.0.tgz#e3a6834cb8c19346efca214c1af84ed28e69dad9" + integrity sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow== + +"@ledgerhq/errors@^6.10.2": + version "6.10.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.10.2.tgz#ba104d495eae5ee91264de91a9ba8e3dcaa1a4ea" + integrity sha512-iMfEJPWaan8QaZw87WMUnFFRJqveE3FpU2ObTE0ydTJLPJNOUJjjurGBklqdWM/j5BIQvpi3byGKFChfNg8CaQ== "@ledgerhq/hw-app-eth@^4.3.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.64.0.tgz#7d41ea7e72ce0033ad50f9adb98a3e3a78e7123a" - integrity sha512-yPNbSE2Lwxo6GQYSXQeGvpdz19cQV4HXpTU1VsAWj7sQgim6Ghz9NZGom3Q4G1KqfH31XjIUDiE6KjwGM8vnaQ== + version "4.78.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.78.0.tgz#fbd7ffe7f371d0c32a53f38c5149ab8d13514297" + integrity sha512-m4s4Zhy4lwYJjZB3xPeGV/8mxQcnoui+Eu1KDEl6atsquZHUpbtern/0hZl88+OlFUz0XrX34W3I9cqj61Y6KA== dependencies: - "@ledgerhq/errors" "^4.64.0" - "@ledgerhq/hw-transport" "^4.64.0" + "@ledgerhq/errors" "^4.78.0" + "@ledgerhq/hw-transport" "^4.78.0" "@ledgerhq/hw-app-eth@~5.11.0": version "5.11.0" @@ -2879,55 +3245,55 @@ "@ledgerhq/errors" "^5.11.0" "@ledgerhq/hw-transport" "^5.11.0" -"@ledgerhq/hw-transport-node-hid-noevents@^4.64.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.64.0.tgz#79b89501b66dcfa7d2537ea0d212700b4f094ec9" - integrity sha512-em5HyZUwPTdsUJnEGJgBPcQlbWaEPj4ysYa6hXZ4No1P/giRDovrvEMfPLYAsaCvs1/Ox1hwaC/Uj2T+7NTUnQ== +"@ledgerhq/hw-transport-node-hid-noevents@^4.78.0": + version "4.78.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.78.0.tgz#6f0dbe1bbfad6516b42ad2d6b6b34a8b07e4cd46" + integrity sha512-CJPVR4wksq+apiXH2GnsttguBxmj9zdM2HjqZ3dHZN8SFW/9Xj3k+baS+pYoUISkECVxDrdfaW3Bd5dWv+jPUg== dependencies: - "@ledgerhq/devices" "^4.64.0" - "@ledgerhq/errors" "^4.64.0" - "@ledgerhq/hw-transport" "^4.64.0" - "@ledgerhq/logs" "^4.64.0" + "@ledgerhq/devices" "^4.78.0" + "@ledgerhq/errors" "^4.78.0" + "@ledgerhq/hw-transport" "^4.78.0" + "@ledgerhq/logs" "^4.72.0" node-hid "^0.7.9" -"@ledgerhq/hw-transport-node-hid-noevents@^5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-5.11.0.tgz#6d400414dfc54defce4c765ea52481dcbb4505c9" - integrity sha512-egE2qaZEHkL89qjbWAnTEV3bYe5ALQRCCL8oTc8JVAu4JaxqCoro4DntXrBjjye7gT6gnUHgok1H5f/DVqX4aw== +"@ledgerhq/hw-transport-node-hid-noevents@^6.27.4": + version "6.27.4" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.4.tgz#3bee0299de8586871d7ef329e5ef8ca9cf21ddab" + integrity sha512-PlHtw9x7h40voLUvBAfcr1Phjo8rrRESEDsU0OY6doFoSHpjRFaNtQR1/okQ/A7hx19uXfqXOhbmrrBLNWrqsg== dependencies: - "@ledgerhq/devices" "^5.11.0" - "@ledgerhq/errors" "^5.11.0" - "@ledgerhq/hw-transport" "^5.11.0" - "@ledgerhq/logs" "^5.11.0" - node-hid "^1.2.0" + "@ledgerhq/devices" "^7.0.1" + "@ledgerhq/errors" "^6.10.2" + "@ledgerhq/hw-transport" "^6.27.4" + "@ledgerhq/logs" "^6.10.0" + node-hid "2.1.1" "@ledgerhq/hw-transport-node-hid@^4.3.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.64.0.tgz#ab2144279b11b697ecd9630631de64f88cba2d62" - integrity sha512-dyYdMsicSMl2yF14LaFiWwyRsNh4BNlrRPKtd5LbOvnWlj23c+TkmEtPWBcEYalGeV1qp86sGbnU9FNgroktLQ== - dependencies: - "@ledgerhq/devices" "^4.64.0" - "@ledgerhq/errors" "^4.64.0" - "@ledgerhq/hw-transport" "^4.64.0" - "@ledgerhq/hw-transport-node-hid-noevents" "^4.64.0" - "@ledgerhq/logs" "^4.64.0" - lodash "^4.17.11" + version "4.78.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.78.0.tgz#abd99e0f918b810a61c035e5ab8c2bd8807aff55" + integrity sha512-OMrY2ecfQ1XjMAuuHqu3n3agMPR06HN1s0ENrKc+Twbb5A17jujpv07WzjxfTN2V1G7vgeZpRqrg2ulhowWbdg== + dependencies: + "@ledgerhq/devices" "^4.78.0" + "@ledgerhq/errors" "^4.78.0" + "@ledgerhq/hw-transport" "^4.78.0" + "@ledgerhq/hw-transport-node-hid-noevents" "^4.78.0" + "@ledgerhq/logs" "^4.72.0" + lodash "^4.17.15" node-hid "^0.7.9" usb "^1.6.0" -"@ledgerhq/hw-transport-node-hid@~5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-5.11.0.tgz#f2d3e0edc25840de4f452cf427a0482c65be8e86" - integrity sha512-J/hP3IqcgZn/sTGblELkwZcH68Gbv3ZeaRWdhei6K2dAuxae4dxoVUf6PoOcupEOcXT5XzJBNMc5800AwFeOgg== +"@ledgerhq/hw-transport-node-hid@^6.27.4": + version "6.27.4" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.4.tgz#a7e0c048be5bb94e2d5653f0cd70c1148228bb53" + integrity sha512-7dnQMUXKPcnlHaJsPT3Oo5WXYfeIqqA6u0mo/rbvFdz3/KsJtDaBF2E3RtBXFHrDmXjBA0leqXFeWXdHDFdF3A== dependencies: - "@ledgerhq/devices" "^5.11.0" - "@ledgerhq/errors" "^5.11.0" - "@ledgerhq/hw-transport" "^5.11.0" - "@ledgerhq/hw-transport-node-hid-noevents" "^5.11.0" - "@ledgerhq/logs" "^5.11.0" - lodash "^4.17.15" - node-hid "^1.2.0" - usb "^1.6.0" + "@ledgerhq/devices" "^7.0.1" + "@ledgerhq/errors" "^6.10.2" + "@ledgerhq/hw-transport" "^6.27.4" + "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.4" + "@ledgerhq/logs" "^6.10.0" + lodash "^4.17.21" + node-hid "2.1.1" + usb "^1.7.0" "@ledgerhq/hw-transport-u2f@4.24.0": version "4.24.0" @@ -2937,16 +3303,34 @@ "@ledgerhq/hw-transport" "^4.24.0" u2f-api "0.2.7" -"@ledgerhq/hw-transport@^4.24.0", "@ledgerhq/hw-transport@^4.64.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.64.0.tgz#dc3e2ff6a35638bdd7e51064312aac6b1e0e92e2" - integrity sha512-6qCuScKczrohDXHDnQRuYPV9v0cQstqbWAa/jRZlDuSLMEEJ2xl1Kj9XIkTpKfMQc6KYwqjwarEON9x8CfaXBQ== +"@ledgerhq/hw-transport@^4.24.0", "@ledgerhq/hw-transport@^4.78.0": + version "4.78.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.78.0.tgz#714786658e1f2fbc0569e06e2abf8d15d310d931" + integrity sha512-xQu16OMPQjFYLjqCysij+8sXtdWv2YLxPrB6FoLvEWGTlQ7yL1nUBRQyzyQtWIYqZd4THQowQmzm1VjxuN6SZw== dependencies: - "@ledgerhq/devices" "^4.64.0" - "@ledgerhq/errors" "^4.64.0" + "@ledgerhq/devices" "^4.78.0" + "@ledgerhq/errors" "^4.78.0" events "^3.0.0" -"@ledgerhq/hw-transport@^5.11.0", "@ledgerhq/hw-transport@~5.11.0": +"@ledgerhq/hw-transport@^5.11.0": + version "5.51.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz#8dd14a8e58cbee4df0c29eaeef983a79f5f22578" + integrity sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw== + dependencies: + "@ledgerhq/devices" "^5.51.1" + "@ledgerhq/errors" "^5.50.0" + events "^3.3.0" + +"@ledgerhq/hw-transport@^6.27.4": + version "6.27.4" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.27.4.tgz#a06853fabb1795f728b5989078e58cad44146cc4" + integrity sha512-i3RYKfSIZ7PHM2sFljAU443qOYMTlghx8l5AZqsNKsXbawHkuOr7EtISW3zqbC0Wh3uws7u63qQ/50TLmylr7g== + dependencies: + "@ledgerhq/devices" "^7.0.1" + "@ledgerhq/errors" "^6.10.2" + events "^3.3.0" + +"@ledgerhq/hw-transport@~5.11.0": version "5.11.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.11.0.tgz#f5c45a34d9b68d81fd2f6641b49815527720364b" integrity sha512-z56iwv0DZZu20T5q9sNMHFQNVuRKYqzCuNFhY9woWSpmOQkyVHCRiEgOQbN5h6kVri6fkfPkDzqqcsYjJlnT9g== @@ -2955,693 +3339,723 @@ "@ledgerhq/errors" "^5.11.0" events "^3.1.0" -"@ledgerhq/logs@^4.64.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-4.64.0.tgz#19a335e3f2d9188188437f8dabb06e0fd45b0052" - integrity sha512-NwgA7q1CXWMkqxoHVaSTk0gJUGbiBbWTM7Uod/Zz8EWNa1Ns0yHthCcSS279htP6oQplEaSppzsie5bcbwNApg== +"@ledgerhq/logs@^4.72.0": + version "4.72.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-4.72.0.tgz#43df23af013ad1135407e5cf33ca6e4c4c7708d5" + integrity sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA== -"@ledgerhq/logs@^5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.11.0.tgz#9ad2aefceeef48cf9d77972f67e63ba478dd04cc" - integrity sha512-NiFDdxLU/z1VGQy0/cbpv7UScMDQ/rU8SznqILSHYTnhK2xvvNFTUkd1W2mpmf9E/hzXFI0UAOieLQ44qovX3w== - -"@lerna/add@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.16.0.tgz#f871eda820fe43b868c3a6154906799485c33342" - integrity sha512-yJ4EdmMudSVaBHE4hbCI1WchPf47HwDiVnu3Qb56fsR7DBvPrCoki/QXub8nXWd6ByfjU0T4mfDmGBKt/+hkWg== - dependencies: - "@evocateur/pacote" "^9.6.3" - "@lerna/bootstrap" "3.16.0" - "@lerna/command" "3.16.0" - "@lerna/filter-options" "3.16.0" - "@lerna/npm-conf" "3.16.0" - "@lerna/validation-error" "3.13.0" +"@ledgerhq/logs@^5.50.0": + version "5.50.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186" + integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA== + +"@ledgerhq/logs@^6.10.0": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.0.tgz#c012c1ecc1a0e53d50e6af381618dca5268461c1" + integrity sha512-lLseUPEhSFUXYTKj6q7s2O3s2vW2ebgA11vMAlKodXGf5AFw4zUoEbTz9CoFOC9jS6xY4Qr8BmRnxP/odT4Uuw== + +"@lerna/add@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.5.0.tgz#33c671dc01153f1bda8929de8ed7267d16858ce6" + integrity sha512-RdJ8yyE8BizzrYRjZuqeXtgkHBE/KzcS7tmBG+UKCQ5QFLnkdORzaVECNy2sfZl0vTtrxj4cv+kuwxIeg/4XVQ== + dependencies: + "@lerna/bootstrap" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/filter-options" "5.5.0" + "@lerna/npm-conf" "5.5.0" + "@lerna/validation-error" "5.5.0" dedent "^0.7.0" - npm-package-arg "^6.1.0" - p-map "^2.1.0" - semver "^6.2.0" + npm-package-arg "8.1.1" + p-map "^4.0.0" + pacote "^13.6.1" + semver "^7.3.4" -"@lerna/batch-packages@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.16.0.tgz#1c16cb697e7d718177db744cbcbdac4e30253c8c" - integrity sha512-7AdMkANpubY/FKFI01im01tlx6ygOBJ/0JcixMUWoWP/7Ds3SWQF22ID6fbBr38jUWptYLDs2fagtTDL7YUPuA== - dependencies: - "@lerna/package-graph" "3.16.0" - npmlog "^4.1.2" - -"@lerna/bootstrap@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.16.0.tgz#739634019e9a510e9b445ea3b85d6c24978b4e13" - integrity sha512-4cDKvMi00YaeqmLouq2pnLBplUn0EI+3vO4JWE6ycpR4Jq57+zHCaMKDLydc0oXEE43rdWi0mZjC0wf8nyLQRQ== - dependencies: - "@lerna/batch-packages" "3.16.0" - "@lerna/command" "3.16.0" - "@lerna/filter-options" "3.16.0" - "@lerna/has-npm-version" "3.16.0" - "@lerna/npm-install" "3.16.0" - "@lerna/package-graph" "3.16.0" - "@lerna/pulse-till-done" "3.13.0" - "@lerna/rimraf-dir" "3.14.2" - "@lerna/run-lifecycle" "3.16.0" - "@lerna/run-parallel-batches" "3.16.0" - "@lerna/symlink-binary" "3.16.0" - "@lerna/symlink-dependencies" "3.16.0" - "@lerna/validation-error" "3.13.0" +"@lerna/bootstrap@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-5.5.0.tgz#6773c1357fb88d0cb203b233f9ad9269fb2f43ef" + integrity sha512-GeXLSDi6gxj2O3t5T7qgFabBKoC5EQwiFyQ4ufqx1Wm/mWxqRI+enTBnbaBbmhQaVQ9wfPvMPDukJ5Q9PCTUcQ== + dependencies: + "@lerna/command" "5.5.0" + "@lerna/filter-options" "5.5.0" + "@lerna/has-npm-version" "5.5.0" + "@lerna/npm-install" "5.5.0" + "@lerna/package-graph" "5.5.0" + "@lerna/pulse-till-done" "5.5.0" + "@lerna/rimraf-dir" "5.5.0" + "@lerna/run-lifecycle" "5.5.0" + "@lerna/run-topologically" "5.5.0" + "@lerna/symlink-binary" "5.5.0" + "@lerna/symlink-dependencies" "5.5.0" + "@lerna/validation-error" "5.5.0" + "@npmcli/arborist" "5.3.0" dedent "^0.7.0" - get-port "^4.2.0" - multimatch "^3.0.0" - npm-package-arg "^6.1.0" - npmlog "^4.1.2" - p-finally "^1.0.0" - p-map "^2.1.0" - p-map-series "^1.0.0" - p-waterfall "^1.0.0" - read-package-tree "^5.1.6" - semver "^6.2.0" + get-port "^5.1.1" + multimatch "^5.0.0" + npm-package-arg "8.1.1" + npmlog "^6.0.2" + p-map "^4.0.0" + p-map-series "^2.1.0" + p-waterfall "^2.1.1" + semver "^7.3.4" -"@lerna/changed@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.16.0.tgz#6dc5d9332a0291ec013f9110d580ff58f8687918" - integrity sha512-CuH01JRDg5As9nNsjwS11GnS841cw6ClaSoP8y4E5QcfCDHDZNc9k/pyc28abjIY/cFCtccu6Qjhjhx4Uv1N2w== +"@lerna/changed@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-5.5.0.tgz#7242804f3400491035399cc3108324c154963c8b" + integrity sha512-ZEnVHrPEpf2Iii/Z59g1lfKEwPA1V2an5L27MzNQjbWe6JQZqTU+8V6m+Vmbr4VdEH5jfRL5NVETGCLl7qN/pQ== dependencies: - "@lerna/collect-updates" "3.16.0" - "@lerna/command" "3.16.0" - "@lerna/listable" "3.16.0" - "@lerna/output" "3.13.0" - "@lerna/version" "3.16.0" + "@lerna/collect-updates" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/listable" "5.5.0" + "@lerna/output" "5.5.0" -"@lerna/check-working-tree@3.14.2": - version "3.14.2" - resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.14.2.tgz#5ce007722180a69643a8456766ed8a91fc7e9ae1" - integrity sha512-7safqxM/MYoAoxZxulUDtIJIbnBIgo0PB/FHytueG+9VaX7GMnDte2Bt1EKa0dz2sAyQdmQ3Q8ZXpf/6JDjaeg== +"@lerna/check-working-tree@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-5.5.0.tgz#7b2e4725032fdb17f7d4823e96d443e617af07fb" + integrity sha512-U35yV8R+tv6zQgoDr0rnBt4wm4gyhDcE4tUEeB8m7JHVu7g45Fjv2jFLH1z5RM1PVaEbzKVebqfN5ccB0EBuyg== dependencies: - "@lerna/collect-uncommitted" "3.14.2" - "@lerna/describe-ref" "3.14.2" - "@lerna/validation-error" "3.13.0" + "@lerna/collect-uncommitted" "5.5.0" + "@lerna/describe-ref" "5.5.0" + "@lerna/validation-error" "5.5.0" -"@lerna/child-process@3.14.2": - version "3.14.2" - resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.14.2.tgz#950240cba83f7dfe25247cfa6c9cebf30b7d94f6" - integrity sha512-xnq+W5yQb6RkwI0p16ZQnrn6HkloH/MWTw4lGE1nKsBLAUbmSU5oTE93W1nrG0X3IMF/xWc9UYvNdUGMWvZZ4w== +"@lerna/child-process@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-5.5.0.tgz#b3fbfadd766f79a2c54226de9d7e73643a82d79c" + integrity sha512-er7bsj2W/H8JWAIB+CkgCLk9IlMkyVzywbOZcMC+xic2fp7rmM/BdtAE4nTjkKwfaRYF/bwjHyZowZUR3s8cEg== dependencies: - chalk "^2.3.1" - execa "^1.0.0" - strong-log-transformer "^2.0.0" - -"@lerna/clean@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.16.0.tgz#1c134334cacea1b1dbeacdc580e8b9240db8efa1" - integrity sha512-5P9U5Y19WmYZr7UAMGXBpY7xCRdlR7zhHy8MAPDKVx70rFIBS6nWXn5n7Kntv74g7Lm1gJ2rsiH5tj1OPcRJgg== - dependencies: - "@lerna/command" "3.16.0" - "@lerna/filter-options" "3.16.0" - "@lerna/prompt" "3.13.0" - "@lerna/pulse-till-done" "3.13.0" - "@lerna/rimraf-dir" "3.14.2" - p-map "^2.1.0" - p-map-series "^1.0.0" - p-waterfall "^1.0.0" - -"@lerna/cli@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.13.0.tgz#3d7b357fdd7818423e9681a7b7f2abd106c8a266" - integrity sha512-HgFGlyCZbYaYrjOr3w/EsY18PdvtsTmDfpUQe8HwDjXlPeCCUgliZjXLOVBxSjiOvPeOSwvopwIHKWQmYbwywg== - dependencies: - "@lerna/global-options" "3.13.0" + chalk "^4.1.0" + execa "^5.0.0" + strong-log-transformer "^2.1.0" + +"@lerna/clean@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-5.5.0.tgz#474e2e30bd3fa9a09482188659a87bcef0bd6f6e" + integrity sha512-TRW4Gkv6QpWSy0tm72NrxvgmTAC+W0LqhLPlFM5k5feFS75/HGOycpf97M4JSUueyBCuVjsPfzqp/e6MB3Ntng== + dependencies: + "@lerna/command" "5.5.0" + "@lerna/filter-options" "5.5.0" + "@lerna/prompt" "5.5.0" + "@lerna/pulse-till-done" "5.5.0" + "@lerna/rimraf-dir" "5.5.0" + p-map "^4.0.0" + p-map-series "^2.1.0" + p-waterfall "^2.1.1" + +"@lerna/cli@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-5.5.0.tgz#3463fff62cc2233b6a85ccaed23fad1432b57c30" + integrity sha512-7TtnO2xfnfrpWGIui6ANrH4/AVHmSfjaExSoZKNhh2dKSSEOETEUfFIIzfEAirAVR7EOXAJwDdFbbpB4lQtyUg== + dependencies: + "@lerna/global-options" "5.5.0" dedent "^0.7.0" - npmlog "^4.1.2" - yargs "^12.0.1" + npmlog "^6.0.2" + yargs "^16.2.0" -"@lerna/collect-uncommitted@3.14.2": - version "3.14.2" - resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-3.14.2.tgz#b5ed00d800bea26bb0d18404432b051eee8d030e" - integrity sha512-4EkQu4jIOdNL2BMzy/N0ydHB8+Z6syu6xiiKXOoFl0WoWU9H1jEJCX4TH7CmVxXL1+jcs8FIS2pfQz4oew99Eg== +"@lerna/collect-uncommitted@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-5.5.0.tgz#9ecd3a4fe852715aa83d02e0e0b072015e6ee196" + integrity sha512-oVGXS0fC8q2d1lG695eCd8dkr0fhmUx4bWA1IshVd/u0Puk7f8+m71POcLV3h1gR/2Fqs7vb7G/sPyuzGtwn8w== dependencies: - "@lerna/child-process" "3.14.2" - chalk "^2.3.1" - figgy-pudding "^3.5.1" - npmlog "^4.1.2" + "@lerna/child-process" "5.5.0" + chalk "^4.1.0" + npmlog "^6.0.2" -"@lerna/collect-updates@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.16.0.tgz#6db3ce8a740a4e2b972c033a63bdfb77f2553d8c" - integrity sha512-HwAIl815X2TNlmcp28zCrSdXfoZWNP7GJPEqNWYk7xDJTYLqQ+SrmKUePjb3AMGBwYAraZSEJLbHdBpJ5+cHmQ== +"@lerna/collect-updates@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-5.5.0.tgz#2180052edd727a65a71d5a047f36166a1dee221f" + integrity sha512-6kBMi6K6PHIBvZKlfp/0PvRgmzvvfx+eZpmLjF+0yjcfwBn+QDkq7H+QohBiCzt2vxHVHsM6zutNhl2jNTmChg== dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/describe-ref" "3.14.2" + "@lerna/child-process" "5.5.0" + "@lerna/describe-ref" "5.5.0" minimatch "^3.0.4" - npmlog "^4.1.2" - slash "^2.0.0" + npmlog "^6.0.2" + slash "^3.0.0" -"@lerna/command@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.16.0.tgz#ba3dba49cb5ce4d11b48269cf95becd86e30773f" - integrity sha512-u7tE4GC4/gfbPA9eQg+0ulnoJ+PMoMqomx033r/IxqZrHtmJR9+pF/37S0fsxJ2hX/RMFPC7c9Q/i8NEufSpdQ== - dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/package-graph" "3.16.0" - "@lerna/project" "3.16.0" - "@lerna/validation-error" "3.13.0" - "@lerna/write-log-file" "3.13.0" +"@lerna/command@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/command/-/command-5.5.0.tgz#7be7228bd8f87181274974ff3e539bdd1b4b91e6" + integrity sha512-ut055kFWc1OJFdI9Cj1kDxtJ4ejvAsfRgUoVxWT1Fw4Me/OzQRHYmUupW0FK8Kc+7gcz4mGKzUVWmRmDBvn+Fw== + dependencies: + "@lerna/child-process" "5.5.0" + "@lerna/package-graph" "5.5.0" + "@lerna/project" "5.5.0" + "@lerna/validation-error" "5.5.0" + "@lerna/write-log-file" "5.5.0" + clone-deep "^4.0.1" dedent "^0.7.0" - execa "^1.0.0" + execa "^5.0.0" is-ci "^2.0.0" - lodash "^4.17.14" - npmlog "^4.1.2" + npmlog "^6.0.2" -"@lerna/conventional-commits@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.16.0.tgz#141a4e584d8765542e77fafe9a7448c6e48db196" - integrity sha512-zdvhU+aI7galRyLBFDhvC8T7NbGORJiZbIw/Qgp/TzkSaJfOAE3R7J8J1OZKDgxvhOoVhzMphNycaV3DiUlERQ== +"@lerna/conventional-commits@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-5.5.0.tgz#570a7766fd21fb8c9e78e5980a30fdfc54d549cb" + integrity sha512-qPTRNCm3H4MvZAdQLzyYq7ifJyofMSeZmel232b5mglW3OSehxPQUxzr/u/0p8Nqs89uZxZRHyznLnhRNdXcJQ== + dependencies: + "@lerna/validation-error" "5.5.0" + conventional-changelog-angular "^5.0.12" + conventional-changelog-core "^4.2.4" + conventional-recommended-bump "^6.1.0" + fs-extra "^9.1.0" + get-stream "^6.0.0" + npm-package-arg "8.1.1" + npmlog "^6.0.2" + pify "^5.0.0" + semver "^7.3.4" + +"@lerna/create-symlink@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-5.5.0.tgz#8532b0a1651f1ca7363e7e0e25c1d3ebdb4cea26" + integrity sha512-vWGvRbTh3ji3J/8mVyLPa9Yst4MZzp9W2+8hyYHw8eAzCtHPuH3Z0AReIHpYRfoViUvxIl/rEEuD2D1sDh61BQ== dependencies: - "@lerna/validation-error" "3.13.0" - conventional-changelog-angular "^5.0.3" - conventional-changelog-core "^3.1.6" - conventional-recommended-bump "^5.0.0" - fs-extra "^8.1.0" - get-stream "^4.0.0" - lodash.template "^4.5.0" - npm-package-arg "^6.1.0" - npmlog "^4.1.2" - pify "^4.0.1" - semver "^6.2.0" + cmd-shim "^5.0.0" + fs-extra "^9.1.0" + npmlog "^6.0.2" -"@lerna/create-symlink@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.16.0.tgz#817c86602e334505622eefd197325528811f6c40" - integrity sha512-MiQga30ZYB5mioUA37qkiIMb6X9JtyYhkzgDZFz7iZVdOF0NxkRQJZy+osGnXWij9s1DFfl70pOdVBPMl7LzRA== +"@lerna/create@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-5.5.0.tgz#78fbe4f56efe7f6715a05faff5d6f70bb297419a" + integrity sha512-B+ERbzgFMYspsaU9We65Wqf9Y7sGsEYVFPi3EKpCXxkvVr65YRFL6Mz/WAVggwYkR49umduXXVmjnCWcuT0Ydw== dependencies: - cmd-shim "^2.0.2" - fs-extra "^8.1.0" - npmlog "^4.1.2" - -"@lerna/create@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.16.0.tgz#4de841ec7d98b29bb19fb7d6ad982e65f7a150e8" - integrity sha512-OZApR1Iz7awutbmj4sAArwhqCyKgcrnw9rH0aWAUrkYWrD1w4TwkvAcYAsfx5GpQGbLQwoXhoyyPwPfZRRWz3Q== - dependencies: - "@evocateur/pacote" "^9.6.3" - "@lerna/child-process" "3.14.2" - "@lerna/command" "3.16.0" - "@lerna/npm-conf" "3.16.0" - "@lerna/validation-error" "3.13.0" - camelcase "^5.0.0" + "@lerna/child-process" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/npm-conf" "5.5.0" + "@lerna/validation-error" "5.5.0" dedent "^0.7.0" - fs-extra "^8.1.0" - globby "^9.2.0" - init-package-json "^1.10.3" - npm-package-arg "^6.1.0" - p-reduce "^1.0.0" - pify "^4.0.1" - semver "^6.2.0" - slash "^2.0.0" - validate-npm-package-license "^3.0.3" - validate-npm-package-name "^3.0.0" - whatwg-url "^7.0.0" - -"@lerna/describe-ref@3.14.2": - version "3.14.2" - resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.14.2.tgz#edc3c973f5ca9728d23358c4f4d3b55a21f65be5" - integrity sha512-qa5pzDRK2oBQXNjyRmRnN7E8a78NMYfQjjlRFB0KNHMsT6mCiL9+8kIS39sSE2NqT8p7xVNo2r2KAS8R/m3CoQ== - dependencies: - "@lerna/child-process" "3.14.2" - npmlog "^4.1.2" - -"@lerna/diff@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.16.0.tgz#6d09a786f9f5b343a2fdc460eb0be08a05b420aa" - integrity sha512-QUpVs5TPl8vBIne10/vyjUxanQBQQp7Lk3iaB8MnCysKr0O+oy7trWeFVDPEkBTCD177By7yPGyW5Yey1nCBbA== - dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/command" "3.16.0" - "@lerna/validation-error" "3.13.0" - npmlog "^4.1.2" - -"@lerna/exec@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.16.0.tgz#2b6c033cee46181b6eede0eb12aad5c2c0181e89" - integrity sha512-mH3O5NXf/O88jBaBBTUf+d56CUkxpg782s3Jxy7HWbVuSUULt3iMRPTh+zEXO5/555etsIVVDDyUR76meklrJA== - dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/command" "3.16.0" - "@lerna/filter-options" "3.16.0" - "@lerna/run-topologically" "3.16.0" - "@lerna/validation-error" "3.13.0" - p-map "^2.1.0" - -"@lerna/filter-options@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.16.0.tgz#b1660b4480c02a5c6efa4d0cd98b9afde4ed0bba" - integrity sha512-InIi1fF8+PxpCwir9bIy+pGxrdE6hvN0enIs1eNGCVS1TTE8osNgiZXa838bMQ1yaEccdcnVX6Z03BNKd56kNg== - dependencies: - "@lerna/collect-updates" "3.16.0" - "@lerna/filter-packages" "3.16.0" + fs-extra "^9.1.0" + globby "^11.0.2" + init-package-json "^3.0.2" + npm-package-arg "8.1.1" + p-reduce "^2.1.0" + pacote "^13.6.1" + pify "^5.0.0" + semver "^7.3.4" + slash "^3.0.0" + validate-npm-package-license "^3.0.4" + validate-npm-package-name "^4.0.0" + yargs-parser "20.2.4" + +"@lerna/describe-ref@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-5.5.0.tgz#9c50ffac8c761408e091a9e717ccc7a74dbe513d" + integrity sha512-gNt9deRWcDoIKCwKRHu/TEt2HcHhQxzVlP8GQHYp4NuWTG9c+gTQfyuXvbZd0K9jCijPUBNy/oMb6usXceJWeg== + dependencies: + "@lerna/child-process" "5.5.0" + npmlog "^6.0.2" + +"@lerna/diff@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-5.5.0.tgz#37790ce266ca139abf1f7f4597aa86e8f2f12d1d" + integrity sha512-2PIka/4kKDOsh5Ht+X2OuLNTWzRk+LcnN5bCin87w7vGw3esdvlT1fj1tKjoZ1/aC/O8tqtKXyeP9WE6YHWVpw== + dependencies: + "@lerna/child-process" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/validation-error" "5.5.0" + npmlog "^6.0.2" + +"@lerna/exec@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-5.5.0.tgz#bf97d67e772f326e58a3f3d259e77c61ca508a72" + integrity sha512-4asvrCYFGgnEbXtSiKJLDd6DShUl7FIRRCWx7JXJfa0B6sg00cB9Cg3JTp+F+cQWCOspRkzqRetqu57o6wRpXg== + dependencies: + "@lerna/child-process" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/filter-options" "5.5.0" + "@lerna/profiler" "5.5.0" + "@lerna/run-topologically" "5.5.0" + "@lerna/validation-error" "5.5.0" + p-map "^4.0.0" + +"@lerna/filter-options@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-5.5.0.tgz#f71297519d4b4407013f9500db82f089bf45b80a" + integrity sha512-Hwn4sOixZdWVe6SFZ7aPFjhMYoSHz0zbwy3t40KXuhjLqT8T5RLmGWW1u2Al6dQ5fuQyhWXGS4DWfobs7Th62A== + dependencies: + "@lerna/collect-updates" "5.5.0" + "@lerna/filter-packages" "5.5.0" dedent "^0.7.0" + npmlog "^6.0.2" -"@lerna/filter-packages@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.16.0.tgz#7d34dc8530c71016263d6f67dc65308ecf11c9fc" - integrity sha512-eGFzQTx0ogkGDCnbTuXqssryR6ilp8+dcXt6B+aq1MaqL/vOJRZyqMm4TY3CUOUnzZCi9S2WWyMw3PnAJOF+kg== +"@lerna/filter-packages@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-5.5.0.tgz#5fad84745eec01779a830040bab79c222d8794f3" + integrity sha512-Ad23aRPKgr/zt6jMWi8xKL+2z47GBQyxC4HhsDEMp62OGeGhGyK1sGW+S8OTEh17sIVpGG2GX9eCfnG8pvfxUQ== dependencies: - "@lerna/validation-error" "3.13.0" - multimatch "^3.0.0" - npmlog "^4.1.2" + "@lerna/validation-error" "5.5.0" + multimatch "^5.0.0" + npmlog "^6.0.2" -"@lerna/get-npm-exec-opts@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz#d1b552cb0088199fc3e7e126f914e39a08df9ea5" - integrity sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw== +"@lerna/get-npm-exec-opts@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.5.0.tgz#55fb0c2ce17b304e98df1f6ce714825dd86c413f" + integrity sha512-WRt560FB6rsj4yVtR1wIJWJufITajECaw1omNi2KkL7/o7ky4NvHACVOtibETUNMXrnuPJ/QBww4roLFVIAyog== dependencies: - npmlog "^4.1.2" + npmlog "^6.0.2" -"@lerna/get-packed@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.16.0.tgz#1b316b706dcee86c7baa55e50b087959447852ff" - integrity sha512-AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw== +"@lerna/get-packed@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-5.5.0.tgz#d8d103ed01ca19e72b19d6807232a808dad414c8" + integrity sha512-X+91ma9SQPrsVctsrFRBABn4+T87lnTEd/BngB7OYlYFsJCc+a6vd+5pnIWxKK5OiUr6+tRpMbJp8BUXJFdb4Q== dependencies: - fs-extra "^8.1.0" - ssri "^6.0.1" - tar "^4.4.8" - -"@lerna/github-client@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.16.0.tgz#619874e461641d4f59ab1b3f1a7ba22dba88125d" - integrity sha512-IVJjcKjkYaUEPJsDyAblHGEFFNKCRyMagbIDm14L7Ab94ccN6i4TKOqAFEJn2SJHYvKKBdp3Zj2zNlASOMe3DA== - dependencies: - "@lerna/child-process" "3.14.2" - "@octokit/plugin-enterprise-rest" "^3.6.1" - "@octokit/rest" "^16.28.4" - git-url-parse "^11.1.2" - npmlog "^4.1.2" - -"@lerna/gitlab-client@3.15.0": - version "3.15.0" - resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz#91f4ec8c697b5ac57f7f25bd50fe659d24aa96a6" - integrity sha512-OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q== - dependencies: - node-fetch "^2.5.0" - npmlog "^4.1.2" - whatwg-url "^7.0.0" - -"@lerna/global-options@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1" - integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ== - -"@lerna/has-npm-version@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.16.0.tgz#55764a4ce792f0c8553cf996a17f554b9e843288" - integrity sha512-TIY036dA9J8OyTrZq9J+it2DVKifL65k7hK8HhkUPpitJkw6jwbMObA/8D40LOGgWNPweJWqmlrTbRSwsR7DrQ== - dependencies: - "@lerna/child-process" "3.14.2" - semver "^6.2.0" + fs-extra "^9.1.0" + ssri "^9.0.1" + tar "^6.1.0" + +"@lerna/github-client@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-5.5.0.tgz#8653db4049525c55a10d2e8ce2693ed7913ecfd4" + integrity sha512-CaBleVR0F+8Yv4FQu6r7Ocqnh3DEq6dQeu0r4RX+mc9jBn9J/N2SdLKRdC7vcvmkcLCxacg8ewuesYqvakQ8HQ== + dependencies: + "@lerna/child-process" "5.5.0" + "@octokit/plugin-enterprise-rest" "^6.0.1" + "@octokit/rest" "^19.0.3" + git-url-parse "^12.0.0" + npmlog "^6.0.2" + +"@lerna/gitlab-client@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-5.5.0.tgz#b97de42c044345bd28bf672c2322876f87c055cf" + integrity sha512-ktKfBgQnt0MtyiTM3wuec47Wk7nHc+k2YvoC1roDGaXpgWS7lOQnA8RyorX4Hal3ZsrL95qi9vZOolWvUnxS3w== + dependencies: + node-fetch "^2.6.1" + npmlog "^6.0.2" + +"@lerna/global-options@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-5.5.0.tgz#80d4fd02ce0789751aebf535c983048c8298668c" + integrity sha512-ydEsnXi2LRpxkzpSf8GFeCdh1roTKANZdqzjkhuUlBHrKzKxywpNPpGbXmh6JziHMYdgKGZUjnY35TxBlVRN6Q== -"@lerna/import@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.16.0.tgz#b57cb453f4acfc60f6541fcbba10674055cb179d" - integrity sha512-trsOmGHzw0rL/f8BLNvd+9PjoTkXq2Dt4/V2UCha254hMQaYutbxcYu8iKPxz9x86jSPlH7FpbTkkHXDsoY7Yg== +"@lerna/has-npm-version@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-5.5.0.tgz#9bc4a09bd6b6b72b54b0eeed4d65b1fb57a51ac4" + integrity sha512-ALvz0fF1I7Dx+c+0rvkFdqEtp/hs4F/Av2blhOaFWTs78D7FTQa7IpURmvdVDi56H30fqa9b4nEQqnaCRJZKpQ== dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/command" "3.16.0" - "@lerna/prompt" "3.13.0" - "@lerna/pulse-till-done" "3.13.0" - "@lerna/validation-error" "3.13.0" + "@lerna/child-process" "5.5.0" + semver "^7.3.4" + +"@lerna/import@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/import/-/import-5.5.0.tgz#0e7f491edef25181d9dd8e4b30ad5d55b767167c" + integrity sha512-mn87JOcb/j4KBV37Kv589avN5uArcJcASBonm1iWcTwxTvcNFj2BjxnUoVVY6EFamDfBLwWBcAvCO+cvmJkj3Q== + dependencies: + "@lerna/child-process" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/prompt" "5.5.0" + "@lerna/pulse-till-done" "5.5.0" + "@lerna/validation-error" "5.5.0" dedent "^0.7.0" - fs-extra "^8.1.0" - p-map-series "^1.0.0" + fs-extra "^9.1.0" + p-map-series "^2.1.0" -"@lerna/init@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.16.0.tgz#31e0d66bbededee603338b487a42674a072b7a7d" - integrity sha512-Ybol/x5xMtBgokx4j7/Y3u0ZmNh0NiSWzBFVaOs2NOJKvuqrWimF67DKVz7yYtTYEjtaMdug64ohFF4jcT/iag== +"@lerna/info@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/info/-/info-5.5.0.tgz#1dc31a67fdc5288433ec76e06c94d616c043174f" + integrity sha512-2pgogAahv8tqY2sFarOCSXcxJFEag9z1pPGnHwKsq8NtekR0exLwFp93iTbDKRff8ScSmH82lNh22GFKZKLm/A== dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/command" "3.16.0" - fs-extra "^8.1.0" - p-map "^2.1.0" - write-json-file "^3.2.0" + "@lerna/command" "5.5.0" + "@lerna/output" "5.5.0" + envinfo "^7.7.4" -"@lerna/link@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.16.0.tgz#43347170c5a36f633bdfe9e075b2e400b13e1a7f" - integrity sha512-nm9olZuvNGOqTFusgsD1eBDqTWwre3FUX0DkLORbqvvm/TIwRvXoOBmFceV2Q9zpAFRwj4vrnsPNQ/RYC3X4ZQ== +"@lerna/init@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/init/-/init-5.5.0.tgz#f0f573914600131041accbf7bbc986458dda61be" + integrity sha512-dPjuk12s2pSnSL6ib7KQ+RKFyFYvsWAnSMro3sanb07og3tJkwVne8srlmYQsd/NghU8sBdQFFKIV+pzg2sg9w== dependencies: - "@lerna/command" "3.16.0" - "@lerna/package-graph" "3.16.0" - "@lerna/symlink-dependencies" "3.16.0" - p-map "^2.1.0" - slash "^2.0.0" + "@lerna/child-process" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/project" "5.5.0" + fs-extra "^9.1.0" + p-map "^4.0.0" + write-json-file "^4.3.0" + +"@lerna/link@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/link/-/link-5.5.0.tgz#7ff74081fe6beb864096f6d5fd768c65d1c12c26" + integrity sha512-wucP0DBKBG2Mkr9PNkPB9ez5pRxLEIY+6s0hB3iTxCTmef5GYPlQ+ftiaN2/IGVYb569AW97YilROuU2gDMrMw== + dependencies: + "@lerna/command" "5.5.0" + "@lerna/package-graph" "5.5.0" + "@lerna/symlink-dependencies" "5.5.0" + "@lerna/validation-error" "5.5.0" + p-map "^4.0.0" + slash "^3.0.0" -"@lerna/list@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.16.0.tgz#883c00b2baf1e03c93e54391372f67a01b773c2f" - integrity sha512-TkvstoPsgKqqQ0KfRumpsdMXfRSEhdXqOLq519XyI5IRWYxhoqXqfi8gG37UoBPhBNoe64japn5OjphF3rOmQA== +"@lerna/list@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/list/-/list-5.5.0.tgz#8a4a5b2d9a102283e4adf55daba9f2a7585b5140" + integrity sha512-vic7CeD/TL0bh6hzpgHK2Ogz7MW1NB6Sws1J7cl5CTn4sAGm/KZ/g4MNsLFVLJNAiPh+t2cmT0ndyNluShnjqA== dependencies: - "@lerna/command" "3.16.0" - "@lerna/filter-options" "3.16.0" - "@lerna/listable" "3.16.0" - "@lerna/output" "3.13.0" + "@lerna/command" "5.5.0" + "@lerna/filter-options" "5.5.0" + "@lerna/listable" "5.5.0" + "@lerna/output" "5.5.0" -"@lerna/listable@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.16.0.tgz#e6dc47a2d5a6295222663486f50e5cffc580f043" - integrity sha512-mtdAT2EEECqrJSDm/aXlOUFr1MRE4p6hppzY//Klp05CogQy6uGaKk+iKG5yyCLaOXFFZvG4HfO11CmoGSDWzw== +"@lerna/listable@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-5.5.0.tgz#91c2d3ea2b1edab73a12291d3f44fcdfb446f17b" + integrity sha512-2kCpn8vlmRTVA3tGr1XRkHOW2ljXjb/hRNxSK3DUf0k6sl9sEdQFSH7cf5qPnCAPcuLHS7b8kuFhA6x8nXFP3g== dependencies: - "@lerna/query-graph" "3.16.0" - chalk "^2.3.1" - columnify "^1.5.4" + "@lerna/query-graph" "5.5.0" + chalk "^4.1.0" + columnify "^1.6.0" -"@lerna/log-packed@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.16.0.tgz#f83991041ee77b2495634e14470b42259fd2bc16" - integrity sha512-Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ== +"@lerna/log-packed@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-5.5.0.tgz#9485d22db36d17d56ed9875e24fe924ff9e7c45f" + integrity sha512-kVDEy29VfBQeha92IBuPq9W/kP6ffboCWuU64lBIAljTDdpFrMFBeLRrWfLSLIVe2fq8FpGk8PInNlDHmvT5PA== dependencies: - byte-size "^5.0.1" - columnify "^1.5.4" + byte-size "^7.0.0" + columnify "^1.6.0" has-unicode "^2.0.1" - npmlog "^4.1.2" + npmlog "^6.0.2" -"@lerna/npm-conf@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.16.0.tgz#1c10a89ae2f6c2ee96962557738685300d376827" - integrity sha512-HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA== +"@lerna/npm-conf@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-5.5.0.tgz#e97aa65c6a94b4a9a74c6f6bc3a1c15537917bc8" + integrity sha512-ml1Pmn26a61y6nFijpNE9RAbsNOF2XL1Kqyd3x7+XFaDmqbSDqo2g5qlsb4gTdUj/Uy1niRGzy3XdC0FH5G+mg== dependencies: - config-chain "^1.1.11" - pify "^4.0.1" + config-chain "^1.1.12" + pify "^5.0.0" -"@lerna/npm-dist-tag@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.16.0.tgz#b2184cee5e1f291277396854820e1117a544b7ee" - integrity sha512-MQrBkqJJB9+eNphuj9w90QPMOs4NQXMuSRk9NqzeFunOmdDopPCV0Q7IThSxEuWnhJ2n3B7G0vWUP7tNMPdqIQ== +"@lerna/npm-dist-tag@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-5.5.0.tgz#a8d4139689fb13b13320175202f07bf42112e902" + integrity sha512-Hz6n9tqbGUuqI1q9IS3tAGx95TkOqLfXRay9kr/hjswj+HKp0Dtw1cu8YRtizA7CuIWw831eXCbqfFyILfytaA== dependencies: - "@evocateur/npm-registry-fetch" "^4.0.0" - "@lerna/otplease" "3.16.0" - figgy-pudding "^3.5.1" - npm-package-arg "^6.1.0" - npmlog "^4.1.2" + "@lerna/otplease" "5.5.0" + npm-package-arg "8.1.1" + npm-registry-fetch "^13.3.0" + npmlog "^6.0.2" -"@lerna/npm-install@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.16.0.tgz#8ec76a7a13b183bde438fd46296bf7a0d6f86017" - integrity sha512-APUOIilZCzDzce92uLEwzt1r7AEMKT/hWA1ThGJL+PO9Rn8A95Km3o2XZAYG4W0hR+P4O2nSVuKbsjQtz8CjFQ== - dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/get-npm-exec-opts" "3.13.0" - fs-extra "^8.1.0" - npm-package-arg "^6.1.0" - npmlog "^4.1.2" - signal-exit "^3.0.2" - write-pkg "^3.1.0" +"@lerna/npm-install@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-5.5.0.tgz#1ddff558304f62897feaad120c7da28331f5844e" + integrity sha512-axMtqZYuAl5qGcRCBYKqINimMrbQRM1f09sz9rKtwnx15066qT0IaKUt9YYo5bsZm/i3BXpBqcUxZXlGzQNWBQ== + dependencies: + "@lerna/child-process" "5.5.0" + "@lerna/get-npm-exec-opts" "5.5.0" + fs-extra "^9.1.0" + npm-package-arg "8.1.1" + npmlog "^6.0.2" + signal-exit "^3.0.3" + write-pkg "^4.0.0" -"@lerna/npm-publish@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.16.0.tgz#deb208626978a616b331b0e76be40bbe6142d8ba" - integrity sha512-aV4KgPfggYOBaqd2XyGsrn1QjSUEHalR/dEmuCra9HlUUb8t6lnHDN4WQ3K/XwODNcDZssq0G9v2RpIASwIpjg== +"@lerna/npm-publish@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-5.5.0.tgz#388e60b46315c3bdc2b3b7227e503adad13454f7" + integrity sha512-eDcmga5CcXGmSdVXBO75eCX3vypEwQO/lN7VqRpLSOsIHIRUGbfwo/stbz8sIF4+HAkaAFGj6BScjvjlyoh2pQ== + dependencies: + "@lerna/otplease" "5.5.0" + "@lerna/run-lifecycle" "5.5.0" + fs-extra "^9.1.0" + libnpmpublish "^6.0.4" + npm-package-arg "8.1.1" + npmlog "^6.0.2" + pify "^5.0.0" + read-package-json "^5.0.1" + +"@lerna/npm-run-script@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-5.5.0.tgz#f98377022358cb179b304fc05253972afc272bfb" + integrity sha512-ltEtw28CLpG/VaWX4PZ1enJ0wxA/Qw8ScAwhQTZj0xL6Lhkq5H0LoEALVRAq2gK10h1p2IUs/W034oXT1chH0w== dependencies: - "@evocateur/libnpmpublish" "^1.2.2" - "@lerna/otplease" "3.16.0" - "@lerna/run-lifecycle" "3.16.0" - figgy-pudding "^3.5.1" - fs-extra "^8.1.0" - npm-package-arg "^6.1.0" - npmlog "^4.1.2" - pify "^4.0.1" - read-package-json "^2.0.13" + "@lerna/child-process" "5.5.0" + "@lerna/get-npm-exec-opts" "5.5.0" + npmlog "^6.0.2" -"@lerna/npm-run-script@3.14.2": - version "3.14.2" - resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.14.2.tgz#8c518ea9d241a641273e77aad6f6fddc16779c3f" - integrity sha512-LbVFv+nvAoRTYLMrJlJ8RiakHXrLslL7Jp/m1R18vYrB8LYWA3ey+nz5Tel2OELzmjUiemAKZsD9h6i+Re5egg== +"@lerna/otplease@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-5.5.0.tgz#68ac55c9dd2e1589772852834e9012d29d1f2e7a" + integrity sha512-zNS315iH2VRQz/LJTrqUUuEqMnNsCoMXOMOaBzcB/AL29mYMvJlT05dMqenMPKrRtW0tAFzPC7jLTzybdRa7Qg== dependencies: - "@lerna/child-process" "3.14.2" - "@lerna/get-npm-exec-opts" "3.13.0" - npmlog "^4.1.2" + "@lerna/prompt" "5.5.0" -"@lerna/otplease@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-3.16.0.tgz#de66aec4f3e835a465d7bea84b58a4ab6590a0fa" - integrity sha512-uqZ15wYOHC+/V0WnD2iTLXARjvx3vNrpiIeyIvVlDB7rWse9mL4egex/QSgZ+lDx1OID7l2kgvcUD9cFpbqB7Q== +"@lerna/output@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/output/-/output-5.5.0.tgz#dff2b336d9f92403af23b9533f8448763422818c" + integrity sha512-f+MXc9X1xEe2w0AC+CAMr093MumCTNYmyIt8eUMYQMmoRkWT2n4tN8/KvWw9ucSWLKMkZtOTJiC+S6RJ4nWUig== dependencies: - "@lerna/prompt" "3.13.0" - figgy-pudding "^3.5.1" + npmlog "^6.0.2" -"@lerna/output@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989" - integrity sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg== +"@lerna/pack-directory@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-5.5.0.tgz#502d67f9ae4772755c8211cb62d46865f8e5aa9d" + integrity sha512-zHpIAeZOpIH/Slb8vuh75XR46mc4RZNwPS6XpwRgMRpp3Y1Bazlv6hDcq+pZTg1FwYKIDQDRfxW3IQi/aDPIjA== + dependencies: + "@lerna/get-packed" "5.5.0" + "@lerna/package" "5.5.0" + "@lerna/run-lifecycle" "5.5.0" + "@lerna/temp-write" "5.5.0" + npm-packlist "^5.1.1" + npmlog "^6.0.2" + tar "^6.1.0" + +"@lerna/package-graph@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-5.5.0.tgz#d73b84aed819924250cbc21c8fcf1d7e945f809a" + integrity sha512-g378NrCTEmVXqkAkv9EX8L3K7JTioPNuxItXTHQxlHDhZ2RM9KCVbT/ihwefVujWwwMPNij10bmfJUaEp2TGPQ== dependencies: - npmlog "^4.1.2" + "@lerna/prerelease-id-from-version" "5.5.0" + "@lerna/validation-error" "5.5.0" + npm-package-arg "8.1.1" + npmlog "^6.0.2" + semver "^7.3.4" -"@lerna/pack-directory@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.16.0.tgz#10becad1d44666dd38baa01e1a4a9b3a927f5952" - integrity sha512-3Fs4Q6WZktXhjjYfs2f8ud1BSfIfNmkq9uarc9L5/DUvS7AKt4bTofpO1kRYJ4hSSXkFkfVUKy34bVPjpW9UOA== +"@lerna/package@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/package/-/package-5.5.0.tgz#2189e43c4acbbeabf6cd4ae33ad097da7789596e" + integrity sha512-vP08ZdMd3A7B0hEI4ZNgCeBef64yCidrnFUIiIhXb/tAsDmGCGqS2IFdGRNE9vv01tVg0WrPLim4tl8AjoigKw== dependencies: - "@lerna/get-packed" "3.16.0" - "@lerna/package" "3.16.0" - "@lerna/run-lifecycle" "3.16.0" - figgy-pudding "^3.5.1" - npm-packlist "^1.4.4" - npmlog "^4.1.2" - tar "^4.4.10" - temp-write "^3.4.0" - -"@lerna/package-graph@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.16.0.tgz#909c90fb41e02f2c19387342d2a5eefc36d56836" - integrity sha512-A2mum/gNbv7zCtAwJqoxzqv89As73OQNK2MgSX1SHWya46qoxO9a9Z2c5lOFQ8UFN5ZxqWMfFYXRCz7qzwmFXw== - dependencies: - "@lerna/prerelease-id-from-version" "3.16.0" - "@lerna/validation-error" "3.13.0" - npm-package-arg "^6.1.0" - npmlog "^4.1.2" - semver "^6.2.0" + load-json-file "^6.2.0" + npm-package-arg "8.1.1" + write-pkg "^4.0.0" -"@lerna/package@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.16.0.tgz#7e0a46e4697ed8b8a9c14d59c7f890e0d38ba13c" - integrity sha512-2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw== +"@lerna/prerelease-id-from-version@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.5.0.tgz#5f228106078a13d58a84b364c2aa8634451798df" + integrity sha512-cpy0EgfO/7fXPhl/EsJnD8uGv0f8d6FHG2R1Xr7sJvmkffhkIy90qkFA7uSaZAA+ar9QFSAUJ+wGox0bhGJhHA== dependencies: - load-json-file "^5.3.0" - npm-package-arg "^6.1.0" - write-pkg "^3.1.0" + semver "^7.3.4" -"@lerna/prerelease-id-from-version@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz#b24bfa789f5e1baab914d7b08baae9b7bd7d83a1" - integrity sha512-qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA== +"@lerna/profiler@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-5.5.0.tgz#6ab9604ea2850e38ca654d0b8d1f5594c83c2d7d" + integrity sha512-2DkkMxYCq/RsBptN+gJtmqwdrFqji6QMpNlm7v9JgS9kN2aHUIxcavtHXDaYf9sdPoey/bGypRv9DDTDcuw9MA== dependencies: - semver "^6.2.0" + fs-extra "^9.1.0" + npmlog "^6.0.2" + upath "^2.0.1" -"@lerna/project@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.16.0.tgz#2469a4e346e623fd922f38f5a12931dfb8f2a946" - integrity sha512-NrKcKK1EqXqhrGvslz6Q36+ZHuK3zlDhGdghRqnxDcHxMPT01NgLcmsnymmQ+gjMljuLRmvKYYCuHrknzX8VrA== +"@lerna/project@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/project/-/project-5.5.0.tgz#92f1988c70606dbe1aba7f83f265428f7c1601a0" + integrity sha512-TD6/QGv/+Uh7GRXM/9m3EC0QpK2+U1WA+hoE5pSnpU5oDzwwUkynS3RuAcd2ID19e/u/ajfZtV+xcpaM7t+SHw== dependencies: - "@lerna/package" "3.16.0" - "@lerna/validation-error" "3.13.0" - cosmiconfig "^5.1.0" + "@lerna/package" "5.5.0" + "@lerna/validation-error" "5.5.0" + cosmiconfig "^7.0.0" dedent "^0.7.0" - dot-prop "^4.2.0" - glob-parent "^5.0.0" - globby "^9.2.0" - load-json-file "^5.3.0" - npmlog "^4.1.2" - p-map "^2.1.0" - resolve-from "^4.0.0" - write-json-file "^3.2.0" + dot-prop "^6.0.1" + glob-parent "^5.1.1" + globby "^11.0.2" + js-yaml "^4.1.0" + load-json-file "^6.2.0" + npmlog "^6.0.2" + p-map "^4.0.0" + resolve-from "^5.0.0" + write-json-file "^4.3.0" -"@lerna/prompt@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.13.0.tgz#53571462bb3f5399cc1ca6d335a411fe093426a5" - integrity sha512-P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA== - dependencies: - inquirer "^6.2.0" - npmlog "^4.1.2" - -"@lerna/publish@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.16.0.tgz#2679c3cc9f12bc28e35a1e9701217307177d4bc8" - integrity sha512-J5fjCLm0W7MfofNLzHau2j/HIePQtGPTpMUo6gVWLhLkTmb/ZDniSn7wk7y8WASNv5jYk9k22nkXEfSA9rXdfQ== - dependencies: - "@evocateur/libnpmaccess" "^3.1.2" - "@evocateur/npm-registry-fetch" "^4.0.0" - "@evocateur/pacote" "^9.6.3" - "@lerna/check-working-tree" "3.14.2" - "@lerna/child-process" "3.14.2" - "@lerna/collect-updates" "3.16.0" - "@lerna/command" "3.16.0" - "@lerna/describe-ref" "3.14.2" - "@lerna/log-packed" "3.16.0" - "@lerna/npm-conf" "3.16.0" - "@lerna/npm-dist-tag" "3.16.0" - "@lerna/npm-publish" "3.16.0" - "@lerna/otplease" "3.16.0" - "@lerna/output" "3.13.0" - "@lerna/pack-directory" "3.16.0" - "@lerna/prerelease-id-from-version" "3.16.0" - "@lerna/prompt" "3.13.0" - "@lerna/pulse-till-done" "3.13.0" - "@lerna/run-lifecycle" "3.16.0" - "@lerna/run-topologically" "3.16.0" - "@lerna/validation-error" "3.13.0" - "@lerna/version" "3.16.0" - figgy-pudding "^3.5.1" - fs-extra "^8.1.0" - npm-package-arg "^6.1.0" - npmlog "^4.1.2" - p-finally "^1.0.0" - p-map "^2.1.0" - p-pipe "^1.2.0" - semver "^6.2.0" +"@lerna/prompt@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-5.5.0.tgz#5c77de96f09bbcecb45d0db40233f4db7a12a1df" + integrity sha512-B7QEmmyleR+1XAewqEPdgZPecekJgVoAZ8YZgR8l4QlAMvf5BTHI//3AJI/HPN4DYZWGcjDoGFLEkpX906T8Rw== + dependencies: + inquirer "^8.2.4" + npmlog "^6.0.2" + +"@lerna/publish@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-5.5.0.tgz#0ac309bf9fb8a37321534ab83aaf8fa0b6a967e2" + integrity sha512-ZstILgupYxB8TpGkWgPZg1uoFIQUij07kizHau1BZXdV3xwPU6jtYAzGXuztinJDnnxfwjc7SjuinoYZcbmJXg== + dependencies: + "@lerna/check-working-tree" "5.5.0" + "@lerna/child-process" "5.5.0" + "@lerna/collect-updates" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/describe-ref" "5.5.0" + "@lerna/log-packed" "5.5.0" + "@lerna/npm-conf" "5.5.0" + "@lerna/npm-dist-tag" "5.5.0" + "@lerna/npm-publish" "5.5.0" + "@lerna/otplease" "5.5.0" + "@lerna/output" "5.5.0" + "@lerna/pack-directory" "5.5.0" + "@lerna/prerelease-id-from-version" "5.5.0" + "@lerna/prompt" "5.5.0" + "@lerna/pulse-till-done" "5.5.0" + "@lerna/run-lifecycle" "5.5.0" + "@lerna/run-topologically" "5.5.0" + "@lerna/validation-error" "5.5.0" + "@lerna/version" "5.5.0" + fs-extra "^9.1.0" + libnpmaccess "^6.0.3" + npm-package-arg "8.1.1" + npm-registry-fetch "^13.3.0" + npmlog "^6.0.2" + p-map "^4.0.0" + p-pipe "^3.1.0" + pacote "^13.6.1" + semver "^7.3.4" -"@lerna/pulse-till-done@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz#c8e9ce5bafaf10d930a67d7ed0ccb5d958fe0110" - integrity sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA== +"@lerna/pulse-till-done@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-5.5.0.tgz#fc5fbba9494f1e6c2aa2dd2b366b0cb59b5a11f0" + integrity sha512-PcPSCWGzLp00UGJ5VHDpdqpBQ9C9Cs7E5FImEITGHE9UwcAC23LwSp7tOzdXWPyj3u8PLYLn+ebt9ml1jWSKgA== dependencies: - npmlog "^4.1.2" + npmlog "^6.0.2" -"@lerna/query-graph@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-3.16.0.tgz#e6a46ebcd9d5b03f018a06eca2b471735353953c" - integrity sha512-p0RO+xmHDO95ChJdWkcy9TNLysLkoDARXeRHzY5U54VCwl3Ot/2q8fMCVlA5UeGXDutEyyByl3URqEpcQCWI7Q== +"@lerna/query-graph@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-5.5.0.tgz#8e3baee06bb5a5272f947c40451d5a0b3be20b29" + integrity sha512-mqCzZRF+IDPSj2zYJ1eO3PQsZshiKf54BXAe7HnYYJNbs1i8JMRpdaLr3TEyKDpVTcVzbEmFKwGi7KMhJG6rBQ== dependencies: - "@lerna/package-graph" "3.16.0" - figgy-pudding "^3.5.1" + "@lerna/package-graph" "5.5.0" -"@lerna/resolve-symlink@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz#37fc7095fabdbcf317c26eb74e0d0bde8efd2386" - integrity sha512-Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ== +"@lerna/resolve-symlink@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-5.5.0.tgz#3a90a7c6be3d7622c4698636736a88af299b02d9" + integrity sha512-J44Kc6OWa1uNZh+YSWuIBorTpTuXhuuJ7DtX4vwfF3AAp2frW6pBrmFZMibOcyOQ6QCp+PeiHQCXCF42uSq8pA== dependencies: - fs-extra "^8.1.0" - npmlog "^4.1.2" - read-cmd-shim "^1.0.1" + fs-extra "^9.1.0" + npmlog "^6.0.2" + read-cmd-shim "^3.0.0" -"@lerna/rimraf-dir@3.14.2": - version "3.14.2" - resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.14.2.tgz#103a49882abd85d42285d05cc76869b89f21ffd2" - integrity sha512-eFNkZsy44Bu9v1Hrj5Zk6omzg8O9h/7W6QYK1TTUHeyrjTEwytaNQlqF0lrTLmEvq55sviV42NC/8P3M2cvq8Q== +"@lerna/rimraf-dir@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-5.5.0.tgz#fe22c154f2ebd678f27f5258cb655f7b3c948bb4" + integrity sha512-dwWN5SGXQ39FocRAZ3uL7tYUuK98r/VHQZRcJjJ8hxpuxti+EPzGegtA05NsvvmW2PpFsBzYKITFQHX3GX4LWA== dependencies: - "@lerna/child-process" "3.14.2" - npmlog "^4.1.2" - path-exists "^3.0.0" - rimraf "^2.6.2" + "@lerna/child-process" "5.5.0" + npmlog "^6.0.2" + path-exists "^4.0.0" + rimraf "^3.0.2" -"@lerna/run-lifecycle@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.16.0.tgz#5e3cd42c59628fdf7a4e563fcca0c077f13b50a2" - integrity sha512-MxDVlJ6TTerCFnBh7suwxhS6IJOqBHUTstpo8S0IbOCHzZNdUqyyw6I9WL4sGQ8Go00bb2EK5JGuWfTOjVPx8A== +"@lerna/run-lifecycle@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-5.5.0.tgz#50a434b9fd55134bb285c7c7a24532996a6c0d8d" + integrity sha512-BtnEO3IlZ7znUmQtSxd7oSSmgzJbSH+v58foTpbuvMtOBFJxV4LNyv2uyto2t4bYdCWEnw4ybd8j32aEEG9UNQ== dependencies: - "@lerna/npm-conf" "3.16.0" - figgy-pudding "^3.5.1" - npm-lifecycle "^3.1.0" - npmlog "^4.1.2" + "@lerna/npm-conf" "5.5.0" + "@npmcli/run-script" "^4.1.7" + npmlog "^6.0.2" + p-queue "^6.6.2" -"@lerna/run-parallel-batches@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.16.0.tgz#5ace7911a2dd31dfd1e53c61356034e27df0e1fb" - integrity sha512-2J/Nyv+MvogmQEfC7VcS21ifk7w0HVvzo2yOZRPvkCzGRu/rducxtB4RTcr58XCZ8h/Bt1aqQYKExu3c/3GXwg== +"@lerna/run-topologically@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-5.5.0.tgz#39d94868ab39e4f3951bd5322603695a1ebba2e0" + integrity sha512-zl4I/SNg/yiLja1aF0B4X22CRzpRdvLB47KGjAgiGydcHwx2TUmI3MPoQVjvUbaOuctF/wSMS2tI6Hgdo60I0Q== dependencies: - p-map "^2.1.0" - p-map-series "^1.0.0" + "@lerna/query-graph" "5.5.0" + p-queue "^6.6.2" -"@lerna/run-topologically@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-3.16.0.tgz#39e29cfc628bbc8e736d8e0d0e984997ac01bbf5" - integrity sha512-4Hlpv4zDtKWa5Z0tPkeu0sK+bxZEKgkNESMGmWrUCNfj7xwvAJurcraK8+a2Y0TFYwf0qjSLY/MzX+ZbJA3Cgw== +"@lerna/run@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/run/-/run-5.5.0.tgz#294a1b374567255e70e545ae2567ec5c2565dcf6" + integrity sha512-yYR65A/GcDgEMmk2lMSBHGAbdgLMi6wICugLzVXfXISuTbEMzN1dCwSeGBOxzK2cvKV2Bpn4WeEYs64FNmNJbQ== + dependencies: + "@lerna/command" "5.5.0" + "@lerna/filter-options" "5.5.0" + "@lerna/npm-run-script" "5.5.0" + "@lerna/output" "5.5.0" + "@lerna/profiler" "5.5.0" + "@lerna/run-topologically" "5.5.0" + "@lerna/timer" "5.5.0" + "@lerna/validation-error" "5.5.0" + p-map "^4.0.0" + +"@lerna/symlink-binary@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-5.5.0.tgz#1af7df1905dc01b5312af35f1f2f77269ebb9a65" + integrity sha512-vpVzEWgVfKGzMheb9XizF8hF/Ypfov0iMPBSAzVNxu5eNQVUz3KFrIZNgiBsFdIVN4W/y4jLwOSgXXKwvIodkA== dependencies: - "@lerna/query-graph" "3.16.0" - figgy-pudding "^3.5.1" - p-queue "^4.0.0" - -"@lerna/run@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.16.0.tgz#1ea568c6f303e47fa00b3403a457836d40738fd2" - integrity sha512-woTeLlB1OAAz4zzjdI6RyIxSGuxiUPHJZm89E1pDEPoWwtQV6HMdMgrsQd9ATsJ5Ez280HH4bF/LStAlqW8Ufg== - dependencies: - "@lerna/command" "3.16.0" - "@lerna/filter-options" "3.16.0" - "@lerna/npm-run-script" "3.14.2" - "@lerna/output" "3.13.0" - "@lerna/run-topologically" "3.16.0" - "@lerna/timer" "3.13.0" - "@lerna/validation-error" "3.13.0" - p-map "^2.1.0" - -"@lerna/symlink-binary@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.16.0.tgz#b8c79800545c6c5721358513d519906c97ba378d" - integrity sha512-7sgLWKP7RVxKPmnJZnq3ynqOsO6FDNFtJ/eQA46aV8ivKYoJY3+083FFErvka460V2MTBCEZsKXfX8Nezly/fg== - dependencies: - "@lerna/create-symlink" "3.16.0" - "@lerna/package" "3.16.0" - fs-extra "^8.1.0" - p-map "^2.1.0" + "@lerna/create-symlink" "5.5.0" + "@lerna/package" "5.5.0" + fs-extra "^9.1.0" + p-map "^4.0.0" -"@lerna/symlink-dependencies@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.16.0.tgz#ef3a94e207de13f10222feae43b2f121e75e68b6" - integrity sha512-Pi3knz/+es8WltHBTG6UzYA3jFulv8kDGUVw225Bhv3YNcotX8ijXhm6oBO5zvFuW24b4fojZQxznM/EqJdaIw== +"@lerna/symlink-dependencies@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-5.5.0.tgz#7b94c8385397bea1c1be4b280c335155f2e431cf" + integrity sha512-gqFZ4AeVr+nqyfg8c2xNizGzBemfgtCpGv4NnjA/66HJWCE+/fT7NTIi8Qk2glbYf37ojRcjUfc0RvW7NGv5qA== dependencies: - "@lerna/create-symlink" "3.16.0" - "@lerna/resolve-symlink" "3.16.0" - "@lerna/symlink-binary" "3.16.0" - fs-extra "^8.1.0" - p-finally "^1.0.0" - p-map "^2.1.0" - p-map-series "^1.0.0" - -"@lerna/timer@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.13.0.tgz#bcd0904551db16e08364d6c18e5e2160fc870781" - integrity sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw== - -"@lerna/validation-error@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.13.0.tgz#c86b8f07c5ab9539f775bd8a54976e926f3759c3" - integrity sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA== - dependencies: - npmlog "^4.1.2" - -"@lerna/version@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.16.0.tgz#eed87d9f725df1ec0c8784c3cd4a04beed68979c" - integrity sha512-Ui8ZqrUByydFX3HlfrJ5iecnDbk3T5EvcEqwPRqaNF4asTruv88rqlOu+taCwC7YHjzPz2Wc70vEN69WJOejTA== - dependencies: - "@lerna/check-working-tree" "3.14.2" - "@lerna/child-process" "3.14.2" - "@lerna/collect-updates" "3.16.0" - "@lerna/command" "3.16.0" - "@lerna/conventional-commits" "3.16.0" - "@lerna/github-client" "3.16.0" - "@lerna/gitlab-client" "3.15.0" - "@lerna/output" "3.13.0" - "@lerna/prerelease-id-from-version" "3.16.0" - "@lerna/prompt" "3.13.0" - "@lerna/run-lifecycle" "3.16.0" - "@lerna/run-topologically" "3.16.0" - "@lerna/validation-error" "3.13.0" - chalk "^2.3.1" + "@lerna/create-symlink" "5.5.0" + "@lerna/resolve-symlink" "5.5.0" + "@lerna/symlink-binary" "5.5.0" + fs-extra "^9.1.0" + p-map "^4.0.0" + p-map-series "^2.1.0" + +"@lerna/temp-write@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/temp-write/-/temp-write-5.5.0.tgz#82eb605edaba76ea2d43b95f7585dc92d7cadffe" + integrity sha512-7MmqTfyWcjGkgPkWHaldmCmDBSLka50z0+lsmZuGLwIvQl72ZfC+ZJF/6107m+hgtUJBpJQ3UYEhrrdfR4L46Q== + dependencies: + graceful-fs "^4.1.15" + is-stream "^2.0.0" + make-dir "^3.0.0" + temp-dir "^1.0.0" + uuid "^8.3.2" + +"@lerna/timer@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-5.5.0.tgz#c70ecc74a02757d76f9dd4b6013a2bacdb1bb6ae" + integrity sha512-jgCL2ZmZNn7sWL+M/TuGJukTkUs/il6EwBYcgd10h0JazQ4fAiBhFq36ZzTvYkz6ujKvKOcqyWrMdmi8Q339qA== + +"@lerna/validation-error@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-5.5.0.tgz#aad031859878516707c83b9e4d1ea9aeb0180005" + integrity sha512-o/8sEaZKdZdE4/t+E/cFpnYIiDzt7uMHVpWmpCG0l6nZSDzB8+5ehAAudy2qJOwxEAKJ6QGvi7jWLjc2NWa4HQ== + dependencies: + npmlog "^6.0.2" + +"@lerna/version@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/version/-/version-5.5.0.tgz#a40dfd48b3d751d5007e48bcc9828fc69ee812ab" + integrity sha512-E6ZrzTrYwof5cSvyTpztZKOiJKAK+aXi/gfsGbLdbYGMArY4B/pYOMOcRMXHBh7BuLicMih/mRUb4M7uCnuE0A== + dependencies: + "@lerna/check-working-tree" "5.5.0" + "@lerna/child-process" "5.5.0" + "@lerna/collect-updates" "5.5.0" + "@lerna/command" "5.5.0" + "@lerna/conventional-commits" "5.5.0" + "@lerna/github-client" "5.5.0" + "@lerna/gitlab-client" "5.5.0" + "@lerna/output" "5.5.0" + "@lerna/prerelease-id-from-version" "5.5.0" + "@lerna/prompt" "5.5.0" + "@lerna/run-lifecycle" "5.5.0" + "@lerna/run-topologically" "5.5.0" + "@lerna/temp-write" "5.5.0" + "@lerna/validation-error" "5.5.0" + chalk "^4.1.0" dedent "^0.7.0" + load-json-file "^6.2.0" minimatch "^3.0.4" - npmlog "^4.1.2" - p-map "^2.1.0" - p-pipe "^1.2.0" - p-reduce "^1.0.0" - p-waterfall "^1.0.0" - semver "^6.2.0" - slash "^2.0.0" - temp-write "^3.4.0" + npmlog "^6.0.2" + p-map "^4.0.0" + p-pipe "^3.1.0" + p-reduce "^2.1.0" + p-waterfall "^2.1.1" + semver "^7.3.4" + slash "^3.0.0" + write-json-file "^4.3.0" + +"@lerna/write-log-file@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-5.5.0.tgz#6f3d7945ee6dda220f9188d3160eda775bd8941e" + integrity sha512-XPnp5B+bcmwpXJpJn45V8e2SU6Z1oTwW0vW9uW3l0nmbOvpT9PbPkf9hC80cZOWovXSBefUDwEGqA5fQdhvqGg== + dependencies: + npmlog "^6.0.2" + write-file-atomic "^4.0.1" -"@lerna/write-log-file@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.13.0.tgz#b78d9e4cfc1349a8be64d91324c4c8199e822a26" - integrity sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A== +"@mapbox/node-pre-gyp@^1.0.4": + version "1.0.10" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c" + integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA== dependencies: - npmlog "^4.1.2" - write-file-atomic "^2.3.0" + detect-libc "^2.0.0" + https-proxy-agent "^5.0.0" + make-dir "^3.1.0" + node-fetch "^2.6.7" + nopt "^5.0.0" + npmlog "^5.0.1" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.11" + +"@metamask/safe-event-emitter@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c" + integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q== "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -3651,18 +4065,28 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@nodelib/fs.scandir@2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" - integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== +"@noble/hashes@1.1.2", "@noble/hashes@~1.1.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183" + integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA== + +"@noble/secp256k1@1.6.3", "@noble/secp256k1@~1.6.0": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.6.3.tgz#7eed12d9f4404b416999d0c87686836c4c5c9b94" + integrity sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: - "@nodelib/fs.stat" "2.0.3" + "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" - integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.stat@^1.1.2": version "1.1.3" @@ -3670,14 +4094,162 @@ integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== "@nodelib/fs.walk@^1.2.3": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" - integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: - "@nodelib/fs.scandir" "2.1.3" + "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oclif/color@^0.x": +"@npmcli/arborist@5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.3.0.tgz#321d9424677bfc08569e98a5ac445ee781f32053" + integrity sha512-+rZ9zgL1lnbl8Xbb1NQdMjveOMwj4lIYfcDtyJHHi5x4X8jtR6m8SXooJMZy5vmFVZ8w7A2Bnd/oX9eTuU8w5A== + dependencies: + "@isaacs/string-locale-compare" "^1.1.0" + "@npmcli/installed-package-contents" "^1.0.7" + "@npmcli/map-workspaces" "^2.0.3" + "@npmcli/metavuln-calculator" "^3.0.1" + "@npmcli/move-file" "^2.0.0" + "@npmcli/name-from-folder" "^1.0.1" + "@npmcli/node-gyp" "^2.0.0" + "@npmcli/package-json" "^2.0.0" + "@npmcli/run-script" "^4.1.3" + bin-links "^3.0.0" + cacache "^16.0.6" + common-ancestor-path "^1.0.1" + json-parse-even-better-errors "^2.3.1" + json-stringify-nice "^1.1.4" + mkdirp "^1.0.4" + mkdirp-infer-owner "^2.0.0" + nopt "^5.0.0" + npm-install-checks "^5.0.0" + npm-package-arg "^9.0.0" + npm-pick-manifest "^7.0.0" + npm-registry-fetch "^13.0.0" + npmlog "^6.0.2" + pacote "^13.6.1" + parse-conflict-json "^2.0.1" + proc-log "^2.0.0" + promise-all-reject-late "^1.0.0" + promise-call-limit "^1.0.1" + read-package-json-fast "^2.0.2" + readdir-scoped-modules "^1.1.0" + rimraf "^3.0.2" + semver "^7.3.7" + ssri "^9.0.0" + treeverse "^2.0.0" + walk-up-path "^1.0.0" + +"@npmcli/fs@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" + integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== + dependencies: + "@gar/promisify" "^1.1.3" + semver "^7.3.5" + +"@npmcli/git@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931" + integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w== + dependencies: + "@npmcli/promise-spawn" "^3.0.0" + lru-cache "^7.4.4" + mkdirp "^1.0.4" + npm-pick-manifest "^7.0.0" + proc-log "^2.0.0" + promise-inflight "^1.0.1" + promise-retry "^2.0.1" + semver "^7.3.5" + which "^2.0.2" + +"@npmcli/installed-package-contents@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa" + integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw== + dependencies: + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + +"@npmcli/map-workspaces@^2.0.3": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc" + integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg== + dependencies: + "@npmcli/name-from-folder" "^1.0.1" + glob "^8.0.1" + minimatch "^5.0.1" + read-package-json-fast "^2.0.3" + +"@npmcli/metavuln-calculator@^3.0.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622" + integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA== + dependencies: + cacache "^16.0.0" + json-parse-even-better-errors "^2.3.1" + pacote "^13.0.3" + semver "^7.3.5" + +"@npmcli/move-file@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" + integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + +"@npmcli/name-from-folder@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a" + integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA== + +"@npmcli/node-gyp@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35" + integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A== + +"@npmcli/package-json@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a" + integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA== + dependencies: + json-parse-even-better-errors "^2.3.1" + +"@npmcli/promise-spawn@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573" + integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g== + dependencies: + infer-owner "^1.0.4" + +"@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.1.7": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946" + integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg== + dependencies: + "@npmcli/node-gyp" "^2.0.0" + "@npmcli/promise-spawn" "^3.0.0" + node-gyp "^9.0.0" + read-package-json-fast "^2.0.3" + which "^2.0.2" + +"@nrwl/cli@14.6.5": + version "14.6.5" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.6.5.tgz#6751d7c48fff78095fb19874bda6a1f786e47ce8" + integrity sha512-sjT4/oMk1F4+dTpCp08IVE8hfqKsokebUECzC1hTu4pCeFo0oviIi7bQTuCIbG9w4iiHLioa6QmLRXBwVJEr9w== + dependencies: + nx "14.6.5" + +"@nrwl/tao@14.6.5": + version "14.6.5" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.6.5.tgz#202d9ed3e13cb873dd7f218c0622ba8972ba8cd6" + integrity sha512-sSbTSN4Bfh4vQR2iCl9arNzEhJztG6paY2j+k/GwQZdN+QssX9xV32jLWYIC3rDmPJWaZ11uD3TgAyr3X7GXhw== + dependencies: + nx "14.6.5" + +"@oclif/color@^0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@oclif/color/-/color-0.1.2.tgz#28b07e2850d9ce814d0b587ce3403b7ad8f7d987" integrity sha512-M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA== @@ -3688,40 +4260,64 @@ supports-color "^5.4.0" tslib "^1" -"@oclif/command@^1.4.29", "@oclif/command@^1.4.31", "@oclif/command@^1.5.10", "@oclif/command@^1.5.12", "@oclif/command@^1.5.20", "@oclif/command@^1.5.4", "@oclif/command@^1.6.0", "@oclif/command@^1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.8.0.tgz#c1a499b10d26e9d1a611190a81005589accbb339" - integrity sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw== +"@oclif/command@1.8.11": + version "1.8.11" + resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.8.11.tgz#926919fe8ddb7ab778fef8a8f2951c975f35e0c2" + integrity sha512-2fGLMvi6J5+oNxTaZfdWPMWY8oW15rYj0V8yLzmZBAEjfzjLqLIzJE9IlNccN1zwRqRHc1bcISSRDdxJ56IS/Q== dependencies: - "@oclif/config" "^1.15.1" - "@oclif/errors" "^1.3.3" - "@oclif/parser" "^3.8.3" - "@oclif/plugin-help" "^3" + "@oclif/config" "^1.18.2" + "@oclif/errors" "^1.3.5" + "@oclif/parser" "^3.8.6" + "@oclif/plugin-help" "3.2.14" debug "^4.1.1" semver "^7.3.2" -"@oclif/config@^1.12.8", "@oclif/config@^1.15.1", "@oclif/config@^1.17.0", "@oclif/config@^1.6.0", "@oclif/config@^1.6.22", "@oclif/config@^1.8.7": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.17.0.tgz#ba8639118633102a7e481760c50054623d09fcab" - integrity sha512-Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA== +"@oclif/command@^1.4.29", "@oclif/command@^1.4.31", "@oclif/command@^1.5.4", "@oclif/command@^1.6.0", "@oclif/command@^1.8.14", "@oclif/command@^1.8.15", "@oclif/command@^1.8.6", "@oclif/command@^1.8.9": + version "1.8.16" + resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.8.16.tgz#bea46f81b2061b47e1cda318a0b923e62ca4cc0c" + integrity sha512-rmVKYEsKzurfRU0xJz+iHelbi1LGlihIWZ7Qvmb/CBz1EkhL7nOkW4SVXmG2dA5Ce0si2gr88i6q4eBOMRNJ1w== + dependencies: + "@oclif/config" "^1.18.2" + "@oclif/errors" "^1.3.5" + "@oclif/help" "^1.0.1" + "@oclif/parser" "^3.8.6" + debug "^4.1.1" + semver "^7.3.2" + +"@oclif/config@1.18.2": + version "1.18.2" + resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.18.2.tgz#5bfe74a9ba6a8ca3dceb314a81bd9ce2e15ebbfe" + integrity sha512-cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA== + dependencies: + "@oclif/errors" "^1.3.3" + "@oclif/parser" "^3.8.0" + debug "^4.1.1" + globby "^11.0.1" + is-wsl "^2.1.1" + tslib "^2.0.0" + +"@oclif/config@^1.17.1", "@oclif/config@^1.18.2", "@oclif/config@^1.6.0", "@oclif/config@^1.6.22", "@oclif/config@^1.8.7": + version "1.18.3" + resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.18.3.tgz#ddfc144fdab66b1658c2f1b3478fa7fbfd317e79" + integrity sha512-sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA== dependencies: - "@oclif/errors" "^1.3.3" + "@oclif/errors" "^1.3.5" "@oclif/parser" "^3.8.0" debug "^4.1.1" globby "^11.0.1" is-wsl "^2.1.1" - tslib "^2.0.0" + tslib "^2.3.1" "@oclif/dev-cli@^1.23.0": - version "1.26.0" - resolved "https://registry.yarnpkg.com/@oclif/dev-cli/-/dev-cli-1.26.0.tgz#e3ec294b362c010ffc8948003d3770955c7951fd" - integrity sha512-272udZP+bG4qahoAcpWcMTJKiA+V42kRMqQM7n4tgW35brYb2UP5kK+p08PpF8sgSfRTV8MoJVJG9ax5kY82PA== - dependencies: - "@oclif/command" "^1.8.0" - "@oclif/config" "^1.17.0" - "@oclif/errors" "^1.3.3" - "@oclif/plugin-help" "^3.2.0" - cli-ux "^5.2.1" + version "1.26.10" + resolved "https://registry.yarnpkg.com/@oclif/dev-cli/-/dev-cli-1.26.10.tgz#d8df3a79009b68552f5e7f249d1d19ca52278382" + integrity sha512-dJ+II9rVXckzFvG+82PbfphMTnoqiHvsuAAbcHrLdZWPBnFAiDKhNYE0iHnA/knAC4VGXhogsrAJ3ERT5d5r2g== + dependencies: + "@oclif/command" "^1.8.15" + "@oclif/config" "^1.18.2" + "@oclif/errors" "^1.3.5" + "@oclif/plugin-help" "3.2.18" + cli-ux "5.6.7" debug "^4.1.1" find-yarn-workspace-root "^2.0.0" fs-extra "^8.1" @@ -3731,30 +4327,46 @@ qqjs "^0.3.10" tslib "^2.0.3" -"@oclif/errors@^1.2.1", "@oclif/errors@^1.2.2", "@oclif/errors@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@oclif/errors/-/errors-1.3.3.tgz#fb597dfbc58c6b8609dc0b2fdf91a2d487818a82" - integrity sha512-EJR6AIOEkt/NnARNIVAskPDVtdhtO5TTNXmhDrGqMoWVsr0R6DkkLrMyq95BmHvlVWM1nduoq4fQPuCyuF2jaA== +"@oclif/errors@1.3.5", "@oclif/errors@^1.2.2", "@oclif/errors@^1.3.3", "@oclif/errors@^1.3.5": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@oclif/errors/-/errors-1.3.5.tgz#a1e9694dbeccab10fe2fe15acb7113991bed636c" + integrity sha512-OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ== dependencies: clean-stack "^3.0.0" - fs-extra "^9.0.1" + fs-extra "^8.1" indent-string "^4.0.0" strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +"@oclif/help@^1.0.0", "@oclif/help@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@oclif/help/-/help-1.0.1.tgz#fd96a3dd9fb2314479e6c8584c91b63754a7dff5" + integrity sha512-8rsl4RHL5+vBUAKBL6PFI3mj58hjPCp2VYyXD4TAa7IMStikFfOH2gtWmqLzIlxAED2EpD0dfYwo9JJxYsH7Aw== + dependencies: + "@oclif/config" "1.18.2" + "@oclif/errors" "1.3.5" + chalk "^4.1.2" + indent-string "^4.0.0" + lodash "^4.17.21" + string-width "^4.2.0" + strip-ansi "^6.0.0" + widest-line "^3.1.0" + wrap-ansi "^6.2.0" + "@oclif/linewrap@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91" integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw== -"@oclif/parser@^3.8.0", "@oclif/parser@^3.8.3": - version "3.8.4" - resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.8.4.tgz#1a90fc770a42792e574fb896325618aebbe8c9e4" - integrity sha512-cyP1at3l42kQHZtqDS3KfTeyMvxITGwXwH1qk9ktBYvqgMp5h4vHT+cOD74ld3RqJUOZY/+Zi9lb4Tbza3BtuA== +"@oclif/parser@^3.8.0", "@oclif/parser@^3.8.6": + version "3.8.7" + resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.8.7.tgz#236d48db05d0b00157d3b42d31f9dac7550d2a7c" + integrity sha512-b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q== dependencies: + "@oclif/errors" "^1.3.5" "@oclif/linewrap" "^1.0.0" - chalk "^2.4.2" - tslib "^1.9.3" + chalk "^4.1.0" + tslib "^2.3.1" "@oclif/plugin-autocomplete@^0.1.5": version "0.1.5" @@ -3779,6 +4391,39 @@ cli-ux "^5.4.5" lodash "^4.17.11" +"@oclif/plugin-help@3.2.14": + version "3.2.14" + resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-3.2.14.tgz#7149eb322d36abc6cbf09f205bad128141e7eba4" + integrity sha512-NP5qmE2YfcW3MmXjcrxiqKe9Hf3G0uK/qNc0zAMYKU4crFyIsWj7dBfQVFZSb28YXGioOOpjMzG1I7VMxKF38Q== + dependencies: + "@oclif/command" "^1.8.9" + "@oclif/config" "^1.18.2" + "@oclif/errors" "^1.3.5" + chalk "^4.1.2" + indent-string "^4.0.0" + lodash "^4.17.21" + string-width "^4.2.0" + strip-ansi "^6.0.0" + widest-line "^3.1.0" + wrap-ansi "^6.2.0" + +"@oclif/plugin-help@3.2.18": + version "3.2.18" + resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-3.2.18.tgz#f2bf6ba86719c174fc0e4c2149f73b46006bfdbd" + integrity sha512-5n5Pkz4L0duknIvFwx2Ko9Xda3miT6RZP8bgaaK3Q/9fzVBrhi4bOM0u05/OThI6V+3NsSdxYS2o1NLcXToWDg== + dependencies: + "@oclif/command" "^1.8.14" + "@oclif/config" "1.18.2" + "@oclif/errors" "1.3.5" + "@oclif/help" "^1.0.0" + chalk "^4.1.2" + indent-string "^4.0.0" + lodash "^4.17.21" + string-width "^4.2.0" + strip-ansi "^6.0.0" + widest-line "^3.1.0" + wrap-ansi "^6.2.0" + "@oclif/plugin-help@^1.2.4": version "1.2.11" resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-1.2.11.tgz#e6413a6009519230bc4c7e7fe45d8e139939e657" @@ -3792,256 +4437,284 @@ widest-line "^2.0.0" wrap-ansi "^3.0.1" -"@oclif/plugin-help@^3", "@oclif/plugin-help@^3.2.0": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-3.2.1.tgz#0265ef2a7a8a37b0ed64957fb4f1ddac4b457d61" - integrity sha512-vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ== - dependencies: - "@oclif/command" "^1.5.20" - "@oclif/config" "^1.15.1" - "@oclif/errors" "^1.2.2" - chalk "^2.4.1" - indent-string "^4.0.0" - lodash.template "^4.4.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" - widest-line "^3.1.0" - wrap-ansi "^4.0.0" - "@oclif/plugin-not-found@^1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-1.2.4.tgz#160108c82f0aa10f4fb52cee4e0135af34b7220b" - integrity sha512-G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg== + version "1.2.6" + resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-1.2.6.tgz#7e354f7de6866477fe415c8fde357765876fe8ec" + integrity sha512-cfkDub79I9EpselfU/W8FTXhslrkOgfqjaa25tyGo99dAX5UVr6BWL2wbUobsU+rUcm4HN3byzdHDcqfu6hoAw== dependencies: - "@oclif/color" "^0.x" - "@oclif/command" "^1.6.0" - cli-ux "^4.9.0" - fast-levenshtein "^2.0.6" - lodash "^4.17.13" + "@oclif/color" "^0.1.2" + "@oclif/command" "1.8.11" + cli-ux "5.6.6" + fast-levenshtein "^3.0.0" + lodash "^4.17.21" "@oclif/plugin-plugins@^1.9.4": - version "1.9.5" - resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-1.9.5.tgz#b66176e4e8eda731913df6b8f310293a19b95138" - integrity sha512-8U1MKPTaitCBj4HPZpwFo7F5Krw9zEaNqKiX+QkvPz2wfftLqnSqariYvP38S/uo8CDwiR3zHPEYFSxu9CDQQA== - dependencies: - "@oclif/color" "^0.x" - "@oclif/command" "^1.5.12" - "@oclif/errors" "^1.2.2" - chalk "^4.1.0" - cli-ux "^5.2.1" - debug "^4.1.0" + version "1.10.11" + resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-1.10.11.tgz#f2d11dc164a3dd96392298670b4aafc04e89a44a" + integrity sha512-C9eHF10UkxwoAqRYrPW51YDuDOpDXASX4BEA++kTVcqhMQTKBQalmEJKw+gVnLl1YNmapse1ZSAcU1TrXjqykg== + dependencies: + "@oclif/color" "^0.1.2" + "@oclif/command" "^1.8.15" + "@oclif/errors" "^1.3.5" + chalk "^4.1.2" + cli-ux "^5.6.7" + debug "^4.3.3" fs-extra "^9.0" - http-call "^5.2.2" - load-json-file "^5.2.0" + http-call "^5.3.0" + load-json-file "^5.3.0" npm-run-path "^4.0.1" semver "^7.3.2" tslib "^2.0.0" yarn "^1.21.1" "@oclif/plugin-warn-if-update-available@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-1.7.0.tgz#5a72abe39ce0b831eb4ae81cb64eb4b9f3ea424a" - integrity sha512-Nwyz3BJ8RhsfQ+OmFSsJSPIfn5YJqMrCzPh72Zgo2jqIjKIBWD8N9vTTe4kZlpeUUn77SyXFfwlBQbNCL5OEuQ== + version "1.7.3" + resolved "https://registry.yarnpkg.com/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-1.7.3.tgz#efe6676655fabbed2e90cc9e646e9da4c99bc8ae" + integrity sha512-q8q0NIneVCwIAJzglUMsl3EbXR/H5aPDk6g+qs7uF0tToxe07SWSONoNaKPzViwRWvYChMPjL77/rXyW1HVn4A== dependencies: - "@oclif/command" "^1.5.10" - "@oclif/config" "^1.12.8" - "@oclif/errors" "^1.2.2" - chalk "^2.4.1" + "@oclif/command" "^1.8.6" + "@oclif/config" "^1.17.1" + "@oclif/errors" "^1.3.5" + chalk "^4.1.0" debug "^4.1.0" - fs-extra "^7.0.0" + fs-extra "^9.0.1" http-call "^5.2.2" - lodash.template "^4.4.0" - semver "^5.6.0" + lodash "^4.17.21" + semver "^7.3.2" -"@oclif/screen@^1.0.3": +"@oclif/screen@^1.0.3", "@oclif/screen@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-1.0.4.tgz#b740f68609dfae8aa71c3a6cab15d816407ba493" integrity sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw== "@octokit/app@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@octokit/app/-/app-4.2.0.tgz#7e84e81d82a5983119379da2286585617d2eb735" - integrity sha512-gPoVRQFhx/b5n2vc6p+FHOknXo3g2w38k3MxBfxxrULAN/XtIUllVe7h8f2J0Z4bMu0BGGcyWKyGd4T7w108mg== + version "4.3.0" + resolved "https://registry.yarnpkg.com/@octokit/app/-/app-4.3.0.tgz#67a5380344adeae8b1256b0b29918462b8c55f13" + integrity sha512-TAi6Ju1u1rf7+V1vd2pg70SFwmHmwt5WAaAJ8BPaIHALxKbLpyyKUaVP1DBBmNmgF+fw0dwBR/edrClDMpdDfQ== dependencies: "@octokit/request" "^5.0.0" jsonwebtoken "^8.3.0" - lru-cache "^5.1.1" + lru-cache "^6.0.0" -"@octokit/auth-token@^2.4.0": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.2.tgz#10d0ae979b100fa6b72fa0e8e63e27e6d0dbff8a" - integrity sha512-jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ== +"@octokit/auth-token@^2.4.4": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36" + integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g== dependencies: - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.3" -"@octokit/core@^3.0.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.1.0.tgz#9c3c9b23f7504668cfa057f143ccbf0c645a0ac9" - integrity sha512-yPyQSmxIXLieEIRikk2w8AEtWkFdfG/LXcw1KvEtK3iP0ENZLW/WYQmdzOKqfSaLhooz4CJ9D+WY79C8ZliACw== +"@octokit/auth-token@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.1.tgz#88bc2baf5d706cb258474e722a720a8365dff2ec" + integrity sha512-/USkK4cioY209wXRpund6HZzHo9GmjakpV9ycOkpMcMxMk7QVcVFVyCMtzvXYiHsB2crgDgrtNYSELYFBXhhaA== + dependencies: + "@octokit/types" "^7.0.0" + +"@octokit/core@^3.5.1": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085" + integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q== + dependencies: + "@octokit/auth-token" "^2.4.4" + "@octokit/graphql" "^4.5.8" + "@octokit/request" "^5.6.3" + "@octokit/request-error" "^2.0.5" + "@octokit/types" "^6.0.3" + before-after-hook "^2.2.0" + universal-user-agent "^6.0.0" + +"@octokit/core@^4.0.0": + version "4.0.5" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.0.5.tgz#589e68c0a35d2afdcd41dafceab072c2fbc6ab5f" + integrity sha512-4R3HeHTYVHCfzSAi0C6pbGXV8UDI5Rk+k3G7kLVNckswN9mvpOzW9oENfjfH3nEmzg8y3AmKmzs8Sg6pLCeOCA== dependencies: - "@octokit/auth-token" "^2.4.0" - "@octokit/graphql" "^4.3.1" - "@octokit/request" "^5.4.0" - "@octokit/types" "^5.0.0" - before-after-hook "^2.1.0" - universal-user-agent "^5.0.0" + "@octokit/auth-token" "^3.0.0" + "@octokit/graphql" "^5.0.0" + "@octokit/request" "^6.0.0" + "@octokit/request-error" "^3.0.0" + "@octokit/types" "^7.0.0" + before-after-hook "^2.2.0" + universal-user-agent "^6.0.0" "@octokit/endpoint@^6.0.1": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.3.tgz#dd09b599662d7e1b66374a177ab620d8cdf73487" - integrity sha512-Y900+r0gIz+cWp6ytnkibbD95ucEzDSKzlEnaWS52hbCDNcCJYO5mRmWW7HRAnDc7am+N/5Lnd8MppSaTYx1Yg== + version "6.0.12" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658" + integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA== dependencies: - "@octokit/types" "^5.0.0" - is-plain-object "^3.0.0" - universal-user-agent "^5.0.0" + "@octokit/types" "^6.0.3" + is-plain-object "^5.0.0" + universal-user-agent "^6.0.0" -"@octokit/graphql@^4.3.1": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.1.tgz#162aed1490320b88ce34775b3f6b8de945529fa9" - integrity sha512-qgMsROG9K2KxDs12CO3bySJaYoUu2aic90qpFrv7A8sEBzZ7UFGvdgPKiLw5gOPYEYbS0Xf8Tvf84tJutHPulQ== +"@octokit/endpoint@^7.0.0": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.2.tgz#11ee868406ba7bb1642e61bbe676d641f79f02be" + integrity sha512-8/AUACfE9vpRpehE6ZLfEtzkibe5nfsSwFZVMsG8qabqRt1M81qZYUFRZa1B8w8lP6cdfDJfRq9HWS+MbmR7tw== dependencies: - "@octokit/request" "^5.3.0" - "@octokit/types" "^5.0.0" - universal-user-agent "^5.0.0" + "@octokit/types" "^7.0.0" + is-plain-object "^5.0.0" + universal-user-agent "^6.0.0" -"@octokit/plugin-enterprise-rest@^3.6.1": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz#74de25bef21e0182b4fa03a8678cd00a4e67e561" - integrity sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA== +"@octokit/graphql@^4.5.8": + version "4.8.0" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3" + integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg== + dependencies: + "@octokit/request" "^5.6.0" + "@octokit/types" "^6.0.3" + universal-user-agent "^6.0.0" -"@octokit/plugin-paginate-rest@^2.2.0": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.3.tgz#a6ad4377e7e7832fb4bdd9d421e600cb7640ac27" - integrity sha512-eKTs91wXnJH8Yicwa30jz6DF50kAh7vkcqCQ9D7/tvBAP5KKkg6I2nNof8Mp/65G0Arjsb4QcOJcIEQY+rK1Rg== +"@octokit/graphql@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.1.tgz#a06982514ad131fb6fbb9da968653b2233fade9b" + integrity sha512-sxmnewSwAixkP1TrLdE6yRG53eEhHhDTYUykUwdV9x8f91WcbhunIHk9x1PZLALdBZKRPUO2HRcm4kezZ79HoA== dependencies: - "@octokit/types" "^5.0.0" + "@octokit/request" "^6.0.0" + "@octokit/types" "^7.0.0" + universal-user-agent "^6.0.0" -"@octokit/plugin-request-log@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e" - integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw== +"@octokit/openapi-types@^12.11.0": + version "12.11.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0" + integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ== -"@octokit/plugin-rest-endpoint-methods@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.0.0.tgz#b02a2006dda8e908c3f8ab381dd5475ef5a810a8" - integrity sha512-emS6gysz4E9BNi9IrCl7Pm4kR+Az3MmVB0/DoDCmF4U48NbYG3weKyDlgkrz6Jbl4Mu4nDx8YWZwC4HjoTdcCA== +"@octokit/openapi-types@^13.9.0": + version "13.9.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-13.9.0.tgz#847a31b174b44f33a09615a83bc20eeaa59e9ce0" + integrity sha512-MOYjRyLIM0zzNb9RfEwVK6HLIc2nIF2OMVtMqiNOGbX0SHrQvQbI6X1K16ktmaHr8WUBv+eeul8cD9mz4rNiWQ== + +"@octokit/plugin-enterprise-rest@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437" + integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw== + +"@octokit/plugin-paginate-rest@^2.16.8": + version "2.21.3" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz#7f12532797775640dbb8224da577da7dc210c87e" + integrity sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw== + dependencies: + "@octokit/types" "^6.40.0" + +"@octokit/plugin-paginate-rest@^4.0.0": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-4.2.2.tgz#3923b03c0ecf45ff7b3686eba86d2cb2558b30f0" + integrity sha512-oslJFmdcWeB3Q8dzn2WNFBzEAvqCH+cvrjBUhS7uwQxAt5yH91w1eo2flWiR0Rqxh+EijQS5ImoB0iQ3hz7P2Q== + dependencies: + "@octokit/types" "^7.3.0" + +"@octokit/plugin-request-log@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85" + integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== + +"@octokit/plugin-rest-endpoint-methods@^5.12.0": + version "5.16.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz#7ee8bf586df97dd6868cf68f641354e908c25342" + integrity sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw== + dependencies: + "@octokit/types" "^6.39.0" + deprecation "^2.3.1" + +"@octokit/plugin-rest-endpoint-methods@^6.0.0": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.5.0.tgz#c793231ddb8926dffeda170f80aeb276fd9f0108" + integrity sha512-+r/tWwc7hI3vYDb+d0hAqbr04Kle6pL+MmGxMDTUn7wIwry5qFXnUA8RCa5CO8EcuHbZLywnqIVRLdM08qV8Ew== dependencies: - "@octokit/types" "^5.0.0" + "@octokit/types" "^7.3.0" deprecation "^2.3.1" "@octokit/plugin-retry@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@octokit/plugin-retry/-/plugin-retry-3.0.3.tgz#9d7983ab15ae48da43e2584ea90932602c1cd37c" - integrity sha512-RFvcBg4JGyfWTWE35EIF7jf/eglIk5MuvfygzdIMLIVK3/4Ywz3X1x9Ri75nlyAmk53EpVWB4DwM/xEB1NXxXA== + version "3.0.9" + resolved "https://registry.yarnpkg.com/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz#ae625cca1e42b0253049102acd71c1d5134788fe" + integrity sha512-r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ== dependencies: - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.3" bottleneck "^2.15.3" -"@octokit/request-error@^1.0.2": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.0.4.tgz#15e1dc22123ba4a9a4391914d80ec1e5303a23be" - integrity sha512-L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig== +"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677" + integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg== dependencies: + "@octokit/types" "^6.0.3" deprecation "^2.0.0" once "^1.4.0" -"@octokit/request-error@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.2.tgz#0e76b83f5d8fdda1db99027ea5f617c2e6ba9ed0" - integrity sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw== +"@octokit/request-error@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.1.tgz#3fd747913c06ab2195e52004a521889dadb4b295" + integrity sha512-ym4Bp0HTP7F3VFssV88WD1ZyCIRoE8H35pXSKwLeMizcdZAYc/t6N9X9Yr9n6t3aG9IH75XDnZ6UeZph0vHMWQ== dependencies: - "@octokit/types" "^5.0.1" + "@octokit/types" "^7.0.0" deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@^5.0.0", "@octokit/request@^5.3.0", "@octokit/request@^5.4.0": - version "5.4.5" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.5.tgz#8df65bd812047521f7e9db6ff118c06ba84ac10b" - integrity sha512-atAs5GAGbZedvJXXdjtKljin+e2SltEs48B3naJjqWupYl2IUBbB/CJisyjbNHcKpHzb3E+OYEZ46G8eakXgQg== +"@octokit/request@^5.0.0", "@octokit/request@^5.6.0", "@octokit/request@^5.6.3": + version "5.6.3" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0" + integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A== dependencies: "@octokit/endpoint" "^6.0.1" - "@octokit/request-error" "^2.0.0" - "@octokit/types" "^5.0.0" - deprecation "^2.0.0" - is-plain-object "^3.0.0" - node-fetch "^2.3.0" - once "^1.4.0" - universal-user-agent "^5.0.0" + "@octokit/request-error" "^2.1.0" + "@octokit/types" "^6.16.1" + is-plain-object "^5.0.0" + node-fetch "^2.6.7" + universal-user-agent "^6.0.0" -"@octokit/rest@^16.28.4": - version "16.28.5" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.28.5.tgz#56a5a37fc45a6520199189ac3e5eb09420c0ef6f" - integrity sha512-W8hHSm6103c+lNdTuQBMKdZNDCOFFXJdatj92g2d6Hqk134EMDHRc02QWI/Fs1WGnWZ8Leb0QFbXPKO2njeevQ== +"@octokit/request@^6.0.0": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.1.tgz#3ceeb22dab09a29595d96594b6720fc14495cf4e" + integrity sha512-gYKRCia3cpajRzDSU+3pt1q2OcuC6PK8PmFIyxZDWCzRXRSIBH8jXjFJ8ZceoygBIm0KsEUg4x1+XcYBz7dHPQ== dependencies: - "@octokit/request" "^5.0.0" - "@octokit/request-error" "^1.0.2" - atob-lite "^2.0.0" - before-after-hook "^2.0.0" - btoa-lite "^1.0.0" - deprecation "^2.0.0" - lodash.get "^4.4.2" - lodash.set "^4.3.2" - lodash.uniq "^4.5.0" - octokit-pagination-methods "^1.1.0" - once "^1.4.0" - universal-user-agent "^3.0.0" - url-template "^2.0.8" + "@octokit/endpoint" "^7.0.0" + "@octokit/request-error" "^3.0.0" + "@octokit/types" "^7.0.0" + is-plain-object "^5.0.0" + node-fetch "^2.6.7" + universal-user-agent "^6.0.0" "@octokit/rest@^18.0.0": - version "18.0.0" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.0.tgz#7f401d9ce13530ad743dfd519ae62ce49bcc0358" - integrity sha512-4G/a42lry9NFGuuECnua1R1eoKkdBYJap97jYbWDNYBOUboWcM75GJ1VIcfvwDV/pW0lMPs7CEmhHoVrSV5shg== + version "18.12.0" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881" + integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q== dependencies: - "@octokit/core" "^3.0.0" - "@octokit/plugin-paginate-rest" "^2.2.0" - "@octokit/plugin-request-log" "^1.0.0" - "@octokit/plugin-rest-endpoint-methods" "4.0.0" + "@octokit/core" "^3.5.1" + "@octokit/plugin-paginate-rest" "^2.16.8" + "@octokit/plugin-request-log" "^1.0.4" + "@octokit/plugin-rest-endpoint-methods" "^5.12.0" -"@octokit/types@^5.0.0", "@octokit/types@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.0.1.tgz#5459e9a5e9df8565dcc62c17a34491904d71971e" - integrity sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA== +"@octokit/rest@^19.0.3": + version "19.0.4" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.4.tgz#fd8bed1cefffa486e9ae46a9dc608ce81bcfcbdd" + integrity sha512-LwG668+6lE8zlSYOfwPj4FxWdv/qFXYBpv79TWIQEpBLKA9D/IMcWsF/U9RGpA3YqMVDiTxpgVpEW3zTFfPFTA== dependencies: - "@types/node" ">= 8" - -"@opencensus/web-types@0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@opencensus/web-types/-/web-types-0.0.7.tgz#4426de1fe5aa8f624db395d2152b902874f0570a" - integrity sha512-xB+w7ZDAu3YBzqH44rCmG9/RlrOmFuDPt/bpf17eJr8eZSrLt7nc7LnWdxM9Mmoj/YKMHpxRg28txu3TcpiL+g== + "@octokit/core" "^4.0.0" + "@octokit/plugin-paginate-rest" "^4.0.0" + "@octokit/plugin-request-log" "^1.0.4" + "@octokit/plugin-rest-endpoint-methods" "^6.0.0" -"@opentelemetry/api@^0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.10.2.tgz#9647b881f3e1654089ff7ea59d587b2d35060654" - integrity sha512-GtpMGd6vkzDMYcpu2t9LlhEgMy/SzBwRnz48EejlRArYqZzqSzAsKmegUK7zHgl+EOIaK9mKHhnRaQu3qw20cA== +"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.39.0", "@octokit/types@^6.40.0": + version "6.41.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04" + integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg== dependencies: - "@opentelemetry/context-base" "^0.10.2" + "@octokit/openapi-types" "^12.11.0" -"@opentelemetry/api@^0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.6.1.tgz#a00b504801f408230b9ad719716fe91ad888c642" - integrity sha512-wpufGZa7tTxw7eAsjXJtiyIQ42IWQdX9iUQp7ACJcKo1hCtuhLU+K2Nv1U6oRwT1oAlZTE6m4CgWKZBhOiau3Q== +"@octokit/types@^7.0.0", "@octokit/types@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-7.3.0.tgz#658f916c4a53b552a8f95f866589abae6dbfc7b5" + integrity sha512-7Ar22AVxsJBYZuPkGQwFQybGt2YjuP6j6Z36bPntIYy3R9qSowB55mXOsb16hc0UqtJkYBrRMVXKlaX1OHsh1g== dependencies: - "@opentelemetry/context-base" "^0.6.1" + "@octokit/openapi-types" "^13.9.0" "@opentelemetry/api@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.3.tgz#13a12ae9e05c2a782f7b5e84c3cbfda4225eaf80" - integrity sha512-puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ== - -"@opentelemetry/context-base@^0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.10.2.tgz#55bea904b2b91aa8a8675df9eaba5961bddb1def" - integrity sha512-hZNKjKOYsckoOEgBziGMnBcX0M7EtstnCmwz5jZUOUYwlZ+/xxX6z3jPu1XVO2Jivk0eLfuP9GP+vFD49CMetw== - -"@opentelemetry/context-base@^0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.6.1.tgz#b260e454ee4f9635ea024fc83be225e397f15363" - integrity sha512-5bHhlTBBq82ti3qPT15TRxkYTFPPQWbnkkQkmHPtqiS1XcTB69cEKd3Jm7Cfi/vkPoyxapmePE9tyA7EzLt8SQ== + version "1.2.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.2.0.tgz#89ef99401cde6208cff98760b67663726ef26686" + integrity sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g== -"@opentelemetry/semantic-conventions@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz#1028ef0e0923b24916158d80d2ddfd67ea8b6740" - integrity sha512-a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA== +"@opentelemetry/semantic-conventions@^1.0.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.6.0.tgz#ed410c9eb0070491cff9fe914246ce41f88d6f74" + integrity sha512-aPfcBeLErM/PPiAuAbNFLN5sNbZLc3KZlar27uohllN8Zs6jJbHyJU1y7cMA6W/zuq+thkaG8mujiS+3iD/FWQ== "@openzeppelin/upgrades@^2.8.0": version "2.8.0" @@ -4069,10 +4742,18 @@ resolved "https://registry.yarnpkg.com/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6" integrity sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw== +"@parcel/watcher@2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b" + integrity sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg== + dependencies: + node-addon-api "^3.2.1" + node-gyp-build "^4.3.0" + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" - integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= + integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== "@protobufjs/base64@^1.1.2": version "1.1.2" @@ -4087,12 +4768,12 @@ "@protobufjs/eventemitter@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" - integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= + integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== "@protobufjs/fetch@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" - integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= + integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== dependencies: "@protobufjs/aspromise" "^1.1.1" "@protobufjs/inquire" "^1.1.0" @@ -4100,27 +4781,27 @@ "@protobufjs/float@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" - integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= + integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== "@protobufjs/inquire@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" - integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= + integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== "@protobufjs/path@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== "@protobufjs/pool@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" - integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= + integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== "@protobufjs/utf8@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" - integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= + integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== "@react-native-community/cli-debugger-ui@^4.13.1": version "4.13.1" @@ -4242,6 +4923,50 @@ sudo-prompt "^9.0.0" wcwidth "^1.0.1" +"@redux-saga/core@^1.0.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.2.1.tgz#3680989621517d075a2cc85e0d2744b682990ed8" + integrity sha512-ABCxsZy9DwmNoYNo54ZlfuTvh77RXx8ODKpxOHeWam2dOaLGQ7vAktpfOtqSeTdYrKEORtTeWnxkGJMmPOoukg== + dependencies: + "@babel/runtime" "^7.6.3" + "@redux-saga/deferred" "^1.2.1" + "@redux-saga/delay-p" "^1.2.1" + "@redux-saga/is" "^1.1.3" + "@redux-saga/symbols" "^1.1.3" + "@redux-saga/types" "^1.2.1" + redux "^4.0.4" + typescript-tuple "^2.2.1" + +"@redux-saga/deferred@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.2.1.tgz#aca373a08ccafd6f3481037f2f7ee97f2c87c3ec" + integrity sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g== + +"@redux-saga/delay-p@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.2.1.tgz#e72ac4731c5080a21f75b61bedc31cb639d9e446" + integrity sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w== + dependencies: + "@redux-saga/symbols" "^1.1.3" + +"@redux-saga/is@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.3.tgz#b333f31967e87e32b4e6b02c75b78d609dd4ad73" + integrity sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q== + dependencies: + "@redux-saga/symbols" "^1.1.3" + "@redux-saga/types" "^1.2.1" + +"@redux-saga/symbols@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.3.tgz#b731d56201719e96dc887dc3ae9016e761654367" + integrity sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg== + +"@redux-saga/types@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8" + integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA== + "@resolver-engine/core@^0.2.1": version "0.2.1" resolved "https://registry.yarnpkg.com/@resolver-engine/core/-/core-0.2.1.tgz#0d71803f6d3b8cb2e9ed481a1bf0ca5f5256d0c0" @@ -4276,6 +5001,33 @@ debug "^3.1.0" hosted-git-info "^2.6.0" +"@scure/base@~1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938" + integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA== + +"@scure/bip32@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.1.0.tgz#dea45875e7fbc720c2b4560325f1cf5d2246d95b" + integrity sha512-ftTW3kKX54YXLCxH6BB7oEEoJfoE2pIgw7MINKAs5PsS6nqKPuKk1haTF/EuHmYqG330t5GSrdmtRuHaY1a62Q== + dependencies: + "@noble/hashes" "~1.1.1" + "@noble/secp256k1" "~1.6.0" + "@scure/base" "~1.1.0" + +"@scure/bip39@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.0.tgz#92f11d095bae025f166bef3defcc5bf4945d419a" + integrity sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w== + dependencies: + "@noble/hashes" "~1.1.1" + "@scure/base" "~1.1.0" + +"@sinclair/typebox@^0.24.1": + version "0.24.38" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.38.tgz#7f68d9c5775c4c2cec0524b3b990263dd009c968" + integrity sha512-IbYB6vdhLFmzGEyXXEdFAJKyq7S4/RsivkgxNzs/LzwYuUJHmeNQ0cHkjG/Yqm6VgUzzZDLMZAf0XgeeaZAocA== + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -4286,10 +5038,15 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.15.0.tgz#96915baa05e6a6a1d137badf4984d3fc05820bb6" integrity sha512-lu8BpxjAtRCAo5ifytTpCPCj99LF7o/2Myn+NXyNCBqvPYn7Pjd76AMmUB5l7XF1U6t0hcWrlEM5ESufW7wAeA== +"@sindresorhus/is@^4.6.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== + "@sinonjs/commons@^1.7.0": - version "1.7.2" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2" - integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -4300,15 +5057,24 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@solidity-parser/parser@^0.6.0": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.6.2.tgz#49707fc4e06649d39d6b25bdab2e9093d372ce50" - integrity sha512-kUVUvrqttndeprLoXjI5arWHeiP3uh4XODAKbG+ZaWHCVQeelxCbnXBeWxZ2BPHdXgH0xR9dU1b916JhDhbgAA== +"@sinonjs/fake-timers@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" + integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== + dependencies: + "@sinonjs/commons" "^1.7.0" + +"@solidity-parser/parser@^0.14.0", "@solidity-parser/parser@^0.14.1", "@solidity-parser/parser@^0.14.3": + version "0.14.3" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.3.tgz#0d627427b35a40d8521aaa933cc3df7d07bfa36f" + integrity sha512-29g2SZ29HtsqA58pLCtopI1P/cPy5/UAzlcAXO6T/CNJimG6yA8kx4NaseMyJULiC+TEs02Y9/yeHzClqoA0hw== + dependencies: + antlr4ts "^0.5.0-alpha.4" "@stablelib/binary@^0.7.2": version "0.7.2" resolved "https://registry.yarnpkg.com/@stablelib/binary/-/binary-0.7.2.tgz#1b3392170c8a8741c8b8f843ea294de71aeb2cf7" - integrity sha1-GzOSFwyKh0HIuPhD6ilN5xrrLPc= + integrity sha512-J7iGppeKR112ICTZTAoALcT3yBpTrd2Z/F0wwiOUZPVPTDFTQFWHZZdYzfal9+mY1uMUPRSEnNmDuXRZbtE8Xg== dependencies: "@stablelib/int" "^0.5.0" @@ -4333,17 +5099,17 @@ "@stablelib/hash@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@stablelib/hash/-/hash-0.5.0.tgz#89fe9040a3d4383b1921c7d8a60948bc30846068" - integrity sha1-if6QQKPUODsZIcfYpglIvDCEYGg= + integrity sha512-rlNEBTskjKVl9f4rpRgM2GV3IrZWfNJFY5Y/2tmQtA2ozEkPLoUp9J/uJnBRnOpCsuflPW2z+pwqPbEYOPCHwQ== "@stablelib/int@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@stablelib/int/-/int-0.5.0.tgz#cca9225951d55d2de48656755784788633660c2b" - integrity sha1-zKkiWVHVXS3khlZ1V4R4hjNmDCs= + integrity sha512-cuaPoxm3K14LiEICiA3iz0aeGurg75v+haZMV+xloVTw3CT25oMRJgQ6VxZ2p2cHy4kjhVI68kX4oaYrhnTm+g== "@stablelib/wipe@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@stablelib/wipe/-/wipe-0.5.0.tgz#a682d5f9448e950e099e537e6f72fc960275d151" - integrity sha1-poLV+USOlQ4JnlN+b3L8lgJ10VE= + integrity sha512-SifvRV0rTTFR1qEF6G1hondGZyrmiM1laR8PPrO6TZwQG03hJduVbUX8uQk+Q6FdkND2Z9B8uLPyUAquQIk3iA== "@szmarczak/http-timer@^1.1.2": version "1.1.2" @@ -4352,6 +5118,13 @@ dependencies: defer-to-connect "^1.0.1" +"@szmarczak/http-timer@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-5.0.1.tgz#c7c1bf1141cdd4751b0399c8fc7b8b664cd5be3a" + integrity sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw== + dependencies: + defer-to-connect "^2.0.1" + "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -4362,42 +5135,127 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@truffle/abi-utils@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.0.tgz#edbdce6152c6ee711b7b8e267ff5745891931c59" + integrity sha512-W4Kbm17+QQeeK/uXB80t10gw1H8lEnAu+B7bu7NZl2Zy74kwhsrGC+qCjynhRQtGsFnCcsI58VxjjNkn1PsgSg== + dependencies: + change-case "3.0.2" + faker "5.5.3" + fast-check "3.1.1" + web3-utils "1.7.4" + +"@truffle/abi-utils@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.3.tgz#4484489b160ad35aa0716427c73de10ebed40146" + integrity sha512-/KpaaPi0daffnwLhFulMtwdQ7YfZZtj24J34kZJi7OQw9x0dSNSskGFTU5SEv9d3fOfHNYqCevsqtv1zek0+zg== + dependencies: + change-case "3.0.2" + fast-check "3.1.1" + web3-utils "1.7.4" + +"@truffle/artifactor@4.0.171": + version "4.0.171" + resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.171.tgz#59446b53b33ec001a3cbf89a6b37123efb7fd4fd" + integrity sha512-Iwf7Pvu0jVTxicn96PLYgU26HT3kU+whul+q21/Z0BjtCl+mzV0pGlHON28X2xPnbYW/c6pcSpJJlNcm+uNmYg== + dependencies: + "@truffle/contract-schema" "^3.4.10" + fs-extra "^9.1.0" + lodash "^4.17.21" + "@truffle/artifactor@^4.0.36": - version "4.0.52" - resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.52.tgz#f4dee969f32a5e41d9bb6eb291d14e253cbc1198" - integrity sha512-lsuF1rjbY0RRsMKYduWc0VAfSAzndGuV8AM4TQqYyvX4x5/gHFl05HquMXfKtJ2YflE1r/K3Qt2hAB4N5cZwgw== + version "4.0.167" + resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.167.tgz#d4459cf73d68cf276cf061ff21075a645c8e0558" + integrity sha512-zcW3h/Zki++wAikF1WQKhUBXBL8yqDbVuZSqVhtgjroCp0BLsyY+I5dxDRj26zcgiJEzNVYLxOjJpETTDZEbGw== dependencies: - "@truffle/contract-schema" "^3.0.23" - fs-extra "6.0.1" - lodash.assign "^4.2.0" - lodash.merge "^4.6.2" - source-map-support "^0.5.16" + "@truffle/contract-schema" "^3.4.9" + fs-extra "^9.1.0" + lodash "^4.17.21" -"@truffle/blockchain-utils@^0.0.11": - version "0.0.11" - resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.0.11.tgz#9886f4cb7a9f20deded4451ac78f8567ae5c0d75" - integrity sha512-9MyQ/20M96clhIcC7fVFIckGSB8qMsmcdU6iYt98HXJ9GOLNKsCaJFz1OVsJncVreYwTUhoEXTrVBc8zrmPDJQ== +"@truffle/blockchain-utils@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.4.tgz#1365b88c3d2922a066d947e93748f09b0fac2e93" + integrity sha512-HegAo5A8UX9vE8dtceBRgCY207gOb9wj54c8mNOOWHcFpkyJz7kZYGo44As6Imh10/0hD2j7vHQ56Jf+uszJ3A== -"@truffle/blockchain-utils@^0.0.18": - version "0.0.18" - resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.0.18.tgz#69e40e380729cc41fd5bf468304f9e32af57e666" - integrity sha512-XnRu5p1QO9krJizOeBY5WfzPDvEOmCnOT5u6qF8uN3Kkq9vcH3ZqW4XTuzz9ERZNpZfWb3UJx4PUosgeHLs5vw== +"@truffle/code-utils@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@truffle/code-utils/-/code-utils-3.0.0.tgz#47812cdaa6ede006d4f224c3f4d21d165a271e0a" + integrity sha512-MHUrOAZYlbmVp+9W2Mmw6vaLteWolkn6AF5iiKUr/j42Bon6CU5gNnc1gvdVoNdO/xsrqKqyoloYNgtZLgMldg== dependencies: - source-map-support "^0.5.16" + cbor "^5.2.0" -"@truffle/compile-solidity@^4.2.25": - version "4.2.25" - resolved "https://registry.yarnpkg.com/@truffle/compile-solidity/-/compile-solidity-4.2.25.tgz#c13fb6e1086df1f38498facfa6d2807adf9752fb" - integrity sha512-OtbeqTFCh/VaEnXxy5Z3rEcTXgSZC9efmwq2ylAV6PiThXPJUtu4+0qyhYMIVsV1dg8UWchCJ/VIrtbWSj44zA== +"@truffle/codec@^0.14.3": + version "0.14.3" + resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.3.tgz#2b37f7763390391b488c927b12f2310fe7cdb129" + integrity sha512-8lwWQXkbrmewwiDSekZPUiweysGKXOpFSNhtWCi1CS6gtla3bNK8/xE1nUi3ALsuKw2745kzzLZpwKsipGtGKg== dependencies: - "@truffle/config" "^1.2.16" - "@truffle/contract-sources" "^0.1.7" - "@truffle/error" "^0.0.8" - "@truffle/expect" "^0.0.13" + "@truffle/abi-utils" "^0.3.0" + "@truffle/compile-common" "^0.8.0" + big.js "^6.0.3" + bn.js "^5.1.3" + cbor "^5.2.0" + debug "^4.3.1" + lodash "^4.17.21" + semver "7.3.7" + utf8 "^3.0.0" + web3-utils "1.7.4" + +"@truffle/codec@^0.14.6": + version "0.14.6" + resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.6.tgz#28b491fdac3a502e369672be5072ff2fca1d6544" + integrity sha512-0jPT2MCVTk+1OzkWj0h1Twyh7nP5VBdfqrFK6XjPJZggqmm0bLWexoRPeTrVlByjaKq7uih6bH8MnnoED1MMxQ== + dependencies: + "@truffle/abi-utils" "^0.3.3" + "@truffle/compile-common" "^0.8.1" + big.js "^6.0.3" + bn.js "^5.1.3" + cbor "^5.2.0" + debug "^4.3.1" + lodash "^4.17.21" + semver "7.3.7" + utf8 "^3.0.0" + web3-utils "1.7.4" + +"@truffle/compile-common@^0.3.9": + version "0.3.12" + resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.3.12.tgz#73e3849aa61de1f98596b440f0bfce7e3063c2e4" + integrity sha512-X4mnCiaoUD9+0XL7HYF3I+nW3EXggj207DF1uOJUSrS/wjIbs2eqUo1aqMPp0uw0o3Ek2EpDLq9w5Jm3myHLqw== + dependencies: + "@truffle/contract-schema" "^3.2.5" + fs-extra "^8.1.0" + mocha "8.0.1" + ts-node "8.10.2" + +"@truffle/compile-common@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.8.0.tgz#8efcf68c82c2a62651255ebaf4150f222984fd9b" + integrity sha512-3mtEC73dQODTI3/ZwonunVHyPS2BGexXSBIv4pOgMrWwnZPcHlo2+IW2+m2At/DnZehL78bkF993Vti2pJfx6Q== + dependencies: + "@truffle/error" "^0.1.1" + colors "1.4.0" + +"@truffle/compile-common@^0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.8.1.tgz#a3fe500edb880a3104324c9885bbd27b6ce05c54" + integrity sha512-7mzzG9Cfrn+fDT5Sqi7B6pccvIIV5w/GM8/56YgnjysbDzy5aZ6mv0fe37ZbcznEVQ35NJjBy+lEr/ozOGXwQA== + dependencies: + "@truffle/error" "^0.1.1" + colors "1.4.0" + +"@truffle/compile-solidity@^4.3.22": + version "4.3.22" + resolved "https://registry.yarnpkg.com/@truffle/compile-solidity/-/compile-solidity-4.3.22.tgz#b9f0b8834c8095f7d91e4061e1fa67994752d506" + integrity sha512-hYogrD836KhM4V6YED15ioS7NtmfiermgXqZpTtMJcy5klf0Q2tLhVg96dcOZsHM26tNV9wiJPSViJhLN0PNjw== + dependencies: + "@truffle/compile-common" "^0.3.9" + "@truffle/config" "^1.2.29" + "@truffle/contract-sources" "^0.1.8" + "@truffle/error" "^0.0.11" + "@truffle/expect" "^0.0.15" colors "^1.1.2" debug "^4.1.0" - fs-extra "^8.0.1" - ora "^3.0.0" + fs-extra "^8.1.0" + ora "^3.4.0" original-require "^1.0.1" request "^2.85.0" request-promise "^4.2.2" @@ -4405,164 +5263,505 @@ semver "^5.6.0" solc "^0.6.0" +"@truffle/compile-solidity@^6.0.45": + version "6.0.45" + resolved "https://registry.yarnpkg.com/@truffle/compile-solidity/-/compile-solidity-6.0.45.tgz#4e5413dfeb9ed9e1658511e5c40e6efeaff15f5a" + integrity sha512-bXQKyPqciQ7FJKKMInZ+wtpUW4PPK7ytmHtaGVJ6WRhLpQpOi12ncFTNyiKKvAu0yxWAF51wJi4yeZ9EfW/jWw== + dependencies: + "@truffle/compile-common" "^0.8.1" + "@truffle/config" "^1.3.39" + "@truffle/contract-sources" "^0.2.0" + "@truffle/expect" "^0.1.3" + "@truffle/profiler" "^0.1.31" + "@truffle/spinners" "^0.2.2" + axios "0.27.2" + axios-retry "^3.1.9" + debug "^4.3.1" + fs-extra "^9.1.0" + iter-tools "^7.0.2" + lodash "^4.17.21" + node-abort-controller "^3.0.1" + original-require "^1.0.1" + require-from-string "^2.0.2" + semver "7.3.7" + solc "0.8.17" + "@truffle/compile-vyper@^1.0.33": - version "1.0.49" - resolved "https://registry.yarnpkg.com/@truffle/compile-vyper/-/compile-vyper-1.0.49.tgz#62eaa532302a4dda6db530da1d4408adc3769dcb" - integrity sha512-JjV4o5otWGXqkus142P68uBY30mt4VewCW6Uw6WXE2c/hmxHV4+i6nQSBvW3MotVoIxzF+p/+lMxzGom8NC0QQ== + version "1.0.71" + resolved "https://registry.yarnpkg.com/@truffle/compile-vyper/-/compile-vyper-1.0.71.tgz#b068fafcf7967c969ece9bb6fd4b505c39c4d1cc" + integrity sha512-p7szaENTOjzCc9LT99gqqqvy1hWJmnul4iRgkStjYOjJIqiNanEDZ715VMisewPK7q/Xa/FYxqTP51XL+ZWKHw== dependencies: - "@truffle/compile-solidity" "^4.2.25" - async "2.6.1" + "@truffle/compile-solidity" "^4.3.22" colors "^1.1.2" eslint "^5.5.0" minimatch "^3.0.4" -"@truffle/config@^1.2.16", "@truffle/config@^1.2.6": - version "1.2.16" - resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.2.16.tgz#eb08a978675b39047c7ec87a99c9357c2f4fa9b3" - integrity sha512-IYc8bYtnfsT85BkEONIAh50RnxYMKNBZIia90gzkgKn8+HorFrnsZKwLqH7v/PLl8OycNwLIv4/w+BTK76t8bg== +"@truffle/config@^1.2.29", "@truffle/config@^1.2.6", "@truffle/config@^1.3.37": + version "1.3.37" + resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.37.tgz#b0bf87d3cba82da199926e450a7237643f8214eb" + integrity sha512-QscARxWIu7ezFgVzSDXhnTz9bpKNvhJh15NDn71uS5k7CdLEs2ZI0w+2Z82bQPXkxDNCur57l8WL0UDLuGDyQg== dependencies: - "@truffle/error" "^0.0.8" - "@truffle/events" "^0.0.4" - "@truffle/provider" "^0.2.9" - configstore "^4.0.0" + "@truffle/error" "^0.1.1" + "@truffle/events" "^0.1.14" + "@truffle/provider" "^0.2.59" + conf "^10.1.2" find-up "^2.1.0" - lodash.assignin "^4.2.0" - lodash.merge "^4.6.2" - module "^1.2.5" - original-require "1.0.1" - source-map-support "^0.5.16" + lodash "^4.17.21" + original-require "^1.0.1" + +"@truffle/config@^1.3.39": + version "1.3.39" + resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.39.tgz#069faa1cf8faa549451c5ec78a6b6b8d226b4a4d" + integrity sha512-A8WrDswTKOc7ES8QDx2EjUDH6l/oKX9vtsnLAydINvEy7ciN3Q4v4hsEMYp9hRbhVByPiKZ7sOaA0QI2ssnRog== + dependencies: + "@truffle/error" "^0.1.1" + "@truffle/events" "^0.1.15" + "@truffle/provider" "^0.2.61" + conf "^10.1.2" + find-up "^2.1.0" + lodash "^4.17.21" + original-require "^1.0.1" + +"@truffle/contract-schema@^3.2.5", "@truffle/contract-schema@^3.4.9": + version "3.4.9" + resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.9.tgz#57119245452e49f7b1ea6c71900bb6c053d76c8c" + integrity sha512-nhYMXWbUs6dMYHL1f8DTkRk/uo1sADK0yeSYXo/p/7nqnjlHzqrr75BBsKbB7OFIVT05des+GFNQJqBaRZVdxQ== + dependencies: + ajv "^6.10.0" + debug "^4.3.1" -"@truffle/contract-schema@^3.0.14", "@truffle/contract-schema@^3.0.23": - version "3.0.23" - resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.0.23.tgz#5d869d9b10be23034c07c7dbf3c48542eabe63ef" - integrity sha512-N4CaTMcZhOC44Vl6k2r/eua+ojUswl6mNlkVTVYMvWjfKa8GHKKClsZfkGO72aBrBzoTFsM6D75LvQIIRBy3fg== +"@truffle/contract-schema@^3.3.1", "@truffle/contract-schema@^3.4.10": + version "3.4.10" + resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.10.tgz#c11a814c13ad55a5e454fb35ddfa291ae0d24ace" + integrity sha512-BhRNRoRvlj2th6E5RNS0BnS0ZxQe01JJz8I7MjkGqdeXSvrn6qDCAnbmvhNgUv0l5h8w5+gBOQhAJhILf1shdQ== dependencies: ajv "^6.10.0" - crypto-js "^3.1.9-1" - debug "^4.1.0" + debug "^4.3.1" + +"@truffle/contract-sources@^0.1.6", "@truffle/contract-sources@^0.1.8": + version "0.1.12" + resolved "https://registry.yarnpkg.com/@truffle/contract-sources/-/contract-sources-0.1.12.tgz#7a3dfec1bcf6f3632c0f54e522fb6f12b0bdf34b" + integrity sha512-7OH8P+N4n2LewbNiVpuleshPqj8G7n9Qkd5ot79sZ/R6xIRyXF05iBtg3/IbjIzOeQCrCE9aYUHNe2go9RuM0g== + dependencies: + debug "^4.3.1" + glob "^7.1.6" + +"@truffle/contract-sources@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@truffle/contract-sources/-/contract-sources-0.2.0.tgz#b8dd1a5e985eb8cf507f23a751aa7aadc0645ab4" + integrity sha512-S14SKQW3EGbLip3rBU7i+VtB5ImBfBz6TpviSXxQsYY6Udy+aqJEmTkVKA/KhHeOG6yQyZqvb4dWIbMtEh+tYg== + dependencies: + debug "^4.3.1" + glob "^7.1.6" + +"@truffle/contract@4.6.3", "@truffle/contract@^4.6.3": + version "4.6.3" + resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.6.3.tgz#5ba7c032d2666f6a16bad7bcc680bd6e767e4811" + integrity sha512-boiCnXxYUr+9Iy8hiJN8b6pZfTlwnBCTKjqs8dqrLbA3QTlqTmsxkMMLZrqdIY+WuAU3yT6ah/EWGqf1rMvbqQ== + dependencies: + "@ensdomains/ensjs" "^2.1.0" + "@truffle/blockchain-utils" "^0.1.4" + "@truffle/contract-schema" "^3.4.10" + "@truffle/debug-utils" "^6.0.36" + "@truffle/error" "^0.1.1" + "@truffle/interface-adapter" "^0.5.23" + bignumber.js "^7.2.1" + debug "^4.3.1" + ethers "^4.0.32" + web3 "1.7.4" + web3-core-helpers "1.7.4" + web3-core-promievent "1.7.4" + web3-eth-abi "1.7.4" + web3-utils "1.7.4" + +"@truffle/contract@^4.0.37", "@truffle/contract@^4.2.3": + version "4.5.23" + resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.5.23.tgz#8540f0c2d4ebc4782f1d4647016213fa4cac0107" + integrity sha512-ni/RzBdDFo60jaCb8ETCPBfPHRr1WVH5Y27EKmfEyrNg8TC7WZ28SQylMBkwdrgLjqAyPw3Pq7Y5us1f9tcyMQ== + dependencies: + "@ensdomains/ensjs" "^2.1.0" + "@truffle/blockchain-utils" "^0.1.4" + "@truffle/contract-schema" "^3.4.9" + "@truffle/debug-utils" "^6.0.33" + "@truffle/error" "^0.1.1" + "@truffle/interface-adapter" "^0.5.21" + bignumber.js "^7.2.1" + debug "^4.3.1" + ethers "^4.0.32" + web3 "1.7.4" + web3-core-helpers "1.7.4" + web3-core-promievent "1.7.4" + web3-eth-abi "1.7.4" + web3-utils "1.7.4" + +"@truffle/dashboard-message-bus-client@^0.1.6": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-client/-/dashboard-message-bus-client-0.1.6.tgz#1956c1582fd2c1a923343d12d8543db92eba6baf" + integrity sha512-qIf5e+/xfZfXiiOkfWKtRjwbkstpjQpCkbndKSKhZcnz3QLkDIvfgSU6K9d+j4AyNCq4oN38gWoLDa3PVqZo8Q== + dependencies: + "@truffle/dashboard-message-bus-common" "^0.1.4" + "@truffle/promise-tracker" "^0.1.3" + axios "0.27.2" + debug "^4.3.1" + delay "^5.0.0" + isomorphic-ws "^4.0.1" + node-abort-controller "^3.0.1" + tiny-typed-emitter "^2.1.0" + ws "^7.2.0" + +"@truffle/dashboard-message-bus-client@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-client/-/dashboard-message-bus-client-0.1.7.tgz#62e71123eb2cc1e4dce0b1664a9455b3207c77da" + integrity sha512-7F62gQl5K1MIwVk5+dO9FeHD4zblty0jfTjKBMsdDZEd4yazzS2n2QOzxnPsjxvthX1oPPLRxK+VrN9c/3+VTw== + dependencies: + "@truffle/dashboard-message-bus-common" "^0.1.4" + "@truffle/promise-tracker" "^0.1.4" + axios "0.27.2" + debug "^4.3.1" + delay "^5.0.0" + isomorphic-ws "^4.0.1" + node-abort-controller "^3.0.1" + tiny-typed-emitter "^2.1.0" + ws "^7.2.0" + +"@truffle/dashboard-message-bus-common@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-common/-/dashboard-message-bus-common-0.1.4.tgz#f5b5326eb4774d5d209c310c135309f4b3f42bea" + integrity sha512-R+16jYcr/mxhz5pI+0GAJI14XUvYySLTB650kWubMBrVf4vi4QaIOdAOrx4KxAIA6e/5Nq9j0le59Y2c+xAHYg== + +"@truffle/db-loader@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@truffle/db-loader/-/db-loader-0.2.1.tgz#e3fce4abda6bd0fda0a8b47d3614239af11a1d7d" + integrity sha512-qmOYvwfNIgot+tIqZqOwnU6EhYdHgpph+aF/lyepZEKW0U/tPDubkmD/p4E1nZ1Db/yG5XEzTuLCM9nH4aNnZg== + optionalDependencies: + "@truffle/db" "^2.0.1" + +"@truffle/db@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@truffle/db/-/db-2.0.1.tgz#929e4ee58694673caa674ffc2f1f9d405d43c7a4" + integrity sha512-jjBpwpIqAjVNnN/KjefT2xBN2YzxCmxcd4qFhb/iueSrQyZfPQaJRM8hASoQepzV5dDH8iU5gVU7gYX0jQtOBw== + dependencies: + "@graphql-tools/delegate" "^8.4.3" + "@graphql-tools/schema" "^8.3.1" + "@truffle/abi-utils" "^0.3.3" + "@truffle/code-utils" "^3.0.0" + "@truffle/config" "^1.3.39" + abstract-leveldown "^7.2.0" + apollo-server "^3.6.3" + debug "^4.3.1" + fs-extra "^9.1.0" + graphql "^15.3.0" + graphql-tag "^2.12.6" + json-stable-stringify "^1.0.1" + pascal-case "^2.0.1" + pluralize "^8.0.0" + pouchdb "7.3.0" + pouchdb-adapter-memory "^7.1.1" + pouchdb-debug "^7.1.1" + pouchdb-find "^7.0.0" + web3-utils "1.7.4" + +"@truffle/debug-utils@^6.0.33": + version "6.0.33" + resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.33.tgz#cd2104fecb3d45861d697a88fcf73fcd39bc42ad" + integrity sha512-nz6nApTxeqyRM1f9gO4g7sexmlC66YZ6dE1x2KbIz24FYx1yzfT5fAsQ2ZDoFHH++Ah4LH/1TMso76zspcn+vQ== + dependencies: + "@truffle/codec" "^0.14.3" + "@trufflesuite/chromafi" "^3.0.0" + bn.js "^5.1.3" + chalk "^2.4.2" + debug "^4.3.1" + highlightjs-solidity "^2.0.5" -"@truffle/contract-sources@^0.1.6", "@truffle/contract-sources@^0.1.7": - version "0.1.7" - resolved "https://registry.yarnpkg.com/@truffle/contract-sources/-/contract-sources-0.1.7.tgz#11d7543b61141def64c8752eb49759ff5aee7580" - integrity sha512-scv54DrRsgyRfFt+XntMNJDDpyI7d4rhoR5Ab6mlCaq9rkuYDjv2ylVQWOCjPjsOOEQ5EGYPgs22ZkS10oi70A== +"@truffle/debug-utils@^6.0.36": + version "6.0.36" + resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.36.tgz#557e41b0006d36e231b4620bbf0b1e3830d28854" + integrity sha512-oxqVAJOXLUsSpGK3ez0JLTgPoVUhGrvdkYKIfYVkED10lhCgh0HlJ/AbRkUPUV7KR9SKXK5BCDsTJlVbdqtMXA== dependencies: - debug "^4.1.0" - glob "^7.1.2" + "@truffle/codec" "^0.14.6" + "@trufflesuite/chromafi" "^3.0.0" + bn.js "^5.1.3" + chalk "^2.4.2" + debug "^4.3.1" + highlightjs-solidity "^2.0.5" -"@truffle/contract@^4.0.37", "@truffle/contract@^4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.1.13.tgz#8703ff787f73df4fe74a0424837098e64352100b" - integrity sha512-LLtRU4rRBd9jw/ngpYKwr++pEzdR64/vu2UjSxeizP1wIDm1XAIJ7BH2QiWh4PV2i44KzAfgvPtOwgbwr2hvdw== +"@truffle/debugger@^11.0.12": + version "11.0.12" + resolved "https://registry.yarnpkg.com/@truffle/debugger/-/debugger-11.0.12.tgz#629e547b79dae754235ad93ef4c6b0eb6b4135f6" + integrity sha512-coEiRJGdrLJ+TfNPxENvv8mUyRs6sVoPVtyQO8pyOZf6+8sEH/21GhEXx6mxUxWuOhhA0dLYVY9XBqOtx1df/Q== dependencies: - "@truffle/blockchain-utils" "^0.0.18" - "@truffle/contract-schema" "^3.0.23" - "@truffle/error" "^0.0.8" - "@truffle/interface-adapter" "^0.4.6" - bignumber.js "^7.2.1" - ethereum-ens "^0.8.0" - ethers "^4.0.0-beta.1" - exorcist "^1.0.1" - source-map-support "^0.5.16" - web3 "1.2.1" - web3-core-promievent "1.2.1" - web3-eth-abi "1.2.1" - web3-utils "1.2.1" + "@truffle/abi-utils" "^0.3.3" + "@truffle/codec" "^0.14.6" + "@truffle/source-map-utils" "^1.3.97" + bn.js "^5.1.3" + debug "^4.3.1" + json-pointer "^0.6.1" + json-stable-stringify "^1.0.1" + lodash "^4.17.21" + redux "^3.7.2" + redux-saga "1.0.0" + reselect-tree "^1.3.7" + semver "7.3.7" + web3 "1.7.4" + web3-eth-abi "1.7.4" "@truffle/error@0.0.7": version "0.0.7" resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.7.tgz#e9db39885575647ef08bf624b0c13fe46d41a209" integrity sha512-UIfVKsXSXocKnn5+RNklUXNoGd/JVj7V8KmC48TQzmjU33HQI86PX0JDS7SpHMHasI3w9X//1q7Lu7nZtj3Zzg== -"@truffle/error@^0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.6.tgz#75d499845b4b3a40537889e7d04c663afcaee85d" - integrity sha512-QUM9ZWiwlXGixFGpV18g5I6vua6/r+ZV9W/5DQA5go9A3eZUNPHPaTKMIQPJLYn6+ZV5jg5H28zCHq56LHF3yA== +"@truffle/error@^0.0.11": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.11.tgz#2789c0042d7e796dcbb840c7a9b5d2bcd8e0e2d8" + integrity sha512-ju6TucjlJkfYMmdraYY/IBJaFb+Sa+huhYtOoyOJ+G29KcgytUVnDzKGwC7Kgk6IsxQMm62Mc1E0GZzFbGGipw== -"@truffle/error@^0.0.8": - version "0.0.8" - resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.8.tgz#dc94ca36393403449d4b7461bf9452c241e53ec1" - integrity sha512-x55rtRuNfRO1azmZ30iR0pf0OJ6flQqbax1hJz+Avk1K5fdmOv5cr22s9qFnwTWnS6Bw0jvJEoR0ITsM7cPKtQ== +"@truffle/error@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.1.1.tgz#e52026ac8ca7180d83443dca73c03e07ace2a301" + integrity sha512-sE7c9IHIGdbK4YayH4BC8i8qMjoAOeg6nUXUDZZp8wlU21/EMpaG+CLx+KqcIPyR+GSWIW3Dm0PXkr2nlggFDA== -"@truffle/events@^0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.0.4.tgz#38b6db0e6e5ac3dd408d7848c3a535e0c778ed54" - integrity sha512-/Guk0kqHBM41YSeqAcK1LD7dUr8krLoThlipDDshF6gOs7cyBMBmIeRm9iMBExNV6UK2ejSAV39BPCDEo6GoEA== +"@truffle/events@^0.1.14": + version "0.1.14" + resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.14.tgz#6a3f1026dc1739bfac18b7f8351935b9f2756045" + integrity sha512-6hAaThmkiMe7Hub+p6tyOlOqRQS4VUtxXQkSKN3ol5FphCXe7XE2ZFGRPOK+hUgNcrPXjzD2Q6GbSosVqO65oA== + dependencies: + "@truffle/dashboard-message-bus-client" "^0.1.6" + "@truffle/spinners" "^0.2.2" + debug "^4.3.1" + emittery "^0.4.1" + web3-utils "1.7.4" + +"@truffle/events@^0.1.15": + version "0.1.15" + resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.15.tgz#d2dbcb2494804d9cbc80d7ab3a1624bfd86239a2" + integrity sha512-GP0WFayhgzFT1vu9LAYJOzbOnEV7PWdkzrMrjYPv5biQQLcchCNNuIyuarflFZZ/08wpEjvy2F4FHj/RJXRdkQ== dependencies: + "@truffle/dashboard-message-bus-client" "^0.1.7" + "@truffle/spinners" "^0.2.2" + debug "^4.3.1" emittery "^0.4.1" + web3-utils "1.7.4" "@truffle/expect@0.0.12": version "0.0.12" resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.12.tgz#ed609cc538753e79438eb5a9bda7c2fda8ec2535" integrity sha512-5Hyhrf42wvxCdzv6r8q94lDEQa1onMj6A+/lHTTmirfzqIpk4V32yV22DeFL5QuDFfPaParIT5oHOcQGVAg6XQ== -"@truffle/expect@^0.0.10": - version "0.0.10" - resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.10.tgz#efe2f1fae224393437eba6b5b322d48ebf02ed0d" - integrity sha512-9jnqWyyqDUpO9wulBF7s+vUvOh3hjxzaFtuP7yeNRNx80svlB5GsUTLr11atRda02zrBmEo8hzFrU/DKacr4/w== - "@truffle/expect@^0.0.13": version "0.0.13" resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.13.tgz#c8e23edc1a1c3b13f768611e6199113026cf8bf2" integrity sha512-iLRALoFphCCA2ygDjyG+633dCMp81i09+V/oMDkdvDdYDF6KHjSt3Ov9eZMDnzl5PVBvmf2221U4qXSFB8V4fg== +"@truffle/expect@^0.0.15": + version "0.0.15" + resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.15.tgz#293b773680d3e088b8c102480df55907234db533" + integrity sha512-hrIbDRsaEoIkapvY2unw8W5b5qfkz3A3ayxUVxfdPlnevdDUVmvfqfYJrJOSdtbIucwDIhU74VaBPKyiqoTJOw== + +"@truffle/expect@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.1.3.tgz#53f0626fee400e43485292879bbc90973ee5c54a" + integrity sha512-+pQW2Kh+T6Pf1WIv1O8jqKr3Vsagy8lpNbtUXa6eiSkvvb0E+3cMn9K4hXG7APzj7G2f6bSBoVYPxamXGRGvDQ== + "@truffle/external-compile@^1.0.19": - version "1.0.28" - resolved "https://registry.yarnpkg.com/@truffle/external-compile/-/external-compile-1.0.28.tgz#6cbea1782825ad4af637eff78992c23283567e8a" - integrity sha512-eLJ2WmysHt89eZNp2kcqiiShRJsIhEiKjN6X6t/V+mJutYAxJlldsCebTl9fVZ/ZfhWiTExC+G0MdxN8EslLCw== + version "1.0.36" + resolved "https://registry.yarnpkg.com/@truffle/external-compile/-/external-compile-1.0.36.tgz#92b9a7e427e11c930159ac130028a565ad2df5d4" + integrity sha512-01qd3lHCrk+mA6D93YP3dguFmYjehToz5VQgiYRwf2d7XzH7iXlRRk2rqG3PUGx5awgAJFsyGIwqGyy04NXVfw== dependencies: - "@truffle/contract-schema" "^3.0.23" - "@truffle/expect" "^0.0.13" + "@truffle/contract-schema" "^3.2.5" + "@truffle/expect" "^0.0.15" debug "^4.1.0" glob "^7.1.2" web3-utils "1.2.1" -"@truffle/interface-adapter@^0.4.6": - version "0.4.6" - resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.4.6.tgz#d904e2ae6e03712f310eb4da858a1fe07fa27d11" - integrity sha512-FZAUb7tx/7VbxpAbo70+K2v22j1O7y4BwhWypRwYpf1YbE2C1OCo/L8zInaW5LfzRd2BEsfb2GjUgbK9VaFrDA== +"@truffle/interface-adapter@^0.5.21": + version "0.5.21" + resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.21.tgz#f22c99b7cb5d5c4ebbb6106f9274ea844baeaa2b" + integrity sha512-2ltbu3upsWS0TAQu1kLQc048XlXNmDkCzH6iebX4dg3VBB+l7oG/pu5+/kl8t+LRfzGoEMLKwOQt7vk0Vm3PNA== dependencies: - bn.js "^4.11.8" + bn.js "^5.1.3" ethers "^4.0.32" - source-map-support "^0.5.16" - web3 "1.2.1" + web3 "1.7.4" + +"@truffle/interface-adapter@^0.5.23": + version "0.5.23" + resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.23.tgz#a4103270e3c73746089b9e5807aaa1359f4725bb" + integrity sha512-nU8kChKgcUP+tELId1PMgHnmd2KcBdBer59TxfVqAZXRmt6blm2tpBbGYtKzTIdZlf6kMqVbZXdB6u1CJDqfxg== + dependencies: + bn.js "^5.1.3" + ethers "^4.0.32" + web3 "1.7.4" + +"@truffle/profiler@^0.1.31": + version "0.1.31" + resolved "https://registry.yarnpkg.com/@truffle/profiler/-/profiler-0.1.31.tgz#b94a7899a5ba199bbe9439bcf090fb5d696dd066" + integrity sha512-5giNwNVKnOBIPTklaE/2R+L9VICkW/SW+vk+7j5qXBkXuhfEl+m5W6L5fDY88r+RraGgzBlBU7J1HtzMf/36Bg== + dependencies: + "@truffle/contract-sources" "^0.2.0" + "@truffle/expect" "^0.1.3" + debug "^4.3.1" + +"@truffle/promise-tracker@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@truffle/promise-tracker/-/promise-tracker-0.1.3.tgz#8a971a5f22ea6922b3578a49b05be481d2d2a3fa" + integrity sha512-1Z5qEfu0KSS+774xe9aPPlLMvzCJNdEeTofne2HkEPLBb53Lb28ZZoMYrwE8eJRjMKMG+y75IYpX7SKcSgj+OQ== + +"@truffle/promise-tracker@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@truffle/promise-tracker/-/promise-tracker-0.1.4.tgz#6f9d019b048a78b6d024bf2967e24dfa8c3a164d" + integrity sha512-JqsZZXWXUnrF+zsU2jf12BXyVYAHQj0iJck7EyTsdy9Wdx1aSsqX9Cnc6U274Xk0xNXziV+NestyuoF3kHTWiw== + +"@truffle/provider@^0.2.59": + version "0.2.59" + resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.2.59.tgz#a6bc51c53a6bf0e376e9b3167fae255f3b0d9208" + integrity sha512-4b79yUSZlEd7KqzaPkQiiT4aRCGaI+pXPdwJMD0olLvnZrGoNrBtRQSmnXesxBcqi6FaSDxxC+/9URG2HBPE2g== + dependencies: + "@truffle/error" "^0.1.1" + "@truffle/interface-adapter" "^0.5.21" + debug "^4.3.1" + web3 "1.7.4" -"@truffle/provider@^0.2.9": - version "0.2.9" - resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.2.9.tgz#689941899d04fef50aad81ed6c74f89cb76482b3" - integrity sha512-C83cXOjhpvzEhQJxd0hfjX9jW+IMS7P+vLlVuhi1SMK5wBQNvZIb8i6VPnhNBMJV9BHAQx2NlgDcWIFAVVf5Rw== +"@truffle/provider@^0.2.61": + version "0.2.61" + resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.2.61.tgz#c20b891d77eca3c8907fa096f8f23bac7a180e8b" + integrity sha512-/aa4Xy+ag4zohfPWytA+u5QDDDvSdml6p/+zo5eN1nkmJ7hF6noxBlBHG+rEC3Pl+NNNQrbGZMzvlpfsOrNhMw== dependencies: - "@truffle/error" "^0.0.8" - "@truffle/interface-adapter" "^0.4.6" - web3 "1.2.1" + "@truffle/error" "^0.1.1" + "@truffle/interface-adapter" "^0.5.23" + debug "^4.3.1" + web3 "1.7.4" "@truffle/provisioner@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.0.tgz#8a26ab0bea10fcc5a0d119845ddffaa05b997ac9" - integrity sha512-qqnw0I0i7JRQphs4PpkjcVfSx2yZTgaMkCeOmQMwlfsY22vbtXyJNuQYBJCEbtZpFQqsGlsY1hjTe+qFTq6vTg== + version "0.2.60" + resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.60.tgz#12f7d2bc8977ae248a154ce569d290cf8676eba1" + integrity sha512-qlFiu+oyP6ULlCgLshenzoiNQNNyHSIZX8R/LLTw8l0R5fiNVNnkLqi1Z54Vk3ubsX4/nEQPxQ0SwwM0H0X6cQ== + dependencies: + "@truffle/config" "^1.3.37" + +"@truffle/provisioner@^0.2.62": + version "0.2.62" + resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.62.tgz#2aa4141c27382f34b09558e0167b2ba75d249b06" + integrity sha512-rdPXVuSEfha/u0zATCFyCESIRM/Pxvgd3JjkWDhfadIw2N9DSsq8Q0kIetjBjqkkzBoIY0uefLINfEyfqxczzQ== + dependencies: + "@truffle/config" "^1.3.39" + +"@truffle/resolver@9.0.18": + version "9.0.18" + resolved "https://registry.yarnpkg.com/@truffle/resolver/-/resolver-9.0.18.tgz#d048fbb8c62b1fcb34b44350392afd60613e55e6" + integrity sha512-N6ZklGljKZwl4VElovmiE15MVR2SkoFjLbyH2/w5pG5d83/18GdUyotmuLjv6FJ+3MLsWzxboMr4Evw4LRlKog== + dependencies: + "@truffle/compile-solidity" "^6.0.45" + "@truffle/contract" "^4.6.3" + "@truffle/contract-sources" "^0.2.0" + "@truffle/expect" "^0.1.3" + "@truffle/provisioner" "^0.2.62" + abi-to-sol "^0.6.6" + debug "^4.3.1" + detect-installed "^2.0.4" + fs-extra "^9.1.0" + get-installed-path "^4.0.8" + glob "^7.1.6" + web3-utils "1.7.4" "@truffle/resolver@^5.0.18": - version "5.1.6" - resolved "https://registry.yarnpkg.com/@truffle/resolver/-/resolver-5.1.6.tgz#48100ab3a4ef68ce91df6348860ed4a960b6a3a9" - integrity sha512-1DhwdV8upxcyMwv3HR40ysXQuU+XrCeCKBEIYLr7/YXaYZsMQk3En8QkeoiTkOEamIiyOivt9/veHSZ3Mke1GA== + version "5.1.12" + resolved "https://registry.yarnpkg.com/@truffle/resolver/-/resolver-5.1.12.tgz#69c220973bb3326c3513a8e3e5a524f3aaa30f62" + integrity sha512-xiv7okPFT9mUZ9kc4iNMVPE85bGDdDwpMYE/LTmcpLNechmXlphgc3DzwJdQypZd6NjCrc/C1XMF178UiS+Szg== dependencies: - "@truffle/contract" "^4.1.13" + "@truffle/contract" "^4.2.3" "@truffle/expect" "^0.0.13" "@truffle/provisioner" "^0.2.0" debug "^4.1.1" detect-installed "^2.0.4" get-installed-path "^4.0.8" glob "^7.1.6" + source-map-support "^0.5.16" supports-color "^7.1.0" +"@truffle/source-map-utils@^1.3.97": + version "1.3.97" + resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.97.tgz#be2c3e073ab3a17f534a9c7ee4a418215222cf26" + integrity sha512-tSRBBr0+C9VgZJeHOaI3Ptk4x1fUQx4GbgbB8E6yoqOLdfE00pNINaQjUwSAuLyDevyw0U7AdBOY/6mrvRj2iQ== + dependencies: + "@truffle/code-utils" "^3.0.0" + "@truffle/codec" "^0.14.6" + debug "^4.3.1" + json-pointer "^0.6.1" + node-interval-tree "^1.3.3" + web3-utils "1.7.4" + +"@truffle/spinners@^0.2.2": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@truffle/spinners/-/spinners-0.2.2.tgz#0f69f18f3d8242eb6a9a20497e73e1c97e8ca0ac" + integrity sha512-6srCpV5MykkROtkj+ak5YX0GexAVuw+AB+lZIQxWLGP3i75pfJer7vL2nnqgr0madaAUuIixb7A2NJDFx3lOdg== + dependencies: + "@trufflesuite/spinnies" "^0.1.1" + +"@trufflesuite/bigint-buffer@1.1.10": + version "1.1.10" + resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.10.tgz#a1d9ca22d3cad1a138b78baaf15543637a3e1692" + integrity sha512-pYIQC5EcMmID74t26GCC67946mgTJFiLXOT/BYozgrd4UEY2JHEGLhWi9cMiQCt5BSqFEvKkCHNnoj82SRjiEw== + dependencies: + node-gyp-build "4.4.0" + +"@trufflesuite/chromafi@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@trufflesuite/chromafi/-/chromafi-3.0.0.tgz#f6956408c1af6a38a6ed1657783ce59504a1eb8b" + integrity sha512-oqWcOqn8nT1bwlPPfidfzS55vqcIDdpfzo3HbU9EnUmcSTX+I8z0UyUFI3tZQjByVJulbzxHxUGS3ZJPwK/GPQ== + dependencies: + camelcase "^4.1.0" + chalk "^2.3.2" + cheerio "^1.0.0-rc.2" + detect-indent "^5.0.0" + highlight.js "^10.4.1" + lodash.merge "^4.6.2" + strip-ansi "^4.0.0" + strip-indent "^2.0.0" + +"@trufflesuite/spinnies@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@trufflesuite/spinnies/-/spinnies-0.1.1.tgz#719230993f55ab39f936ed8778979e7661af188d" + integrity sha512-jltEtmFJj6xmQqr85gP8OqBHCEiId+zw+uAsb3DyLLRD17O6sySW6Afa2Z/jpzSafj+32ssDfLJ+c0of1NLqcA== + dependencies: + chalk "^4.1.2" + cli-cursor "^3.1.0" + strip-ansi "^6.0.0" + +"@tsconfig/node10@^1.0.7": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" + integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== + +"@tsconfig/node12@^1.0.7": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== + +"@tsconfig/node14@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== + +"@tsconfig/node16@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" + integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== + "@types/abstract-leveldown@*": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-5.0.1.tgz#3c7750d0186b954c7f2d2f6acc8c3c7ba0c3412e" - integrity sha512-wYxU3kp5zItbxKmeRYCEplS2MW7DzyBnxPGj+GJVHZEUZiK/nn5Ei1sUFgURDh+X051+zsGe28iud3oHjrYWQQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz#f055979a99f7654e84d6b8e6267419e9c4cfff87" + integrity sha512-q5veSX6zjUy/DlDhR4Y4cU0k2Ar+DT2LUraP00T19WLmTO6Se1djepCCaqU6nQrwcJ5Hyo/CWqxTzrrFg8eqbQ== + +"@types/accepts@^1.3.5": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" + integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== + dependencies: + "@types/node" "*" "@types/archiver@^5.1.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.1.1.tgz#d6d7610de4386b293abd5c1cb1875e0a4f4e1c30" - integrity sha512-heuaCk0YH5m274NOLSi66H1zX6GtZoMsdE6TYFcpFFjBjg0FoU4i4/M/a/kNlgNg26Xk3g364mNOYe1JaiEPOQ== + version "5.3.1" + resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.3.1.tgz#02991e940a03dd1a32678fead4b4ca03d0e387ca" + integrity sha512-wKYZaSXaDvTZuInAWjCeGG7BEAgTWG2zZW0/f7IYFcoHB2X2d9lkVFnrOlXl3W6NrvO6Ml3FLLu8Uksyymcpnw== dependencies: "@types/glob" "*" @@ -4573,10 +5772,10 @@ dependencies: "@types/pvutils" "*" -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.9" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz#77e59d438522a6fb898fa43dc3455c6e72f3963d" - integrity sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw== +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7": + version "7.1.19" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" + integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -4585,24 +5784,24 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc" - integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ== + version "7.6.4" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" + integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== dependencies: "@babel/types" "^7.0.0" "@types/babel__template@*": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307" - integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg== + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03" - integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A== + version "7.18.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.1.tgz#ce5e2c8c272b99b7a9fd69fa39f0b4cd85028bd9" + integrity sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA== dependencies: "@babel/types" "^7.3.0" @@ -4613,24 +5812,24 @@ dependencies: bignumber.js "*" -"@types/bn.js@*", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5": - version "4.11.6" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" - integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== +"@types/bn.js@*", "@types/bn.js@^5.1.0": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682" + integrity sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g== dependencies: "@types/node" "*" -"@types/bn.js@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.0.tgz#32c5d271503a12653c62cf4d2b45e6eab8cebc68" - integrity sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA== +"@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5": + version "4.11.6" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" + integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== dependencies: "@types/node" "*" -"@types/body-parser@*": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" - integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== +"@types/body-parser@*", "@types/body-parser@1.19.2": + version "1.19.2" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" "@types/node" "*" @@ -4642,81 +5841,85 @@ dependencies: "@types/node" "*" -"@types/bunyan@1.8.4": - version "1.8.4" - resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.4.tgz#69c11adc7b50538d45fb68d9ae39d062b9432f38" - integrity sha512-bxOF3fsm69ezKxdcJ7Oo/PsZMOJ+JIV/QJO2IADfScmR3sLulR88dpSnz6+q+9JJ1kD7dXFFgUrGRSKHLkOX7w== +"@types/bunyan@1.8.8", "@types/bunyan@^1.8.8": + version "1.8.8" + resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.8.tgz#8d6d33f090f37c07e2a80af30ae728450a101008" + integrity sha512-Cblq+Yydg3u+sGiz2mjHjC5MPmdjY+No4qvHrF+BUhblsmSfMvsHLbOG62tPbonsqBj6sbWv1LHcsoe5Jw+/Ow== dependencies: - "@types/events" "*" "@types/node" "*" -"@types/bunyan@^1.8.6": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.6.tgz#6527641cca30bedec5feb9ab527b7803b8000582" - integrity sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ== +"@types/bytebuffer@^5.0.40": + version "5.0.44" + resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.44.tgz#553015fb34db1fc3eb3f7b232bff91c006c251a1" + integrity sha512-k1qonHga/SfQT02NF633i+7tIfKd+cfC/8pjnedcfuXJNMWooss/FkCgRMSnLf2WorLjbuH4bfgAZEbtyHBDoQ== dependencies: + "@types/long" "^3.0.0" "@types/node" "*" -"@types/bytebuffer@^5.0.40": - version "5.0.40" - resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.40.tgz#d6faac40dcfb09cd856cdc4c01d3690ba536d3ee" - integrity sha512-h48dyzZrPMz25K6Q4+NCwWaxwXany2FhQg/ErOcdZS1ZpsaDnDMZg8JYLMTGz7uvXKrcKGJUZJlZObyfgdaN9g== +"@types/cacheable-request@^6.0.2": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9" + integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA== dependencies: - "@types/long" "*" + "@types/http-cache-semantics" "*" + "@types/keyv" "*" "@types/node" "*" + "@types/responselike" "*" "@types/caseless@*": - version "0.12.1" - resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a" - integrity sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A== + version "0.12.2" + resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" + integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w== "@types/cbor@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/cbor/-/cbor-2.0.0.tgz#c627afc2ee22f23f2337fecb34628a4f97c6afbb" - integrity sha1-xievwu4i8j8jN/7LNGKKT5fGr7s= + integrity sha512-yQH0JLcrHrH/GBIFFFq6DAsj9M4rmYsmSpGGGs67JrLGWPepYr2c1YugGjMd2Ib5pebluRAfNPJ4O1p80qX9HQ== dependencies: "@types/node" "*" -"@types/chai@^4.1.3", "@types/chai@^4.1.4": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a" - integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA== +"@types/chai-subset@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94" + integrity sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw== + dependencies: + "@types/chai" "*" + +"@types/chai@*", "@types/chai@^4.1.3", "@types/chai@^4.1.4": + version "4.3.3" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.3.tgz#3c90752792660c4b562ad73b3fbd68bf3bc7ae07" + integrity sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g== "@types/cli-table@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@types/cli-table/-/cli-table-0.3.0.tgz#f1857156bf5fd115c6a2db260ba0be1f8fc5671c" integrity sha512-QnZUISJJXyhyD6L1e5QwXDV/A5i2W1/gl6D6YMc8u0ncPepbv/B4w3S+izVvtAg60m6h+JP09+Y/0zF2mojlFQ== -"@types/color-name@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" - integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== - "@types/command-exists@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@types/command-exists/-/command-exists-1.2.0.tgz#d97e0ed10097090e4ab0367ed425b0312fad86f3" integrity sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A== "@types/concat-stream@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@types/concat-stream/-/concat-stream-1.6.0.tgz#394dbe0bb5fee46b38d896735e8b68ef2390d00d" - integrity sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0= + version "1.6.1" + resolved "https://registry.yarnpkg.com/@types/concat-stream/-/concat-stream-1.6.1.tgz#24bcfc101ecf68e886aaedce60dfd74b632a1b74" + integrity sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA== dependencies: "@types/node" "*" "@types/connect@*": - version "3.4.32" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28" - integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg== + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== dependencies: "@types/node" "*" "@types/cookiejar@*": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.1.tgz#90b68446364baf9efd8e8349bb36bd3852b75b80" - integrity sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw== + version "2.1.2" + resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8" + integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog== -"@types/cors@^2.8.5": +"@types/cors@2.8.12", "@types/cors@^2.8.5": version "2.8.12" resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== @@ -4727,9 +5930,11 @@ integrity sha512-lIxCk6G7AwmUagQ4gIQGxUBnvAq664prFD9nSAz6dgd1XmBXBtZABV/op+QsJsIyaP1GZsf/iXhYKHX3azSRCw== "@types/debug@^4.1.4", "@types/debug@^4.1.5": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + dependencies: + "@types/ms" "*" "@types/dotenv@^8.2.0": version "8.2.0" @@ -4738,24 +5943,24 @@ dependencies: dotenv "*" -"@types/duplexify@^3.5.0", "@types/duplexify@^3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@types/duplexify/-/duplexify-3.6.0.tgz#dfc82b64bd3a2168f5bd26444af165bf0237dcd8" - integrity sha512-5zOA53RUlzN74bvrSGwjudssD9F3a797sDZQkiYpUOxW+WHaXTCPz4/d5Dgi6FKnOqZ2CpaTo0DhgIfsXAOE/A== +"@types/duplexify@^3.6.0": + version "3.6.1" + resolved "https://registry.yarnpkg.com/@types/duplexify/-/duplexify-3.6.1.tgz#5685721cf7dc4a21b6f0e8a8efbec6b4d2fbafad" + integrity sha512-n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ== dependencies: "@types/node" "*" "@types/elliptic@^6.4.12", "@types/elliptic@^6.4.9": - version "6.4.12" - resolved "https://registry.yarnpkg.com/@types/elliptic/-/elliptic-6.4.12.tgz#e8add831f9cc9a88d9d84b3733ff669b68eaa124" - integrity sha512-gP1KsqoouLJGH6IJa28x7PXb3cRqh83X8HCLezd2dF+XcAIMKYv53KV+9Zn6QA561E120uOqZBQ+Jy/cl+fviw== + version "6.4.14" + resolved "https://registry.yarnpkg.com/@types/elliptic/-/elliptic-6.4.14.tgz#7bbaad60567a588c1f08b10893453e6b9b4de48e" + integrity sha512-z4OBcDAU0GVwDTuwJzQCiL6188QvZMkvoERgcVjq0/mPM8jCfdwZ3x5zQEVoL9WCAru3aG5wl3Z5Ww5wBWn7ZQ== dependencies: "@types/bn.js" "*" "@types/ethereum-protocol@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/ethereum-protocol/-/ethereum-protocol-1.0.0.tgz#416e3827d5fdfa4658b0045b35a008747871b271" - integrity sha512-3DiI3Zxf81CgX+VhxNNFJBv/sfr1BFBKQK2sQ85hU9FwWJJMWV5gRDV79OUNShiwj3tYYIezU94qpucsb3dThQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/ethereum-protocol/-/ethereum-protocol-1.0.2.tgz#e765d4c6f4b5ebe906932bd20333e307c56a9bc7" + integrity sha512-Ri/hwt4UckZlF7eqhhAQcXsNvcgQmSJOKZteLco1/5NsRcneW/cJuQcrQNILN2Ohs9WUQjeGW3ZRRNqkEVMzuQ== dependencies: bignumber.js "7.2.1" @@ -4767,23 +5972,10 @@ "@types/bn.js" "*" "@types/node" "*" -"@types/events@*": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86" - integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== - -"@types/express-jwt@0.0.42": - version "0.0.42" - resolved "https://registry.yarnpkg.com/@types/express-jwt/-/express-jwt-0.0.42.tgz#4f04e1fadf9d18725950dc041808a4a4adf7f5ae" - integrity sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag== - dependencies: - "@types/express" "*" - "@types/express-unless" "*" - "@types/express-rate-limit@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@types/express-rate-limit/-/express-rate-limit-5.0.0.tgz#46b0dbae748a53347a5e1c3bdbb5a54e3f5c34f9" - integrity sha512-tVRtvshGIYTNiUET3XJaONn1Li0V9mhi9Tb23Kf3rJ19hsgbCywkZBOf5Xhd9OXBO0Ssw7B+qAHL77xe/TiqUw== + version "5.1.3" + resolved "https://registry.yarnpkg.com/@types/express-rate-limit/-/express-rate-limit-5.1.3.tgz#79f2ca40d90455a5798da6f8e06d8a3d35f4a1d6" + integrity sha512-H+TYy3K53uPU2TqPGFYaiWc2xJV6+bIFkDd/Ma2/h67Pa6ARk9kWE0p/K9OH1Okm0et9Sfm66fmXoAxsH2PHXg== dependencies: "@types/express" "*" @@ -4794,37 +5986,41 @@ dependencies: "@types/express-serve-static-core" "*" -"@types/express-serve-static-core@*": - version "4.17.5" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c" - integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw== +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": + version "4.17.30" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04" + integrity sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ== dependencies: "@types/node" "*" + "@types/qs" "*" "@types/range-parser" "*" -"@types/express-serve-static-core@^4.17.18": - version "4.17.24" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" - integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== +"@types/express-serve-static-core@4.17.31": + version "4.17.31" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" + integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" -"@types/express-unless@*": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@types/express-unless/-/express-unless-0.5.2.tgz#07e29883d280778588644b03563d8796f870f20e" - integrity sha512-Q74UyYRX/zIgl1HSp9tUX2PlG8glkVm+59r7aK4KGKzC5jqKIOX6rrVLRQrzpZUQ84VukHtRoeAuon2nIssHPQ== +"@types/express@*", "@types/express@^4.17.12", "@types/express@^4.17.13", "@types/express@^4.17.6": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== dependencies: - "@types/express" "*" + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" -"@types/express@*", "@types/express@^4.17.3", "@types/express@^4.17.6": - version "4.17.8" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a" - integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ== +"@types/express@4.17.14": + version "4.17.14" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" + integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "*" + "@types/express-serve-static-core" "^4.17.18" "@types/qs" "*" "@types/serve-static" "*" @@ -4837,82 +6033,64 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" -"@types/express@^4.17.12": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/form-data@*": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e" - integrity sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ== - dependencies: - "@types/node" "*" - "@types/form-data@0.0.33": version "0.0.33" resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-0.0.33.tgz#c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8" - integrity sha1-yayFsqX9GENbjIXZ7LUObWyJP/g= + integrity sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw== dependencies: "@types/node" "*" "@types/fs-extra@^8.0.0", "@types/fs-extra@^8.0.1", "@types/fs-extra@^8.1.0": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d" - integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg== + version "8.1.2" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f" + integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg== dependencies: "@types/node" "*" "@types/glob@*": - version "7.1.4" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" - integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== + version "8.0.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.0.tgz#321607e9cbaec54f687a0792b2d1d370739455d2" + integrity sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA== dependencies: "@types/minimatch" "*" "@types/node" "*" "@types/glob@^7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" - integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== dependencies: - "@types/events" "*" "@types/minimatch" "*" "@types/node" "*" -"@types/google-libphonenumber@^7.4.17": - version "7.4.17" - resolved "https://registry.yarnpkg.com/@types/google-libphonenumber/-/google-libphonenumber-7.4.17.tgz#26974213353cb459e403a5740812115a596cf170" - integrity sha512-NdqFHXBGxwiGjJn7dTAjcCckgxE+LbE3jik6/SNiC9ZfG4BxHJM1X6m8w+/ZpSGRN5s0+4dIL+MaD/KSXywp1g== - -"@types/google-libphonenumber@^7.4.23": +"@types/google-libphonenumber@^7.4.17", "@types/google-libphonenumber@^7.4.23": version "7.4.23" resolved "https://registry.yarnpkg.com/@types/google-libphonenumber/-/google-libphonenumber-7.4.23.tgz#c44c9125d45f042943694d605fd8d8d796cafc3b" integrity sha512-C3ydakLTQa8HxtYf9ge4q6uT9krDX8smSIxmmW3oACFi5g5vv6T068PRExF7UyWbWpuYiDG8Nm24q2X5XhcZWw== -"@types/graceful-fs@^4.1.2": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" - integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ== +"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" + integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== dependencies: "@types/node" "*" "@types/hdkey@^0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@types/hdkey/-/hdkey-0.7.0.tgz#6734d138e3c597f241be8fae2e60c2949bc3af87" - integrity sha512-hS/ueljJBb6i7r7VqhgmBVmDqGKMqQg2nlGIaf71CCG6+iGNE7yeaHgtBWR/wveD+o+K0ma0VE/XweUBHHTQFQ== + version "0.7.1" + resolved "https://registry.yarnpkg.com/@types/hdkey/-/hdkey-0.7.1.tgz#9bc63ebbe96b107b277b65ea7a95442a677d0d61" + integrity sha512-4Kkr06hq+R8a9EzVNqXGOY2x1xA7dhY6qlp6OvaZ+IJy1BCca1Cv126RD9X7CMJoXoLo8WvAizy8gQHpqW6K0Q== dependencies: "@types/node" "*" +"@types/http-cache-semantics@*": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" + integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== + "@types/humanize-duration@^3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@types/humanize-duration/-/humanize-duration-3.18.0.tgz#1de456980ff537a17cd62447f3d128bb57198d5a" - integrity sha512-11QHl+GvEQ5TlCjA9xqQKNv4S0P8XFq5uHeZe2UPjngESBl7tA1tai/60eEYwWMFWIyQOl7ybarYF0B33K3Qtg== + version "3.27.1" + resolved "https://registry.yarnpkg.com/@types/humanize-duration/-/humanize-duration-3.27.1.tgz#f14740d1f585a0a8e3f46359b62fda8b0eaa31e7" + integrity sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w== "@types/inquirer@^6.5.0": version "6.5.0" @@ -4923,59 +6101,73 @@ rxjs "^6.4.0" "@types/is-base64@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@types/is-base64/-/is-base64-1.1.0.tgz#8f0e0874ba0df223a413e46fa12e681708d19080" - integrity sha512-rigoMG77vfIXWjYUDBMPCY0qVzY1dGtEILSsjCcvDH/UgB2ENTZl0uKQknJq4W4nEUqVZqX0M9Uw/VRZ/vwzWQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/is-base64/-/is-base64-1.1.1.tgz#a17d2b0075f637f80f9ab5f76f0071a65f6965d4" + integrity sha512-JgnGhP+MeSHEQmvxcobcwPEP4Ew56voiq9/0hmP/41lyQ/3gBw/ZCIRy2v+QkEOdeCl58lRcrf6+Y6WMlJGETA== "@types/isomorphic-fetch@0.0.31": version "0.0.31" resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.31.tgz#ec120166ce22f0b134e8770f40c97cd076068fae" - integrity sha1-7BIBZs4i8LE06HcPQMl80HYGj64= + integrity sha512-mJLpWAOSe9LmccuMkgL2wMfqTFt4kW5kEw2PhhnDT+J0AUn6e1c7dq5CJKL+iUmc9N1QrgWrah8kWqePpmemKA== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" - integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-report@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" - integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a" - integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" + integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^26.0.21": - version "26.0.21" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.21.tgz#3a73c2731e7e4f0fbaea56ce7ff8c79cf812bd24" - integrity sha512-ab9TyM/69yg7eew9eOwKMUmvIZAKEGZYlq/dhe5/0IMUd/QLJv5ldRMdddSn+u22N13FP3s5jYyktxuBwY0kDA== +"@types/jest@^29.1.1": + version "29.1.1" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.1.1.tgz#cf21a0835a1ba9a30ea1966019f1261c6a114c92" + integrity sha512-U9Ey07dGWl6fUFaIaUQUKWG5NoKi/zizeVQCGV8s4nSU0jPgqphVZvS64+8BtWYvrc3ZGw6wo943NSYPxkrp/g== dependencies: - jest-diff "^26.0.0" - pretty-format "^26.0.0" + expect "^29.0.0" + pretty-format "^29.0.0" "@types/json-schema@^7.0.6": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== + +"@types/jsonwebtoken@^8.5.8": + version "8.5.9" + resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz#2c064ecb0b3128d837d2764aa0b117b0ff6e4586" + integrity sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg== + dependencies: + "@types/node" "*" + +"@types/keyv@*": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@types/node" "*" "@types/ledgerhq__hw-transport-node-hid@^4.22.2": version "4.22.2" @@ -5001,37 +6193,52 @@ "@types/abstract-leveldown" "*" "@types/node" "*" -"@types/lodash@^4.14.104": - version "4.14.136" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.136.tgz#413e85089046b865d960c9ff1d400e04c31ab60f" - integrity sha512-0GJhzBdvsW2RUccNHOBkabI8HZVdOXmXbXhuKlDEd5Vv12P7oAVGfomGp3Ne21o5D/qu1WmthlNKFaoZJJeErA== +"@types/lodash@^4.14.104", "@types/lodash@^4.14.170": + version "4.14.184" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe" + integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q== -"@types/lodash@^4.14.170": - version "4.14.170" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.170.tgz#0d67711d4bf7f4ca5147e9091b847479b87925d6" - integrity sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q== +"@types/long@^3.0.0": + version "3.0.32" + resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69" + integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA== -"@types/long@*", "@types/long@^4.0.0", "@types/long@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" - integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== +"@types/long@^4.0.0", "@types/long@^4.0.1": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" + integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== + +"@types/lru-cache@5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.1.tgz#c48c2e27b65d2a153b19bfc1a317e30872e01eef" + integrity sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw== "@types/mathjs@^4.4.1": - version "4.4.1" - resolved "https://registry.yarnpkg.com/@types/mathjs/-/mathjs-4.4.1.tgz#ce876a823848486f3675f8573e93f2d282feba19" - integrity sha512-i6Y5yEo9aUD+6Pbh8WDDMpth6IvBVYvm6SKpsMxlraeuhN1ei182TLzU/EL5viQbFMzgOSqOhmXi87mwXsoQaw== + version "4.4.5" + resolved "https://registry.yarnpkg.com/@types/mathjs/-/mathjs-4.4.5.tgz#b28d46919c68b93bcabf0551729624b302af9b4b" + integrity sha512-Z9XyD6ORkE/dTwCGQ4htXaB8D/OkcRhQy4EtEvJ6lRmbgcYoS2q3CAMoB3s2mgQZmyQy85gtJcfbCz85LV1w+Q== dependencies: decimal.js "^10.0.0" "@types/mime@*": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b" - integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" + integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== -"@types/minimatch@*", "@types/minimatch@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== +"@types/minimatch@*": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== + +"@types/minimatch@^3.0.3": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + +"@types/minimist@^1.2.0": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/mkdirp@^0.5.2": version "0.5.2" @@ -5041,15 +6248,20 @@ "@types/node" "*" "@types/mocha@^5.2.5": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.6.tgz#b8622d50557dd155e9f2f634b7d68fd38de5e94b" - integrity sha512-1axi39YdtBI7z957vdqXI4Ac25e7YihYQtJa+Clnxg1zTJEaIRbndt71O3sP4GAMgiAm0pY26/b9BrY4MR/PMw== + version "5.2.7" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea" + integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ== "@types/mocha@^7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce" integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w== +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== + "@types/node-fetch@2.5.12": version "2.5.12" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66" @@ -5058,10 +6270,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node-fetch@^2.5.0", "@types/node-fetch@^2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c" - integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw== +"@types/node-fetch@^2.5.7": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" + integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== dependencies: "@types/node" "*" form-data "^3.0.0" @@ -5073,76 +6285,61 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>= 8": - version "14.0.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.20.tgz#0da05cddbc761e1fa98af88a17244c8c1ff37231" - integrity sha512-MRn/NP3dee8yL5QhbSA6riuwkS+UOcsPUMOIOG3KMUQpuor/2TopdRBu8QaaB4fGU+gz/bzyDWt0FtUbeJ8H1A== +"@types/node@*", "@types/node@18.7.16", "@types/node@>=12.12.47", "@types/node@>=13.7.0": + version "18.7.16" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" + integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== "@types/node@10.12.18": version "10.12.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67" integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ== -"@types/node@10.17.0": - version "10.17.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.0.tgz#537c61a1df699a8331c79dab2ccc2c8799873c66" - integrity sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg== - "@types/node@11.11.6": version "11.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a" integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ== -"@types/node@>=12.12.47": - version "15.0.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.3.tgz#ee09fcaac513576474c327da5818d421b98db88a" - integrity sha512-/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ== - -"@types/node@>=13.7.0": - version "16.11.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.1.tgz#2e50a649a50fc403433a14f829eface1a3443e97" - integrity sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA== - -"@types/node@^10", "@types/node@^10.12.18", "@types/node@^10.3.2": - version "10.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.10.tgz#e491484c6060af8d461e12ec81c0da8a3282b8de" - integrity sha512-V8wj+w2YMNvGuhgl/MA5fmTxgjmVHVoasfIaxMMZJV6Y8Kk+Ydpi1z2whoShDCJ2BuNVoqH/h1hrygnBxkrw/Q== +"@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": + version "10.17.60" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" + integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== "@types/node@^12.11.7", "@types/node@^12.12.17", "@types/node@^12.12.6", "@types/node@^12.6.1": - version "12.12.62" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.62.tgz#733923d73669188d35950253dd18a21570085d2b" - integrity sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg== + version "12.20.55" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" + integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^13.7.0": - version "13.13.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.10.tgz#34a9be3cbc409fd235984bd18a130006f5234396" - integrity sha512-J+FbkhLTcFstD7E5mVZDjYxa1VppwT2HALE6H3n2AnBSP8uiCQk0Pyr6BkJcP38dFV9WecoVJRJmFnl9ikIW7Q== +"@types/node@^18.7.16": + version "18.7.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154" + integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg== "@types/node@^6.0.52": - version "6.14.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.6.tgz#31df045b4c7618ff74d84f542fc3d29445dd566b" - integrity sha512-rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w== + version "6.14.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" + integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== -"@types/node@^8.0.0", "@types/node@^8.0.47", "@types/node@^8.10.59": - version "8.10.59" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04" - integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ== - -"@types/node@^9.3.0", "@types/node@^9.4.1": - version "9.6.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.7.tgz#5f3816d1db2155edcde1b2e3aa5d0e5c520cb564" - integrity sha512-MuUfEDBrQ/hb7KOqMiDeItAuRxlilQUgNRthTSCU4HgilH8UBh7wiHxWrv/lcyHyFZcREaODVVRNrAunphVwlg== +"@types/node@^8.0.0", "@types/node@^8.10.59": + version "8.10.66" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" + integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== "@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/p-defer@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@types/p-defer/-/p-defer-1.0.3.tgz#786ce79c86f779fcd9e9bec4f1fbd1167aeac064" integrity sha512-0CK39nXek0mSZL/lnGYjhcR1QLAxg9N0/5S1BvU+MQwjlP4Jd2ebbEkJ/bEUqYMAvKLMZcGd4sJE13dnUKlDnQ== +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + "@types/pbkdf2@^3.0.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.0.tgz#039a0e9b67da0cdc4ee5dab865caa6b267bb66b1" @@ -5150,23 +6347,24 @@ dependencies: "@types/node" "*" -"@types/pg-types@*": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@types/pg-types/-/pg-types-1.11.5.tgz#1eebbe62b6772fcc75c18957a90f933d155e005b" - integrity sha512-L8ogeT6vDzT1vxlW3KITTCt+BVXXVkLXfZ/XNm6UqbcJgxf+KPO7yjWx7dQQE8RW07KopL10x2gNMs41+IkMGQ== - "@types/pg@^7.14.3": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@types/pg/-/pg-7.14.3.tgz#eb166e4f4287923890b10ed20371f937938cb995" - integrity sha512-go5zddQ1FrUQHeBvqPzQ1svKo4KKucSwvqLsvwc/EIuQ9sxDA21b68xc/RwhzAK5pPCnez8NrkYatFIGdJBVvA== + version "7.14.11" + resolved "https://registry.yarnpkg.com/@types/pg/-/pg-7.14.11.tgz#daf5555504a1f7af4263df265d91f140fece52e3" + integrity sha512-EnZkZ1OMw9DvNfQkn2MTJrwKmhJYDEs5ujWrPfvseWNoI95N8B4HzU/Ltrq5ZfYxDX/Zg8mTzwr6UAyTjjFvXA== dependencies: "@types/node" "*" - "@types/pg-types" "*" + pg-protocol "^1.2.0" + pg-types "^2.2.0" -"@types/prettier@^1.13.2", "@types/prettier@^2.0.0", "@types/prettier@^2.2.1": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf" - integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w== +"@types/prettier@^1.13.2": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" + integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== + +"@types/prettier@^2.0.0", "@types/prettier@^2.1.5": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc" + integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A== "@types/promise.allsettled@^1.0.3": version "1.0.3" @@ -5182,31 +6380,31 @@ "@types/revalidator" "*" "@types/prompts@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/prompts/-/prompts-1.1.1.tgz#5688abfa6a95ddfe808f8ae5337e86e5cf8f3147" - integrity sha512-iqE02VXr48Dw//ZBTU0wiL1gbBn3sclnAuTztMLjd2L3bKgq2Qcn0d6ezIXFMaaAl2382g99CUp/p3scU/JCpQ== + version "1.2.0" + resolved "https://registry.yarnpkg.com/@types/prompts/-/prompts-1.2.0.tgz#891e73f735ad5e82e8adae3a99424128e105fb62" + integrity sha512-7JXpT2rSd4hqd2oBWU1wfEW6x6gX+qPH+gLzGEx+My3wcb67K9Rc02xNQRVn67phusmXm5Yqn4oTP2OW1G5zdQ== "@types/prop-types@*": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c" - integrity sha512-ZBFR7TROLVzCkswA3Fmqq+IIJt62/T7aY/Dmz+QkU7CaW2QFqAitCE8Ups7IzmGhcN1YWMBT4Qcoc07jU9hOJQ== + version "15.7.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== "@types/pvutils@*": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@types/pvutils/-/pvutils-0.0.2.tgz#e21684962cfa58ac920fd576d90556032dc86009" - integrity sha512-CgQAm7pjyeF3Gnv78ty4RBVIfluB+Td+2DR8iPaU0prF18pkzptHHP+DoKPfpsJYknKsVZyVsJEu5AuGgAqQ5w== + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/pvutils/-/pvutils-1.0.1.tgz#f23c5c7915faedf4d281226579cf361127adea11" + integrity sha512-OwGyloDb4Gz7cKzFt1ZfHkNXbh1gxd5706hPF5ot4cvsa2EfbqY1tz2nWtu6xWDccNSZ16p/pi027gloQu4hsQ== "@types/qrcode@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.4.tgz#984d97bb72caa558d470158701081ccb712f616b" - integrity sha512-aILE5yvKaqQXlY0YPMEYwK/KwdD43fwQTyagj0ffBBTQj8h//085Zp8LUrOnZ9FT69x64f5UgDo0EueY4BPAdg== + version "1.5.0" + resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.0.tgz#6a98fe9a9a7b2a9a3167b6dde17eff999eabe40b" + integrity sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA== dependencies: "@types/node" "*" "@types/qs@*", "@types/qs@^6.2.31": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7" - integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw== + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== "@types/randombytes@^2.0.0": version "2.0.0" @@ -5216,9 +6414,9 @@ "@types/node" "*" "@types/range-parser@*": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" - integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== "@types/react-native@0.63.50": version "0.63.50" @@ -5228,30 +6426,31 @@ "@types/react" "*" "@types/react@*": - version "16.9.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.41.tgz#925137ee4d2ff406a0ecf29e8e9237390844002e" - integrity sha512-6cFei7F7L4wwuM+IND/Q2cV1koQUvJ8iSV+Gwn0c3kvABZ691g7sp3hfEQHOUBJtccl1gPi+EyNjMIl9nGA0ug== + version "18.0.18" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.18.tgz#9f16f33d57bc5d9dca848d12c3572110ff9429ac" + integrity sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg== dependencies: "@types/prop-types" "*" - csstype "^2.2.0" + "@types/scheduler" "*" + csstype "^3.0.2" "@types/readable-stream@^2.3.5": - version "2.3.7" - resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.7.tgz#46a1c78844b4bdafddaa69c76bbfd29d70fca670" - integrity sha512-oAbOdOKhx5nu1+pBPiwEHh6gqA3ojgwwNwNIjNd67TqwEjvVePqe21mnYc6RrnGZ8aVPFBe6sci3cU2pKKwuug== + version "2.3.14" + resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.14.tgz#1282cdc03a1fc9ed52982aa8f0553d7c251070b9" + integrity sha512-8jQ5Mp7bsDJEnW/69i6nAaQMoLwAVJVc7ZRAVTrdh/o6XueQsX38TEvKuYyoQj76/mg7WdlRfMrtl9pDLCJWsg== dependencies: "@types/node" "*" safe-buffer "*" -"@types/request@^2.47.0": - version "2.48.1" - resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.1.tgz#e402d691aa6670fbbff1957b15f1270230ab42fa" - integrity sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg== +"@types/request@^2.48.1": + version "2.48.8" + resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.8.tgz#0b90fde3b655ab50976cb8c5ac00faca22f5a82c" + integrity sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ== dependencies: "@types/caseless" "*" - "@types/form-data" "*" "@types/node" "*" "@types/tough-cookie" "*" + form-data "^2.5.0" "@types/resolve@^0.0.8": version "0.0.8" @@ -5260,6 +6459,20 @@ dependencies: "@types/node" "*" +"@types/responselike@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-3.0.0.tgz#5ecc1fc88552e5ac03de648a7796f9e125d002dc" + integrity sha512-zfgGLWx5IQOTJgQPD4UfGEhapTKUPC1ra/QCG02y3GUJWrhX05bBf/EfTh3aFj2DKi7cLo+cipXLNclD27tQXQ== + dependencies: + responselike "*" + +"@types/responselike@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + dependencies: + "@types/node" "*" + "@types/revalidator@*": version "0.3.8" resolved "https://registry.yarnpkg.com/@types/revalidator/-/revalidator-0.3.8.tgz#86e0b03b49736000ad42ce6b002725e74c6805ff" @@ -5273,25 +6486,35 @@ "@types/glob" "*" "@types/node" "*" +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "@types/secp256k1@^4.0.0", "@types/secp256k1@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.1.tgz#fb3aa61a1848ad97d7425ff9dcba784549fca5a4" - integrity sha512-+ZjSA8ELlOp8SlKi0YLB2tz9d5iPNEmOBd+8Rz21wTMdaXQIa9b6TEnD6l5qKOCypE7FSyPyck12qZJxSDNoog== + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c" + integrity sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w== dependencies: "@types/node" "*" +"@types/seedrandom@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-3.0.1.tgz#1254750a4fec4aff2ebec088ccd0bb02e91fedb4" + integrity sha512-giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw== + "@types/semver@7.3.8": version "7.3.8" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59" integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now== "@types/serve-static@*": - version "1.13.2" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48" - integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q== + version "1.15.0" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" + integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== dependencies: - "@types/express-serve-static-core" "*" "@types/mime" "*" + "@types/node" "*" "@types/solidity-parser-antlr@^0.2.3": version "0.2.3" @@ -5304,9 +6527,16 @@ integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== "@types/stack-utils@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" - integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== + +"@types/stoppable@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/stoppable/-/stoppable-1.1.1.tgz#a6f1f280e29f8f3c743277534425e0a75041d2f9" + integrity sha512-b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw== + dependencies: + "@types/node" "*" "@types/string-hash@^1.1.1": version "1.1.1" @@ -5314,42 +6544,49 @@ integrity sha512-ijt3zdHi2DmZxQpQTmozXszzDo78V4R3EdvX0jFMfnMH2ZzQSmCbaWOMPGXFUYSzSIdStv78HDjg32m5dxc+tA== "@types/superagent@*": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.7.tgz#a7d92d98c490ee0f802a127fdf149b9a114f77a5" - integrity sha512-JSwNPgRYjIC4pIeOqLwWwfGj6iP1n5NE6kNBEbGx2V8H78xCPwx7QpNp9plaI30+W3cFEzJO7BIIsXE+dbtaGg== + version "4.1.15" + resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.15.tgz#63297de457eba5e2bc502a7609426c4cceab434a" + integrity sha512-mu/N4uvfDN2zVQQ5AYJI/g4qxn2bHB6521t1UuH09ShNWjebTqN0ZFuYK9uYjcgmI0dTQEs+Owi1EO6U0OkOZQ== dependencies: "@types/cookiejar" "*" "@types/node" "*" "@types/supertest@^2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.9.tgz#049bddbcb0ee0d60a9b836ccc977d813a1c32325" - integrity sha512-0BTpWWWAO1+uXaP/oA0KW1eOZv4hc0knhrWowV06Gwwz3kqQxNO98fUFM2e15T+PdPRmOouNFrYvaBgdojPJ3g== + version "2.0.12" + resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.12.tgz#ddb4a0568597c9aadff8dbec5b2e8fddbe8692fc" + integrity sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ== dependencies: "@types/superagent" "*" "@types/tar-fs@*": - version "1.16.2" - resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-1.16.2.tgz#6f5acea15d3b7777b8bf3f1c6d4e80ce71288f34" - integrity sha512-eds/pbRf0Fe0EKmrHDbs8mRkfbjz2upAdoUfREw14dPboZaHqqZ1Y+uVeoakoPavpZMpj22nhUTAYkX5bz3DXA== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-2.0.1.tgz#6391dcad1b03dea2d79fac07371585ab54472bb1" + integrity sha512-qlsQyIY9sN7p221xHuXKNoMfUenOcvEBN4zI8dGsYbYCqHtTarXOEXSIgUnK+GcR0fZDse6pAIc5pIrCh9NefQ== dependencies: "@types/node" "*" "@types/tar-stream" "*" "@types/tar-stream@*": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-1.6.1.tgz#67d759068ff781d976cad978893bb7a334ec8809" - integrity sha512-pYCDOPuRE+4tXFk1rSMYiuI+kSrXiJ4av1bboQbkcEBA2rqwEWfIn9kdMSH+5nYu58WksHuxwx+7kVbtg0Le7w== + version "2.2.2" + resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-2.2.2.tgz#be9d0be9404166e4b114151f93e8442e6ab6fb1d" + integrity sha512-1AX+Yt3icFuU6kxwmPakaiGrJUwG44MpuiqPg4dSolRFk6jmvs4b3IbUol9wKDLIgU76gevn3EwE8y/DkSJCZQ== dependencies: "@types/node" "*" -"@types/targz@1.0.0", "@types/targz@^1.0.0": +"@types/targz@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/targz/-/targz-1.0.0.tgz#cca3b2c87548d98f961b57306dc36d06f9fd15b2" integrity sha512-kNFPOpsmdtT+DMXHuu5H7gXD5LlMHtS/kSQjuVY3QqxHQqGFV854o+EimC1GZ5/+iYZWzk9dNRiAUFbI/mvUsQ== dependencies: "@types/tar-fs" "*" +"@types/targz@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/targz/-/targz-1.0.1.tgz#8b68a867b5dc28a755fd57e62d8b17f94e28462f" + integrity sha512-Uf5QxuLICkVOmSyDhPicBpIXk2oLIqaldObfr/WsTKTAPk666OpbeL0wZuNXwc5yg9OH1cBVj1rpMHGBJe4ilg== + dependencies: + "@types/tar-fs" "*" + "@types/through@*": version "0.0.30" resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895" @@ -5363,21 +6600,14 @@ integrity sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA== "@types/tough-cookie@*": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.4.tgz#821878b81bfab971b93a265a561d54ea61f9059f" - integrity sha512-Set5ZdrAaKI/qHdFlVMgm/GsAv/wkXhSTuZFkJ+JI7HK+wIkIlOaUXSXieIvJ0+OvGIqtREFoE+NHJtEq0gtEw== - -"@types/tunnel@^0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.1.tgz#0d72774768b73df26f25df9184273a42da72b19c" - integrity sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A== - dependencies: - "@types/node" "*" + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== "@types/underscore@^1.8.8": - version "1.8.8" - resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.8.8.tgz#510fe1ca5e7fa87fccd405b9a8b566d420bc3d1b" - integrity sha512-EquzRwzAAs04anQ8/6MYXFKvHoD+MIlF+gu87EDda7dN9zrKvQYHsc9VFAPB1xY4tUHQVvBMtjsHrvof2EE1Mg== + version "1.11.4" + resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.4.tgz#62e393f8bc4bd8a06154d110c7d042a93751def3" + integrity sha512-uO4CD2ELOjw8tasUrAhvnn2W4A0ZECOvMjCivJr4gA9pGgjv+qxKWY9GLTMVEK8ej85BxQOocUyE7hImmSQYcg== "@types/utf8@^2.1.6": version "2.1.6" @@ -5385,14 +6615,14 @@ integrity sha512-pRs2gYF5yoKYrgSaira0DJqVg2tFuF+Qjp838xS7K+mJyY2jJzjsrl6y17GbIa4uMRogMbxs+ghNCvKg6XyNrA== "@types/uuid@^7.0.3": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.4.tgz#00a5749810b4ad80bff73a61f9cc9d0d521feb3c" - integrity sha512-WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g== + version "7.0.5" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.5.tgz#b1d2f772142a301538fae9bdf9cf15b9f2573a29" + integrity sha512-hKB88y3YHL8oPOs/CNlaXtjWn93+Bs48sDQR37ZUqG2tLeCS7EA1cmnkKsuQsub9OKEB/y/Rw9zqJqqNSbqVlQ== "@types/web3-provider-engine@^14.0.0": - version "14.0.0" - resolved "https://registry.yarnpkg.com/@types/web3-provider-engine/-/web3-provider-engine-14.0.0.tgz#43adc3b39dc9812b82aef8cd2d66577665ad59b0" - integrity sha512-yHr8mX2SoX3JNyfqdLXdO1UobsGhfiwSgtekbVxKLQrzD7vtpPkKbkIVsPFOhvekvNbPsCmDyeDCLkpeI9gSmA== + version "14.0.1" + resolved "https://registry.yarnpkg.com/@types/web3-provider-engine/-/web3-provider-engine-14.0.1.tgz#9ceb76af025e9359a28cff1f0fc4c19070c40ab7" + integrity sha512-SaAfLJY/40wKFDsNFwaNfwqFSL6kVhTx9JD18qM+Gaw1qdAXLYF/6E7TIqWEdoG4so6fki/zxURP5NsoCePYJw== dependencies: "@types/ethereum-protocol" "*" @@ -5404,29 +6634,41 @@ web3 "*" "@types/yargs-parser@*": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0" - integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw== + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^11.0.0": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.2.tgz#fd4b676846fe731a5de5c6d2e5ef6a377262fc30" - integrity sha512-zG61PAp2OcoIBjRV44wftJj6AJgzJrOc32LCYOBqk9bdgcdzK5DCJHV9QZJ60+Fu+fOn79g8Ks3Gixm4CfkZ+w== + version "11.1.8" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.8.tgz#b730ecb2bde209d12194cdf8bf9f12c4bd21965a" + integrity sha512-49Pmk3GBUOrs/ZKJodGMJeEeiulv2VdfAYpGgkTCSXpNWx7KCX36+PbrkItwzrjTDHO2QoEZDpbhFoMN1lxe9A== "@types/yargs@^13.0.0", "@types/yargs@^13.0.2": - version "13.0.3" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380" - integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ== + version "13.0.12" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.12.tgz#d895a88c703b78af0465a9de88aa92c61430b092" + integrity sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ== dependencies: "@types/yargs-parser" "*" "@types/yargs@^15.0.0": - version "15.0.4" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299" - integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg== + version "15.0.14" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" + integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== + dependencies: + "@types/yargs-parser" "*" + +"@types/yargs@^17.0.8": + version "17.0.12" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526" + integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ== dependencies: "@types/yargs-parser" "*" +"@ungap/promise-all-settled@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" + integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== + "@web3-js/scrypt-shim@^0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@web3-js/scrypt-shim/-/scrypt-shim-0.1.0.tgz#0bf7529ab6788311d3e07586f7d89107c3bea2cc" @@ -5592,6 +6834,11 @@ "@webassemblyjs/wast-parser" "1.8.5" "@xtuc/long" "4.2.2" +"@xmldom/xmldom@^0.7.0": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" + integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -5607,7 +6854,7 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -JSONStream@^1.0.4, JSONStream@^1.2.1, JSONStream@^1.3.2, JSONStream@^1.3.4: +JSONStream@^1.0.4, JSONStream@^1.2.1: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== @@ -5620,7 +6867,7 @@ abab@^2.0.3, abab@^2.0.5: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== -abbrev@1, abbrev@~1.1.1: +abbrev@1, abbrev@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -5628,31 +6875,47 @@ abbrev@1, abbrev@~1.1.1: abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" - integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU= + integrity sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q== -abort-controller@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-2.0.3.tgz#b174827a732efadff81227ed4b8d1cc569baf20a" - integrity sha512-EPSq5wr2aFyAZ1PejJB32IX9Qd4Nwus+adnp7STYFM5/23nLPBazqZ1oor6ZqbH+4otaaGXTlC8RN5hq3C8w9Q== - dependencies: - event-target-shim "^5.0.0" +abi-to-sol@^0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/abi-to-sol/-/abi-to-sol-0.6.6.tgz#2f0b7ea949f7015c1a7939d200b9e8d07f2c3c6d" + integrity sha512-PRn81rSpv6NXFPYQSw7ujruqIP6UkwZ/XoFldtiqCX8+2kHVc73xVaUVvdbro06vvBVZiwnxhEIGdI4BRMwGHw== + dependencies: + "@truffle/abi-utils" "^0.3.0" + "@truffle/contract-schema" "^3.3.1" + ajv "^6.12.5" + better-ajv-errors "^0.8.2" + neodoc "^2.0.2" + semver "^7.3.5" + source-map-support "^0.5.19" + optionalDependencies: + prettier "^2.7.1" + prettier-plugin-solidity "^1.0.0-dev.23" -abort-controller@^3.0.0: +abort-controller@3.0.0, abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== dependencies: event-target-shim "^5.0.0" -abortcontroller-polyfill@^1.1.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.3.0.tgz#de69af32ae926c210b7efbcc29bf644ee4838b00" - integrity sha512-lbWQgf+eRvku3va8poBlDBO12FigTQr9Zb7NIjXrePrhxWVKdCP2wbDl1tLDaYa18PWTom3UEWwdH13S46I+yA== +abort-controller@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-2.0.3.tgz#b174827a732efadff81227ed4b8d1cc569baf20a" + integrity sha512-EPSq5wr2aFyAZ1PejJB32IX9Qd4Nwus+adnp7STYFM5/23nLPBazqZ1oor6ZqbH+4otaaGXTlC8RN5hq3C8w9Q== + dependencies: + event-target-shim "^5.0.0" + +abortcontroller-polyfill@^1.1.9, abortcontroller-polyfill@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5" + integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q== absolute-path@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" - integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c= + integrity sha512-HQiug4c+/s3WOvEnDRxXVmNtSG5s2gJM9r19BTcqjp7BWcE48PB+Y2G6jE65kqI0LpsQeMZygt/b60Gi4KxGyA== abstract-leveldown@3.0.0: version "3.0.0" @@ -5686,6 +6949,18 @@ abstract-leveldown@^6.2.1: level-supports "~1.0.0" xtend "~4.0.0" +abstract-leveldown@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz#08d19d4e26fb5be426f7a57004851b39e1795a2e" + integrity sha512-DnhQwcFEaYsvYDnACLZhMmCWd3rkOeEvglpa4q5i/5Jlm3UIsWaxVzuXvDLFCSCWRO3yy2/+V/G7FusFgejnfQ== + dependencies: + buffer "^6.0.3" + catering "^2.0.0" + is-buffer "^2.0.5" + level-concat-iterator "^3.0.0" + level-supports "^2.0.1" + queue-microtask "^1.2.3" + abstract-leveldown@~2.6.0: version "2.6.3" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz#1c5e8c6a5ef965ae8c35dfb3a8770c476b82c4b8" @@ -5693,7 +6968,7 @@ abstract-leveldown@~2.6.0: dependencies: xtend "~4.0.0" -abstract-leveldown@~6.2.1: +abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3: version "6.2.3" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz#036543d87e3710f2528e47040bc3261b77a9a8eb" integrity sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ== @@ -5704,18 +6979,13 @@ abstract-leveldown@~6.2.1: level-supports "~1.0.0" xtend "~4.0.0" -accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== +accepts@^1.3.5, accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -acorn-es7-plugin@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz#f2ee1f3228a90eead1245f9ab1922eb2e71d336b" - integrity sha1-8u4fMiipDurRJF+asZIusucdM2s= + mime-types "~2.1.34" + negotiator "0.6.3" acorn-globals@^6.0.0: version "6.0.0" @@ -5726,72 +6996,64 @@ acorn-globals@^6.0.0: acorn-walk "^7.1.1" acorn-jsx@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" - integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn@4.X: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c= - -"acorn@>= 2.5.2 <= 5.7.3": - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== +acorn-walk@^8.1.1, acorn-walk@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^6.0.7, acorn@^6.2.1: - version "6.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" - integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== acorn@^7.1.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4: +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== -adal-node@^0.1.28: - version "0.1.28" - resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.1.28.tgz#468c4bb3ebbd96b1270669f4b9cba4e0065ea485" - integrity sha1-RoxLs+u9lrEnBmn0ucuk4AZepIU= +adal-node@^0.2.2: + version "0.2.3" + resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.2.3.tgz#87ed3dbed344f6e114e36bf18fe1c4e7d3cc6069" + integrity sha512-gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ== dependencies: - "@types/node" "^8.0.47" - async ">=0.6.0" + "@xmldom/xmldom" "^0.7.0" + async "^2.6.3" + axios "^0.21.1" date-utils "*" jws "3.x.x" - request ">= 2.52.0" underscore ">= 1.3.1" uuid "^3.1.0" - xmldom ">= 0.1.x" xpath.js "~1.1.0" +add-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa" + integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ== + aes-js@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" - integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0= + integrity sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw== -aes-js@^3.1.1: +aes-js@^3.1.1, aes-js@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a" integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ== -agent-base@4, agent-base@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" - integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== - dependencies: - es6-promisify "^5.0.0" - agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -5799,61 +7061,78 @@ agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: dependencies: debug "4" -agent-base@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" - integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== +agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== dependencies: es6-promisify "^5.0.0" -agentkeepalive@^3.3.0, agentkeepalive@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67" - integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ== +agentkeepalive@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== dependencies: + debug "^4.1.0" + depd "^1.1.2" humanize-ms "^1.2.1" +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" - integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.6.1, ajv@^6.9.1: - version "6.12.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" - integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.5, ajv@^6.12.6, ajv@^6.6.1, ajv@^6.9.1: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== 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.12.2, ajv@^6.12.6: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== +ajv@^8.0.0, ajv@^8.6.3: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" + integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== dependencies: fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" uri-js "^4.2.2" algebrite@^0.2.23: version "0.2.23" resolved "https://registry.yarnpkg.com/algebrite/-/algebrite-0.2.23.tgz#e0490d7c6ea7ddb0dc46fc98d1026415dfe2d853" - integrity sha1-4EkNfG6n3bDcRvyY0QJkFd/i2FM= + integrity sha512-9eLHJVW3QqIZMq679gqbqEl/DXux4KvSWFyvLJ75ovl92RG3lm5mkL5UmjKcUveUH5WF1/TImP8UqiWbRZJTKg== dependencies: big-integer "^1.6.15" amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= + integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg== anser@^1.4.9: version "1.4.10" @@ -5863,7 +7142,7 @@ anser@^1.4.9: ansi-align@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= + integrity sha512-TdlOggdA/zURfMYa7ABC66j+oqfMew58KpJMbUlH3bcZP1b+cBHIHDDn5uH9INsxrHBPjsqM0tDB4jPTF/vgJA== dependencies: string-width "^2.0.0" @@ -5879,6 +7158,11 @@ ansi-colors@3.2.3: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813" integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw== +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-colors@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9" @@ -5886,10 +7170,15 @@ ansi-colors@^1.0.1: dependencies: ansi-wrap "^0.1.0" +ansi-colors@^4.1.1: + version "4.1.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== + ansi-cyan@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" - integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM= + integrity sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A== dependencies: ansi-wrap "0.1.0" @@ -5899,11 +7188,11 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-fragments@^0.2.1: version "0.2.1" @@ -5917,38 +7206,33 @@ ansi-fragments@^0.2.1: ansi-gray@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" - integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE= + integrity sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw== dependencies: ansi-wrap "0.1.0" ansi-red@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" - integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw= + integrity sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow== dependencies: ansi-wrap "0.1.0" ansi-regex@^2.0.0, ansi-regex@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== -ansi-regex@^3.0.0, ansi-regex@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1" + integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== ansi-regex@^4.0.0, ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" + 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.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -5956,7 +7240,7 @@ ansi-regex@^5.0.1: ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" @@ -5966,44 +7250,48 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: color-convert "^1.9.0" ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" - integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: - "@types/color-name" "^1.1.1" color-convert "^2.0.1" +ansi-styles@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" + integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== + ansi-wrap@0.1.0, ansi-wrap@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" - integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= + integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw== ansi-yellow@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-yellow/-/ansi-yellow-0.1.1.tgz#cb9356f2f46c732f0e3199e6102955a77da83c1d" - integrity sha1-y5NW8vRscy8OMZnmEClVp32oPB0= + integrity sha512-6E3D4BQLXHLl3c/NwirWVZ+BCkMq2qsYxdeAGGOijKrx09FaqU+HktFL6QwAwNvgJiMLnv6AQ2C1gFZx0h1CBg== dependencies: ansi-wrap "0.1.0" ansicolors@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" - integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= - -ansistyles@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539" - integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk= + integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg== antlr4@4.7.1: version "4.7.1" resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773" integrity sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ== +antlr4ts@^0.5.0-alpha.4: + version "0.5.0-alpha.4" + resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a" + integrity sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ== + any-promise@1.3.0, any-promise@^1.0.0, any-promise@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== anymatch@^2.0.0: version "2.0.0" @@ -6013,32 +7301,131 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@^3.0.3, anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== +anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" +apollo-datasource@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8" + integrity sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + apollo-server-env "^4.2.1" + +apollo-reporting-protobuf@^3.3.1, apollo-reporting-protobuf@^3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.3.tgz#df2b7ff73422cd682af3f1805d32301aefdd9e89" + integrity sha512-L3+DdClhLMaRZWVmMbBcwl4Ic77CnEBPXLW53F7hkYhkaZD88ivbCVB1w/x5gunO6ZHrdzhjq0FHmTsBvPo7aQ== + dependencies: + "@apollo/protobufjs" "1.2.6" + +apollo-server-core@^3.10.3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.10.3.tgz#64db45703785e9e79e7c5dadb6df2f7ee6fcbecc" + integrity sha512-PiTirlcaszgnJGzSsGui9XWh0KAh0BUW+GvRKN6O0H0qOSXSLmoqqyL83J+u+HaUZGyyiE0+VOkyCcuF+kKbEw== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + "@apollo/utils.usagereporting" "^1.0.0" + "@apollographql/apollo-tools" "^0.5.3" + "@apollographql/graphql-playground-html" "1.6.29" + "@graphql-tools/mock" "^8.1.2" + "@graphql-tools/schema" "^8.0.0" + "@josephg/resolvable" "^1.0.0" + apollo-datasource "^3.3.2" + apollo-reporting-protobuf "^3.3.3" + apollo-server-env "^4.2.1" + apollo-server-errors "^3.3.1" + apollo-server-plugin-base "^3.6.3" + apollo-server-types "^3.6.3" + async-retry "^1.2.1" + fast-json-stable-stringify "^2.1.0" + graphql-tag "^2.11.0" + loglevel "^1.6.8" + lru-cache "^6.0.0" + sha.js "^2.4.11" + uuid "^9.0.0" + whatwg-mimetype "^3.0.0" + +apollo-server-env@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.2.1.tgz#ea5b1944accdbdba311f179e4dfaeca482c20185" + integrity sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g== + dependencies: + node-fetch "^2.6.7" + +apollo-server-errors@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" + integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== + +apollo-server-express@^3.10.3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.10.3.tgz#946b857c7d8516235a757e853966dd1189f247e1" + integrity sha512-Z8m0r10mX8KlGS3noYeRPcWxWR2hX6NHJicjuwZ62PeTZlrDJF5cwGmXqbUg/sCTPx7Ny//ZEASBTwFFp8DOeQ== + dependencies: + "@types/accepts" "^1.3.5" + "@types/body-parser" "1.19.2" + "@types/cors" "2.8.12" + "@types/express" "4.17.14" + "@types/express-serve-static-core" "4.17.31" + accepts "^1.3.5" + apollo-server-core "^3.10.3" + apollo-server-types "^3.6.3" + body-parser "^1.19.0" + cors "^2.8.5" + parseurl "^1.3.3" + +apollo-server-plugin-base@^3.6.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.3.tgz#7eaf24af19641ddccf37307f294aba6877bf4c86" + integrity sha512-/Q0Zx8N8La97faKV0siGHDzfZ56ygN6ovtUpPbr+1GIbNmUzkte3lWW2YV08HmxiRmC2i2OGN80exNJEvbKvNA== + dependencies: + apollo-server-types "^3.6.3" + +apollo-server-types@^3.6.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.6.3.tgz#7818cab914c865dafa53ea263ca6cb1854b4f05a" + integrity sha512-+7caNTLdevpWI2dGKSa7CWdyudO3NBuJ3HzcrYxjBei6Bth9YdRUNzPSFmBjlm2baHF0GsrMwLpjO+HStJzm3A== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + apollo-reporting-protobuf "^3.3.3" + apollo-server-env "^4.2.1" + +apollo-server@^3.6.3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-3.10.3.tgz#1da948f6494d30fb6dcb37b636c140489ea0bf39" + integrity sha512-qWaCVKmMpUmDPiug93kWbqVPt9/T9RwFsPP6cZ4MUF/0X931WrWPpYzyETPUhnVgdPzWbdVcvbXjgyKYc4NB2g== + dependencies: + "@types/express" "4.17.14" + apollo-server-core "^3.10.3" + apollo-server-express "^3.10.3" + express "^4.17.1" + app-module-path@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" - integrity sha1-ZBqlXft9am8KgUHEucCqULbCTdU= + integrity sha512-gkco+qxENJV+8vFcDiiFhuoSvRXb2a/QPqpSoWhVz829VNJfOTnELbBmPmNKFxf3xdNnw4DWCkzkDaavcX/1YQ== append-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" - integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE= + integrity sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA== dependencies: buffer-equal "^1.0.0" -aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, aproba@~1.2.0: +aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -"aproba@^1.1.2 || 2", aproba@^2.0.0: +"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== @@ -6060,35 +7447,51 @@ archiver-utils@^2.1.0: readable-stream "^2.0.0" archiver@^5.0.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" - integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== + version "5.3.1" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.1.tgz#21e92811d6f09ecfce649fbefefe8c79e57cbbb6" + integrity sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w== dependencies: archiver-utils "^2.1.0" - async "^3.2.0" + async "^3.2.3" buffer-crc32 "^0.2.1" readable-stream "^3.6.0" readdir-glob "^1.0.0" tar-stream "^2.2.0" zip-stream "^4.1.0" -archy@^1.0.0, archy@~1.0.0: +archy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= + integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw== + +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== dependencies: delegates "^1.0.0" readable-stream "^2.0.6" arg@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0" - integrity sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg== + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== argparse@^1.0.7: version "1.0.10" @@ -6097,10 +7500,20 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +argsarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb" + integrity sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg== + argv@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab" - integrity sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas= + integrity sha512-dEamhpPEwRUBpLNHeuCm/v+g0anFByHahxodVO/BbAarHVBBg2MccCwf9K+o1Pof+2btdnkJelYVUWjW/VrATw== armlet@^2.7.0: version "2.7.0" @@ -6116,7 +7529,7 @@ armlet@^2.7.0: arr-diff@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a" - integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo= + integrity sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q== dependencies: arr-flatten "^1.0.1" array-slice "^0.2.3" @@ -6124,19 +7537,19 @@ arr-diff@^1.0.1: arr-diff@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= + integrity sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA== dependencies: arr-flatten "^1.0.1" arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== arr-filter@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee" - integrity sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4= + integrity sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA== dependencies: make-iterator "^1.0.0" @@ -6148,24 +7561,24 @@ arr-flatten@^1.0.1, arr-flatten@^1.1.0: arr-map@^2.0.0, arr-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4" - integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ= + integrity sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw== dependencies: make-iterator "^1.0.0" arr-union@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" - integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0= + integrity sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA== arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== array-back@^1.0.3, array-back@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/array-back/-/array-back-1.0.4.tgz#644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b" - integrity sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs= + integrity sha512-1WxbZvrmyhkNoeYcizokbmh5oiOCIfyvGtcqbK3Ls1v1fKcquzxnQSceOx6tzq7jmai2kFLWIpGND2cLhH6TPw== dependencies: typical "^2.6.0" @@ -6176,11 +7589,6 @@ array-back@^2.0.0: dependencies: typical "^2.6.1" -array-differ@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1" - integrity sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w== - array-differ@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" @@ -6189,42 +7597,32 @@ array-differ@^3.0.0: array-each@^1.0.0, array-each@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" - integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= - -array-filter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= + integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA== array-filter@~0.0.0: version "0.0.1" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" - integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw= - -array-find-index@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= + integrity sha512-VW0FpCIhjZdarWjIz8Vpva7U95fl2Jn+b+mmFFMLn8PIVscOQcAgEznwUzTEuUHuqZqIxwzRlcaN/urTFFQoiw== array-flatten@1.1.1, array-flatten@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== -array-flatten@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" - integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY= +array-flatten@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-3.0.0.tgz#6428ca2ee52c7b823192ec600fa3ed2f157cd541" + integrity sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA== array-ify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" - integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= + integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== array-initial@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795" - integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U= + integrity sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw== dependencies: array-slice "^1.0.0" is-number "^4.0.0" @@ -6239,17 +7637,17 @@ array-last@^1.1.1: array-map@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" - integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI= + integrity sha512-123XMszMB01QKVptpDQ7x1m1pP5NmJIG1kbl0JSPPRezvwQChxAN0Gvzo7rvR1IZ2tOL2tmiy7kY/KKgnpVVpg== array-reduce@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b" - integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys= + integrity sha512-8jR+StqaC636u7h3ye1co3lQRefgVVUQUhuAmRbDqIMeR2yuXzRvkCNQiQ5J/wbREmoBLNtp13dhaaVpZQDRUw== array-slice@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" - integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU= + integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q== array-slice@^1.0.0: version "1.1.0" @@ -6265,10 +7663,10 @@ array-sort@^1.0.0: get-value "^2.0.6" kind-of "^5.0.2" -array-union@^1.0.1, array-union@^1.0.2: +array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= + integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng== dependencies: array-uniq "^1.0.1" @@ -6280,33 +7678,44 @@ array-union@^2.1.0: array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= + integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q== array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= + integrity sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg== array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.map@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.3.tgz#1609623618d3d84134a37d4a220030c2bd18420b" - integrity sha512-nNcb30v0wfDyIe26Yif3PcV1JXQp4zEeEfupG7L4SRjnD6HLbO5b2a7eVSba53bOx4YCHYMBHt+Fp4vYstneRA== +array.prototype.map@^1.0.1, array.prototype.map@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.4.tgz#0d97b640cfdd036c1b41cfe706a5e699aa0711f2" + integrity sha512-Qds9QnX7A0qISY7JT5WuJO0NJPE9CMlC6JzHQfhpqAAQQzufVRoeH7EzUY5GcPTx72voG8LV/5eo+b8Qi8hmhA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + es-abstract "^1.19.0" es-array-method-boxes-properly "^1.0.0" - is-string "^1.0.5" + is-string "^1.0.7" + +array.prototype.reduce@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f" + integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.2" + es-array-method-boxes-properly "^1.0.0" + is-string "^1.0.7" arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= + integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== arrify@^2.0.0, arrify@^2.0.1: version "2.0.1" @@ -6316,7 +7725,7 @@ arrify@^2.0.0, arrify@^2.0.1: as-array@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/as-array/-/as-array-1.0.0.tgz#28a6eeeaa5729f1f4eca2047df5e9de1abda0ed1" - integrity sha1-KKbu6qVynx9OyiBH316d4avaDtE= + integrity sha512-yTEVeqmnVlLJV0j8IAz/mcMGbr88+yX9SqTxyFc1HJwmW8Zy347jEmWFIg34MRqCUS8CXRKy8a8B/9BaoYDW2w== dependencies: lodash.isarguments "2.4.x" lodash.isobject "^2.4.1" @@ -6325,17 +7734,17 @@ as-array@^1.0.0: as-array@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/as-array/-/as-array-2.0.0.tgz#4f04805d87f8fce8e511bc2108f8e5e3a287d547" - integrity sha1-TwSAXYf4/OjlEbwhCPjl46KH1Uc= + integrity sha512-1Sd1LrodN0XYxYeZcN1J4xYZvmvTwD5tDWaPUGPIzH1mFsmzsPnVtd2exWhecMjtZk/wYWjNZJiD3b1SLCeJqg== asap@^2.0.0, asap@~2.0.3, asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= + integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== ascli@~1: version "1.0.1" resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc" - integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw= + integrity sha512-JGQaNxpaCJz9Bd1JvVaFIHuWn9S+l3xhN17R0V/vmUDiGE0QngNMXhjlqpwqV+91plWz9Fg+Lt28Lj7p5vjs8A== dependencies: colour "~0.7.1" optjs "~3.2.2" @@ -6351,32 +7760,25 @@ asn1.js@^5.2.0: safer-buffer "^2.1.0" asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + version "0.2.6" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" + integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== dependencies: safer-buffer "~2.1.0" asn1js@^2.0.26: - version "2.0.26" - resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.0.26.tgz#0a6d435000f556a96c6012969d9704d981b71251" - integrity sha512-yG89F0j9B4B0MKIcFyWWxnpZPLaNTjCj4tkE3fjbAoo0qmpGw0PYYqSbX/4ebnd9Icn8ZgK4K1fvDyEtW1JYtQ== + version "2.4.0" + resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.4.0.tgz#9ca61dbdd7e4eb49b9ae95b36ab0615b77daff93" + integrity sha512-PvZC0FMyMut8aOnR2jAEGSkmRtHIUYPe9amUEnGjr9TdnUmsfoOkjrvUkOEU9mzpYBR1HyO9bF+8U1cLTMMHhQ== dependencies: - pvutils latest + pvutils "^1.1.3" assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== assert@^1.1.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" - integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE= - dependencies: - util "0.10.3" - -assert@^1.4.1: version "1.5.0" resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== @@ -6392,7 +7794,7 @@ assertion-error@^1.1.0: assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== ast-types@^0.13.2: version "0.13.4" @@ -6417,9 +7819,9 @@ async-done@^1.2.0, async-done@^1.2.2: stream-exhaust "^1.0.1" async-each@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735" - integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== async-eventemitter@^0.2.2: version "0.2.4" @@ -6433,7 +7835,14 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async-retry@^1.3.1: +async-mutex@^0.2.6: + version "0.2.6" + resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.2.6.tgz#0d7a3deb978bc2b984d5908a2038e1ae2e54ff40" + integrity sha512-Hs4R+4SPgamu6rSGW8C7cV9gaWUKEHykfzCCvIRuaVv636Ju10ZdeUbvb4TBEW0INuq2DHZqXbK4Nd3yG4RaRw== + dependencies: + tslib "^2.0.0" + +async-retry@^1.2.1, async-retry@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280" integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw== @@ -6443,21 +7852,14 @@ async-retry@^1.3.1: async-settle@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b" - integrity sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs= + integrity sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw== dependencies: async-done "^1.2.2" -async@1.x, async@^1.3.0, async@^1.4.2, async@^1.5.2: +async@1.x, async@^1.3.0, async@^1.4.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= - -async@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" - integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ== - dependencies: - lodash "^4.17.10" + integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== async@2.6.2: version "2.6.2" @@ -6466,32 +7868,22 @@ async@2.6.2: dependencies: lodash "^4.17.11" -async@>=0.6.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== - -async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1, async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== +async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1, async@^2.6.3, async@^2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" -async@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" - integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== +async@^3.2.2, async@^3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== async@~0.9.0: version "0.9.2" resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= - -async@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" - integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k= + integrity sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw== asynckit@^0.4.0: version "0.4.0" @@ -6503,64 +7895,96 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -atob-lite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696" - integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY= - -atob@^2.1.1: +atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -available-typed-arrays@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" - integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== - dependencies: - array-filter "^1.0.0" +atomically@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" + integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== -await-semaphore@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/await-semaphore/-/await-semaphore-0.1.3.tgz#2b88018cc8c28e06167ae1cdff02504f1f9688d3" - integrity sha512-d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q== +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== aws-sdk@^2.705.0: - version "2.814.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.814.0.tgz#7a1c36006e0b5826f14bd2511b1d229ef6814bb0" - integrity sha512-empd1m/J/MAkL6d9OeRpmg9thobULu0wk4v8W3JToaxGi2TD7PIdvE6yliZKyOVAdJINhBWEBhxR4OUIHhcGbQ== + version "2.1211.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1211.0.tgz#b7907679a4f2d84e5a507020f27d1f2f1130a479" + integrity sha512-lr4XdoLiLop7e8ftdNdS4OAaZWdY43Z4yx+WR9qcXSdaac1U89MrAybAbLL0SXW94chscd+FIfzmf2dNZnyVfQ== dependencies: buffer "4.9.2" events "1.1.1" ieee754 "1.1.13" - jmespath "0.15.0" + jmespath "0.16.0" querystring "0.2.0" sax "1.2.1" url "0.10.3" - uuid "3.3.2" + util "^0.12.4" + uuid "8.0.0" xml2js "0.4.19" aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.8.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" - integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + +axios-retry@^3.1.9: + version "3.3.1" + resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.3.1.tgz#47624646138aedefbad2ac32f226f4ee94b6dcab" + integrity sha512-RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q== + dependencies: + "@babel/runtime" "^7.15.4" + is-retry-allowed "^2.2.0" + +axios@0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" + integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== + dependencies: + follow-redirects "^1.14.9" + form-data "^4.0.0" + +axios@^0.18.0: + version "0.18.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" + integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== + dependencies: + follow-redirects "1.5.10" + is-buffer "^2.0.2" + +axios@^0.21.1: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + +axios@^0.25.0: + version "0.25.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" + integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== + dependencies: + follow-redirects "^1.14.7" -axios@0.21.1, axios@^0.18.0, axios@^0.19.0, axios@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== +axios@^0.26.1: + version "0.26.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== dependencies: - follow-redirects "^1.10.0" + follow-redirects "^1.14.8" babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g== dependencies: chalk "^1.1.3" esutils "^2.0.2" @@ -6608,7 +8032,7 @@ babel-generator@^6.26.0: babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ= + integrity sha512-gCtfYORSG1fUMX4kKraymq607FWgMWg+j42IFPc18kFQEsmtaibP4UrqsXt8FlEJle25HUd4tsoDR7H2wDhe9Q== dependencies: babel-helper-explode-assignable-expression "^6.24.1" babel-runtime "^6.22.0" @@ -6617,7 +8041,7 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: babel-helper-call-delegate@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340= + integrity sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ== dependencies: babel-helper-hoist-variables "^6.24.1" babel-runtime "^6.22.0" @@ -6627,7 +8051,7 @@ babel-helper-call-delegate@^6.24.1: babel-helper-define-map@^6.24.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8= + integrity sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA== dependencies: babel-helper-function-name "^6.24.1" babel-runtime "^6.26.0" @@ -6637,7 +8061,7 @@ babel-helper-define-map@^6.24.1: babel-helper-explode-assignable-expression@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo= + integrity sha512-qe5csbhbvq6ccry9G7tkXbzNtcDiH4r51rrPUbwwoTzZ18AqxWYRZT6AOmxrpxKnQBW0pYlBI/8vh73Z//78nQ== dependencies: babel-runtime "^6.22.0" babel-traverse "^6.24.1" @@ -6646,7 +8070,7 @@ babel-helper-explode-assignable-expression@^6.24.1: babel-helper-function-name@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= + integrity sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q== dependencies: babel-helper-get-function-arity "^6.24.1" babel-runtime "^6.22.0" @@ -6657,7 +8081,7 @@ babel-helper-function-name@^6.24.1: babel-helper-get-function-arity@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= + integrity sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng== dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" @@ -6665,7 +8089,7 @@ babel-helper-get-function-arity@^6.24.1: babel-helper-hoist-variables@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY= + integrity sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw== dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" @@ -6673,7 +8097,7 @@ babel-helper-hoist-variables@^6.24.1: babel-helper-optimise-call-expression@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc= + integrity sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA== dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" @@ -6681,7 +8105,7 @@ babel-helper-optimise-call-expression@^6.24.1: babel-helper-regex@^6.24.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI= + integrity sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg== dependencies: babel-runtime "^6.26.0" babel-types "^6.26.0" @@ -6690,7 +8114,7 @@ babel-helper-regex@^6.24.1: babel-helper-remap-async-to-generator@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs= + integrity sha512-RYqaPD0mQyQIFRu7Ho5wE2yvA/5jxqCIj/Lv4BXNq23mHYu/vxikOy2JueLiBxQknwapwrJeNCesvY0ZcfnlHg== dependencies: babel-helper-function-name "^6.24.1" babel-runtime "^6.22.0" @@ -6701,7 +8125,7 @@ babel-helper-remap-async-to-generator@^6.24.1: babel-helper-replace-supers@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo= + integrity sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw== dependencies: babel-helper-optimise-call-expression "^6.24.1" babel-messages "^6.23.0" @@ -6713,7 +8137,7 @@ babel-helper-replace-supers@^6.24.1: babel-helpers@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= + integrity sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ== dependencies: babel-runtime "^6.22.0" babel-template "^6.24.1" @@ -6732,17 +8156,43 @@ babel-jest@^26.6.3: graceful-fs "^4.2.4" slash "^3.0.0" +babel-jest@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.0.2.tgz#7efde496c07607949e9be499bf277aa1543ded95" + integrity sha512-yTu4/WSi/HzarjQtrJSwV+/0maoNt+iP0DmpvFJdv9yY+5BuNle8TbheHzzcSWj5gIHfuhpbLYHWRDYhWKyeKQ== + dependencies: + "@jest/transform" "^29.0.2" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^29.0.2" + chalk "^4.0.0" + graceful-fs "^4.2.9" + slash "^3.0.0" + +babel-jest@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.1.2.tgz#540d3241925c55240fb0c742e3ffc5f33a501978" + integrity sha512-IuG+F3HTHryJb7gacC7SQ59A9kO56BctUsT67uJHp1mMCHUOMXpDwOHWGifWqdWVknN2WNkCVQELPjXx0aLJ9Q== + dependencies: + "@jest/transform" "^29.1.2" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^29.0.2" + chalk "^4.0.0" + graceful-fs "^4.2.9" + slash "^3.0.0" + babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= + integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== dependencies: babel-runtime "^6.22.0" babel-plugin-check-es2015-constants@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o= + integrity sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA== dependencies: babel-runtime "^6.22.0" @@ -6753,15 +8203,15 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-istanbul@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" - integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== +babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@istanbuljs/load-nyc-config" "^1.0.0" "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^4.0.0" + istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" babel-plugin-jest-hoist@^26.6.2: @@ -6774,20 +8224,54 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" +babel-plugin-jest-hoist@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.0.2.tgz#ae61483a829a021b146c016c6ad39b8bcc37c2c8" + integrity sha512-eBr2ynAEFjcebVvu8Ktx580BD1QKCrBG1XwEUTXJe285p9HA/4hOhfWCFRQhTKSyBV0VzjhG7H91Eifz9s29hg== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.1.14" + "@types/babel__traverse" "^7.0.6" + +babel-plugin-polyfill-corejs2@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d" + integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q== + dependencies: + "@babel/compat-data" "^7.17.7" + "@babel/helper-define-polyfill-provider" "^0.3.2" + semver "^6.1.1" + +babel-plugin-polyfill-corejs3@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7" + integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.2" + core-js-compat "^3.21.0" + +babel-plugin-polyfill-regenerator@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe" + integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.2" + babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= + integrity sha512-4Zp4unmHgw30A1eWI5EpACji2qMocisdXhAftfhXoSV9j0Tvj6nRFE3tOmRY912E0FMRm/L5xWE7MGVT2FoLnw== babel-plugin-syntax-exponentiation-operator@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4= + integrity sha512-Z/flU+T9ta0aIEKl1tGEmN/pZiI1uXmCiGFRegKacQfEJzp7iNsKloZmyJlQr+75FCJtiFfGIK03SiCvCt9cPQ== babel-plugin-syntax-trailing-function-commas@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM= + integrity sha512-Gx9CH3Q/3GKbhs07Bszw5fPTlU+ygrOGfAhEt7W2JICwufpC4SuO0mG0+4NykPBSYPMJhqvVlDBU17qB1D+hMQ== babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" @@ -6797,7 +8281,7 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: babel-plugin-transform-async-to-generator@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= + integrity sha512-7BgYJujNCg0Ti3x0c/DL3tStvnKS6ktIYOmo9wginv/dfZOrbSZ+qG4IRRHMBOzZ5Awb1skTiAsQXg/+IWkZYw== dependencies: babel-helper-remap-async-to-generator "^6.24.1" babel-plugin-syntax-async-functions "^6.8.0" @@ -6806,21 +8290,21 @@ babel-plugin-transform-async-to-generator@^6.22.0: babel-plugin-transform-es2015-arrow-functions@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE= + integrity sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE= + integrity sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-block-scoping@^6.23.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8= + integrity sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw== dependencies: babel-runtime "^6.26.0" babel-template "^6.26.0" @@ -6831,7 +8315,7 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0: babel-plugin-transform-es2015-classes@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs= + integrity sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag== dependencies: babel-helper-define-map "^6.24.1" babel-helper-function-name "^6.24.1" @@ -6846,7 +8330,7 @@ babel-plugin-transform-es2015-classes@^6.23.0: babel-plugin-transform-es2015-computed-properties@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM= + integrity sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw== dependencies: babel-runtime "^6.22.0" babel-template "^6.24.1" @@ -6854,14 +8338,14 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0: babel-plugin-transform-es2015-destructuring@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0= + integrity sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-duplicate-keys@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4= + integrity sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug== dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" @@ -6869,14 +8353,14 @@ babel-plugin-transform-es2015-duplicate-keys@^6.22.0: babel-plugin-transform-es2015-for-of@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE= + integrity sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-function-name@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos= + integrity sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg== dependencies: babel-helper-function-name "^6.24.1" babel-runtime "^6.22.0" @@ -6885,14 +8369,14 @@ babel-plugin-transform-es2015-function-name@^6.22.0: babel-plugin-transform-es2015-literals@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4= + integrity sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ= + integrity sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA== dependencies: babel-plugin-transform-es2015-modules-commonjs "^6.24.1" babel-runtime "^6.22.0" @@ -6911,7 +8395,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-e babel-plugin-transform-es2015-modules-systemjs@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM= + integrity sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg== dependencies: babel-helper-hoist-variables "^6.24.1" babel-runtime "^6.22.0" @@ -6920,7 +8404,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.23.0: babel-plugin-transform-es2015-modules-umd@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg= + integrity sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw== dependencies: babel-plugin-transform-es2015-modules-amd "^6.24.1" babel-runtime "^6.22.0" @@ -6929,7 +8413,7 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0: babel-plugin-transform-es2015-object-super@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40= + integrity sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA== dependencies: babel-helper-replace-supers "^6.24.1" babel-runtime "^6.22.0" @@ -6937,7 +8421,7 @@ babel-plugin-transform-es2015-object-super@^6.22.0: babel-plugin-transform-es2015-parameters@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys= + integrity sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ== dependencies: babel-helper-call-delegate "^6.24.1" babel-helper-get-function-arity "^6.24.1" @@ -6949,7 +8433,7 @@ babel-plugin-transform-es2015-parameters@^6.23.0: babel-plugin-transform-es2015-shorthand-properties@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA= + integrity sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw== dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" @@ -6957,14 +8441,14 @@ babel-plugin-transform-es2015-shorthand-properties@^6.22.0: babel-plugin-transform-es2015-spread@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE= + integrity sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-sticky-regex@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw= + integrity sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ== dependencies: babel-helper-regex "^6.24.1" babel-runtime "^6.22.0" @@ -6973,21 +8457,21 @@ babel-plugin-transform-es2015-sticky-regex@^6.22.0: babel-plugin-transform-es2015-template-literals@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0= + integrity sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-typeof-symbol@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I= + integrity sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw== dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-unicode-regex@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek= + integrity sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ== dependencies: babel-helper-regex "^6.24.1" babel-runtime "^6.22.0" @@ -6996,7 +8480,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0: babel-plugin-transform-exponentiation-operator@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4= + integrity sha512-LzXDmbMkklvNhprr20//RStKVcT8Cu+SQtX18eMHLhjHf2yFzwtQ0S2f0jQ+89rokoNdmwoSqYzAhq86FxlLSQ== dependencies: babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" babel-plugin-syntax-exponentiation-operator "^6.8.0" @@ -7005,22 +8489,22 @@ babel-plugin-transform-exponentiation-operator@^6.22.0: babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8= + integrity sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg== dependencies: regenerator-transform "^0.10.0" babel-plugin-transform-strict-mode@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g= + integrity sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw== dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" babel-preset-current-node-syntax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77" - integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q== + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-bigint" "^7.8.3" @@ -7072,9 +8556,9 @@ babel-preset-env@^1.7.0: semver "^5.3.0" babel-preset-fbjs@^3.2.0, babel-preset-fbjs@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541" - integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw== + version "3.4.0" + resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c" + integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow== dependencies: "@babel/plugin-proposal-class-properties" "^7.0.0" "@babel/plugin-proposal-object-rest-spread" "^7.0.0" @@ -7112,10 +8596,18 @@ babel-preset-jest@^26.6.2: babel-plugin-jest-hoist "^26.6.2" babel-preset-current-node-syntax "^1.0.0" +babel-preset-jest@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.0.2.tgz#e14a7124e22b161551818d89e5bdcfb3b2b0eac7" + integrity sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA== + dependencies: + babel-plugin-jest-hoist "^29.0.2" + babel-preset-current-node-syntax "^1.0.0" + babel-register@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= + integrity sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A== dependencies: babel-core "^6.26.0" babel-runtime "^6.26.0" @@ -7125,10 +8617,10 @@ babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0: +babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== dependencies: core-js "^2.4.0" regenerator-runtime "^0.11.0" @@ -7136,7 +8628,7 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runti babel-template@^6.24.1, babel-template@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= + integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg== dependencies: babel-runtime "^6.26.0" babel-traverse "^6.26.0" @@ -7147,7 +8639,7 @@ babel-template@^6.24.1, babel-template@^6.26.0: babel-traverse@^6.24.1, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= + integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA== dependencies: babel-code-frame "^6.26.0" babel-messages "^6.23.0" @@ -7162,7 +8654,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0: babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= + integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== dependencies: babel-runtime "^6.26.0" esutils "^2.0.2" @@ -7172,7 +8664,7 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: babelify@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/babelify/-/babelify-7.3.0.tgz#aa56aede7067fd7bd549666ee16dc285087e88e5" - integrity sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU= + integrity sha512-vID8Fz6pPN5pJMdlUnNFSfrlcx5MUule4k9aKs/zbZPyXxMTcRrB0M4Tarw22L8afr8eYSWxDPYCob3TdrqtlA== dependencies: babel-core "^6.0.14" object-assign "^4.0.0" @@ -7185,7 +8677,7 @@ babylon@^6.18.0: bach@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880" - integrity sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA= + integrity sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg== dependencies: arr-filter "^1.1.1" arr-flatten "^1.0.1" @@ -7200,38 +8692,23 @@ bach@^1.0.0: backoff@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f" - integrity sha1-9hbtqdPktmuMp/ynn2lXIsX44m8= + integrity sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA== dependencies: precond "0.2" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base-64@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" - integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base-x@^3.0.2, base-x@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.8.tgz#1e1106c2537f0162e8b52474a557ebb09000018d" - integrity sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA== + version "3.0.9" + resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.9.tgz#6349aaabb58526332de9f60995e548a53fe21320" + integrity sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ== dependencies: safe-buffer "^5.0.1" -base64-js@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978" - integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg= - -base64-js@^1.0.2, base64-js@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" - integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== - -base64-js@^1.1.2, base64-js@^1.3.1, base64-js@^1.5.1: +base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.3.0, base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -7252,7 +8729,7 @@ base@^0.11.1: basic-auth-connect@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz#fdb0b43962ca7b40456a7c2bb48fe173da2d2122" - integrity sha1-/bC0OWLKe0BFanwrtI/hc9otISI= + integrity sha512-kiV+/DTgVro4aZifY/hwRwALBISViL5NP4aReaR2EVJEObpbUBHIkdJh/YpcoEiYt7nBodZ6U2ajZeZvSxUCCg== basic-auth@~2.0.1: version "2.0.1" @@ -7264,81 +8741,122 @@ basic-auth@~2.0.1: bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== + dependencies: + tweetnacl "^0.14.3" + +bech32@1.1.4, bech32@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9" + integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ== + +before-after-hook@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e" + integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ== + +better-ajv-errors@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/better-ajv-errors/-/better-ajv-errors-0.8.2.tgz#9abf27e19d2cee60f400753510f7a3a96d655adf" + integrity sha512-FnODTBJSQSHmJXDLPiC7ca0dC4S1HSTPv1+Hg2sm/C71i3Dj0l1jcUEaq/3OQ6MmnUveshTsUvUj65pDSr3Qow== dependencies: - tweetnacl "^0.14.3" + "@babel/code-frame" "^7.0.0" + "@babel/runtime" "^7.0.0" + chalk "^2.4.1" + core-js "^3.2.1" + json-to-ast "^2.0.3" + jsonpointer "^5.0.0" + leven "^3.1.0" -before-after-hook@^2.0.0, before-after-hook@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" - integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== +big-integer@1.6.36: + version "1.6.36" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36" + integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg== -big-integer@1.6.x: +big-integer@1.6.x, big-integer@^1.6.15, big-integer@^1.6.17, big-integer@^1.6.44: version "1.6.51" resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== -big-integer@^1.6.15, big-integer@^1.6.17, big-integer@^1.6.44: - version "1.6.48" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" - integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== -bigi@^1.1.0: +big.js@^6.0.3: + version "6.2.1" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f" + integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ== + +bigi@^1.1.0, bigi@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825" - integrity sha1-nGZalfiLiwj8Bc/XMfVhhZ1yWCU= + integrity sha512-ddkU+dFIuEIW8lE7ZwdIAf2UPoM90eaprg5m3YXAVVTmKlqV/9BX4A2M8BOK2yOq6/VgZFVhK6QAxJebhlbhzw== -bignumber.js@*, bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, "bignumber.js@git+https://github.com/debris/bignumber.js#master", "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", "bignumber.js@git+https://github.com/frozeman/bignumber.js-nolookahead.git", bignumber.js@~8.0.2: - version "9.0.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" - integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== +bignumber.js@*, bignumber.js@9.1.0, bignumber.js@^9.0.0, bignumber.js@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62" + integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A== -bin-links@^1.1.0, bin-links@^1.1.2: - version "1.1.8" - resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.8.tgz#bd39aadab5dc4bdac222a07df5baf1af745b2228" - integrity sha512-KgmVfx+QqggqP9dA3iIc5pA4T1qEEEL+hOhOhNPaUm77OTrJoOXE/C05SJLNJe6m/2wUK7F1tDSou7n5TfCDzQ== +bignumber.js@7.2.1, bignumber.js@^7.2.0, bignumber.js@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" + integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ== + +"bignumber.js@git+https://github.com/debris/bignumber.js#master": + version "2.0.7" + resolved "git+https://github.com/debris/bignumber.js#c7a38de919ed75e6fb6ba38051986e294b328df9" + +"bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2": + version "2.0.7" + resolved "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" + +bignumber.js@~8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.0.2.tgz#d8c4e1874359573b1ef03011a2d861214aeef137" + integrity sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw== + +bin-links@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.3.tgz#3842711ef3db2cd9f16a5f404a996a12db355a6e" + integrity sha512-zKdnMPWEdh4F5INR07/eBrodC7QrF5JKvqskjz/ZZRXg5YSAZIbn8zGhbhUrElzHBZ2fvEQdOU59RHcTG3GiwA== dependencies: - bluebird "^3.5.3" - cmd-shim "^3.0.0" - gentle-fs "^2.3.0" - graceful-fs "^4.1.15" - npm-normalize-package-bin "^1.0.0" - write-file-atomic "^2.3.0" + cmd-shim "^5.0.0" + mkdirp-infer-owner "^2.0.0" + npm-normalize-package-bin "^2.0.0" + read-cmd-shim "^3.0.0" + rimraf "^3.0.0" + write-file-atomic "^4.0.0" binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU= + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== binary-extensions@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" - integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== binary@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= + integrity sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg== dependencies: buffers "~0.1.1" chainsaw "~0.1.0" -bindings@^1.2.1, bindings@^1.3.0, bindings@^1.4.0, bindings@^1.5.0: +bindings@^1.2.1, bindings@^1.3.0, bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== dependencies: file-uri-to-path "1.0.0" -bintrees@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" - integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= +bintrees@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8" + integrity sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw== bip32@2.0.5: version "2.0.5" @@ -7353,16 +8871,15 @@ bip32@2.0.5: typeforce "^1.11.5" wif "^2.0.6" -bip32@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/bip32/-/bip32-2.0.6.tgz#6a81d9f98c4cd57d05150c60d8f9e75121635134" - integrity sha512-HpV5OMLLGTjSVblmrtYRfFFKuQB+GArM0+XP8HGWfJ5vxYBqo+DesvJwOdC2WJ3bCkZShGf0QIfoIpeomVzVdA== +bip32@3.1.0, bip32@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bip32/-/bip32-3.1.0.tgz#ce90e020d0e6b41e891a0122ff053efabcce1ccc" + integrity sha512-eoeajYEzJ4d6yyVtby8C+XkCeKItiC4Mx56a0M9VaqTMC73SWOm4xVZG7SaR8e/yp4eSyky2XcBpH3DApPdu7Q== dependencies: - "@types/node" "10.12.18" bs58check "^2.1.1" create-hash "^1.2.0" create-hmac "^1.1.7" - tiny-secp256k1 "^1.1.3" + ripemd160 "^2.0.2" typeforce "^1.11.5" wif "^2.0.6" @@ -7400,11 +8917,26 @@ bip39@^2.2.0, bip39@^2.5.0: bip66@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22" - integrity sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI= + integrity sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw== dependencies: safe-buffer "^5.0.1" -bl@^1.0.0, bl@^3.0.0, bl@^4.0.1, bl@^4.0.3: +bl@^1.0.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7" + integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + +bl@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" + integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== + dependencies: + readable-stream "^3.0.1" + +bl@^4.0.3, bl@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -7414,9 +8946,9 @@ bl@^1.0.0, bl@^3.0.0, bl@^4.0.1, bl@^4.0.3: readable-stream "^3.4.0" blakejs@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5" - integrity sha1-ad+S75U6qIylGjLfarHFShVfx6U= + version "1.2.1" + resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814" + integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ== "blind-threshold-bls@https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a": version "0.1.0" @@ -7437,9 +8969,9 @@ blakejs@^1.1.0: bluebird@^2.9.33: version "2.11.0" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" - integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE= + integrity sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ== -bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.4, bluebird@^3.5.5: +bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.4, bluebird@^3.5.5, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -7447,34 +8979,34 @@ bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3. bluebird@~3.4.1: version "3.4.7" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= - -bluebird@~3.5.1: - version "3.5.5" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" - integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== + integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA== bn.js@4.11.6: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" - integrity sha1-UzRK2xRhehP26N0s4okF0cC6MhU= + integrity sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA== bn.js@4.11.8: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0, bn.js@^4.8.0: +bn.js@4.11.9: version "4.11.9" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== -bn.js@^5.1.1, bn.js@^5.1.2: - version "5.1.3" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" - integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0, bn.js@^4.8.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + +bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3, bn.js@^5.2.0, bn.js@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" + integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@1.19.0, body-parser@^1.16.0, body-parser@^1.18.3, body-parser@^1.19.0: +body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== @@ -7490,12 +9022,28 @@ body-parser@1.19.0, body-parser@^1.16.0, body-parser@^1.18.3, body-parser@^1.19. raw-body "2.4.0" type-is "~1.6.17" -boom@7.x.x: - version "7.3.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-7.3.0.tgz#733a6d956d33b0b1999da3fe6c12996950d017b9" - integrity sha512-Swpoyi2t5+GhOEGw8rEsKvTxFLIDiiKoUc2gsoV6Lyr43LHBIzch3k2MvYUs8RTROrIkVJ3Al0TkaOGjnb+B6A== +body-parser@1.20.0, body-parser@^1.16.0, body-parser@^1.18.3, body-parser@^1.19.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" + integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== dependencies: - hoek "6.x.x" + bytes "3.1.2" + content-type "~1.0.4" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.10.3" + raw-body "2.5.1" + type-is "~1.6.18" + unpipe "1.0.0" + +boolbase@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== bottleneck@^2.15.3: version "2.19.5" @@ -7565,10 +9113,17 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^1.8.0, braces@^1.8.2: version "1.8.5" resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= + integrity sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw== dependencies: expand-range "^1.8.1" preserve "^0.2.0" @@ -7590,7 +9145,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -7600,7 +9155,7 @@ braces@^3.0.1, braces@~3.0.2: brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== browser-process-hrtime@^1.0.0: version "1.0.0" @@ -7644,22 +9199,14 @@ browserify-des@^1.0.0: safe-buffer "^5.1.2" browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" - integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= + version "4.1.0" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" + integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== dependencies: - bn.js "^4.1.0" + bn.js "^5.0.0" randombytes "^2.0.1" -browserify-sha3@^0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/browserify-sha3/-/browserify-sha3-0.0.4.tgz#086c47b8c82316c9d47022c26185954576dd8e26" - integrity sha1-CGxHuMgjFsnUcCLCYYWVRXbdjiY= - dependencies: - js-sha3 "^0.6.1" - safe-buffer "^5.1.1" - -browserify-sign@^4.0.0, browserify-sign@^4.0.4: +browserify-sign@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== @@ -7689,33 +9236,32 @@ browserslist@^3.2.6: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" -browserslist@^4.14.5: - version "4.16.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" - integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== +browserslist@^4.20.2, browserslist@^4.21.3: + version "4.21.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" + integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== dependencies: - caniuse-lite "^1.0.30001181" - colorette "^1.2.1" - electron-to-chromium "^1.3.649" - escalade "^3.1.1" - node-releases "^1.1.70" + caniuse-lite "^1.0.30001370" + electron-to-chromium "^1.4.202" + node-releases "^2.0.6" + update-browserslist-db "^1.0.5" bs-logger@0.x: - version "0.2.5" - resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.5.tgz#1d82f0cf88864e1341cd9262237f8d0748a49b22" - integrity sha512-uFLE0LFMxrH8Z5Hd9QgivvRbrl/NFkOTHzGhlqQxsnmx5JBLrp4bc249afLL+GccyY/8hkcGi2LpVaOzaEY0nQ== + version "0.2.6" + resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" + integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== dependencies: - fast-json-stable-stringify "^2.0.0" + fast-json-stable-stringify "2.x" bs58@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d" - integrity sha1-VZCNWPGYKrogCPob7Y+RmYopv40= + integrity sha512-77ld2g7Hn1GyIUpuUVfbZdhO1q9R9gv/GYam4HAeAW/tzhQDrbJ2ZttN1tIe4hmKrWFE+oUtAhBNx/EA5SVdTg== -bs58@^4.0.0: +bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" - integrity sha1-vhYedsNU9veIrkBx9j806MTwpCo= + integrity sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw== dependencies: base-x "^3.0.2" @@ -7728,18 +9274,13 @@ bs58check@<3.0.0, bs58check@^2.1.1, bs58check@^2.1.2: create-hash "^1.1.0" safe-buffer "^5.1.2" -bser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" - integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== dependencies: node-int64 "^0.4.0" -btoa-lite@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337" - integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc= - btoa@1.2.1, btoa@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73" @@ -7750,7 +9291,7 @@ buffer-alloc-unsafe@^1.1.0: resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== -buffer-alloc@^1.1.0, buffer-alloc@^1.2.0: +buffer-alloc@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== @@ -7761,42 +9302,42 @@ buffer-alloc@^1.1.0, buffer-alloc@^1.2.0: buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== buffer-equal-constant-time@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" - integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= + integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA== buffer-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== -buffer-from@1.x, buffer-from@^1.0.0, buffer-from@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +buffer-from@1.1.2, buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-indexof-polyfill@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf" - integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8= + version "1.0.2" + resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c" + integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A== buffer-reverse@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-reverse/-/buffer-reverse-1.0.1.tgz#49283c8efa6f901bc01fa3304d06027971ae2f60" - integrity sha1-SSg8jvpvkBvAH6MwTQYCeXGuL2A= + integrity sha512-M87YIUBsZ6N924W57vDwT/aOu8hw7ZgdByz6ijksLjmHJELBASmYTTlNHRgjE+pTsT9oJXGaDSgqqwfdHotDUg== buffer-to-arraybuffer@^0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz#6064a40fa76eb43c723aba9ef8f6e1216d10511a" - integrity sha1-YGSkD6dutDxyOrqe+PbhIW0QURo= + integrity sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ== buffer-writer@2.0.0: version "2.0.0" @@ -7806,9 +9347,16 @@ buffer-writer@2.0.0: buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== + +buffer-xor@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-2.0.2.tgz#34f7c64f04c777a1f8aac5e661273bb9dd320289" + integrity sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ== + dependencies: + safe-buffer "^5.1.1" -buffer@4.9.2, buffer@^4.3.0, buffer@^4.9.1: +buffer@4.9.2, buffer@^4.3.0: version "4.9.2" resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== @@ -7817,24 +9365,7 @@ buffer@4.9.2, buffer@^4.3.0, buffer@^4.9.1: ieee754 "^1.1.4" isarray "^1.0.0" -buffer@^3.0.1: - version "3.6.0" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb" - integrity sha1-pyyTb3e5a/UvX357RnGAYoVR3vs= - dependencies: - base64-js "0.0.8" - ieee754 "^1.1.4" - isarray "^1.0.0" - -buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786" - integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - -buffer@^6.0.3: +buffer@6.0.3, buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== @@ -7842,34 +9373,56 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" +buffer@^5.0.5, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + buffers@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= + integrity sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ== + +bufferutil@4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.5.tgz#da9ea8166911cc276bf677b8aed2d02d31f59028" + integrity sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A== + dependencies: + node-gyp-build "^4.3.0" bufferutil@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.1.tgz#3a177e8e5819a1243fe16b63a199951a7ad8d4a7" - integrity sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA== + version "4.0.6" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.6.tgz#ebd6c67c7922a0e902f053e5d8be5ec850e48433" + integrity sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw== dependencies: - node-gyp-build "~3.7.0" + node-gyp-build "^4.3.0" -builtin-modules@^1.0.0, builtin-modules@^1.1.1: +builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ== builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== builtins@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" - integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= + integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ== + +builtins@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" + integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== + dependencies: + semver "^7.0.0" -bunyan-debug-stream@2.0.0, bunyan-debug-stream@^2.0.0: +bunyan-debug-stream@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-2.0.0.tgz#b9593e38753f594e3f9db3eb2fdebdc2af147a9f" integrity sha512-Ovl43CJ7nUwalLzdXc6E1nGIy6ift9Z/QpYXUtsjpDAg35ZFKXifKNZyfpMGuN3N7ijLLqbnxPsMMHsXDdXa9A== @@ -7878,11 +9431,19 @@ bunyan-debug-stream@2.0.0, bunyan-debug-stream@^2.0.0: exception-formatter "^1.0.4" bunyan-debug-stream@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-1.1.1.tgz#4740a00b7d5c2d9d1b714925ab0802516040813e" - integrity sha512-jJbQ1gXUL6vMmZVdbaTFK1v1sGa7axLrSQQwkB6HU9HCPTzsw2HsKcPHm1vgXZlEck/4IvEuRwg/9+083YelCg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-1.1.2.tgz#3d09a788a8ddf37a23b6840e7e19cf46239bc7b4" + integrity sha512-mNU4QelBu9tUyE6VA0+AQdyillEMefx/2h7xkNL1Uvhw5w9JWtwGWAb7Rdnmj9opmwEaPrRvnJSy2+c1q47+sA== dependencies: - colors "^1.0.3" + colors "1.4.0" + exception-formatter "^1.0.4" + +bunyan-debug-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-2.0.1.tgz#9bd7c7e30c7b2cf711317e9d37529b0464c3b164" + integrity sha512-MCEoqggU7NMt7f2O+PU8VkqfSkoQoa4lmN/OWhaRfqFRBF1Se2TOXQyLF6NxC+EtfrdthnquQe8jOe83fpEoGA== + dependencies: + colors "1.4.0" exception-formatter "^1.0.4" bunyan-gke-stackdriver@0.1.2: @@ -7890,103 +9451,69 @@ bunyan-gke-stackdriver@0.1.2: resolved "https://registry.yarnpkg.com/bunyan-gke-stackdriver/-/bunyan-gke-stackdriver-0.1.2.tgz#a47e3724bbb324b1ec0b7dc4350c4d7073aae66d" integrity sha512-eY5OLgAXvOvOq2YpxI0HlV5HjAcLm36Ln3PxxsztO+2GrFSgU3oXoic2LCif/heBKoyOZdMyXKWF5dvswSOS6w== -bunyan@1.8.12, bunyan@^1.8.12: +bunyan@1.8.12: version "1.8.12" resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797" - integrity sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c= + integrity sha512-dmDUbGHeGcvCDLRFOscZkwx1ZO/aFz3bJOCi5nCgzdhFGPxwK+y5AcDBnqagNGlJZ7lje/l6JUEz9mQcutttdg== optionalDependencies: dtrace-provider "~0.8" moment "^2.10.6" mv "~2" safe-json-stringify "~1" -byline@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" - integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= - -byte-size@^4.0.2: - version "4.0.4" - resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.4.tgz#29d381709f41aae0d89c631f1c81aec88cd40b23" - integrity sha512-82RPeneC6nqCdSwCX2hZUz3JPOvN5at/nTEw/CMf05Smu3Hrpo9Psb7LjN+k+XndNArG1EY8L4+BM3aTM4BCvw== +bunyan@^1.8.12: + version "1.8.15" + resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" + integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== + optionalDependencies: + dtrace-provider "~0.8" + moment "^2.19.3" + mv "~2" + safe-json-stringify "~1" -byte-size@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-5.0.1.tgz#4b651039a5ecd96767e71a3d7ed380e48bed4191" - integrity sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw== +byte-size@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3" + integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A== bytebuffer@~5: version "5.0.1" resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" - integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0= + integrity sha512-IuzSdmADppkZ6DlpycMkm8l9zeEq16fWtLvunEwFiYciR/BHo4E8/xs5piFquG+Za8OWmMqHF8zuRviz2LHvRQ== dependencies: long "~3" bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== bytes@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + bytewise-core@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/bytewise-core/-/bytewise-core-1.2.3.tgz#3fb410c7e91558eb1ab22a82834577aa6bd61d42" - integrity sha1-P7QQx+kVWOsasiqCg0V3qmvWHUI= + integrity sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA== dependencies: typewise-core "^1.2" bytewise@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/bytewise/-/bytewise-1.1.0.tgz#1d13cbff717ae7158094aa881b35d081b387253e" - integrity sha1-HRPL/3F65xWAlKqIGzXQgbOHJT4= + integrity sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ== dependencies: bytewise-core "^1.2.2" typewise "^1.0.3" -cacache@^10.0.0, cacache@^10.0.4: - version "10.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460" - integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA== - dependencies: - bluebird "^3.5.1" - chownr "^1.0.1" - glob "^7.1.2" - graceful-fs "^4.1.11" - lru-cache "^4.1.1" - mississippi "^2.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.2" - ssri "^5.2.4" - unique-filename "^1.1.0" - y18n "^4.0.0" - -cacache@^11.0.2, cacache@^11.3.3: - version "11.3.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" - integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - -cacache@^12.0.0, cacache@^12.0.2: +cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== @@ -8007,6 +9534,30 @@ cacache@^12.0.0, cacache@^12.0.2: unique-filename "^1.1.1" y18n "^4.0.0" +cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0: + version "16.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" + integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== + dependencies: + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + glob "^8.0.1" + infer-owner "^1.0.4" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + unique-filename "^2.0.0" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -8022,6 +9573,11 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +cacheable-lookup@^6.0.4: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz#0330a543471c61faa4e9035db583aad753b36385" + integrity sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww== + cacheable-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" @@ -8035,23 +9591,28 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" +cacheable-request@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" + integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^4.0.0" + lowercase-keys "^2.0.0" + normalize-url "^6.0.1" + responselike "^2.0.0" + cachedown@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cachedown/-/cachedown-1.0.0.tgz#d43f036e4510696b31246d7db31ebf0f7ac32d15" - integrity sha1-1D8DbkUQaWsxJG19sx6/D3rDLRU= + integrity sha512-t+yVk82vQWCJF3PsWHMld+jhhjkkWjcAzz8NbFx1iULOXWl8Tm/FdM4smZNVw3MRr0X+lVTx9PKzvEn4Ng19RQ== dependencies: abstract-leveldown "^2.4.1" lru-cache "^3.2.0" -call-bind@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" - integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.0" - -call-bind@^1.0.2: +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -8059,103 +9620,88 @@ call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" -call-limit@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.1.tgz#ef15f2670db3f1992557e2d965abc459e6e358d4" - integrity sha512-5twvci5b9eRBw2wCfPtN0GmlR2/gadZqyFpPhOK6CvMFoFgA+USnZ6Jpu1lhG9h85pQ3Ouil3PfXWRD4EUaRiQ== - call-me-maybe@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" - integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= + integrity sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw== caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= + integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ== dependencies: callsites "^2.0.0" caller-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= + integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A== dependencies: caller-callsite "^2.0.0" callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ== callsites@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" - integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camelcase-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" - integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= +camel-case@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" + integrity sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w== dependencies: - camelcase "^2.0.0" - map-obj "^1.0.0" + no-case "^2.2.0" + upper-case "^1.1.1" -camelcase-keys@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" - integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= +camelcase-keys@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" + integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== dependencies: - camelcase "^4.1.0" - map-obj "^2.0.0" - quick-lru "^1.0.0" + camelcase "^5.3.1" + map-obj "^4.0.0" + quick-lru "^4.0.1" -camelcase@^2.0.0, camelcase@^2.0.1: +camelcase@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + integrity sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw== camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= + integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg== camelcase@^4.0.0, camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= + integrity sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw== camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e" - integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w== - -camelcase@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== - -caniuse-lite@^1.0.30000844: - version "1.0.30001113" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz#22016ab55b5a8b04fa00ca342d9ee1b98df48065" - integrity sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA== +camelcase@^6.0.0, camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001181: - version "1.0.30001196" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz#00518a2044b1abf3e0df31fadbe5ed90b63f4e64" - integrity sha512-CPvObjD3ovWrNBaXlAIGWmg2gQQuJ5YhuciUOjPRox6hIQttu8O+b51dx6VIpIY9ESd2d0Vac1RKpICdG4rGUg== +caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001370: + version "1.0.30001390" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz#158a43011e7068ef7fc73590e9fd91a7cece5e7f" + integrity sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g== -capture-exit@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" - integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28= +capture-exit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" + integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g== dependencies: - rsvp "^3.3.3" + rsvp "^4.8.4" capture-stack-trace@^1.0.0: version "1.0.1" @@ -8165,20 +9711,25 @@ capture-stack-trace@^1.0.0: cardinal@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" - integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU= + integrity sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw== dependencies: ansicolors "~0.3.2" redeyed "~2.1.0" -caseless@~0.12.0: +caseless@^0.12.0, caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== + +catering@^2.0.0, catering@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/catering/-/catering-2.1.1.tgz#66acba06ed5ee28d5286133982a927de9a04b510" + integrity sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w== caw@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/caw/-/caw-1.2.0.tgz#ffb226fe7efc547288dc62ee3e97073c212d1034" - integrity sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ= + integrity sha512-GIAlMoessjWW8p0mkStU4kMvV35toVCAyOWhUajk7O0d7wJI8F9TDjfrkSoO26b0d1QsnDLmw5I3X+yd6OKorQ== dependencies: get-proxy "^1.0.1" is-obj "^1.0.0" @@ -8195,6 +9746,14 @@ cbor@^4.1.5: json-text-sequence "^0.1" nofilter "^1.0.3" +cbor@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz#4cca67783ccd6de7b50ab4ed62636712f287a67c" + integrity sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A== + dependencies: + bignumber.js "^9.0.1" + nofilter "^1.0.4" + chai-as-promised@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0" @@ -8205,31 +9764,49 @@ chai-as-promised@^7.1.1: chai-subset@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/chai-subset/-/chai-subset-1.6.0.tgz#a5d0ca14e329a79596ed70058b6646bd6988cfe9" - integrity sha1-pdDKFOMpp5WW7XAFi2ZGvWmIz+k= + integrity sha512-K3d+KmqdS5XKW5DWPd5sgNffL3uxdDe+6GdnJh3AYPhwnBGRY5urfvfcbRtWIvvpz+KxkL9FeBB6MZewLUNwug== -chai@^4.0.1, chai@^4.1.2, chai@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5" - integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw== +chai@^4.0.1, chai@^4.1.2, chai@^4.2.0, chai@^4.3.6: + version "4.3.6" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c" + integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q== dependencies: assertion-error "^1.1.0" check-error "^1.0.2" deep-eql "^3.0.1" get-func-name "^2.0.0" - pathval "^1.1.0" + loupe "^2.3.1" + pathval "^1.1.1" type-detect "^4.0.5" chainsaw@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= + integrity sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ== dependencies: traverse ">=0.3.0 <0.4" -chalk@1.1.3, chalk@^1.1.3: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -8237,15 +9814,6 @@ chalk@1.1.3, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" @@ -8254,14 +9822,38 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" +change-case@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.0.2.tgz#fd48746cce02f03f0a672577d1d3a8dc2eceb037" + integrity sha512-Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA== + dependencies: + camel-case "^3.0.0" + constant-case "^2.0.0" + dot-case "^2.1.0" + header-case "^1.0.0" + is-lower-case "^1.1.0" + is-upper-case "^1.1.0" + lower-case "^1.1.1" + lower-case-first "^1.0.0" + no-case "^2.3.2" + param-case "^2.1.0" + pascal-case "^2.0.0" + path-case "^2.1.0" + sentence-case "^2.1.0" + snake-case "^2.1.0" + swap-case "^1.1.0" + title-case "^2.1.0" + upper-case "^1.1.1" + upper-case-first "^1.1.0" + char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" @@ -8270,7 +9862,7 @@ char-regex@^1.0.2: chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" - integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= + integrity sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg== chardet@^0.7.0: version "0.7.0" @@ -8280,20 +9872,45 @@ chardet@^0.7.0: "charenc@>= 0.0.1": version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" - integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc= + integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== check-error@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= + integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== checkpoint-store@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/checkpoint-store/-/checkpoint-store-1.1.0.tgz#04e4cb516b91433893581e6d4601a78e9552ea06" - integrity sha1-BOTLUWuRQziTWB5tRgGnjpVS6gY= + integrity sha512-J/NdY2WvIx654cc6LWSq/IYFFCUf75fFTgwzFnmbqyORH4MwgiQCgswLLKBGzmsyTI5V7i5bp/So6sMbDWhedg== dependencies: functional-red-black-tree "^1.0.1" +cheerio-select@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4" + integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g== + dependencies: + boolbase "^1.0.0" + css-select "^5.1.0" + css-what "^6.1.0" + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + +cheerio@^1.0.0-rc.2: + version "1.0.0-rc.12" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" + integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== + dependencies: + cheerio-select "^2.1.0" + dom-serializer "^2.0.0" + domhandler "^5.0.3" + domutils "^3.0.1" + htmlparser2 "^8.0.1" + parse5 "^7.0.0" + parse5-htmlparser2-tree-adapter "^7.0.0" + chevrotain@6.5.0: version "6.5.0" resolved "https://registry.yarnpkg.com/chevrotain/-/chevrotain-6.5.0.tgz#dcbef415516b0af80fd423cc0d96b28d3f11374e" @@ -8304,7 +9921,7 @@ chevrotain@6.5.0: child-process-promise@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/child-process-promise/-/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074" - integrity sha1-RzChHvYQ+tRQuPIjx50x172tgHQ= + integrity sha512-Fi4aNdqBsr0mv+jgWxcZ/7rAIC2mgihrptyVI4foh/rrjY/3BNjfP9+oaiFx/fzim+1ZyCNBae0DlyfQhSugog== dependencies: cross-spawn "^4.0.2" node-version "^1.0.0" @@ -8325,6 +9942,36 @@ chokidar@3.3.0: optionalDependencies: fsevents "~2.1.1" +chokidar@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450" + integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.3.0" + optionalDependencies: + fsevents "~2.1.2" + +chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.4.1, chokidar@^3.5.1: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chokidar@^2.0.0, chokidar@^2.1.5, chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" @@ -8336,45 +9983,28 @@ chokidar@^2.0.0, chokidar@^2.1.5, chokidar@^2.1.8: glob-parent "^3.1.0" inherits "^2.0.3" is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - -chokidar@^3.0.2, chokidar@^3.4.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d" - integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.4.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" optionalDependencies: - fsevents "~2.1.2" + fsevents "^1.2.7" -chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2: +chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== -chownr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" - integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE= +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^1.5.0: version "1.6.0" @@ -8386,10 +10016,10 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -cidr-regex@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-1.0.6.tgz#74abfd619df370b9d54ab14475568e97dd64c0c1" - integrity sha1-dKv9YZ3zcLnVSrFEdVaOl91kwME= +ci-info@^3.2.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128" + integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg== cids@^0.7.1: version "0.7.5" @@ -8415,10 +10045,15 @@ cjs-module-lexer@^0.6.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== +cjs-module-lexer@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" + integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== + cjson@^0.3.1: version "0.3.3" resolved "https://registry.yarnpkg.com/cjson/-/cjson-0.3.3.tgz#a92d9c786e5bf9b930806329ee05d5d3261b4afa" - integrity sha1-qS2ceG5b+bkwgGMp7gXV0yYbSvo= + integrity sha512-yKNcXi/Mvi5kb1uK0sahubYiyfUO2EUgOp4NcY9+8NX5Xmc+4yeNogZuLFkpLBBj7/QI9MjRUIuXrV9XOw5kVg== dependencies: json-parse-helpfulerror "^1.0.3" @@ -8438,21 +10073,21 @@ class-utils@^0.3.5: static-extend "^0.1.1" clean-stack@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.1.0.tgz#9e7fec7f3f8340a2ab4f127c80273085e8fbbdd0" - integrity sha512-uQWrpRm+iZZUCAp7ZZJQbd4Za9I3AjR/3YTjmcnAtkauaIm/T5CT6U8zVI6e60T6OANqBFAzuR9/HB3NzuZCRA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== clean-stack@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-3.0.0.tgz#a7c249369fcf0f33c7888c20ea3f3dc79620211f" - integrity sha512-RHxtgFvXsRQ+1AM7dlozLDY7ssmvUUh0XEnfnyhYgJTO6beNZHBogiaCwGM9Q3rFrUkYxOtsZRC0zAturg5bjg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-3.0.1.tgz#155bf0b2221bf5f4fba89528d24c5953f17fe3a8" + integrity sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg== dependencies: escape-string-regexp "4.0.0" cli-boxes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM= + integrity sha512-3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg== cli-boxes@^2.2.0, cli-boxes@^2.2.1: version "2.2.1" @@ -8471,50 +10106,36 @@ cli-color@^1.2.0, cli-color@^1.4.0: memoizee "^0.4.14" timers-ext "^0.1.5" -cli-columns@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e" - integrity sha1-ZzLZcpee/CrkRKHwjgj6E5yWoY4= +cli-cursor@3.1.0, cli-cursor@^3.0.0, cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== dependencies: - string-width "^2.0.0" - strip-ansi "^3.0.1" + restore-cursor "^3.1.0" cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== dependencies: restore-cursor "^2.0.0" -cli-cursor@^3.0.0, cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - cli-progress@^3.4.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.8.2.tgz#abaf1fc6d6401351f16f068117a410554a0eb8c7" - integrity sha512-qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ== + version "3.11.2" + resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" + integrity sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA== dependencies: - colors "^1.1.2" - string-width "^4.2.0" + string-width "^4.2.3" -cli-spinners@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.1.0.tgz#22c34b4d51f573240885b201efda4e4ec9fff3c7" - integrity sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA== +cli-spinners@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== -cli-table2@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz#2d1ef7f218a0e786e214540562d4bd177fe32d97" - integrity sha1-LR738hig54biFFQFYtS9F3/jLZc= - dependencies: - lodash "^3.10.1" - string-width "^1.0.1" - optionalDependencies: - colors "^1.1.2" +cli-spinners@^2.0.0, cli-spinners@^2.5.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" + integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== cli-table3@^0.5.0: version "0.5.1" @@ -8527,48 +10148,53 @@ cli-table3@^0.5.0: colors "^1.1.2" cli-table@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" - integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM= + version "0.3.11" + resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.11.tgz#ac69cdecbe81dccdba4889b9a18b7da312a9d3ee" + integrity sha512-IqLQi4lO0nIB4tcdTpN4LCB9FI3uqrJZK7RC515EnhZ6qBaglkIgICb1wjeAqpdoOabm1+SuQtkXIPdYC93jhQ== dependencies: colors "1.0.3" -cli-ux@^4.4.0, cli-ux@^4.9.0: - version "4.9.3" - resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-4.9.3.tgz#4c3e070c1ea23eef010bbdb041192e0661be84ce" - integrity sha512-/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA== +cli-ux@5.6.6: + version "5.6.6" + resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-5.6.6.tgz#1424f5a9fbddcd796ad985b867a3de7f5a452090" + integrity sha512-4wUB34zoFklcZV0z5YiOM5IqVMMt9c3TK3QYRK3dqyk3XoRC0ybiWDWHfsMDjkKrzsVTw95rXn9NrzSHbae4pg== dependencies: - "@oclif/errors" "^1.2.2" + "@oclif/command" "^1.8.9" + "@oclif/errors" "^1.3.5" "@oclif/linewrap" "^1.0.0" - "@oclif/screen" "^1.0.3" - ansi-escapes "^3.1.0" - ansi-styles "^3.2.1" + "@oclif/screen" "^1.0.4" + ansi-escapes "^4.3.0" + ansi-styles "^4.2.0" cardinal "^2.1.1" - chalk "^2.4.1" - clean-stack "^2.0.0" - extract-stack "^1.0.0" - fs-extra "^7.0.0" + chalk "^4.1.0" + clean-stack "^3.0.0" + cli-progress "^3.4.0" + extract-stack "^2.0.0" + fs-extra "^8.1" hyperlinker "^1.0.0" - indent-string "^3.2.0" - is-wsl "^1.1.0" - lodash "^4.17.11" - password-prompt "^1.0.7" - semver "^5.6.0" - strip-ansi "^5.0.0" - supports-color "^5.5.0" - supports-hyperlinks "^1.0.1" - treeify "^1.1.0" - tslib "^1.9.3" + indent-string "^4.0.0" + is-wsl "^2.2.0" + js-yaml "^3.13.1" + lodash "^4.17.21" + natural-orderby "^2.0.1" + object-treeify "^1.1.4" + password-prompt "^1.1.2" + semver "^7.3.2" + string-width "^4.2.0" + strip-ansi "^6.0.0" + supports-color "^8.1.0" + supports-hyperlinks "^2.1.0" + tslib "^2.0.0" -cli-ux@^5.2.1, cli-ux@^5.4.5, cli-ux@^5.4.9: - version "5.5.1" - resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-5.5.1.tgz#99d28dae0c3ef7845fa2ea56e066a1d5fcceca9e" - integrity sha512-t3DT1U1C3rArLGYLpKa3m9dr/8uKZRI8HRm/rXKL7UTjm4c+Yd9zHNWg1tP8uaJkUbhmvx5SQHwb3VWpPUVdHQ== +cli-ux@5.6.7, cli-ux@^5.4.5, cli-ux@^5.4.9, cli-ux@^5.6.7: + version "5.6.7" + resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-5.6.7.tgz#32ef9e6cb2b457be834280cc799028a11c8235a8" + integrity sha512-dsKAurMNyFDnO6X1TiiRNiVbL90XReLKcvIq4H777NMqXGBxBws23ag8ubCJE97vVZEgWG2eSUhsyLf63Jv8+g== dependencies: - "@oclif/command" "^1.6.0" - "@oclif/errors" "^1.2.1" + "@oclif/command" "^1.8.15" + "@oclif/errors" "^1.3.5" "@oclif/linewrap" "^1.0.0" - "@oclif/screen" "^1.0.3" + "@oclif/screen" "^1.0.4" ansi-escapes "^4.3.0" ansi-styles "^4.2.0" cardinal "^2.1.1" @@ -8581,21 +10207,48 @@ cli-ux@^5.2.1, cli-ux@^5.4.5, cli-ux@^5.4.9: indent-string "^4.0.0" is-wsl "^2.2.0" js-yaml "^3.13.1" - lodash "^4.17.11" + lodash "^4.17.21" natural-orderby "^2.0.1" object-treeify "^1.1.4" password-prompt "^1.1.2" semver "^7.3.2" string-width "^4.2.0" strip-ansi "^6.0.0" - supports-color "^7.1.0" + supports-color "^8.1.0" supports-hyperlinks "^2.1.0" tslib "^2.0.0" +cli-ux@^4.4.0: + version "4.9.3" + resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-4.9.3.tgz#4c3e070c1ea23eef010bbdb041192e0661be84ce" + integrity sha512-/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA== + dependencies: + "@oclif/errors" "^1.2.2" + "@oclif/linewrap" "^1.0.0" + "@oclif/screen" "^1.0.3" + ansi-escapes "^3.1.0" + ansi-styles "^3.2.1" + cardinal "^2.1.1" + chalk "^2.4.1" + clean-stack "^2.0.0" + extract-stack "^1.0.0" + fs-extra "^7.0.0" + hyperlinker "^1.0.0" + indent-string "^3.2.0" + is-wsl "^1.1.0" + lodash "^4.17.11" + password-prompt "^1.0.7" + semver "^5.6.0" + strip-ansi "^5.0.0" + supports-color "^5.5.0" + supports-hyperlinks "^1.0.1" + treeify "^1.1.0" + tslib "^1.9.3" + cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== cli-width@^3.0.0: version "3.0.0" @@ -8605,7 +10258,7 @@ cli-width@^3.0.0: cliui@^3.0.3, cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= + integrity sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w== dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -8647,37 +10300,41 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" -clone-buffer@^1.0.0: +clone-buffer@1.0.0, clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= + integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" + integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== dependencies: mimic-response "^1.0.0" -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= - clone-stats@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= + integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== clone@2.1.2, clone@^2.0.0, clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== -clone@^1.0.0, clone@^1.0.2: +clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== cloneable-readable@^1.0.0: version "1.1.3" @@ -8691,65 +10348,61 @@ cloneable-readable@^1.0.0: cls-bluebird@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee" - integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4= + integrity sha512-XVb0RPmHQyy35Tz9z34gvtUcBKUK8A/1xkGCyeFc9B0C7Zr5SysgFaswRVdwI5NEMcO+3JKlIDGIOgERSn9NdA== dependencies: is-bluebird "^1.0.2" shimmer "^1.1.0" -cmd-shim@^2.0.2, cmd-shim@~2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb" - integrity sha1-b8vamUg6j9FdfTChlspp1oii79s= - dependencies: - graceful-fs "^4.1.2" - mkdirp "~0.5.0" - -cmd-shim@^3.0.0, cmd-shim@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz#2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb" - integrity sha512-DtGg+0xiFhQIntSBRzL2fRQBnmtAVwXIDo4Qq46HPpObYquxMaZS4sb82U9nH91qJrlosC1wa9gwr0QyL/HypA== +cmd-shim@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724" + integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw== dependencies: - graceful-fs "^4.1.2" - mkdirp "~0.5.0" + mkdirp-infer-owner "^2.0.0" co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== + +code-error-fragment@0.0.230: + version "0.0.230" + resolved "https://registry.yarnpkg.com/code-error-fragment/-/code-error-fragment-0.0.230.tgz#d736d75c832445342eca1d1fedbf17d9618b14d7" + integrity sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw== code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== codecov@^3.6.5: - version "3.7.1" - resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.7.1.tgz#434cb8d55f18ef01672e5739d3d266696bebc202" - integrity sha512-JHWxyPTkMLLJn9SmKJnwAnvY09kg2Os2+Ux+GG7LwZ9g8gzDDISpIN5wAsH1UBaafA/yGcd3KofMaorE8qd6Lw== + version "3.8.3" + resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.8.3.tgz#9c3e364b8a700c597346ae98418d09880a3fdbe7" + integrity sha512-Y8Hw+V3HgR7V71xWH2vQ9lyS358CbGCldWlJFR0JirqoGtOoas3R3/OclRTvgUYFK29mmJICDPauVKmpqbwhOA== dependencies: argv "0.0.2" - ignore-walk "3.0.3" - js-yaml "3.13.1" - teeny-request "6.0.1" - urlgrey "0.4.4" + ignore-walk "3.0.4" + js-yaml "3.14.1" + teeny-request "7.1.1" + urlgrey "1.0.0" coinstring@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/coinstring/-/coinstring-2.3.0.tgz#cdb63363a961502404a25afb82c2e26d5ff627a4" - integrity sha1-zbYzY6lhUCQEolr7gsLibV/2J6Q= + integrity sha512-2xMhQ++4ETUPiy2oqOlfydsuQArNLB6TExNF33Jmv+IgpmV8Hf6v6yICQAwH4uEHTnkJ3DscSyeKFrg37ljIOw== dependencies: bs58 "^2.0.1" create-hash "^1.1.1" collect-v8-coverage@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz#150ee634ac3650b71d9c985eb7f608942334feb1" - integrity sha512-VKIhJgvk8E1W28m5avZ2Gv2Ruv5YiF56ug2oclvaG9md69BuZImMG2sk9g7QNKLUbtYAKQjXjYxbYZVUlMMKmQ== + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== collection-map@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" - integrity sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw= + integrity sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA== dependencies: arr-map "^2.0.2" for-own "^1.0.0" @@ -8758,12 +10411,12 @@ collection-map@^1.0.0: collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== dependencies: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -8780,78 +10433,73 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.2: - version "1.5.5" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" - integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== +color-string@^1.6.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" + integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" -color-support@^1.1.3: +color-support@^1.1.2, color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -color@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" - integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== +color@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" + color-convert "^1.9.3" + color-string "^1.6.0" -colorette@1.1.0, colorette@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.1.0.tgz#1f943e5a357fac10b4e0f5aaef3b14cdc1af6ec7" - integrity sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg== - -colorette@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== +colorette@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" + integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== -colornames@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" - integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y= +colorette@^1.0.7: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== colors@1.0.3, colors@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== -colors@1.4.0, colors@^1.0.3, colors@^1.1.2, colors@^1.2.1: +colors@1.4.0, colors@^1.0.3, colors@^1.1.2: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== colorspace@1.1.x: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" - integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== + version "1.1.4" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== dependencies: - color "3.0.x" + color "^3.1.3" text-hex "1.0.x" colour@~0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778" - integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g= + integrity sha512-Rel466v0EnmKPcsxHo91L4kgPs/6XF7Pu2LJNszq9lXYwi5CFWEeIiRaTX5ym7PPMdj4udDHkLSVC1//JVkZQg== -columnify@^1.5.4, columnify@~1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb" - integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs= +columnify@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3" + integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q== dependencies: - strip-ansi "^3.0.0" + strip-ansi "^6.0.1" wcwidth "^1.0.0" combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: @@ -8890,7 +10538,7 @@ commander@3.0.2, commander@^3.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.12.1, commander@^2.19.0, commander@^2.20.0: +commander@^2.12.1, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -8900,45 +10548,43 @@ commander@^4.0.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +commander@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + +commander@^8.1.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA== -commander@~2.17.1: - version "2.17.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" - integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== - -commander@~2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" - integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ= - dependencies: - graceful-readlink ">= 1.0.0" +common-ancestor-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7" + integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w== commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== -compare-func@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" - integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg= +compare-func@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" + integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA== dependencies: array-ify "^1.0.0" - dot-prop "^3.0.0" + dot-prop "^5.1.0" compare-semver@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/compare-semver/-/compare-semver-1.1.0.tgz#7c0a79a27bb80b6c6994445f82958259d3d02153" - integrity sha1-fAp5onu4C2xplERfgpWCWdPQIVM= + integrity sha512-AENcdfhxsMCzzl+QRdOwMQeA8tZBEEacAmA4pGPoyco27G9sIaM98WNYkcToC9O0wIx1vE+1ErmaM4t0/fXhMw== dependencies: semver "^5.0.1" @@ -8947,15 +10593,15 @@ compare-versions@^3.5.1: resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== -complex.js@^2.0.11: - version "2.0.15" - resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.0.15.tgz#7add6848b4c1d12aa9262f7df925ebe7a51a7406" - integrity sha512-gDBvQU8IG139ZBQTSo2qvDFP+lANMGluM779csXOr6ny1NUtA3wkUnCFjlDNH/moAVfXtvClYt6G0zarFbtz5w== +complex.js@2.0.11: + version "2.0.11" + resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.0.11.tgz#09a873fbf15ffd8c18c9c2201ccef425c32b8bf1" + integrity sha512-6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw== component-emitter@^1.2.0, component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== compress-commons@^4.1.0: version "4.1.1" @@ -8990,18 +10636,9 @@ compression@^1.7.0, compression@^1.7.1: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -concat-stream@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.1.tgz#f3b80acf9e1f48e3875c0688b41b6c31602eea1c" - integrity sha1-87gKz54fSOOHXAaItBtsMWAu6hw= - dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.5.2, concat-stream@^1.6.0: +concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -9021,15 +10658,23 @@ concat-stream@^2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -config-chain@^1.1.11, config-chain@^1.1.12: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" +conf@^10.1.2: + version "10.2.0" + resolved "https://registry.yarnpkg.com/conf/-/conf-10.2.0.tgz#838e757be963f1a2386dfe048a98f8f69f7b55d6" + integrity sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg== + dependencies: + ajv "^8.6.3" + ajv-formats "^2.1.1" + atomically "^1.7.0" + debounce-fn "^4.0.0" + dot-prop "^6.0.1" + env-paths "^2.2.1" + json-schema-typed "^7.0.3" + onetime "^5.1.2" + pkg-up "^3.1.0" + semver "^7.3.5" -config-chain@~1.1.11: +config-chain@^1.1.12, config-chain@^1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== @@ -9038,11 +10683,11 @@ config-chain@~1.1.11: proto-list "~1.2.1" configstore@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" - integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.5.tgz#e9af331fadc14dabd544d3e7e76dc446a09a530f" + integrity sha512-nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA== dependencies: - dot-prop "^4.1.0" + dot-prop "^4.2.1" graceful-fs "^4.1.2" make-dir "^1.0.0" unique-string "^1.0.0" @@ -9073,17 +10718,7 @@ configstore@^5.0.0, configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" -connect@^3.6.2: - version "3.6.6" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524" - integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ= - dependencies: - debug "2.6.9" - finalhandler "1.1.0" - parseurl "~1.3.2" - utils-merge "1.0.1" - -connect@^3.6.5: +connect@^3.6.2, connect@^3.6.5: version "3.7.0" resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== @@ -9094,28 +10729,34 @@ connect@^3.6.5: utils-merge "1.0.1" console-browserify@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" - integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= - dependencies: - date-now "^0.1.4" + version "1.2.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" + integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + +constant-case@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-2.0.0.tgz#4175764d389d3fa9c8ecd29186ed6005243b6a46" + integrity sha512-eS0N9WwmjTqrOmR3o83F5vW8Z+9R1HnVz3xmzT2PMFug9ly+Au/fxRWlEBSb6LcZwspSsEn9Xs1uw9YgzAg1EQ== + dependencies: + snake-case "^2.1.0" + upper-case "^1.1.1" constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= + integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ== -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: - safe-buffer "5.1.2" + safe-buffer "5.2.1" content-hash@^2.5.2: version "2.5.2" @@ -9131,110 +10772,109 @@ content-type@^1.0.4, content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -conventional-changelog-angular@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0" - integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA== +conventional-changelog-angular@^5.0.12: + version "5.0.13" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c" + integrity sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA== dependencies: - compare-func "^1.3.1" + compare-func "^2.0.0" q "^1.5.1" -conventional-changelog-core@^3.1.6: - version "3.2.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0" - integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g== +conventional-changelog-core@^4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz#e50d047e8ebacf63fac3dc67bf918177001e1e9f" + integrity sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg== dependencies: - conventional-changelog-writer "^4.0.5" - conventional-commits-parser "^3.0.2" + add-stream "^1.0.0" + conventional-changelog-writer "^5.0.0" + conventional-commits-parser "^3.2.0" dateformat "^3.0.0" - get-pkg-repo "^1.0.0" - git-raw-commits "2.0.0" + get-pkg-repo "^4.0.0" + git-raw-commits "^2.0.8" git-remote-origin-url "^2.0.0" - git-semver-tags "^2.0.2" - lodash "^4.2.1" - normalize-package-data "^2.3.5" + git-semver-tags "^4.1.1" + lodash "^4.17.15" + normalize-package-data "^3.0.0" q "^1.5.1" read-pkg "^3.0.0" read-pkg-up "^3.0.0" - through2 "^3.0.0" + through2 "^4.0.0" -conventional-changelog-preset-loader@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4" - integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA== +conventional-changelog-preset-loader@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c" + integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g== -conventional-changelog-writer@^4.0.5: - version "4.0.6" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.6.tgz#24db578ac8e7c89a409ef9bba12cf3c095990148" - integrity sha512-ou/sbrplJMM6KQpR5rKFYNVQYesFjN7WpNGdudQSWNi6X+RgyFUcSv871YBYkrUYV9EX8ijMohYVzn9RUb+4ag== +conventional-changelog-writer@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359" + integrity sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ== dependencies: - compare-func "^1.3.1" - conventional-commits-filter "^2.0.2" + conventional-commits-filter "^2.0.7" dateformat "^3.0.0" - handlebars "^4.1.0" + handlebars "^4.7.7" json-stringify-safe "^5.0.1" - lodash "^4.2.1" - meow "^4.0.0" + lodash "^4.17.15" + meow "^8.0.0" semver "^6.0.0" split "^1.0.0" - through2 "^3.0.0" + through2 "^4.0.0" -conventional-commits-filter@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1" - integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ== +conventional-commits-filter@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3" + integrity sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA== dependencies: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-parser@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d" - integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg== +conventional-commits-parser@^3.2.0: + version "3.2.4" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972" + integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q== dependencies: JSONStream "^1.0.4" - is-text-path "^2.0.0" - lodash "^4.2.1" - meow "^4.0.0" - split2 "^2.0.0" - through2 "^3.0.0" - trim-off-newlines "^1.0.0" + is-text-path "^1.0.1" + lodash "^4.17.15" + meow "^8.0.0" + split2 "^3.0.0" + through2 "^4.0.0" -conventional-recommended-bump@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-5.0.0.tgz#019d45a1f3d2cc14a26e9bad1992406ded5baa23" - integrity sha512-CsfdICpbUe0pmM4MTG90GPUqnFgB1SWIR2HAh+vS+JhhJdPWvc0brs8oadWoYGhFOQpQwe57JnvzWEWU0m2OSg== +conventional-recommended-bump@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz#cfa623285d1de554012f2ffde70d9c8a22231f55" + integrity sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw== dependencies: concat-stream "^2.0.0" - conventional-changelog-preset-loader "^2.1.1" - conventional-commits-filter "^2.0.2" - conventional-commits-parser "^3.0.2" - git-raw-commits "2.0.0" - git-semver-tags "^2.0.2" - meow "^4.0.0" + conventional-changelog-preset-loader "^2.3.4" + conventional-commits-filter "^2.0.7" + conventional-commits-parser "^3.2.0" + git-raw-commits "^2.0.8" + git-semver-tags "^4.1.1" + meow "^8.0.0" q "^1.5.1" -convert-source-map@1.X, convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== +convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== cookiejar@^2.1.0, cookiejar@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" - integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== + version "2.1.3" + resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" + integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== copy-concurrently@^1.0.0: version "1.0.5" @@ -9251,45 +10891,57 @@ copy-concurrently@^1.0.0: copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== copy-props@^2.0.1: - version "2.0.4" - resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.4.tgz#93bb1cadfafd31da5bb8a9d4b41f471ec3a72dfe" - integrity sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A== + version "2.0.5" + resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2" + integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw== dependencies: - each-props "^1.3.0" - is-plain-object "^2.0.1" + each-props "^1.3.2" + is-plain-object "^5.0.0" -core-js-pure@^3.0.1: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" - integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA== +core-js-compat@^3.21.0: + version "3.25.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.1.tgz#6f13a90de52f89bbe6267e5620a412c7f7ff7e42" + integrity sha512-pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw== + dependencies: + browserslist "^4.21.3" -core-js@3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.2.tgz#2799ea1a59050f0acf50dfe89b916d6503b16caa" - integrity sha512-hIE5dXkRzRvnZ5vhkRfQxUvDxQZmD9oueA08jDYRBKJHx+VIl/Pne/e0A4x9LObEEthC/TqiZybUoNM4tRgnKg== +core-js-pure@^3.0.1: + version "3.25.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.1.tgz#79546518ae87cc362c991d9c2d211f45107991ee" + integrity sha512-7Fr74bliUDdeJCBMxkkIuQ4xfxn/SwrVg+HkJUAoNEXVqYLv55l6Af0dJ5Lq2YBUW9yKqSkLXaS5SYPK6MGa/A== -core-js@^2.4.0, core-js@^2.5.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== +core-js@3.6.5: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" + integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== -core-js@^2.4.1: +core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.0.0: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" - integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== + version "3.25.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.1.tgz#5818e09de0db8956e16bf10e2a7141e931b7c69c" + integrity sha512-sr0FY4lnO1hkQ4gLDr24K0DGnweGO1QwSj5BpfQjpSJPdqWalja4cTps29Y/PJVG/P7FYlPDkH3hO+Tr0CvDgQ== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-js@^3.2.1: + version "3.25.5" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.5.tgz#e86f651a2ca8a0237a5f064c2fe56cef89646e27" + integrity sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw== + +core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== cors@^2.8.1, cors@^2.8.5: version "2.8.5" @@ -9309,21 +10961,29 @@ cosmiconfig@^5.0.5, cosmiconfig@^5.0.7, cosmiconfig@^5.1.0, cosmiconfig@^5.2.1: js-yaml "^3.13.1" parse-json "^4.0.0" +cosmiconfig@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + country-data@^0.0.31: version "0.0.31" resolved "https://registry.yarnpkg.com/country-data/-/country-data-0.0.31.tgz#80966b8e1d147fa6d6a589d32933f8793774956d" - integrity sha1-gJZrjh0Uf6bWpYnTKTP4eTd0lW0= + integrity sha512-YqlY/i6ikZwoBFfdjK+hJTGaBdTgDpXLI15MCj2UsXZ2cPBb+Kx86AXmDH7PRGt0LUleck0cCgNdWeIhfbcxkQ== dependencies: currency-symbol-map "~2" underscore ">1.4.4" crc-32@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" - integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== - dependencies: - exit-on-epipe "~1.0.1" - printj "~1.1.0" + version "1.2.2" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff" + integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ== crc32-stream@^4.0.2: version "4.0.2" @@ -9344,7 +11004,7 @@ create-ecdh@^4.0.0: create-error-class@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= + integrity sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw== dependencies: capture-stack-trace "^1.0.0" @@ -9359,7 +11019,7 @@ create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2, create-hash@^1.2.0: ripemd160 "^2.0.1" sha.js "^2.4.0" -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4, create-hmac@^1.1.7: +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== @@ -9371,15 +11031,35 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + cross-env@^5.1.3, cross-env@^5.1.6: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" - integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg== + version "5.2.1" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.1.tgz#b2c76c1ca7add66dc874d11798466094f551b34d" + integrity sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ== + dependencies: + cross-spawn "^6.0.5" + +cross-fetch@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.4.tgz#7bef7020207e684a7638ef5f2f698e24d9eb283c" + integrity sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw== + dependencies: + node-fetch "2.6.0" + whatwg-fetch "3.0.0" + +cross-fetch@^2.1.0, cross-fetch@^2.1.1: + version "2.2.6" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a" + integrity sha512-9JZz+vXCmfKUZ68zAptS7k4Nu8e2qcibe7WVZYps7sAgk5R8GYTc+T1WR0v1rlP9HxgARmOX1UTIJZFytajpNA== dependencies: - cross-spawn "^6.0.5" - is-windows "^1.0.0" + node-fetch "^2.6.7" + whatwg-fetch "^2.0.4" -cross-fetch@3.0.4, cross-fetch@^2.1.0, cross-fetch@^2.1.1, cross-fetch@^3.0.2, cross-fetch@^3.0.6: +cross-fetch@^3.0.6, cross-fetch@^3.1.4: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== @@ -9400,7 +11080,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: cross-spawn@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" - integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE= + integrity sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA== dependencies: lru-cache "^4.0.1" which "^1.2.9" @@ -9408,13 +11088,13 @@ cross-spawn@^4.0.2: cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= + integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A== dependencies: lru-cache "^4.0.1" shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.1: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -9426,14 +11106,20 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1: "crypt@>= 0.0.1": version "0.0.2" resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" - integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs= + integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== -cryptiles@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-4.1.3.tgz#2461d3390ea0b82c643a6ba79f0ed491b0934c25" - integrity sha512-gT9nyTMSUC1JnziQpPbxKGBbUg8VL7Zn2NB4E1cJYvuXdElHrwxrV9bmltZGDzet45zSDGyYceueke1TjynGzw== +crypto-addr-codec@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/crypto-addr-codec/-/crypto-addr-codec-0.1.7.tgz#e16cea892730178fe25a38f6d15b680cab3124ae" + integrity sha512-X4hzfBzNhy4mAc3UpiXEC/L0jo5E8wAa9unsnA8nNXYzXjCcGk83hfC5avJWCSGT8V91xMnAS9AKMHmjw5+XCg== dependencies: - boom "7.x.x" + base-x "^3.0.8" + big-integer "1.6.36" + blakejs "^1.1.0" + bs58 "^4.0.1" + ripemd160-min "0.0.6" + safe-buffer "^5.2.0" + sha3 "^2.1.1" crypto-browserify@3.12.0, crypto-browserify@^3.11.0: version "3.12.0" @@ -9452,35 +11138,41 @@ crypto-browserify@3.12.0, crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^3.1.4: - version "3.1.8" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.8.tgz#715f070bf6014f2ae992a98b3929258b713f08d5" - integrity sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU= - -crypto-js@^3.1.9-1: - version "3.1.9-1" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8" - integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg= +crypto-js@^3.1.4, crypto-js@^3.1.9-1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b" + integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q== crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" - integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= + integrity sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg== crypto-random-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -css@2.X: - version "2.2.4" - resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" - integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw== +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== dependencies: - inherits "^2.0.3" - source-map "^0.6.1" - source-map-resolve "^0.5.2" - urix "^0.1.0" + boolbase "^1.0.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" + nth-check "^2.0.1" + +css-what@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + +cssfilter@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" + integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw== cssom@^0.4.4: version "0.4.4" @@ -9499,27 +11191,23 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^2.2.0: - version "2.6.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b" - integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w== +csstype@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" + integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== csv-parser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/csv-parser/-/csv-parser-2.0.0.tgz#70d7f80f84b4412df6c5c9665a09e9db1455c235" - integrity sha512-LcnmVMTnfQV5OhI3X0O3ragZpK2/frlVNHRUCRNBJ/w0nMRIDjts0tJnBeZIRHhOsv7mF3tB8sSFtnJRyox5Vw== + version "2.3.5" + resolved "https://registry.yarnpkg.com/csv-parser/-/csv-parser-2.3.5.tgz#6b3bf0907684914ff2c5abfbadab111a69eae5db" + integrity sha512-LCHolC4AlNwL+5EuD5LH2VVNKpD8QixZW2zzK1XmrVYUaslFY4c5BooERHOCIubG9iv/DAyFjs4x0HvWNZuyWg== dependencies: - buffer-alloc "^1.1.0" - buffer-from "^1.0.0" - generate-function "^1.0.1" - generate-object-property "^1.0.0" minimist "^1.2.0" - ndjson "^1.4.0" + through2 "^3.0.1" csv-streamify@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/csv-streamify/-/csv-streamify-3.0.4.tgz#4cb614c57e3f299cca17b63fdcb4ad167777f47a" - integrity sha1-TLYUxX4/KZzKF7Y/3LStFnd39Ho= + integrity sha512-IQkxN0zu0gym8/5CHrSyReeRewbw+aRDrMrGI5WmIY/LmEcNpAcPOyETBHREKgsWHeEQWEihiBmx5EcKAsKWZw== dependencies: through2 "2.0.1" @@ -9533,24 +11221,17 @@ csv-stringify@^4.3.1: currency-symbol-map@~2: version "2.2.0" resolved "https://registry.yarnpkg.com/currency-symbol-map/-/currency-symbol-map-2.2.0.tgz#2b3c1872ff1ac2ce595d8273e58e1fff0272aea2" - integrity sha1-KzwYcv8aws5ZXYJz5Y4f/wJyrqI= - -currently-unhandled@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" - integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= - dependencies: - array-find-index "^1.0.1" + integrity sha512-fPZJ3jqM68+AAgqQ7UaGbgHL/39rp6l7GyqS2k1HJPu/kpS8D07x/+Uup6a9tCUKIlOFcRrDCf1qxSt8jnI5BA== cycle@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" - integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI= + integrity sha512-TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA== -cyclist@~0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" - integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA= +cyclist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" + integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A== d@1, d@^1.0.1: version "1.0.1" @@ -9560,17 +11241,15 @@ d@1, d@^1.0.1: es5-ext "^0.10.50" type "^1.0.1" -dargs@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17" - integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc= - dependencies: - number-is-nan "^1.0.0" +dargs@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" + integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== dependencies: assert-plus "^1.0.0" @@ -9588,129 +11267,120 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-and-time@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.12.0.tgz#6d30c91c47fa72edadd628b71ec2ac46909b9267" - integrity sha512-n2RJIAp93AucgF/U/Rz5WRS2Hjg5Z+QxscaaMCi6pVZT1JpJKRH+C08vyH/lRR1kxNXnPxgo3lWfd+jCb/UcuQ== +dataloader@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" + integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ== -date-and-time@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-2.0.1.tgz#bc8b72704980e8a0979bb186118d30d02059ef04" - integrity sha512-O7Xe5dLaqvY/aF/MFWArsAM1J4j7w1CSZlPCX9uHgmb+6SbkPd8Q4YOvfvH/cZGvFlJFfHOZKxQtmMUOoZhc/w== +date-and-time@^0.14.2: + version "0.14.2" + resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.14.2.tgz#a4266c3dead460f6c231fe9674e585908dac354e" + integrity sha512-EFTCh9zRSEpGPmJaexg7HTuzZHh6cnJj1ui7IGCFNXzd2QdpsNh05Db5TF3xzJm30YN+A8/6xHSuRcQqoc3kFA== -date-now@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" - integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= +date-and-time@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.6.3.tgz#2daee52df67c28bd93bce862756ac86b68cf4237" + integrity sha512-lcWy3AXDRJOD7MplwZMmNSRM//kZtJaLz4n6D1P5z9wEmZGBKhJRBIr1Xs9KNQJmdXPblvgffynYji4iylUTcA== date-utils@*: version "1.2.21" resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64" - integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q= + integrity sha512-wJMBjqlwXR0Iv0wUo/lFbhSQ7MmG1hl36iuxuE91kW+5b5sWbase73manEqNH9sOLFAMG83B4ffNKq9/Iq0FVA== dateformat@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -dayjs@^1.8.15: - version "1.8.20" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.20.tgz#724a5cb6ad1f6fc066b0bd9a800dedcc7886f19e" - integrity sha512-mH0MCDxw6UCGJYxVN78h8ugWycZAO8thkj3bW6vApL5tS0hQplIDdAQcmbvl7n35H0AKdCJQaArTrIQw2xt4Qg== - -dayjs@^1.8.29: - version "1.9.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.9.6.tgz#6f0c77d76ac1ff63720dd1197e5cb87b67943d70" - integrity sha512-HngNLtPEBWRo8EFVmHFmSXAjtCX8rGNqeXQI0Gh7wCTSqwaKgPIDqu9m07wABVopNwzvOeCb+2711vQhDlcIXw== +dayjs@^1.8.15, dayjs@^1.8.29: + version "1.11.5" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.5.tgz#00e8cc627f231f9499c19b38af49f56dc0ac5e93" + integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA== -debug-fabulous@0.0.X: - version "0.0.4" - resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.0.4.tgz#fa071c5d87484685424807421ca4b16b0b1a0763" - integrity sha1-+gccXYdIRoVCSAdCHKSxawsaB2M= +debounce-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" + integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== dependencies: - debug "2.X" - lazy-debug-legacy "0.0.X" - object-assign "4.1.0" + mimic-fn "^3.0.0" -debug@2.6.9, debug@2.X, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@3.1.0: +debug@3.1.0, debug@=3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== dependencies: ms "2.0.0" -debug@3.2.6, debug@^3.0.1, debug@^3.1.0: +debug@3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== dependencies: ms "^2.1.1" -debug@4: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87" - integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg== - dependencies: - ms "^2.1.1" - -debug@4.1.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -debug@^4.3.1: +debug@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== +debug@4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== dependencies: ms "2.1.2" +debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" - integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= + integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw== -decamelize-keys@^1.0.0: +decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= + integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg== dependencies: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decamelize@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== +decimal.js@10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231" + integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw== + decimal.js@^10.0.0, decimal.js@^10.2.1: version "10.4.0" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.0.tgz#97a7448873b01e92e5ff9117d89a7bca8e63e0fe" @@ -9719,12 +11389,12 @@ decimal.js@^10.0.0, decimal.js@^10.2.1: decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== decompress-response@^3.2.0, decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== dependencies: mimic-response "^1.0.0" @@ -9735,6 +11405,13 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" @@ -9767,14 +11444,14 @@ decompress-targz@^4.0.0: decompress-unzip@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" - integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k= + integrity sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw== dependencies: file-type "^3.8.0" get-stream "^2.2.0" pify "^2.3.0" yauzl "^2.4.2" -decompress@^4.0.0, decompress@^4.2.1: +decompress@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118" integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== @@ -9791,7 +11468,7 @@ decompress@^4.0.0, decompress@^4.2.1: dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= + integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== deep-eql@^3.0.1: version "3.0.1" @@ -9801,53 +11478,53 @@ deep-eql@^3.0.1: type-detect "^4.0.0" deep-equal@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.1.tgz#fc12bbd6850e93212f21344748682ccc5a8813cf" - integrity sha512-7Et6r6XfNW61CPPCIYfm1YPGSmh6+CliYeL4km7GWJcpX5LTAflGF8drLLR+MZX+2P3NZfAfSduutBbSWqER4g== + version "2.0.5" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9" + integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw== + dependencies: + call-bind "^1.0.0" + es-get-iterator "^1.1.1" + get-intrinsic "^1.0.1" + is-arguments "^1.0.4" + is-date-object "^1.0.2" + is-regex "^1.1.1" + isarray "^2.0.5" + object-is "^1.1.4" + object-keys "^1.1.1" + object.assign "^4.1.2" + regexp.prototype.flags "^1.3.0" + side-channel "^1.0.3" + which-boxed-primitive "^1.0.1" + which-collection "^1.0.1" + which-typed-array "^1.1.2" + +deep-equal@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== dependencies: - es-abstract "^1.16.3" - es-get-iterator "^1.0.1" is-arguments "^1.0.4" is-date-object "^1.0.1" is-regex "^1.0.4" - isarray "^2.0.5" object-is "^1.0.1" object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" - side-channel "^1.0.1" - which-boxed-primitive "^1.0.1" - which-collection "^1.0.0" - -deep-equal@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= -deep-extend@^0.5.1, deep-extend@^0.6.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f" - integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w== +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-freeze@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84" - integrity sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ= - -deep-is@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + integrity sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg== -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deepmerge@^2.0.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" - integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA== - deepmerge@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.3.0.tgz#d3c47fd6f3a93d517b14426b0628a17b0125f5f7" @@ -9868,12 +11545,12 @@ default-compare@^1.0.0: default-resolution@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684" - integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ= + integrity sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ== defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + integrity sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA== dependencies: clone "^1.0.2" @@ -9882,6 +11559,11 @@ defer-to-connect@^1.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +defer-to-connect@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== + deferred-leveldown@~1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz#3acd2e0b75d1669924bc0a4b642851131173e1eb" @@ -9905,24 +11587,30 @@ deferred-leveldown@~5.3.0: abstract-leveldown "~6.2.1" inherits "^2.0.3" -define-properties@^1.1.2, define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== + +define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== dependencies: - object-keys "^1.0.12" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== dependencies: is-descriptor "^0.1.0" define-property@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== dependencies: is-descriptor "^1.0.0" @@ -9937,17 +11625,22 @@ define-property@^2.0.2: defined@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + integrity sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ== -degenerator@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.1.tgz#7ef78ec0c8577a544477308ddf1d2d6e88d51f5b" - integrity sha512-LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ== +degenerator@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235" + integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ== dependencies: ast-types "^0.13.2" escodegen "^1.8.1" esprima "^4.0.0" - vm2 "^3.9.3" + vm2 "^3.9.8" + +delay@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d" + integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw== delayed-stream@~1.0.0: version "1.0.0" @@ -9957,32 +11650,32 @@ delayed-stream@~1.0.0: delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== delimit-stream@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/delimit-stream/-/delimit-stream-0.1.0.tgz#9b8319477c0e5f8aeb3ce357ae305fc25ea1cd2b" - integrity sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs= + integrity sha512-a02fiQ7poS5CnjiJBAsjGLPp5EwVoGHNeu9sziBd9huppRfsAFIpv5zNLv0V1gbop53ilngAf5Kf331AwcoRBQ== denodeify@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631" - integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE= + integrity sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg== -denque@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" - integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== +denque@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" + integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== -depd@^2.0.0, depd@~2.0.0: +depd@2.0.0, depd@^2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -depd@~1.1.2: +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" @@ -9997,51 +11690,56 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" -destroy@^1.0.4, destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +destroy@1.2.0, destroy@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-file@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63" - integrity sha1-STXe39lIhkjgBrASlWbpOGcR6mM= + integrity sha512-akiVcMZym+vO3IxctGG9dnuJT4AYQTAhjsGbjeGqqMUr9Ffy7XEAUmfKLSHugr/tGLaAZ4jWROErPPrsfG8+bQ== dependencies: fs-exists-sync "^0.1.0" detect-file@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" - integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q== detect-indent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== dependencies: repeating "^2.0.0" -detect-indent@^5.0.0, detect-indent@~5.0.0: +detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" - integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= + integrity sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g== + +detect-indent@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" + integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== detect-installed@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-installed/-/detect-installed-2.0.4.tgz#a0850465e7c3ebcff979d6b6535ad344b80dd7c5" - integrity sha1-oIUEZefD68/5eda2U1rTRLgN18U= + integrity sha512-IpGo06Ff/rMGTKjFvVPbY9aE4mRT2XP3eYHC/ZS25LKDr2h8Gbv74Ez2q/qd7IYDqD9ZjI/VGedHNXsbKZ/Eig== dependencies: get-installed-path "^2.0.3" detect-libc@^1.0.2, detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== -detect-newline@2.X, detect-newline@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" - integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== detect-newline@^3.0.0: version "3.1.0" @@ -10051,12 +11749,12 @@ detect-newline@^3.0.0: detect-node@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127" - integrity sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc= + integrity sha512-64uDTOK+fKEa6XoSbkkDoeAX8Ep1XhwxwZtL1aw1En5p5UOK/ekJoFqd5BB1o+uOvF1iHVv6qDUxdOQ/VgWEQg== detox@^17.13.2: - version "17.14.0" - resolved "https://registry.yarnpkg.com/detox/-/detox-17.14.0.tgz#c0d08c0e4ab5dbaa6ff1d72ad830eef1cf3b63f2" - integrity sha512-6PNowwA6KCURY3lCONaSceHwwLIaRGeAS5U5mz4ke7aBThLWrCryacdi931xtOlm1zIvI4BfvGIbTODhnlUt0A== + version "17.14.9" + resolved "https://registry.yarnpkg.com/detox/-/detox-17.14.9.tgz#e269de0937e615eac92ac283b2303751bcf2c072" + integrity sha512-WLpl7BJ2xecZJ02hFFWgzo61RnlO/LlsH/U8GWztoXsT0z0t9iKsBci8AhSSErQfH0IHnNtDcZknIxt0gzNhoQ== dependencies: bunyan "^1.8.12" bunyan-debug-stream "^1.1.0" @@ -10082,44 +11780,45 @@ detox@^17.13.2: yargs "^16.0.3" yargs-unparser "^2.0.0" -dezalgo@^1.0.0, dezalgo@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" - integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY= +dezalgo@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" + integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig== dependencies: asap "^2.0.0" wrappy "1" -diagnostics@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a" - integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ== - dependencies: - colorspace "1.1.x" - enabled "1.0.x" - kuler "1.0.x" - dicer@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" - integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== + version "0.3.1" + resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.1.tgz#abf28921e3475bc5e801e74e0159fd94f927ba97" + integrity sha512-ObioMtXnmjYs3aRtpIJt9rgQSPCIhKVkFPip+E9GUDyWl8N435znUxK/JfNwGZJ2wnn5JKQ7Ly3vOK5Q5dylGA== dependencies: - streamsearch "0.1.2" + streamsearch "^1.1.0" diff-sequences@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== +diff-sequences@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.0.0.tgz#bae49972ef3933556bcb0800b72e8579d19d9e4f" + integrity sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA== + diff@3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== -diff@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" - integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q== +diff@4.0.2, diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +diff@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== diffie-hellman@^5.0.0: version "5.0.3" @@ -10131,9 +11830,9 @@ diffie-hellman@^5.0.0: randombytes "^2.0.0" dijkstrajs@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b" - integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs= + version "1.0.2" + resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257" + integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg== dir-glob@2.0.0: version "2.0.0" @@ -10143,13 +11842,6 @@ dir-glob@2.0.0: arrify "^1.0.1" path-type "^3.0.0" -dir-glob@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" - integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== - dependencies: - path-type "^3.0.0" - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -10165,7 +11857,7 @@ dir-to-object@^2.0.0: doctrine@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523" - integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM= + integrity sha512-qiB/Rir6Un6Ad/TIgTRzsremsTGWzs8j7woXvp14jgq00676uBiBT5eUOi+FgRywZFVy5Us/c04ISRpZhRbS6w== dependencies: esutils "^1.1.6" isarray "0.0.1" @@ -10177,6 +11869,15 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + dom-storage@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/dom-storage/-/dom-storage-2.1.0.tgz#00fb868bc9201357ea243c7bcfd3304c1e34ea39" @@ -10192,6 +11893,11 @@ domain-browser@^1.1.1: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -10199,72 +11905,131 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -dot-prop@^3.0.0, dot-prop@^4.1.0, dot-prop@^4.2.0, dot-prop@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" - integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== +domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + +dot-case@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee" + integrity sha512-HnM6ZlFqcajLsyudHq7LeeLDr2rFAVYtDv/hV5qchQEidSck8j9OPUsXY9KwJv/lHMtYlX4DjRQqwFYa+0r8Ug== + dependencies: + no-case "^2.2.0" + +dot-prop@^4.1.0, dot-prop@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4" + integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ== + dependencies: + is-obj "^1.0.0" + +dot-prop@^5.1.0, dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dot-prop@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" + integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== dependencies: is-obj "^2.0.0" dotdir-regex@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/dotdir-regex/-/dotdir-regex-0.1.0.tgz#d45df4c8863be6f5593d716914381767e938c0b6" - integrity sha1-1F30yIY75vVZPXFpFDgXZ+k4wLY= + integrity sha512-00odj/E9hnwoi/W0ZcudUwlR/OSjhMgcBgevA4G8tgSJdGy0cVIKrmKLkh97Kw6aXvE47islrIisBld19+X1AQ== + +dotenv@*: + version "16.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.2.tgz#0b0f8652c016a3858ef795024508cddc4bffc5bf" + integrity sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA== -dotenv@*, dotenv@8.2.0, dotenv@^8.2.0: +dotenv@8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== -dotenv@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" - integrity sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow== - dotenv@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.1.0.tgz#9853b6ca98292acb7dec67a95018fa40bccff42c" - integrity sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw== + version "6.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" + integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== + +dotenv@^8.2.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== + +dotenv@~10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" + integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== + +dotignore@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/dotignore/-/dotignore-0.1.2.tgz#f942f2200d28c3a76fbdd6f0ee9f3257c8a2e905" + integrity sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw== + dependencies: + minimatch "^3.0.4" dottie@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.1.tgz#697ad9d72004db7574d21f892466a3c285893659" - integrity sha512-ch5OQgvGDK2u8pSZeSYAQaV/lczImd7pMJ7BcEPXmnFVjy4yJIzP6CsODJUTH8mg1tyH1Z2abOiuJO3DjZ/GBw== + version "2.0.2" + resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154" + integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg== + +double-ended-queue@2.1.0-0: + version "2.1.0-0" + resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" + integrity sha512-+BNfZ+deCo8hMNpDqDnvT+c0XpJ5cUa6mqYq89bho2Ifze4URTqRkcwR399hWoTrTkbZ/XJYDgP6rc7pRgffEQ== drbg.js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b" - integrity sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs= + integrity sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g== dependencies: browserify-aes "^1.0.6" create-hash "^1.1.2" create-hmac "^1.1.4" dtrace-provider@~0.8: - version "0.8.7" - resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04" - integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ= + version "0.8.8" + resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e" + integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg== dependencies: - nan "^2.10.0" + nan "^2.14.0" duplexer2@~0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA== dependencies: readable-stream "^2.0.2" duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + version "0.1.5" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" + integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== duplexer@^0.1.1, duplexer@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" - integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + version "0.1.2" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0: +duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== @@ -10274,7 +12039,7 @@ duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -duplexify@^4.0.0: +duplexify@^4.0.0, duplexify@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0" integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw== @@ -10284,17 +12049,7 @@ duplexify@^4.0.0: readable-stream "^3.1.1" stream-shift "^1.0.0" -duplexify@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.1.tgz#7027dc374f157b122a8ae08c2d3ea4d2d953aa61" - integrity sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA== - dependencies: - end-of-stream "^1.4.1" - inherits "^2.0.3" - readable-stream "^3.1.1" - stream-shift "^1.0.0" - -each-props@^1.3.0: +each-props@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333" integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA== @@ -10305,7 +12060,7 @@ each-props@^1.3.0: ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== dependencies: jsbn "~0.1.0" safer-buffer "^2.1.0" @@ -10325,11 +12080,6 @@ ecurve@^1.0.6: bigi "^1.1.0" safe-buffer "^5.0.1" -editor@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742" - integrity sha1-YMf4e9YrzGqJT6jM1q+3gjok90I= - editorconfig@^0.15.3: version "0.15.3" resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" @@ -10343,19 +12093,24 @@ editorconfig@^0.15.3: ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.3.47: - version "1.3.529" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.529.tgz#a7eed559bc848a7c8d95026be7d8929e3f9af169" - integrity sha512-n3sriLldqNyjBlosbnPftjCY+m1dVOY307I1Y0HaHAqDGe3hRvK7ksJwWd+qs599ybR4jobCo1+7zXM9GyNMSA== +electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.202: + version "1.4.243" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz#9d5f1b10eafd6e434b687a88f1e7b0441dee168a" + integrity sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw== -electron-to-chromium@^1.3.649: - version "1.3.681" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.681.tgz#facd915ae46a020e8be566a2ecdc0b9444439be9" - integrity sha512-W6uYvSUTHuyX2DZklIESAqx57jfmGjUkd7Z3RWqLdj9Mmt39ylhBuvFXlskQnvBHj0MYXIeQI+mjiwVddZLSvA== +elliptic@6.3.3: + version "6.3.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" + integrity sha512-cIky9SO2H8W2eU1NOLySnhOYJnuEWCq9ZJeHvHd/lXzEL9vyraIMfilZSn57X3aVX+wkfYmqkch2LvmTzkjFpA== + dependencies: + bn.js "^4.4.0" + brorand "^1.0.1" + hash.js "^1.0.0" + inherits "^2.0.1" -elliptic@6.3.3, elliptic@6.5.2, elliptic@6.5.3, elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4: +elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -10368,6 +12123,16 @@ elliptic@6.3.3, elliptic@6.5.2, elliptic@6.5.3, elliptic@6.5.4, elliptic@^6.4.0, minimalistic-assert "^1.0.1" minimalistic-crypto-utils "^1.0.1" +emittery@0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.0.tgz#bb373c660a9d421bb44706ec4967ed50c02a8026" + integrity sha512-AGvFfs+d0JKCJQ4o01ASQLGPmSCxgfU9RFXvzPvZdjKK8oscynksuJhWrSTSw7j7Ep/sZct5b5ZhYCi8S/t0HQ== + +emittery@^0.10.2: + version "0.10.2" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933" + integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw== + emittery@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.4.1.tgz#abe9d3297389ba424ac87e53d1c701962ce7433d" @@ -10378,10 +12143,10 @@ emittery@^0.7.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== -"emoji-regex@>=6.0.0 <=6.1.1": - version "6.1.1" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e" - integrity sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4= +emoji-regex@^10.1.0: + version "10.2.1" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.2.1.tgz#a41c330d957191efd3d9dfe6e1e8e1e9ab048b3f" + integrity sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA== emoji-regex@^7.0.1: version "7.0.3" @@ -10396,19 +12161,27 @@ emoji-regex@^8.0.0: emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= + integrity sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng== -enabled@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= - dependencies: - env-variable "0.0.x" +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -encodeurl@~1.0.1, encodeurl@~1.0.2: +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== + +encode-utf8@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda" + integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw== + +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== encoding-down@5.0.4, encoding-down@~5.0.0: version "5.0.4" @@ -10431,12 +12204,12 @@ encoding-down@^6.3.0: level-codec "^9.0.0" level-errors "^2.0.0" -encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= +encoding@^0.1.11, encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: - iconv-lite "~0.4.13" + iconv-lite "^0.6.2" end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" @@ -10445,10 +12218,17 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" +end-stream@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/end-stream/-/end-stream-0.1.0.tgz#32003f3f438a2b0143168137f8fa6e9866c81ed5" + integrity sha512-Brl10T8kYnc75IepKizW6Y9liyW8ikz1B7n/xoHrJxoVSSjoqPn30sb7XVFfQERK4QfUMYRGs9dhWwtt2eu6uA== + dependencies: + write-stream "~0.4.3" + ends-with@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a" - integrity sha1-L52pjVelDP2kVxzkM5AAUA9Oa4o= + integrity sha512-lRppY4dK3VkqBdR242sKcAJeYc8Gf/DhoX9AWvWI2RzccmLnqBQfwm2k4oSDv5MPDjUqawCauXhZkyWxkVhRsg== enhanced-resolve@4.1.0: version "4.1.0" @@ -10460,59 +12240,66 @@ enhanced-resolve@4.1.0: tapable "^1.0.0" enhanced-resolve@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" - integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== + version "4.5.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" + integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" tapable "^1.0.0" +enquirer@~2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + ent@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== -env-paths@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" - integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA= +entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== -env-variable@0.0.x: - version "0.0.6" - resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808" - integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg== +env-paths@^2.2.0, env-paths@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -envinfo@^7.7.2: - version "7.7.4" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320" - integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ== +envinfo@^7.7.2, envinfo@^7.7.4: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== -err-code@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" - integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" error-ex@^1.2.0, error-ex@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" - integrity sha1-+FWobOYa3E6GIcPNoh56dhLDqNw= + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" error-stack-parser@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" - integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== + version "2.1.4" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" + integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== dependencies: - stackframe "^1.1.1" + stackframe "^1.3.4" errorhandler@^1.5.0: version "1.5.1" @@ -10522,79 +12309,51 @@ errorhandler@^1.5.0: accepts "~1.3.7" escape-html "~1.0.3" -es-abstract@^1.16.3, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.5.0: - version "1.17.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" - integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.5" - is-regex "^1.0.5" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" - -es-abstract@^1.18.0-next.1: - version "1.18.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" - integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.2.2" - is-negative-zero "^2.0.0" - is-regex "^1.1.1" - object-inspect "^1.8.0" - object-keys "^1.1.1" - object.assign "^4.1.1" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" - -es-abstract@^1.18.0-next.2: - version "1.18.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4" - integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw== +es-abstract@^1.17.0-next.1, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.0, es-abstract@^1.20.1: + version "1.20.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.2.tgz#8495a07bc56d342a3b8ea3ab01bd986700c2ccb3" + integrity sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" - get-intrinsic "^1.1.1" + function.prototype.name "^1.1.5" + get-intrinsic "^1.1.2" + get-symbol-description "^1.0.0" has "^1.0.3" - has-symbols "^1.0.2" - is-callable "^1.2.3" - is-negative-zero "^2.0.1" - is-regex "^1.1.2" - is-string "^1.0.5" - object-inspect "^1.9.0" + has-property-descriptors "^1.0.0" + has-symbols "^1.0.3" + internal-slot "^1.0.3" + is-callable "^1.2.4" + is-negative-zero "^2.0.2" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + is-string "^1.0.7" + is-weakref "^1.0.2" + object-inspect "^1.12.2" object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.0" + object.assign "^4.1.4" + regexp.prototype.flags "^1.4.3" + string.prototype.trimend "^1.0.5" + string.prototype.trimstart "^1.0.5" + unbox-primitive "^1.0.2" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== -es-get-iterator@^1.0.1, es-get-iterator@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9" - integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw== +es-get-iterator@^1.0.2, es-get-iterator@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7" + integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.1" + call-bind "^1.0.2" + get-intrinsic "^1.1.0" has-symbols "^1.0.1" - is-arguments "^1.0.4" - is-map "^2.0.1" - is-set "^2.0.1" + is-arguments "^1.1.0" + is-map "^2.0.2" + is-set "^2.0.2" is-string "^1.0.5" isarray "^2.0.5" @@ -10607,25 +12366,25 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== +es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: + version "0.10.62" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5" + integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA== dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" + es6-iterator "^2.0.3" + es6-symbol "^3.1.3" + next-tick "^1.1.0" -es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3: +es6-iterator@^2.0.1, es6-iterator@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= + integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g== dependencies: d "1" es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-promise@^4.0.3: +es6-promise@^4.0.3, es6-promise@^4.2.8: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== @@ -10633,11 +12392,11 @@ es6-promise@^4.0.3: es6-promisify@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" - integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= + integrity sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ== dependencies: es6-promise "^4.0.3" -es6-symbol@^3.1.1, es6-symbol@~3.1.3: +es6-symbol@^3.1.1, es6-symbol@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== @@ -10645,7 +12404,7 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3: d "^1.0.1" ext "^1.1.2" -es6-weak-map@^2.0.1, es6-weak-map@^2.0.2: +es6-weak-map@^2.0.1, es6-weak-map@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53" integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA== @@ -10668,9 +12427,9 @@ escape-goat@^2.0.0: escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== -escape-latex@^1.2.0: +escape-latex@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/escape-latex/-/escape-latex-1.2.0.tgz#07c03818cf7dac250cce517f4fda1b001ef2bca1" integrity sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw== @@ -10678,9 +12437,9 @@ escape-latex@^1.2.0: escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -escape-string-regexp@4.0.0: +escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== @@ -10693,7 +12452,7 @@ escape-string-regexp@^2.0.0: escodegen@1.8.x: version "1.8.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" - integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg= + integrity sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A== dependencies: esprima "^2.7.1" estraverse "^1.9.1" @@ -10734,7 +12493,7 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1, eslint-utils@^1.4.1: +eslint-utils@^1.3.1: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== @@ -10742,9 +12501,9 @@ eslint-utils@^1.3.1, eslint-utils@^1.4.1: eslint-visitor-keys "^1.1.0" eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" - integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint@^5.16.0, eslint@^5.5.0, eslint@^5.6.0: version "5.16.0" @@ -10812,7 +12571,7 @@ esprima-extract-comments@^1.1.0: esprima@2.7.x, esprima@^2.7.1: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" - integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= + integrity sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A== esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" @@ -10820,30 +12579,30 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" - integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: - estraverse "^4.1.0" + estraverse "^5.2.0" estraverse@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" - integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q= + integrity sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA== -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= +estraverse@^4.1.1, estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== -estraverse@^5.2.0: +estraverse@^5.1.0, estraverse@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== @@ -10851,7 +12610,7 @@ estraverse@^5.2.0: esutils@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375" - integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U= + integrity sha512-RG1ZkUT7iFJG9LSHr7KDuuMSlujfeTtMNIcInURxKAxhMtwQhI3NrQhz26gZQYlsYZQKzsnwtpKrFKj9K9Qu1A== esutils@^2.0.2: version "2.0.3" @@ -10861,7 +12620,7 @@ esutils@^2.0.2: etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== eth-block-tracker@^3.0.0: version "3.0.1" @@ -10888,74 +12647,80 @@ eth-block-tracker@^4.4.2: pify "^3.0.0" safe-event-emitter "^1.0.1" -eth-ens-namehash@2.0.8, eth-ens-namehash@^2.0.0: +eth-ens-namehash@2.0.8, eth-ens-namehash@^2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf" - integrity sha1-IprEbsqG1S4MmR58sq74P/D2i88= + integrity sha512-VWEI1+KJfz4Km//dadyvBBoBeSQ0MHTXPvr8UIXiLW6IanxvAV+DmlZAijZwAyggqGUfwQBeHf7tc9wzc1piSw== dependencies: idna-uts46-hx "^2.3.1" js-sha3 "^0.5.7" eth-gas-reporter@^0.2.16: - version "0.2.16" - resolved "https://registry.yarnpkg.com/eth-gas-reporter/-/eth-gas-reporter-0.2.16.tgz#e4d93b4bde057b0dd1472df98c0e5a157fd5bc36" - integrity sha512-E/RdhLK93XiiHxdrh3WmpjrH42o9IA+6KRSPOjsbbCpRazzQq9aKaIz4e+GRlHKP+dpamna4GNxILJOTIdVebA== + version "0.2.25" + resolved "https://registry.yarnpkg.com/eth-gas-reporter/-/eth-gas-reporter-0.2.25.tgz#546dfa946c1acee93cb1a94c2a1162292d6ff566" + integrity sha512-1fRgyE4xUB8SoqLgN3eDfpDfwEfRxh2Sz1b7wzFbyQA+9TekMmvSjjoRu9SKcSVyK+vLkLIsVbJDsTWjw195OQ== dependencies: - "@ethersproject/abi" "5.0.0-beta.142" + "@ethersproject/abi" "^5.0.0-beta.146" + "@solidity-parser/parser" "^0.14.0" cli-table3 "^0.5.0" - colors "^1.1.2" - ethereumjs-util "6.2.0" + colors "1.4.0" + ethereum-cryptography "^1.0.3" ethers "^4.0.40" fs-readdir-recursive "^1.1.0" lodash "^4.17.14" markdown-table "^1.1.3" - mocha "^5.2.0" + mocha "^7.1.1" req-cwd "^2.0.0" request "^2.88.0" request-promise-native "^1.0.5" sha1 "^1.1.1" - solidity-parser-diligence "^0.4.17" sync-request "^6.0.0" -eth-json-rpc-errors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/eth-json-rpc-errors/-/eth-json-rpc-errors-1.0.1.tgz#4204d81167bb49de1f5e7c708d72e52c177c821e" - integrity sha512-Z3iESIy5x2m9Phe/H885E3RWifZ/K+T08CUwd3djcUILwxP+XoMI9+Jspv1UkMcFlZFKigzOGZinIzmOpvBLhg== +eth-json-rpc-errors@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/eth-json-rpc-errors/-/eth-json-rpc-errors-1.1.1.tgz#148377ef55155585981c21ff574a8937f9d6991f" + integrity sha512-WT5shJ5KfNqHi9jOZD+ID8I1kuYWNrigtZat7GOQkvwo99f8SzAVaEcWhJUv656WiZOAg3P1RiJQANtUmDmbIg== + dependencies: + fast-safe-stringify "^2.0.6" + +eth-json-rpc-errors@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/eth-json-rpc-errors/-/eth-json-rpc-errors-2.0.2.tgz#c1965de0301fe941c058e928bebaba2e1285e3c4" + integrity sha512-uBCRM2w2ewusRHGxN8JhcuOb2RN3ueAOYH/0BhqdFmQkZx5lj5+fLKTz0mIVOzd4FG5/kUksCzCD7eTEim6gaA== dependencies: fast-safe-stringify "^2.0.6" -eth-json-rpc-filters@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.1.0.tgz#e7357a38983cde29858818dc55d394b9cf47c0f0" - integrity sha512-r/Zk0Tvx3BNYOCPCSEXxe2BeZJpKlA+E+76kYo8g95cHGXRP4uXKDnoTkFaRc/mamabmRhfyCoOjhDDx8iA3eA== +eth-json-rpc-filters@^4.1.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz#eb35e1dfe9357ace8a8908e7daee80b2cd60a10d" + integrity sha512-DGtqpLU7bBg63wPMWg1sCpkKCf57dJ+hj/k3zF26anXMzkmtSBDExL8IhUu7LUd34f0Zsce3PYNO2vV2GaTzaw== dependencies: - await-semaphore "^0.1.3" - eth-json-rpc-middleware "^4.1.4" + "@metamask/safe-event-emitter" "^2.0.0" + async-mutex "^0.2.6" + eth-json-rpc-middleware "^6.0.0" eth-query "^2.1.2" - json-rpc-engine "^5.1.3" - lodash.flatmap "^4.5.0" - safe-event-emitter "^1.0.1" + json-rpc-engine "^6.1.0" + pify "^5.0.0" eth-json-rpc-infura@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.0.tgz#62c3f516b51351038c32a548704467cec113ca8f" - integrity sha512-FLcpdxPRVBCUc7yoE+wHGvyYg2lATedP+/q7PsKvaSzQpJbgTG4ZjLnyrLanxDr6M1k/dSNa6V5QnILwjUKJcw== + version "3.2.1" + resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz#26702a821067862b72d979c016fd611502c6057f" + integrity sha512-W7zR4DZvyTn23Bxc0EWsq4XGDdD63+XPUCEhV2zQvQGavDVC4ZpFDK4k99qN7bd7/fjj37+rxmuBOBeIqCA5Mw== dependencies: cross-fetch "^2.1.1" eth-json-rpc-middleware "^1.5.0" json-rpc-engine "^3.4.0" json-rpc-error "^2.0.0" - tape "^4.8.0" eth-json-rpc-infura@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-4.0.2.tgz#8af1a1a2e9a0a82aaa302bbc96fb1a4c15d69b83" - integrity sha512-dvgOrci9lZqpjpp0hoC3Zfedhg3aIpLFVDH0TdlKxRlkhR75hTrKTwxghDrQwE0bn3eKrC8RsN1m/JdnIWltpw== + version "4.1.0" + resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-4.1.0.tgz#623478375ba65e4304dea529ed69e8bd7938270d" + integrity sha512-DFYitKovzVlCdUulEccdm4g6k/vnvyByuw7rd5OoWDBSIiaeinI8Z/SntLjSIs2c+YvE20DGwk/GLwZGCWDN1Q== dependencies: - cross-fetch "^2.1.1" - eth-json-rpc-errors "^1.0.1" - eth-json-rpc-middleware "^4.1.4" + eth-json-rpc-middleware "^4.4.0" + eth-rpc-errors "^3.0.0" json-rpc-engine "^5.1.3" + node-fetch "^2.6.0" eth-json-rpc-middleware@^1.5.0: version "1.6.0" @@ -10976,10 +12741,10 @@ eth-json-rpc-middleware@^1.5.0: promise-to-callback "^1.0.0" tape "^4.6.3" -eth-json-rpc-middleware@^4.1.4, eth-json-rpc-middleware@^4.1.5: - version "4.2.0" - resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-4.2.0.tgz#cfb77c5056cb8001548c6c7d54f4af5fce04d489" - integrity sha512-90LljqRyJhkg7fOwKunh1lu1Mr5bspXMBDitaTGyGPPNiFTbMrhtfbf9fteYlXRFCbq+aIFWwl/X+P7nkrdkLg== +eth-json-rpc-middleware@^4.1.5, eth-json-rpc-middleware@^4.4.0: + version "4.4.1" + resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-4.4.1.tgz#07d3dd0724c24a8d31e4a172ee96271da71b4228" + integrity sha512-yoSuRgEYYGFdVeZg3poWOwAlRI+MoBIltmOB86MtpoZjvLbou9EB/qWMOWSmH2ryCWLW97VYY6NWsmWm3OAA7A== dependencies: btoa "^1.2.1" clone "^2.1.1" @@ -10996,10 +12761,27 @@ eth-json-rpc-middleware@^4.1.4, eth-json-rpc-middleware@^4.1.5: pify "^3.0.0" safe-event-emitter "^1.0.1" +eth-json-rpc-middleware@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-6.0.0.tgz#4fe16928b34231a2537856f08a5ebbc3d0c31175" + integrity sha512-qqBfLU2Uq1Ou15Wox1s+NX05S9OcAEL4JZ04VZox2NS0U+RtCMjSxzXhLFWekdShUPZ+P8ax3zCO2xcPrp6XJQ== + dependencies: + btoa "^1.2.1" + clone "^2.1.1" + eth-query "^2.1.2" + eth-rpc-errors "^3.0.0" + eth-sig-util "^1.4.2" + ethereumjs-util "^5.1.2" + json-rpc-engine "^5.3.0" + json-stable-stringify "^1.0.1" + node-fetch "^2.6.1" + pify "^3.0.0" + safe-event-emitter "^1.0.1" + eth-lib@0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.7.tgz#2f93f17b1e23aec3759cd4a3fe20c1286a3fc1ca" - integrity sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco= + integrity sha512-VqEBQKH92jNsaE8lG9CTq8M/bc12gdAfb5MY8Ro1hVyXkh7rOtY3m5tRHK3Hus5HqIAAwU2ivcUjTLVwsvf/kw== dependencies: bn.js "^4.11.6" elliptic "^6.4.0" @@ -11029,11 +12811,25 @@ eth-lib@^0.1.26: eth-query@^2.0.2, eth-query@^2.1.0, eth-query@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.2.tgz#d6741d9000106b51510c72db92d6365456a6da5e" - integrity sha1-1nQdkAAQa1FRDHLbktY2VFam2l4= + integrity sha512-srES0ZcvwkR/wd5OQBRA1bIJMww1skfGS0s8wlwK3/oNP4+wnds60krvu5R1QbpRQjMmpG5OMIWro5s7gvDPsA== dependencies: json-rpc-random-id "^1.0.0" xtend "^4.0.1" +eth-rpc-errors@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz#d7b22653c70dbf9defd4ef490fd08fe70608ca10" + integrity sha512-iPPNHPrLwUlR9xCSYm7HHQjWBasor3+KZfRvwEWxMz3ca0yqnlBeJrnyphkGIXZ4J7AMAaOLmwy4AWhnxOiLxg== + dependencies: + fast-safe-stringify "^2.0.6" + +eth-rpc-errors@^4.0.2: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a" + integrity sha512-Z3ymjopaoft7JDoxZcEb3pwdGh7yiYMhOwm2doUt6ASXlMavpNlK6Cre0+IMl2VSGyEU9rkiperQhp5iRxn5Pg== + dependencies: + fast-safe-stringify "^2.0.6" + eth-sig-util@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-2.3.0.tgz#c54a6ac8e8796f7e25f59cf436982a930e645231" @@ -11049,7 +12845,7 @@ eth-sig-util@2.3.0: eth-sig-util@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.2.tgz#8d958202c7edbaae839707fba6f09ff327606210" - integrity sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA= + integrity sha512-iNZ576iTOGcfllftB73cPB5AN+XUQAT/T8xzsILsghXC1o8gJUqe3RHlcDqagu+biFpYQ61KQrZZJza8eRSYqw== dependencies: ethereumjs-abi "git+https://github.com/ethereumjs/ethereumjs-abi.git" ethereumjs-util "^5.1.1" @@ -11071,19 +12867,19 @@ eth-tx-summary@^3.1.2: through2 "^2.0.3" ethashjs@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ethashjs/-/ethashjs-0.0.7.tgz#30bfe4196726690a0c59d3b8272e70d4d0c34bae" - integrity sha1-ML/kGWcmaQoMWdO4Jy5w1NDDS64= + version "0.0.8" + resolved "https://registry.yarnpkg.com/ethashjs/-/ethashjs-0.0.8.tgz#227442f1bdee409a548fb04136e24c874f3aa6f9" + integrity sha512-/MSbf/r2/Ld8o0l15AymjOTlPqpN8Cr4ByUEA9GtR4x0yAh3TdtDzEg29zMjXCNPI7u6E5fOQdj/Cf9Tc7oVNw== dependencies: - async "^1.4.2" - buffer-xor "^1.0.3" - ethereumjs-util "^4.0.1" + async "^2.1.2" + buffer-xor "^2.0.1" + ethereumjs-util "^7.0.2" miller-rabin "^4.0.0" ethereum-bloom-filters@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.7.tgz#b7b80735e385dbb7f944ce6b4533e24511306060" - integrity sha512-cDcJJSJ9GMAcURiAWO3DxIEhTL/uWqlQnvgKpuYQzYPrt/izuGU+1ntQmHt0IRq6ADoSYHFnB+aCEFIldjhkMQ== + version "1.0.10" + resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.10.tgz#3ca07f4aed698e75bd134584850260246a5fed8a" + integrity sha512-rxJ5OFN3RwjQxDcFP2Z5+Q9ho4eIdEmSc2ht0fCu8Se9nbXjZ7/031uXoUYJ87KHCOdVeiUuwSnoS7hmYAGVHA== dependencies: js-sha3 "^0.8.0" @@ -11095,7 +12891,7 @@ ethereum-common@0.2.0: ethereum-common@^0.0.18: version "0.0.18" resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f" - integrity sha1-L9w1dvIykDNYl26znaeDIT/5Uj8= + integrity sha512-EoltVQTRNg2Uy4o84qpa2aXymXDJhxm7eos/ACOg0DG4baAbMjhbdAEsx9GeE8sC3XCxnYvrrzZDH8D8MtA2iQ== ethereum-cryptography@^0.1.3: version "0.1.3" @@ -11118,22 +12914,20 @@ ethereum-cryptography@^0.1.3: secp256k1 "^4.0.1" setimmediate "^1.0.5" -ethereum-ens@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/ethereum-ens/-/ethereum-ens-0.8.0.tgz#6d0f79acaa61fdbc87d2821779c4e550243d4c57" - integrity sha512-a8cBTF4AWw1Q1Y37V1LSCS9pRY4Mh3f8vCg5cbXCCEJ3eno1hbI/+Ccv9SZLISYpqQhaglP3Bxb/34lS4Qf7Bg== +ethereum-cryptography@^1.0.3: + version "1.1.2" + resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.1.2.tgz#74f2ac0f0f5fe79f012c889b3b8446a9a6264e6d" + integrity sha512-XDSJlg4BD+hq9N2FjvotwUET9Tfxpxc3kWGE2AqUG5vcbeunnbImVk3cj6e/xT3phdW21mE8R5IugU4fspQDcQ== dependencies: - bluebird "^3.4.7" - eth-ens-namehash "^2.0.0" - js-sha3 "^0.5.7" - pako "^1.0.4" - underscore "^1.8.3" - web3 "^1.0.0-beta.34" + "@noble/hashes" "1.1.2" + "@noble/secp256k1" "1.6.3" + "@scure/bip32" "1.1.0" + "@scure/bip39" "1.1.0" -ethereum-types@^2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-2.1.5.tgz#477e2741837af07286cb3c48f3443a8bac2afb4b" - integrity sha512-2aX0x5iUOYgfuaA72YIS0j6GaD0pewcTNZistsPPCFJd4K3JzbJmyD6U4DdCKHWeEslt+NCUx4DgaRq1GMJHvw== +ethereum-types@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-2.1.6.tgz#57d9d515fad86ab987c0f6962c4203be37da8579" + integrity sha512-xaN5TxLvkdFCGjGfUQ5wV00GHzDHStozP1j+K/YdmUeQXVGiD15cogYPhBVWG3pQJM/aBjtYrpMrjywvKkNC4A== dependencies: "@types/node" "*" bignumber.js "~8.0.2" @@ -11141,22 +12935,22 @@ ethereum-types@^2.1.5: ethereumjs-abi@0.6.5: version "0.6.5" resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz#5a637ef16ab43473fa72a29ad90871405b3f5241" - integrity sha1-WmN+8Wq0NHP6cqKa2QhxQFs/UkE= + integrity sha512-rCjJZ/AE96c/AAZc6O3kaog4FhOsAViaysBxqJNy2+LHP0ttH0zkZ7nXdVHOAyt6lFwLO0nlCwWszysG/ao1+g== dependencies: bn.js "^4.10.0" ethereumjs-util "^4.3.0" -ethereumjs-abi@0.6.7, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": +ethereumjs-abi@0.6.7: version "0.6.7" - resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#8431eab7b3384e65e8126a4602520b78031666fb" + resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.7.tgz#d1d1c5cdb8d910a7d97645ba9e93be5d153bba2e" + integrity sha512-EMLOA8ICO5yAaXDhjVEfYjsJIXYutY8ufTE93eEKwsVtp2usQreKwsDTJ9zvam3omYqNuffr8IONIqb2uUslGQ== dependencies: bn.js "^4.11.8" ethereumjs-util "^6.0.0" -ethereumjs-abi@^0.6.8: +ethereumjs-abi@^0.6.8, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": version "0.6.8" - resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz#71bc152db099f70e62f108b7cdfca1b362c6fcae" - integrity sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA== + resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0" dependencies: bn.js "^4.11.8" ethereumjs-util "^6.0.0" @@ -11201,32 +12995,16 @@ ethereumjs-block@^1.2.2, ethereumjs-block@^1.4.1, ethereumjs-block@^1.6.0: ethereumjs-util "^5.0.0" merkle-patricia-tree "^2.1.2" -ethereumjs-blockchain@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ethereumjs-blockchain/-/ethereumjs-blockchain-3.4.0.tgz#92240da6ecd86b3d8d324df69510b381f26c966b" - integrity sha512-wxPSmt6EQjhbywkFbftKcb0qRFIZWocHMuDa8/AB4eWL/UPYalNcDyLaxYbrDytmhHid3Uu8G/tA3C/TxZBuOQ== - dependencies: - async "^2.6.1" - ethashjs "~0.0.7" - ethereumjs-block "~2.2.0" - ethereumjs-common "^1.1.0" - ethereumjs-util "~6.0.0" - flow-stoplight "^1.0.0" - level-mem "^3.0.1" - lru-cache "^5.1.1" - safe-buffer "^5.1.2" - semaphore "^1.1.0" - ethereumjs-blockchain@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/ethereumjs-blockchain/-/ethereumjs-blockchain-4.0.3.tgz#e013034633a30ad2006728e8e2b21956b267b773" - integrity sha512-0nJWbyA+Gu0ZKZr/cywMtB/77aS/4lOVsIKbgUN2sFQYscXO5rPbUfrEe7G2Zhjp86/a0VqLllemDSTHvx3vZA== + version "4.0.4" + resolved "https://registry.yarnpkg.com/ethereumjs-blockchain/-/ethereumjs-blockchain-4.0.4.tgz#30f2228dc35f6dcf94423692a6902604ae34960f" + integrity sha512-zCxaRMUOzzjvX78DTGiKjA+4h2/sF0OYL1QuPux0DHpyq8XiNoF5GYHtb++GUxVlMsMfZV7AVyzbtgcRdIcEPQ== dependencies: async "^2.6.1" ethashjs "~0.0.7" ethereumjs-block "~2.2.2" ethereumjs-common "^1.5.0" - ethereumjs-util "~6.1.0" + ethereumjs-util "^6.1.0" flow-stoplight "^1.0.0" level-mem "^3.0.1" lru-cache "^5.1.1" @@ -11259,19 +13037,6 @@ ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@ ethereum-common "^0.0.18" ethereumjs-util "^5.0.0" -ethereumjs-util@6.1.0, ethereumjs-util@~6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz#e9c51e5549e8ebd757a339cc00f5380507e799c8" - integrity sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q== - dependencies: - bn.js "^4.11.0" - create-hash "^1.1.2" - ethjs-util "0.1.6" - keccak "^1.0.2" - rlp "^2.0.0" - safe-buffer "^5.1.1" - secp256k1 "^3.0.1" - ethereumjs-util@6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.0.tgz#23ec79b2488a7d041242f01e25f24e5ad0357960" @@ -11285,31 +13050,31 @@ ethereumjs-util@6.2.0: rlp "^2.2.3" secp256k1 "^3.0.1" -ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6" - integrity sha1-PpQosxfuvaPXJg2FT93alUsfG8Y= +ethereumjs-util@^4.3.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.1.tgz#f4bf9b3b515a484e3cc8781d61d9d980f7c83bd0" + integrity sha512-WrckOZ7uBnei4+AKimpuF1B3Fv25OmoRgmYCpGsP7u8PFxXAmAgiJSYT2kRWnt6fVIlKaQlZvuwXp7PIrmn3/w== dependencies: bn.js "^4.8.0" create-hash "^1.1.2" - keccakjs "^0.2.0" + elliptic "^6.5.2" + ethereum-cryptography "^0.1.3" rlp "^2.0.0" - secp256k1 "^3.0.1" ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5, ethereumjs-util@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz#3e0c0d1741471acf1036052d048623dee54ad642" - integrity sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA== + version "5.2.1" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz#a833f0e5fca7e5b361384dc76301a721f537bf65" + integrity sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ== dependencies: bn.js "^4.11.0" create-hash "^1.1.2" + elliptic "^6.5.2" + ethereum-cryptography "^0.1.3" ethjs-util "^0.1.3" - keccak "^1.0.2" rlp "^2.0.0" safe-buffer "^5.1.1" - secp256k1 "^3.0.1" -ethereumjs-util@^6.0.0, ethereumjs-util@^6.2.0: +ethereumjs-util@^6.0.0, ethereumjs-util@^6.1.0, ethereumjs-util@^6.2.0: version "6.2.1" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz#fcb4e4dd5ceacb9d2305426ab1a5cd93e3163b69" integrity sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw== @@ -11322,47 +13087,37 @@ ethereumjs-util@^6.0.0, ethereumjs-util@^6.2.0: ethjs-util "0.1.6" rlp "^2.2.3" -ethereumjs-util@^7.0.2: - version "7.0.7" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.0.7.tgz#484fb9c03b766b2ee64821281070616562fb5a59" - integrity sha512-vU5rtZBlZsgkTw3o6PDKyB8li2EgLavnAbsKcfsH2YhHH1Le+PP8vEiMnAnvgc1B6uMoaM5GDCrVztBw0Q5K9g== +ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: + version "7.1.5" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" + integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== dependencies: - "@types/bn.js" "^4.11.3" + "@types/bn.js" "^5.1.0" bn.js "^5.1.2" create-hash "^1.1.2" ethereum-cryptography "^0.1.3" - ethjs-util "0.1.6" rlp "^2.2.4" -ethereumjs-util@~6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.0.0.tgz#f14841c182b918615afefd744207c7932c8536c0" - integrity sha512-E3yKUyl0Fs95nvTFQZe/ZSNcofhDzUsDlA5y2uoRmf1+Ec7gpGhNCsgKkZBRh7Br5op8mJcYF/jFbmjj909+nQ== - dependencies: - bn.js "^4.11.0" - create-hash "^1.1.2" - ethjs-util "^0.1.6" - keccak "^1.0.2" - rlp "^2.0.0" - safe-buffer "^5.1.1" - secp256k1 "^3.0.1" - -ethereumjs-vm@3.0.0: - version "3.0.0" - resolved "git+https://github.com/celo-org/ethereumjs-vm.git#0fd539c09175e116e06e94ac5289584607c406a5" +ethereumjs-vm@4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-4.1.3.tgz#dc8eb45f47d775da9f0b2437d5e20896fdf66f37" + integrity sha512-RTrD0y7My4O6Qr1P2ZIsMfD6RzL6kU/RhBZ0a5XrPzAeR61crBS7or66ohDrvxDI/rDBxMi+6SnsELih6fzalw== dependencies: async "^2.1.2" async-eventemitter "^0.2.2" - ethereumjs-account "^2.0.3" - ethereumjs-block "~2.2.0" - ethereumjs-blockchain "^3.4.0" - ethereumjs-common "^1.1.0" - ethereumjs-util "^6.0.0" + core-js-pure "^3.0.1" + ethereumjs-account "^3.0.0" + ethereumjs-block "^2.2.2" + ethereumjs-blockchain "^4.0.3" + ethereumjs-common "^1.5.0" + ethereumjs-tx "^2.1.2" + ethereumjs-util "^6.2.0" fake-merkle-patricia-tree "^1.0.1" functional-red-black-tree "^1.0.1" merkle-patricia-tree "^2.3.2" rustbn.js "~0.2.0" safe-buffer "^5.1.1" + util.promisify "^1.0.0" ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4, ethereumjs-vm@^2.6.0: version "2.6.0" @@ -11422,7 +13177,7 @@ ethereumjs-vm@^4.2.0: safe-buffer "^5.1.1" util.promisify "^1.0.0" -ethereumjs-wallet@0.6.4, ethereumjs-wallet@^0.6.0, ethereumjs-wallet@^0.6.3: +ethereumjs-wallet@0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.4.tgz#67dd013dd839e69a8eb9a8f78cacfc9bff307167" integrity sha512-xAYLWVH/MA9Ds1+BiDTfdRrCBQIz7r70EJSjuBnvw/x40qJ1jBoBBAp8/l+I9VPGAsUXvHTfcnp2OZ9LbcTs/g== @@ -11437,20 +13192,35 @@ ethereumjs-wallet@0.6.4, ethereumjs-wallet@^0.6.0, ethereumjs-wallet@^0.6.3: utf8 "^3.0.0" uuid "^3.3.2" -ethereumjs-wallet@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-1.0.1.tgz#664a4bcacfc1291ca2703de066df1178938dba1c" - integrity sha512-3Z5g1hG1das0JWU6cQ9HWWTY2nt9nXCcwj7eXVNAHKbo00XAZO8+NHlwdgXDWrL0SXVQMvTWN8Q/82DRH/JhPw== +ethereumjs-wallet@^0.6.0, ethereumjs-wallet@^0.6.3: + version "0.6.5" + resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.5.tgz#685e9091645cee230ad125c007658833991ed474" + integrity sha512-MDwjwB9VQVnpp/Dc1XzA6J1a3wgHQ4hSvA1uWNatdpOrtCbPVuQSKSyRnjLvS0a+KKMw2pvQ9Ybqpb3+eW8oNA== dependencies: aes-js "^3.1.1" bs58check "^2.1.2" ethereum-cryptography "^0.1.3" - ethereumjs-util "^7.0.2" + ethereumjs-util "^6.0.0" randombytes "^2.0.6" - scrypt-js "^3.0.1" + safe-buffer "^5.1.2" + scryptsy "^1.2.1" utf8 "^3.0.0" uuid "^3.3.2" +ethereumjs-wallet@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-1.0.2.tgz#2c000504b4c71e8f3782dabe1113d192522e99b6" + integrity sha512-CCWV4RESJgRdHIvFciVQFnCHfqyhXWchTPlkfp28Qc53ufs+doi5I/cV2+xeK9+qEo25XCWfP9MiL+WEPAZfdA== + dependencies: + aes-js "^3.1.2" + bs58check "^2.1.2" + ethereum-cryptography "^0.1.3" + ethereumjs-util "^7.1.2" + randombytes "^2.1.0" + scrypt-js "^3.0.1" + utf8 "^3.0.0" + uuid "^8.3.2" + ethers@4.0.0-beta.3: version "4.0.0-beta.3" resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.3.tgz#15bef14e57e94ecbeb7f9b39dd0a4bd435bc9066" @@ -11467,14 +13237,14 @@ ethers@4.0.0-beta.3: uuid "2.0.1" xmlhttprequest "1.8.0" -ethers@^4.0.0-beta.1, ethers@^4.0.20, ethers@^4.0.27, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: - version "4.0.47" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.47.tgz#91b9cd80473b1136dd547095ff9171bd1fc68c85" - integrity sha512-hssRYhngV4hiDNeZmVU/k5/E8xmLG8UpcNUzg6mb7lqhgpFPH/t7nuv20RjRrEf0gblzvi2XwR5Te+V3ZFc9pQ== +ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: + version "4.0.49" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894" + integrity sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg== dependencies: aes-js "3.0.0" - bn.js "^4.4.0" - elliptic "6.5.2" + bn.js "^4.11.9" + elliptic "6.5.4" hash.js "1.1.3" js-sha3 "0.5.7" scrypt-js "2.0.4" @@ -11482,15 +13252,51 @@ ethers@^4.0.0-beta.1, ethers@^4.0.20, ethers@^4.0.27, ethers@^4.0.32, ethers@^4. uuid "2.0.1" xmlhttprequest "1.8.0" +ethers@^5.0.13: + version "5.7.0" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.0.tgz#0055da174b9e076b242b8282638bc94e04b39835" + integrity sha512-5Xhzp2ZQRi0Em+0OkOcRHxPzCfoBfgtOQA+RUylSkuHbhTEaQklnYi2hsWbRgs3ztJsXVXd9VKBcO1ScWL8YfA== + dependencies: + "@ethersproject/abi" "5.7.0" + "@ethersproject/abstract-provider" "5.7.0" + "@ethersproject/abstract-signer" "5.7.0" + "@ethersproject/address" "5.7.0" + "@ethersproject/base64" "5.7.0" + "@ethersproject/basex" "5.7.0" + "@ethersproject/bignumber" "5.7.0" + "@ethersproject/bytes" "5.7.0" + "@ethersproject/constants" "5.7.0" + "@ethersproject/contracts" "5.7.0" + "@ethersproject/hash" "5.7.0" + "@ethersproject/hdnode" "5.7.0" + "@ethersproject/json-wallets" "5.7.0" + "@ethersproject/keccak256" "5.7.0" + "@ethersproject/logger" "5.7.0" + "@ethersproject/networks" "5.7.0" + "@ethersproject/pbkdf2" "5.7.0" + "@ethersproject/properties" "5.7.0" + "@ethersproject/providers" "5.7.0" + "@ethersproject/random" "5.7.0" + "@ethersproject/rlp" "5.7.0" + "@ethersproject/sha2" "5.7.0" + "@ethersproject/signing-key" "5.7.0" + "@ethersproject/solidity" "5.7.0" + "@ethersproject/strings" "5.7.0" + "@ethersproject/transactions" "5.7.0" + "@ethersproject/units" "5.7.0" + "@ethersproject/wallet" "5.7.0" + "@ethersproject/web" "5.7.0" + "@ethersproject/wordlists" "5.7.0" + ethjs-unit@0.1.6, ethjs-unit@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" - integrity sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk= + integrity sha512-/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw== dependencies: bn.js "4.11.6" number-to-bn "1.7.0" -ethjs-util@0.1.6, ethjs-util@^0.1.3, ethjs-util@^0.1.6: +ethjs-util@0.1.6, ethjs-util@^0.1.3: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.6.tgz#f308b62f185f9fe6237132fb2a9818866a5cd536" integrity sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w== @@ -11501,7 +13307,7 @@ ethjs-util@0.1.6, ethjs-util@^0.1.3, ethjs-util@^0.1.6: event-emitter@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk= + integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA== dependencies: d "1" es5-ext "~0.10.14" @@ -11539,20 +13345,25 @@ eventemitter3@4.0.4: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== +eventemitter3@^4.0.4: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + events-listener@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/events-listener/-/events-listener-1.1.0.tgz#dd49b4628480eba58fde31b870ee346b3990b349" integrity sha512-Kd3EgYfODHueq6GzVfs/VUolh2EgJsS8hkO3KpnDrxVjU3eq63eXM2ujXkhPP+OkeUOhL8CxdfZbQXzryb5C4g== -events@1.1.1, events@^1.0.0: +events@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= + integrity sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw== -events@^3.0.0, events@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== +events@^3.0.0, events@^3.1.0, events@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -11570,9 +13381,9 @@ exception-formatter@^1.0.4: colors "^1.0.3" exec-sh@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b" - integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^0.10.0: version "0.10.0" @@ -11590,7 +13401,7 @@ execa@^0.10.0: execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= + integrity sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw== dependencies: cross-spawn "^5.0.1" get-stream "^3.0.0" @@ -11629,9 +13440,9 @@ execa@^2.1.0: strip-final-newline "^2.0.0" execa@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" - integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A== + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== dependencies: cross-spawn "^7.0.0" get-stream "^5.0.0" @@ -11643,6 +13454,21 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + exegesis-express@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/exegesis-express/-/exegesis-express-2.0.1.tgz#f162cdd68ee93dc14d832b02b1dbeab053697ee9" @@ -11675,39 +13501,24 @@ exegesis@^2.5.7: exit-code@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/exit-code/-/exit-code-1.0.2.tgz#ce165811c9f117af6a5f882940b96ae7f9aecc34" - integrity sha1-zhZYEcnxF69qX4gpQLlq5/muzDQ= - -exit-on-epipe@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" - integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== + integrity sha512-U80QYrKun5np62yRqG6geNRP5TZKU2HF73Bb6IE3XjDHXKlserAdP14tIaP3W9J6ezv84DwbpbRTAtu4FsKcgw== exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -exorcist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/exorcist/-/exorcist-1.0.1.tgz#79316e3c4885845490f7bb405c0e5b5db1167c52" - integrity sha1-eTFuPEiFhFSQ97tAXA5bXbEWfFI= - dependencies: - is-stream "~1.1.0" - minimist "0.0.5" - mkdirp "~0.5.1" - mold-source-map "~0.4.0" + integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== expand-brackets@^0.1.1, expand-brackets@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= + integrity sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA== dependencies: is-posix-bracket "^0.1.0" expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== dependencies: debug "^2.3.3" define-property "^0.2.5" @@ -11720,7 +13531,7 @@ expand-brackets@^2.1.4: expand-range@^1.8.1: version "1.8.2" resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= + integrity sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA== dependencies: fill-range "^2.1.0" @@ -11732,14 +13543,14 @@ expand-template@^2.0.3: expand-tilde@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449" - integrity sha1-C4HrqJflo9MdHD0QL48BRB5VlEk= + integrity sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q== dependencies: os-homedir "^1.0.1" expand-tilde@^2.0.0, expand-tilde@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= + integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw== dependencies: homedir-polyfill "^1.0.1" @@ -11755,17 +13566,39 @@ expect@^26.6.2: jest-message-util "^26.6.2" jest-regex-util "^26.0.0" +expect@^29.0.0: + version "29.1.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.1.2.tgz#82f8f28d7d408c7c68da3a386a490ee683e1eced" + integrity sha512-AuAGn1uxva5YBbBlXb+2JPxJRuemZsmlGcapPXWNSBNsQtAULfjioREGBWuI0EOvYUKjDnrCy8PW5Zlr1md5mw== + dependencies: + "@jest/expect-utils" "^29.1.2" + jest-get-type "^29.0.0" + jest-matcher-utils "^29.1.2" + jest-message-util "^29.1.2" + jest-util "^29.1.2" + +expect@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.0.2.tgz#22c7132400f60444b427211f1d6bb604a9ab2420" + integrity sha512-JeJlAiLKn4aApT4pzUXBVxl3NaZidWIOdg//smaIlP9ZMBDkHZGFd9ubphUZP9pUyDEo7bC6M0IIZR51o75qQw== + dependencies: + "@jest/expect-utils" "^29.0.2" + jest-get-type "^29.0.0" + jest-matcher-utils "^29.0.2" + jest-message-util "^29.0.2" + jest-util "^29.0.2" + export-files@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/export-files/-/export-files-2.1.1.tgz#bbf64574053a09e4eb98e5f43501d572b2c3ce7f" - integrity sha1-u/ZFdAU6CeTrmOX0NQHVcrLDzn8= + integrity sha512-r2x1Zt0OKgdXRy0bXis3sOI8TNYmo5Fe71qXwsvpYaMvIlH5G0fWEf3AYiE2bONjePdSOojca7Jw+p9CQ6/6NQ== dependencies: lazy-cache "^1.0.3" express-rate-limit@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.1.1.tgz#572e75c47ef890a6c9a3347f27bf3557d571f9ed" - integrity sha512-puA1zcCx/quwWUOU6pT6daCt6t7SweD9wKChKhb+KSgFMKRwS81C224hiSAUANw/gnSHiwEhgozM/2ezEBZPeA== + version "5.5.1" + resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2" + integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg== express-request-id@1.4.1: version "1.4.1" @@ -11775,66 +13608,67 @@ express-request-id@1.4.1: uuid "^3.3.2" express@^4.14.0, express@^4.16.4, express@^4.17.1: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + version "4.18.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" + integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== dependencies: - accepts "~1.3.7" + accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" + body-parser "1.20.0" + content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.0" + cookie "0.5.0" cookie-signature "1.0.6" debug "2.6.9" - depd "~1.1.2" + depd "2.0.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "~1.1.2" + finalhandler "1.2.0" fresh "0.5.2" + http-errors "2.0.0" merge-descriptors "1.0.1" methods "~1.1.2" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" + proxy-addr "~2.0.7" + qs "6.10.3" range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" + safe-buffer "5.2.1" + send "0.18.0" + serve-static "1.15.0" + setprototypeof "1.2.0" + statuses "2.0.1" type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== + version "1.7.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f" + integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw== dependencies: - type "^2.0.0" + type "^2.7.2" extend-shallow@^1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071" - integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE= + integrity sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw== dependencies: kind-of "^1.1.0" extend-shallow@^2.0.0, extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== dependencies: is-extendable "^0.1.0" extend-shallow@^3.0.0, extend-shallow@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== dependencies: assign-symbols "^1.0.0" is-extendable "^1.0.1" @@ -11854,9 +13688,9 @@ external-editor@^2.0.4: tmp "^0.0.33" external-editor@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" - integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== dependencies: chardet "^0.7.0" iconv-lite "^0.4.24" @@ -11865,7 +13699,7 @@ external-editor@^3.0.3: extglob@^0.3.0, extglob@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= + integrity sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg== dependencies: is-extglob "^1.0.0" @@ -11894,7 +13728,7 @@ extract-comments@^1.1.0: extract-stack@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-1.0.0.tgz#b97acaf9441eea2332529624b732fc5a1c8165fa" - integrity sha1-uXrK+UQe6iMyUpYktzL8WhyBZfo= + integrity sha512-M5Ge0JIrn12EtIVpje2G+hI5X78hmX4UDzynZ7Vnp1MiPSqleEonmgr2Rh59eygEEgq3YJ1GDP96rnM8tnVg/Q== extract-stack@^2.0.0: version "2.0.0" @@ -11904,41 +13738,46 @@ extract-stack@^2.0.0: extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== eyes@0.1.x: version "0.1.8" resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" - integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= + integrity sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ== fake-merkle-patricia-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fake-merkle-patricia-tree/-/fake-merkle-patricia-tree-1.0.1.tgz#4b8c3acfb520afadf9860b1f14cd8ce3402cddd3" - integrity sha1-S4w6z7Ugr635hgsfFM2M40As3dM= + integrity sha512-Tgq37lkc9pUIgIKw5uitNUKcgcYL3R6JvXtKQbOf/ZSavXbidsksgp/pAY6p//uhw0I4yoMsvTSovvVIsk/qxA== dependencies: checkpoint-store "^1.1.0" +faker@5.5.3: + version "5.5.3" + resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e" + integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g== + fancy-log@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1" - integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E= + version "1.3.3" + resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" + integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== dependencies: ansi-gray "^0.1.1" color-support "^1.1.3" + parse-node-version "^1.0.0" time-stamp "^1.0.0" -fast-async@^6.1.2: - version "6.3.8" - resolved "https://registry.yarnpkg.com/fast-async/-/fast-async-6.3.8.tgz#031b9e1d5a84608b117b3e7c999ad477ed2b08a2" - integrity sha512-TjlooyqrYm/gOXjD2UHNwfrWkvTbzU105Nk4bvcRTeRoL+wIeK6rqbqDg3CN9z5p37cE2iXhP6SxQFz8OVIaUg== +fast-check@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-3.1.1.tgz#72c5ae7022a4e86504762e773adfb8a5b0b01252" + integrity sha512-3vtXinVyuUKCKFKYcwXhGE6NtGWkqF8Yh3rvMZNzmwz8EPrgoc/v4pDdLHyLnCyCI5MZpZZkDEwFyXyEONOxpA== dependencies: - nodent-compiler "^3.2.10" - nodent-runtime ">=3.2.1" + pure-rand "^5.0.1" fast-deep-equal@^3.1.1: version "3.1.3" @@ -11950,7 +13789,18 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^2.0.2, fast-glob@^2.2.6: +fast-glob@3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-glob@^2.0.2: version "2.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw== @@ -11962,55 +13812,67 @@ fast-glob@^2.0.2, fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz#87ee30e9e9f3eb40d6f254a7997655da753d7c82" - integrity sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g== +fast-glob@^3.0.3, fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" + micromatch "^4.0.4" -fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: +fast-levenshtein@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9" + integrity sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw== + +fast-levenshtein@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz#37b899ae47e1090e40e3fd2318e4d5f0142ca912" + integrity sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ== + dependencies: + fastest-levenshtein "^1.0.7" + +fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-safe-stringify@^2.0.4, fast-safe-stringify@^2.0.6: - version "2.0.7" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" - integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== - -fast-text-encoding@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz#3e5ce8293409cfaa7177a71b9ca84e1b1e6f25ef" - integrity sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ== +fast-safe-stringify@^2.0.6: + version "2.1.1" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" + integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== -fast-text-encoding@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53" - integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig== +fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3: + version "1.0.6" + resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" + integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== fast-url-parser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" - integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= + integrity sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ== dependencies: punycode "^1.3.2" +fastest-levenshtein@^1.0.7: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + fastq@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" - integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA== + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: - reusify "^1.0.0" + reusify "^1.0.4" faye-websocket@0.11.3: version "0.11.3" @@ -12027,11 +13889,11 @@ faye-websocket@0.11.4: websocket-driver ">=0.5.1" fb-watchman@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" - integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== dependencies: - bser "^2.0.0" + bser "2.1.1" fbjs-css-vars@^1.0.0: version "1.0.2" @@ -12068,17 +13930,24 @@ fbjs@^1.0.0: setimmediate "^1.0.5" ua-parser-js "^0.7.18" -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== dependencies: pend "~1.2.0" -fecha@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd" - integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg== +fecha@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" + integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== + +fetch-cookie@0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407" + integrity sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA== + dependencies: + tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0" fetch-mock@9.10.4: version "9.10.4" @@ -12098,26 +13967,26 @@ fetch-mock@9.10.4: fetch-ponyfill@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz#ae3ce5f732c645eab87e4ae8793414709b239893" - integrity sha1-rjzl9zLGReq4fkroeTQUcJsjmJM= + integrity sha512-knK9sGskIg2T7OnYLdZ2hZXn0CtDrAIBxYQLpmEf0BqfdWnwmM1weccUl5+4EdA44tzNSFAuxITPbXtPehUB3g== dependencies: node-fetch "~1.7.1" -figgy-pudding@^3.0.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: +figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= +figures@3.2.0, figures@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" + integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== dependencies: escape-string-regexp "^1.0.5" -figures@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec" - integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg== +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== dependencies: escape-string-regexp "^1.0.5" @@ -12131,12 +14000,12 @@ file-entry-cache@^5.0.1: file-type@^3.8.0: version "3.9.0" resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" - integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek= + integrity sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA== file-type@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" - integrity sha1-LdvqfHP/42No365J3DOMBYwritY= + integrity sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ== file-type@^6.1.0: version "6.2.0" @@ -12156,7 +14025,7 @@ file-uri-to-path@2: filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= + integrity sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ== filesize@^6.1.0: version "6.4.0" @@ -12166,26 +14035,26 @@ filesize@^6.1.0: fill-keys@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/fill-keys/-/fill-keys-1.0.2.tgz#9a8fa36f4e8ad634e3bf6b4f3c8882551452eb20" - integrity sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA= + integrity sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA== dependencies: is-object "~1.0.1" merge-descriptors "~1.0.0" fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - integrity sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM= + version "2.2.4" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" + integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== dependencies: is-number "^2.1.0" isobject "^2.0.0" - randomatic "^1.1.3" + randomatic "^3.0.0" repeat-element "^1.1.2" repeat-string "^1.5.2" fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== dependencies: extend-shallow "^2.0.1" is-number "^3.0.0" @@ -12199,35 +14068,30 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -filter-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" - integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs= - -finalhandler@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" - integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U= +finalhandler@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== dependencies: debug "2.6.9" - encodeurl "~1.0.1" + encodeurl "~1.0.2" escape-html "~1.0.3" on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.3.1" + parseurl "~1.3.3" + statuses "~1.5.0" unpipe "~1.0.0" -finalhandler@1.1.2, finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" - statuses "~1.5.0" + statuses "2.0.1" unpipe "~1.0.0" find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: @@ -12239,15 +14103,10 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-npm-prefix@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf" - integrity sha512-KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA== - find-replace@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-1.0.3.tgz#b88e7364d2d9c959559f388c66670d6130441fa0" - integrity sha1-uI5zZNLZyVlVnziMZmcNYTBEH6A= + integrity sha512-KrUnjzDCD9426YnCP56zGYy/eieTnhtK6Vn++j+JJzmlsWWwEkDnsyVF575spT6HJ6Ow9tlbT3TQTDsa+O4UWA== dependencies: array-back "^1.0.4" test-value "^2.1.0" @@ -12259,22 +14118,7 @@ find-up@3.0.0, find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - -find-up@^4.0.0, find-up@^4.1.0: +find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== @@ -12282,13 +14126,28 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -find-yarn-workspace-root@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db" - integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q== +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA== + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ== dependencies: - fs-extra "^4.0.3" - micromatch "^3.1.4" + locate-path "^2.0.0" find-yarn-workspace-root@^2.0.0: version "2.0.0" @@ -12310,7 +14169,7 @@ findup-sync@3.0.0, findup-sync@^3.0.0: findup-sync@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-1.0.0.tgz#6f7e4b57b6ee3a4037b4414eaedea3f58f71e0ec" - integrity sha1-b35LV7buOkA3tEFOrt6j9Y9x4Ow= + integrity sha512-VyWlYDW822Fybow9EjxaArNhS296zu4eYUWI+l2SVfo0/iqvodwI83RBwXSMczgcEejZGOg5+cGJc53OIdtjjA== dependencies: detect-file "^0.1.0" is-glob "^2.0.1" @@ -12320,7 +14179,7 @@ findup-sync@^1.0.0: findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" - integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= + integrity sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g== dependencies: detect-file "^1.0.0" is-glob "^3.1.0" @@ -12339,15 +14198,15 @@ fined@^1.0.1: parse-filepath "^1.0.1" firebase-admin@^8.10.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-8.10.0.tgz#4a838aec52df49845eba07ad59a40b4df996e815" - integrity sha512-QzJZ1sBh9xzKjb44aP6m1duy0Xe1ixexwh0eaOt1CkJYCOq2b6bievK4GNWMl5yGQ7FFBEbZO6hyDi+5wrctcg== + version "8.13.0" + resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-8.13.0.tgz#997d34ae8357d7dc162ba622148bbebcf7f2e923" + integrity sha512-krXj5ncWMJBhCpXSn9UFY6zmDWjFjqgx+1e9ATXKFYndEjmKtNBuJzqdrAdDh7aTUR7X6+0TPx4Hbc08kd0lwQ== dependencies: - "@firebase/database" "^0.5.17" + "@firebase/database" "^0.6.0" "@types/node" "^8.10.59" dicer "^0.3.0" - jsonwebtoken "8.1.0" - node-forge "0.7.4" + jsonwebtoken "^8.5.1" + node-forge "^0.7.6" optionalDependencies: "@google-cloud/firestore" "^3.0.0" "@google-cloud/storage" "^4.1.2" @@ -12369,9 +14228,9 @@ firebase-admin@^9.12.0: "@google-cloud/storage" "^5.3.0" firebase-functions-test@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/firebase-functions-test/-/firebase-functions-test-0.2.0.tgz#797125d56c23ac6b175a9308cc7887c669d4bdb0" - integrity sha512-ItONnirBztDIMVgrUeb3sTFfNHnlRhaMopQfTjWt2FZ8COvX946FzgvKMQT708LGwiUVXW/4OjfAOKaW8A2nMw== + version "0.2.3" + resolved "https://registry.yarnpkg.com/firebase-functions-test/-/firebase-functions-test-0.2.3.tgz#90d6da662d604ed013a3735c6cdba5984e0d57ea" + integrity sha512-zYX0QTm53wCazuej7O0xqbHl90r/v1PTXt/hwa0jo1YF8nDM+iBKnLDlkIoW66MDd0R6aGg4BvKzTTdJpvigUA== dependencies: "@types/lodash" "^4.14.104" lodash "^4.17.5" @@ -12384,27 +14243,17 @@ firebase-functions-test@^0.3.3: "@types/lodash" "^4.14.104" lodash "^4.17.5" -firebase-functions@^3.15.7: - version "3.15.7" - resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.15.7.tgz#ac88657e7e28f5a5926d41ae3e8fae9c94621ccd" - integrity sha512-ZD7r8eoWWebgs+mTqfH8NLUT2C0f7/cyAvIA1RSUdBVQZN7MBBt3oSlN/rL3e+m6tdlJz6YbQ3hrOKOGjOVYvQ== +firebase-functions@^3.15.7, firebase-functions@^3.6.0: + version "3.23.0" + resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.23.0.tgz#ac8da127ff3e97c354f3cd740a71534572d1f4ca" + integrity sha512-/jujnNChTWIuoXK3IPNGYu1zjXF1fYRy88uYbkrJhs3dhK6EdXZi0rX6JUEOCB7h6IkRQvbio+bvtaoI7h+4Lg== dependencies: "@types/cors" "^2.8.5" "@types/express" "4.17.3" cors "^2.8.5" express "^4.17.1" lodash "^4.17.14" - -firebase-functions@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.6.0.tgz#10fb2a46d13625a88299bbf9176750315f9da628" - integrity sha512-8S70Pq5nOblDKmBExq2CAgBMq+L8IDOcv10HfpDWGtgK5IpYlP0BKcchXYXcyjHtIG7xWHtR9oBLVtXFUiTp3A== - dependencies: - "@types/express" "^4.17.3" - cors "^2.8.5" - express "^4.17.1" - jsonwebtoken "^8.5.1" - lodash "^4.17.14" + node-fetch "^2.6.7" firebase-tools@9.20.0: version "9.20.0" @@ -12471,29 +14320,24 @@ firebase-tools@9.20.0: ws "^7.2.3" firebase@^7.2.2: - version "7.8.0" - resolved "https://registry.yarnpkg.com/firebase/-/firebase-7.8.0.tgz#1f71bf3712574fab5a7dc81c2a0bb6423a9fdbca" - integrity sha512-oOXb8asc9mF+xN3nHUnt8cFDo4sDkSuTSLRmPM3Jpz6yriBHJYuO1k7G6sbJOtCVl+nkj0maIyByNVQxt2eBlA== - dependencies: - "@firebase/analytics" "0.2.12" - "@firebase/app" "0.5.3" - "@firebase/app-types" "0.5.0" - "@firebase/auth" "0.13.4" - "@firebase/database" "0.5.20" - "@firebase/firestore" "1.10.0" - "@firebase/functions" "0.4.31" - "@firebase/installations" "0.4.1" - "@firebase/messaging" "0.6.3" - "@firebase/performance" "0.2.31" - "@firebase/polyfill" "0.3.31" - "@firebase/remote-config" "0.1.12" - "@firebase/storage" "0.3.25" - "@firebase/util" "0.2.39" - -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= + version "7.24.0" + resolved "https://registry.yarnpkg.com/firebase/-/firebase-7.24.0.tgz#dab53b9c0f1c9538d2d6f4f51769897b0b6d60d8" + integrity sha512-j6jIyGFFBlwWAmrlUg9HyQ/x+YpsPkc/TTkbTyeLwwAJrpAmmEHNPT6O9xtAnMV4g7d3RqLL/u9//aZlbY4rQA== + dependencies: + "@firebase/analytics" "0.6.0" + "@firebase/app" "0.6.11" + "@firebase/app-types" "0.6.1" + "@firebase/auth" "0.15.0" + "@firebase/database" "0.6.13" + "@firebase/firestore" "1.18.0" + "@firebase/functions" "0.5.1" + "@firebase/installations" "0.4.17" + "@firebase/messaging" "0.7.1" + "@firebase/performance" "0.4.2" + "@firebase/polyfill" "0.3.36" + "@firebase/remote-config" "0.1.28" + "@firebase/storage" "0.3.43" + "@firebase/util" "0.3.2" flagged-respawn@^1.0.0: version "1.0.1" @@ -12503,7 +14347,7 @@ flagged-respawn@^1.0.0: flat-arguments@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/flat-arguments/-/flat-arguments-1.0.2.tgz#9baa780adf0501f282d726c9c6a038dba44ea76f" - integrity sha1-m6p4Ct8FAfKC1ybJxqA426ROp28= + integrity sha512-ZIkB09bqQdKP9buPOiZcS/4HK3q992C5q62qAE72d0xWAXfaSbP840BZYUBgHRkzdx6jYRIpKT4ur+Nay/JRlg== dependencies: array-flatten "^1.0.0" as-array "^1.0.0" @@ -12520,9 +14364,9 @@ flat-cache@^2.0.1: write "1.0.3" flat@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2" - integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw== + version "4.1.1" + resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.1.tgz#a392059cc382881ff98642f5da4dde0a959f309b" + integrity sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA== dependencies: is-buffer "~2.0.3" @@ -12532,14 +14376,14 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916" - integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flow-stoplight@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/flow-stoplight/-/flow-stoplight-1.0.0.tgz#4a292c5bcff8b39fa6cc0cb1a853d86f27eeff7b" - integrity sha1-SiksW8/4s5+mzAyxqFPYbyfu/3s= + integrity sha512-rDjbZUKpN8OYhB0IE/vY/I8UWO/602IIJEU/76Tv4LvYnwHCk0BCsvz4eRr9n+FQcri7L5cyaXOo0+/Kh4HisA== flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: version "1.1.1" @@ -12549,12 +14393,29 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.10.0: - version "1.13.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" - integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== + +follow-redirects@1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== + dependencies: + debug "=3.1.0" + +follow-redirects@^1.12.1: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== -for-each@~0.3.3: +follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.14.8, follow-redirects@^1.14.9: + version "1.15.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" + integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== + +for-each@^0.3.3, for-each@~0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== @@ -12564,38 +14425,43 @@ for-each@~0.3.3: for-in@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" - integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE= + integrity sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g== -for-in@^1.0.1: +for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== for-own@^0.1.3, for-own@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= + integrity sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw== dependencies: for-in "^1.0.1" for-own@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= + integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg== dependencies: for-in "^1.0.1" -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= +foreach@^2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.6.tgz#87bcc8a1a0e74000ff2bf9802110708cfb02eb6e" + integrity sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg== forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== + +form-data-encoder@1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.1.tgz#ac80660e4f87ee0d3d3c3638b7da8278ddb8ec96" + integrity sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg== -form-data@^2.2.0, form-data@^2.3.1, form-data@^2.3.2: +form-data@^2.2.0, form-data@^2.3.1, form-data@^2.5.0: version "2.5.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== @@ -12613,6 +14479,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -12623,49 +14498,41 @@ form-data@~2.3.2: mime-types "^2.1.12" formidable@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659" - integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg== + version "1.2.6" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168" + integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ== -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fp-ts@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.1.1.tgz#c910544499d7c959351bb4260ee7c44a544084c1" integrity sha512-YcWhMdDCFCja0MmaDroTgNu+NWWrrnUEn92nvDgrtVy9Z71YFnhNVIghoHPt8gs82ijoMzFGeWKvArbyICiJgw== -fraction.js@^4.0.12: - version "4.1.0" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.0.tgz#229ec1cedc8c3c7e5d2d20688ba64f0a43af5830" - integrity sha512-o9lSKpK0TDqDwTL24Hxqi6I99s942l6TYkfl6WvGWgLOIFz/YonSGKfiSeMadoiNvTfqnfOa9mjb5SGVbBK9/w== +fraction.js@4.0.12: + version "4.0.12" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.12.tgz#0526d47c65a5fb4854df78bc77f7bec708d7b8c3" + integrity sha512-8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA== fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== dependencies: map-cache "^0.2.2" fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -from2@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz#88413baaa5f9a597cfde9221d86986cd3c061dfd" - integrity sha1-iEE7qqX5pZfP3pIh2GmGzTwGHf0= - dependencies: - inherits "~2.0.1" - readable-stream "~1.1.10" + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g== dependencies: inherits "^2.0.1" readable-stream "^2.0.0" @@ -12673,7 +14540,7 @@ from2@^2.1.0: from@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= + integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g== fs-constants@^1.0.0: version "1.0.0" @@ -12683,21 +14550,12 @@ fs-constants@^1.0.0: fs-exists-sync@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= - -fs-extra@6.0.1, fs-extra@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" - integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" + integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== fs-extra@^0.30.0: version "0.30.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0" - integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A= + integrity sha512-UvSPKyhMn6LEd/WpUaV9C9t3zATuqoqfWc3QdPhPLb58prN9tqYPlPWi8Krxi44loBoUzlobqZ3+8tGpxxSzwA== dependencies: graceful-fs "^4.1.2" jsonfile "^2.1.0" @@ -12708,13 +14566,22 @@ fs-extra@^0.30.0: fs-extra@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= + integrity sha512-VerQV6vEKuhDWD2HGOybV6v5I73syoc/cXAbKlgTC7M/oFVEtklWlp9QH2Ijw3IaWDOQcMkldSPa7zXy79Z/UQ== dependencies: graceful-fs "^4.1.2" jsonfile "^2.1.0" klaw "^1.0.0" -fs-extra@^4.0.2, fs-extra@^4.0.3: +fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-extra@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== @@ -12732,6 +14599,15 @@ fs-extra@^5.0.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" + integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^7.0.0, fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -12741,7 +14617,7 @@ fs-extra@^7.0.0, fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^8.0.1, fs-extra@^8.1, fs-extra@^8.1.0: +fs-extra@^8.1, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== @@ -12750,7 +14626,7 @@ fs-extra@^8.0.1, fs-extra@^8.1, fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0, fs-extra@^9.0.1: +fs-extra@^9.0, fs-extra@^9.0.1, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -12760,17 +14636,24 @@ fs-extra@^9.0, fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^1.2.5: +fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== dependencies: minipass "^2.6.0" +fs-minipass@^2.0.0, fs-minipass@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs-mkdirp-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" - integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes= + integrity sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ== dependencies: graceful-fs "^4.1.11" through2 "^2.0.3" @@ -12780,19 +14663,10 @@ fs-readdir-recursive@^1.1.0: resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== -fs-vacuum@^1.2.10, fs-vacuum@~1.2.10: - version "1.2.10" - resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36" - integrity sha1-t2Kb7AekAxolSP35n17PHMizHjY= - dependencies: - graceful-fs "^4.1.2" - path-is-inside "^1.0.1" - rimraf "^2.5.2" - -fs-write-stream-atomic@^1.0.8, fs-write-stream-atomic@~1.0.10: +fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= + integrity sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA== dependencies: graceful-fs "^4.1.2" iferr "^0.1.5" @@ -12802,17 +14676,22 @@ fs-write-stream-atomic@^1.0.8, fs-write-stream-atomic@~1.0.10: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@^1.2.7: - version "1.2.9" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" - integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== dependencies: + bindings "^1.5.0" nan "^2.12.1" - node-pre-gyp "^0.12.0" -fsevents@^2.1.2, fsevents@~2.1.1, fsevents@~2.1.2: +fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +fsevents@~2.1.1, fsevents@~2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== @@ -12830,30 +14709,91 @@ fstream@^1.0.12: ftp@^0.3.10: version "0.3.10" resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d" - integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0= + integrity sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ== dependencies: readable-stream "1.1.x" xregexp "2.0.0" -function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function.prototype.name@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" + integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.0" + functions-have-names "^1.2.2" + functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== + +functions-have-names@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== funpermaproxy@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.0.1.tgz#4650e69b7c334d9717c06beba9b339cc08ac3335" - integrity sha512-9pEzs5vnNtR7ZGihly98w/mQ7blsvl68Wj30ZCDAXy7qDN4CWLLjdfjtH/P2m6whsnaJkw15hysCNHMXue+wdA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" + integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== + +ganache@7.4.4, ganache@^7.4.4: + version "7.4.4" + resolved "https://registry.yarnpkg.com/ganache/-/ganache-7.4.4.tgz#af1bb7e85cde010c8d05186ab952a69df970dfa2" + integrity sha512-wC5XZB7ttHXc4rYfAq8+ieOZZajlsTdWsWievtQNjiuxcrIkqPqSwAZK6IP5mbooe/HSp3bDGJhXW5EHVd2G9w== + dependencies: + "@trufflesuite/bigint-buffer" "1.1.10" + "@types/bn.js" "^5.1.0" + "@types/lru-cache" "5.1.1" + "@types/seedrandom" "3.0.1" + emittery "0.10.0" + keccak "3.0.2" + leveldown "6.1.0" + secp256k1 "4.0.3" + optionalDependencies: + bufferutil "4.0.5" + utf-8-validate "5.0.7" + +gauge@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" + integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + object-assign "^4.1.1" + signal-exit "^3.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.2" + +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg== dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -12874,21 +14814,21 @@ gaxios@^1.0.2, gaxios@^1.0.4, gaxios@^1.2.1, gaxios@^1.2.2, gaxios@^1.5.0: https-proxy-agent "^2.2.1" node-fetch "^2.3.0" -gaxios@^2.0.0, gaxios@^2.0.1, gaxios@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-2.3.0.tgz#442eb57c6f00811795946a89a13dfe47bdb9ba40" - integrity sha512-VgC4JKJQAAAGK5rFZbPcS5mXsdIYVMIUJOxMjSOkYdfhB74R0L6y8PFQDdS0r1ObG6hdP11e71EjHh3xbI+6fQ== +gaxios@^2.0.0, gaxios@^2.1.0: + version "2.3.4" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-2.3.4.tgz#eea99353f341c270c5f3c29fc46b8ead56f0a173" + integrity sha512-US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA== dependencies: abort-controller "^3.0.0" extend "^3.0.2" - https-proxy-agent "^4.0.0" + https-proxy-agent "^5.0.0" is-stream "^2.0.0" node-fetch "^2.3.0" gaxios@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.0.3.tgz#497730758f5b0d43a32ebdbebe5f1bd9f7db7aed" - integrity sha512-PkzQludeIFhd535/yucALT/Wxyj/y2zLyrMwPcJmnLHDugmV49NvAi/vb+VUq/eWztATZCNcb8ue+ywPG+oLuw== + version "3.2.0" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.2.0.tgz#11b6f0e8fb08d94a10d4d58b044ad3bec6dd486a" + integrity sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q== dependencies: abort-controller "^3.0.0" extend "^3.0.2" @@ -12897,40 +14837,32 @@ gaxios@^3.0.0: node-fetch "^2.3.0" gaxios@^4.0.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.2.tgz#845827c2dc25a0213c8ab4155c7a28910f5be83f" - integrity sha512-T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q== + version "4.3.3" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22" + integrity sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA== dependencies: abort-controller "^3.0.0" extend "^3.0.2" https-proxy-agent "^5.0.0" is-stream "^2.0.0" - node-fetch "^2.6.1" + node-fetch "^2.6.7" -gcp-metadata@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-0.9.3.tgz#1f9d7495f7460a14526481f29e11596dd563dd26" - integrity sha512-caV4S84xAjENtpezLCT/GILEAF5h/bC4cNqZFmt/tjTn8t+JBtTkQrgBrJu3857YdsnlM8rxX/PMcKGtE8hUlw== +gcp-metadata@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-1.0.0.tgz#5212440229fa099fc2f7c2a5cdcb95575e9b2ca6" + integrity sha512-Q6HrgfrCQeEircnNP3rCcEgiDv7eF9+1B+1MMgpE190+/+0mjQR8PxeOaRgxZWmdDAF9EIryHB9g1moPiw1SbQ== dependencies: gaxios "^1.0.2" json-bigint "^0.3.0" -gcp-metadata@^3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-3.3.1.tgz#1c5c05591e7a9c1613463b05dab9642319f08f1f" - integrity sha512-RrASg1HaVAxoB9Q/8sYfJ++v9PMiiqIgOrOxZeagMgS4osZtICT1lKBx2uvzYgwetxj8i6K99Z0iuKMg7WraTg== +gcp-metadata@^3.4.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-3.5.0.tgz#6d28343f65a6bbf8449886a0c0e4a71c77577055" + integrity sha512-ZQf+DLZ5aKcRpLzYUyBS3yo3N0JSa82lNDO8rj3nMSlovLcz2riKFBsYgDzeXcv75oo5eqB2lx+B14UvPoCRnA== dependencies: gaxios "^2.1.0" json-bigint "^0.3.0" -gcp-metadata@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.1.0.tgz#8b9b5903882076948554af471c838e7ea2f564b4" - integrity sha512-r57SV28+olVsflPlKyVig3Muo/VDlcsObMtvDGOEtEJXj+DDE8bEl0coIkXh//hbkSDTvo+f5lbihZOndYXQQQ== - dependencies: - gaxios "^3.0.0" - json-bigint "^0.3.0" - gcp-metadata@^4.2.0: version "4.3.1" resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9" @@ -12952,9 +14884,9 @@ gcs-resumable-upload@^1.0.0: stream-events "^1.0.4" gcs-resumable-upload@^2.2.4: - version "2.2.5" - resolved "https://registry.yarnpkg.com/gcs-resumable-upload/-/gcs-resumable-upload-2.2.5.tgz#13e832130eb8c12be6d80f4bdc6fc0c410f73ad1" - integrity sha512-r98Hnxza8oYT21MzpziAB2thz3AURGz54+osWtczxGNxH7Fodb0HVUEtfqTwBS5vcf9RnKwR7c0EMaI8R39feg== + version "2.3.3" + resolved "https://registry.yarnpkg.com/gcs-resumable-upload/-/gcs-resumable-upload-2.3.3.tgz#02c616ed17eff6676e789910aeab3907d412c5f8" + integrity sha512-sf896I5CC/1AxeaGfSFg3vKMjUq/r+A3bscmVzZm10CElyRanN0XwPu/MxeIO4LSP+9uF6yKzXvNsaTsMXUG6Q== dependencies: abort-controller "^3.0.0" configstore "^5.0.0" @@ -12963,24 +14895,6 @@ gcs-resumable-upload@^2.2.4: pumpify "^2.0.0" stream-events "^1.0.4" -gcs-resumable-upload@^3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/gcs-resumable-upload/-/gcs-resumable-upload-3.3.1.tgz#bb3b0d776ce64b7c40d81fffadac7d54d878a9f3" - integrity sha512-WyC0i4VkslIdrdmeM5PNuGzANALLXTG5RoHb08OE30gYT+FEvCDPiA8KOjV2s1wOu9ngEW4+IuzBjtP/ni7UdQ== - dependencies: - abort-controller "^3.0.0" - configstore "^5.0.0" - extend "^3.0.2" - gaxios "^4.0.0" - google-auth-library "^7.0.0" - pumpify "^2.0.0" - stream-events "^1.0.4" - -generate-function@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-1.1.0.tgz#54c21b080192b16d9877779c5bb81666e772365f" - integrity sha1-VMIbCAGSsW2Yd3ecW7gWZudyNl8= - generate-function@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" @@ -12988,50 +14902,16 @@ generate-function@^2.3.1: dependencies: is-property "^1.0.2" -generate-object-property@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" - integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA= - dependencies: - is-property "^1.0.0" - generate-password@^1.5.1: version "1.7.0" resolved "https://registry.yarnpkg.com/generate-password/-/generate-password-1.7.0.tgz#00ba4eb1e71f89a72307b0d6604ee0d4e7f5770c" integrity sha512-WPCtlfy0jexf7W5IbwxGUgpIDvsZIohbI2DAq2Q6TSlKKis+G4GT9sxvPxrZUGL8kP6WUXMWNqYnxY6DDKAdFA== -genfun@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" - integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== - -gensync@^1.0.0-beta.1: - version "1.0.0-beta.1" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" - integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== - gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -gentle-fs@^2.0.1, gentle-fs@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz#11201bf66c18f930ddca72cf69460bdfa05727b1" - integrity sha512-OlwBBwqCFPcjm33rF2BjW+Pr6/ll2741l+xooiwTCeaX2CA1ZuclavyMBe0/KlR21/XGsgY6hzEQZ15BdNa13Q== - dependencies: - aproba "^1.1.2" - chownr "^1.1.2" - cmd-shim "^3.0.3" - fs-vacuum "^1.2.10" - graceful-fs "^4.1.11" - iferr "^0.1.5" - infer-owner "^1.0.4" - mkdirp "^0.5.1" - path-is-inside "^1.0.2" - read-cmd-shim "^1.0.1" - slide "^1.1.6" - get-caller-file@^1.0.1, get-caller-file@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -13045,7 +14925,7 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= + integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== get-installed-path@^2.0.3: version "2.1.1" @@ -13061,64 +14941,54 @@ get-installed-path@^4.0.8: dependencies: global-modules "1.0.0" -get-intrinsic@^1.0.0, get-intrinsic@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" - integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg== +get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" + integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== dependencies: function-bind "^1.1.1" has "^1.0.3" - has-symbols "^1.0.1" + has-symbols "^1.0.3" -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-pkg-repo@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d" - integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0= +get-pkg-repo@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385" + integrity sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA== dependencies: - hosted-git-info "^2.1.4" - meow "^3.3.0" - normalize-package-data "^2.3.0" - parse-github-repo-url "^1.3.0" + "@hutson/parse-repository-url" "^3.0.0" + hosted-git-info "^4.0.0" through2 "^2.0.0" + yargs "^16.2.0" get-port@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a" - integrity sha1-h4P53OvR7qSVozThpqJR54iHqxo= + integrity sha512-Za6hwpIQjqx3rxtqHZpVdn4r/74EkANdpp4GKJO2GcjsRrnMD5QfiuDIcEckUrtmCIC13FNZqNkhmucZvNrjhg== dependencies: pinkie-promise "^2.0.0" get-port@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" - integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw= + integrity sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg== -get-port@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119" - integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw== +get-port@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193" + integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ== get-proxy@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-1.1.0.tgz#894854491bc591b0f147d7ae570f5c678b7256eb" - integrity sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus= + integrity sha512-3cJ+77wC52qD2PqWNXtB2HkU6tQXc/X3hSMtSN0Y8c8nbYMMxF7vpsjH4H0iSt+28l/NK13DKl8iKAVGkqDFnA== dependencies: rc "^1.1.2" -get-stdin@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" - integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= - get-stdin@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" @@ -13127,7 +14997,7 @@ get-stdin@^7.0.0: get-stream@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" - integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= + integrity sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA== dependencies: object-assign "^4.0.1" pinkie-promise "^2.0.0" @@ -13135,7 +15005,7 @@ get-stream@^2.2.0: get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= + integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ== get-stream@^4.0.0, get-stream@^4.1.0: version "4.1.0" @@ -13151,11 +15021,19 @@ get-stream@^5.0.0, get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-stream@^6.0.0: +get-stream@^6.0.0, get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + get-uri@3: version "3.0.2" resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c" @@ -13171,7 +15049,7 @@ get-uri@3: get-value@^1.1.5: version "1.3.1" resolved "https://registry.yarnpkg.com/get-value/-/get-value-1.3.1.tgz#8ac7ef4f20382392b2646548f9b9ad2dc6c89642" - integrity sha1-isfvTyA4I5KyZGVI+bmtLcbIlkI= + integrity sha512-TrDxHI5wqgpM5Guhoz7xmblwy7kzhDauSs4df3NP907yFmLtCkOau8YtGo087jZXKDwP22NG6fCo0UA4EFLjOw== dependencies: arr-flatten "^1.0.1" is-extendable "^0.1.1" @@ -13181,7 +15059,7 @@ get-value@^1.1.5: get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== getopts@2.2.5: version "2.2.5" @@ -13191,75 +15069,73 @@ getopts@2.2.5: getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== dependencies: assert-plus "^1.0.0" -git-raw-commits@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5" - integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg== +git-raw-commits@^2.0.8: + version "2.0.11" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723" + integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A== dependencies: - dargs "^4.0.1" - lodash.template "^4.0.2" - meow "^4.0.0" - split2 "^2.0.0" - through2 "^2.0.0" + dargs "^7.0.0" + lodash "^4.17.15" + meow "^8.0.0" + split2 "^3.0.0" + through2 "^4.0.0" git-remote-origin-url@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f" - integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8= + integrity sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw== dependencies: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3" - integrity sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w== +git-semver-tags@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780" + integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA== dependencies: - meow "^4.0.0" - semver "^5.5.0" + meow "^8.0.0" + semver "^6.0.0" -git-up@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0" - integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw== +git-up@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-6.0.0.tgz#dbd6e4eee270338be847a0601e6d0763c90b74db" + integrity sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA== dependencies: - is-ssh "^1.3.0" - parse-url "^5.0.0" + is-ssh "^1.4.0" + parse-url "^7.0.2" -git-url-parse@^11.1.2: - version "11.1.2" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67" - integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ== +git-url-parse@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-12.0.0.tgz#4ba70bc1e99138321c57e3765aaf7428e5abb793" + integrity sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q== dependencies: - git-up "^4.0.0" + git-up "^6.0.0" gitconfiglocal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b" - integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s= + integrity sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ== dependencies: ini "^1.3.2" github-from-package@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== github-slugger@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.3.0.tgz#9bd0a95c5efdfc46005e82a906ef8e2a059124c9" - integrity sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q== - dependencies: - emoji-regex ">=6.0.0 <=6.1.1" + version "1.4.0" + resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= + integrity sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA== dependencies: glob-parent "^2.0.0" is-glob "^2.0.0" @@ -13267,12 +15143,12 @@ glob-base@^0.3.0: glob-fs-dotfiles@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/glob-fs-dotfiles/-/glob-fs-dotfiles-0.1.6.tgz#b4f17b73c188418aba47cd206cf5a7226b4a8949" - integrity sha1-tPF7c8GIQYq6R80gbPWnImtKiUk= + integrity sha512-CUTouLo3beDkPJG3Pt/3Qieq1tfGEKVSb/kM7j3m93sdM6LUx/NRlnpy7SGA2Q8/NPXoUUd4F7CNqngX0PdYPg== glob-fs-gitignore@^0.1.5: version "0.1.6" resolved "https://registry.yarnpkg.com/glob-fs-gitignore/-/glob-fs-gitignore-0.1.6.tgz#885e6f412f859cc59756154829dbd55726cde992" - integrity sha1-iF5vQS+FnMWXVhVIKdvVVybN6ZI= + integrity sha512-0NSbtFTLX0mS2QTgAqATtLiEAYI8xsyLmkQ3Pm+RoOTxhOqVMfzOYI5kzaqt8oECoUmmw7xk+Gp2pjjhRfFq7w== dependencies: findup-sync "^1.0.0" micromatch "^2.3.11" @@ -13313,64 +15189,50 @@ glob-fs@^0.1.7: glob-parent@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-1.3.0.tgz#971edd816ed5db58705b58079647a64d0aef7968" - integrity sha1-lx7dgW7V21hwW1gHlkemTQrveWg= + integrity sha512-hTmuuCjsIMiB85432X8VgmlgWVn99Np49NOWsRyfPkvsFBmsHOoCkOoFGNrMgauLMDD06Mzw+uVTw+oWNCAzgQ== dependencies: is-glob "^2.0.0" glob-parent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= + integrity sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w== dependencies: is-glob "^2.0.0" -glob-parent@^3.0.0, glob-parent@^3.1.0: +glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= + integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA== dependencies: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== +glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" glob-slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/glob-slash/-/glob-slash-1.0.0.tgz#fe52efa433233f74a2fe64c7abb9bc848202ab95" - integrity sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U= + integrity sha512-ZwFh34WZhZX28ntCMAP1mwyAJkn8+Omagvt/GvA+JQM/qgT0+MR2NPF3vhvgdshfdvDyGZXs8fPXW84K32Wjuw== glob-slasher@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/glob-slasher/-/glob-slasher-1.0.1.tgz#747a0e5bb222642ee10d3e05443e109493cb0f8e" - integrity sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44= + integrity sha512-5MUzqFiycIKLMD1B0dYOE4hGgLLUZUNGGYO4BExdwT32wUwW3DBOE7lMQars7vB1q43Fb3Tyt+HmgLKsJhDYdg== dependencies: glob-slash "^1.0.0" lodash.isobject "^2.4.1" toxic "^1.0.0" -glob-stream@^5.3.2: - version "5.3.5" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22" - integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI= - dependencies: - extend "^3.0.0" - glob "^5.0.3" - glob-parent "^3.0.0" - micromatch "^2.3.7" - ordered-read-streams "^0.3.0" - through2 "^0.6.0" - to-absolute-glob "^0.1.1" - unique-stream "^2.0.2" - glob-stream@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" - integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ= + integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw== dependencies: extend "^3.0.0" glob "^7.1.1" @@ -13386,7 +15248,7 @@ glob-stream@^6.1.0: glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" - integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= + integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig== glob-to-regexp@^0.4.0: version "0.4.1" @@ -13394,15 +15256,16 @@ glob-to-regexp@^0.4.0: integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== glob-watcher@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.3.tgz#88a8abf1c4d131eb93928994bc4a593c2e5dd626" - integrity sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg== + version "5.0.5" + resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc" + integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw== dependencies: anymatch "^2.0.0" async-done "^1.2.0" chokidar "^2.0.0" is-negated-glob "^1.0.0" just-debounce "^1.0.0" + normalize-path "^3.0.0" object.defaults "^1.1.0" glob@7.1.2: @@ -13429,29 +15292,19 @@ glob@7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^5.0.15, glob@^5.0.3: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI= +glob@7.1.4: + version "7.1.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" + integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== dependencies: + fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "2 || 3" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.4: +glob@7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -13463,7 +15316,7 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.3: +glob@7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -13475,22 +15328,55 @@ glob@^7.0.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@~7.1.2: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== +glob@^5.0.15: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA== + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^6.0.1: + version "6.0.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" + integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A== + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.2.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1, glob@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU= + integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg== dependencies: ini "^1.3.4" @@ -13527,22 +15413,15 @@ global-modules@2.0.0: global-modules@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" - integrity sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0= + integrity sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA== dependencies: global-prefix "^0.1.4" is-windows "^0.2.0" -global-npm@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/global-npm/-/global-npm-0.3.0.tgz#7c5115394a677d1245c4e3ba0b78bb6752797ee0" - integrity sha1-fFEVOUpnfRJFxOO6C3i7Z1J5fuA= - dependencies: - which "^1.2.1" - global-prefix@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f" - integrity sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= + integrity sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw== dependencies: homedir-polyfill "^1.0.0" ini "^1.3.4" @@ -13552,7 +15431,7 @@ global-prefix@^0.1.4: global-prefix@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= + integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg== dependencies: expand-tilde "^2.0.2" homedir-polyfill "^1.0.1" @@ -13569,13 +15448,13 @@ global-prefix@^3.0.0: kind-of "^6.0.2" which "^1.3.1" -global@~4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" - integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8= +global@~4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" + integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== dependencies: min-document "^2.19.0" - process "~0.5.1" + process "^0.11.10" globals@^11.1.0, globals@^11.7.0: version "11.12.0" @@ -13587,19 +15466,33 @@ globals@^9.18.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -globby@^11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" - integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ== +globby@^10.0.1: + version "10.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" + integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== dependencies: + "@types/glob" "^7.1.1" array-union "^2.1.0" dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" + +globby@^11.0.1, globby@^11.0.2: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" slash "^3.0.0" -globby@^8, globby@^8.0.1: +globby@^8: version "8.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d" integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w== @@ -13612,20 +15505,6 @@ globby@^8, globby@^8.0.1: pify "^3.0.0" slash "^1.0.0" -globby@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" - integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== - dependencies: - "@types/glob" "^7.1.1" - array-union "^1.0.2" - dir-glob "^2.2.2" - fast-glob "^2.2.6" - glob "^7.1.3" - ignore "^4.0.3" - pify "^4.0.1" - slash "^2.0.0" - glogg@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" @@ -13633,15 +15512,15 @@ glogg@^1.0.0: dependencies: sparkles "^1.0.0" -google-auth-library@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-3.1.0.tgz#6378ea3e56067312209eee58223e5a00adaec639" - integrity sha512-EntjrOgSffw5EhZGoV8+ROPwEK/aQpoMZaULw3bKailEGdjaUI25PmmFc4AN6vG/Q24YEUiuLxtTXa1Usar5Eg== +google-auth-library@^3.0.0, google-auth-library@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-3.1.2.tgz#ff2f88cd5cd2118a57bd3d5ad3c093c8837fc350" + integrity sha512-cDQMzTotwyWMrg5jRO7q0A4TL/3GWBgO7I7q5xGKNiiFf9SmGY/OJ1YsLMgI2MVHHsEGyrqYnbnmV1AE+Z6DnQ== dependencies: base64-js "^1.3.0" fast-text-encoding "^1.0.0" gaxios "^1.2.1" - gcp-metadata "^0.9.3" + gcp-metadata "^1.0.0" gtoken "^2.3.2" https-proxy-agent "^2.2.1" jws "^3.1.5" @@ -13649,34 +15528,20 @@ google-auth-library@^3.0.0: semver "^5.5.0" google-auth-library@^5.0.0, google-auth-library@^5.5.0: - version "5.9.2" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-5.9.2.tgz#e528f4f1cd10657073d7ae2b9a9ce17ac97c3538" - integrity sha512-rBE1YTOZ3/Hu6Mojkr+UUmbdc/F28hyMGYEGxjyfVA9ZFmq12oqS3AeftX4h9XpdVIcxPooSo8hECYGT6B9XqQ== + version "5.10.1" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-5.10.1.tgz#504ec75487ad140e68dd577c21affa363c87ddff" + integrity sha512-rOlaok5vlpV9rSiUu5EpR0vVpc+PhN62oF4RyX/6++DG1VsaulAFEMlDYBLjJDDPI6OcNOCGAKy9UVB/3NIDXg== dependencies: arrify "^2.0.0" base64-js "^1.3.0" + ecdsa-sig-formatter "^1.0.11" fast-text-encoding "^1.0.0" gaxios "^2.1.0" - gcp-metadata "^3.3.0" + gcp-metadata "^3.4.0" gtoken "^4.1.0" jws "^4.0.0" lru-cache "^5.0.0" -google-auth-library@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.0.1.tgz#b5bbff2583f024188a37920cb509e194f2cc4dd2" - integrity sha512-NWEM9W0o+fmUJMK/wEuJ1vAc8H/JAseOWB8tjOAAkz8yobU+5IDtO/rPCbbRwFF1obIOCe0lj1pkq9ld2OFZeg== - dependencies: - arrify "^2.0.0" - base64-js "^1.3.0" - ecdsa-sig-formatter "^1.0.11" - fast-text-encoding "^1.0.0" - gaxios "^3.0.0" - gcp-metadata "^4.1.0" - gtoken "^5.0.0" - jws "^4.0.0" - lru-cache "^5.0.0" - google-auth-library@^6.1.3: version "6.1.6" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.1.6.tgz#deacdcdb883d9ed6bac78bb5d79a078877fdf572" @@ -13692,10 +15557,10 @@ google-auth-library@^6.1.3: jws "^4.0.0" lru-cache "^6.0.0" -google-auth-library@^7.0.0, google-auth-library@^7.6.1, google-auth-library@^7.9.2: - version "7.10.1" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.1.tgz#e44ac923bc3540215aaead6e1fd117ee06883f51" - integrity sha512-nQxgM1ZopUMcpMnu95kOSzI+9tJl4YDOZJomSTBGlRLpxfBopdwto7WvzoI87HuN0nQqVETgOsHi/C/po1rppA== +google-auth-library@^7.0.0, google-auth-library@^7.14.0, google-auth-library@^7.14.1: + version "7.14.1" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.1.tgz#e3483034162f24cc71b95c8a55a210008826213c" + integrity sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -13707,14 +15572,32 @@ google-auth-library@^7.0.0, google-auth-library@^7.6.1, google-auth-library@^7.9 jws "^4.0.0" lru-cache "^6.0.0" +google-gax@2.30.3: + version "2.30.3" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.3.tgz#5d2c227972d99d6a6cd77963c44d0575974e7b60" + integrity sha512-Zsd6hbJBMvAcJS3cYpAsmupvfsxygFR2meUZJcGeR7iUqYHCR/1Hf2aQNB9srrlXQMm91pNiUvW0Kz6Qld8QkA== + dependencies: + "@grpc/grpc-js" "~1.6.0" + "@grpc/proto-loader" "0.6.9" + "@types/long" "^4.0.0" + abort-controller "^3.0.0" + duplexify "^4.0.0" + fast-text-encoding "^1.0.3" + google-auth-library "^7.14.0" + is-stream-ended "^0.1.4" + node-fetch "^2.6.1" + object-hash "^3.0.0" + proto3-json-serializer "^0.1.8" + protobufjs "6.11.2" + retry-request "^4.0.0" + google-gax@^0.25.0: - version "0.25.5" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-0.25.5.tgz#90b1f63929f92f8d75a6c284356e2ff5c62e4511" - integrity sha512-+x6Ys6v5agnX5+xqNw3IRCLjJL/wk50sT81x8InWo2cpnWmJwHMsBsjSYThHO23FDaBv3GkV8PpIMQhO18khAw== + version "0.25.6" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-0.25.6.tgz#5ea5c743933ba957da63951bc828aef91fb69340" + integrity sha512-+CVtOSLQt42mwVvJJirhBiAvWsp8zKeb9zW5Wy3wyvb3VG9OugHzZpwvYO9D4yNPPspe7L9CpIs80I5nUJlS8w== dependencies: "@grpc/grpc-js" "^0.3.0" "@grpc/proto-loader" "^0.4.0" - "@types/duplexify" "^3.6.0" duplexify "^3.6.0" google-auth-library "^3.0.0" google-proto-files "^0.20.0" @@ -13725,15 +15608,15 @@ google-gax@^0.25.0: lodash.has "^4.5.2" protobufjs "^6.8.8" retry-request "^4.0.0" - semver "^5.5.1" + semver "^6.0.0" walkdir "^0.3.2" -google-gax@^1.13.0: - version "1.15.3" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-1.15.3.tgz#e88cdcbbd19c7d88cc5fd7d7b932c4d1979a5aca" - integrity sha512-3JKJCRumNm3x2EksUTw4P1Rad43FTpqrtW9jzpf3xSMYXx+ogaqTM1vGo7VixHB4xkAyATXVIa3OcNSh8H9zsQ== +google-gax@^1.15.3: + version "1.15.4" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-1.15.4.tgz#dc37dea2a8c58717cd50db40f01b21cbf9da7739" + integrity sha512-Wzl43ueWEKNsLcMJ33sPps179nD7wn6Jcl/P+ZQNS+HxdCJcoQEgJe3AmulsJnatwjBE3pVPIE4HFJNhpRGvUw== dependencies: - "@grpc/grpc-js" "~1.0.3" + "@grpc/grpc-js" "~1.3.6" "@grpc/proto-loader" "^0.5.1" "@types/fs-extra" "^8.0.1" "@types/long" "^4.0.0" @@ -13749,83 +15632,51 @@ google-gax@^1.13.0: semver "^6.0.0" walkdir "^0.4.0" -google-gax@^2.0.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.6.1.tgz#ab09c4f94ccdd0a81a0f743f49fec83108587fbf" - integrity sha512-AKQKfaaXCJhMrP4nniz/ei7j+uyqG7nNrGmQxDBIBtDMUbZUMnH0Kw8asts35vmciEV5UeIWfclVcAU+VaJptw== - dependencies: - "@grpc/grpc-js" "~1.0.0" - "@grpc/proto-loader" "^0.5.1" - "@types/long" "^4.0.0" - abort-controller "^3.0.0" - duplexify "^3.6.0" - google-auth-library "^6.0.0" - is-stream-ended "^0.1.4" - lodash.at "^4.6.0" - lodash.has "^4.5.2" - node-fetch "^2.6.0" - protobufjs "^6.9.0" - retry-request "^4.0.0" - semver "^6.0.0" - walkdir "^0.4.0" - -google-gax@^2.24.1: - version "2.28.0" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.28.0.tgz#30ec17bac62f6002cfe10a0237155554b262156a" - integrity sha512-kuqc8a4+CTCMBcF3tlOL7Sa74JWkTzcZxatAQTCVK35WToXkHnJ0qncFOJuegUv3EbV9IQY4j/+NZdFLv+lbTA== +google-gax@^2.0.1, google-gax@^2.24.1: + version "2.30.5" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.5.tgz#e836f984f3228900a8336f608c83d75f9cb73eff" + integrity sha512-Jey13YrAN2hfpozHzbtrwEfEHdStJh1GwaQ2+Akh1k0Tv/EuNVSuBtHZoKSBm5wBMvNsxTsEIZ/152NrYyZgxQ== dependencies: - "@grpc/grpc-js" "~1.4.0" - "@grpc/proto-loader" "^0.6.1" + "@grpc/grpc-js" "~1.6.0" + "@grpc/proto-loader" "^0.6.12" "@types/long" "^4.0.0" abort-controller "^3.0.0" duplexify "^4.0.0" fast-text-encoding "^1.0.3" - google-auth-library "^7.6.1" + google-auth-library "^7.14.0" is-stream-ended "^0.1.4" node-fetch "^2.6.1" - object-hash "^2.1.1" - proto3-json-serializer "^0.1.1" - protobufjs "6.11.2" + object-hash "^3.0.0" + proto3-json-serializer "^0.1.8" + protobufjs "6.11.3" retry-request "^4.0.0" -google-libphonenumber@^3.2.15: - version "3.2.15" - resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.15.tgz#3a01dc554dbf83c754f249c16df3605e5d154bb9" - integrity sha512-tbCIuzMoH34RdrbFRw5kijAZn/p6JMQvsgtr1glg2ugbwqrMPlOL8pHNK8cyGo9B6SXpcMm4hdyDqwomR+HPRg== - -google-libphonenumber@^3.2.27: - version "3.2.27" - resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.27.tgz#06a0c1d42be712a6fd4189e2e3b07fc36cacee01" - integrity sha512-et3QlrfWemNPhyUfXZmJG8TfzitfAN71ygNI15+B35zNge/7vyZxkpDsc13oninkf8RAtN2kNEzvMr4L1n3vfQ== +google-libphonenumber@^3.2.15, google-libphonenumber@^3.2.27: + version "3.2.30" + resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.30.tgz#a9f421ff1ff87694de11fe5a1c2b9693b996ee67" + integrity sha512-Kx2/AqmY0P6863vOhkiCFqfAxfY3jagMe916ByU38JRKiRCqSHGJW1qTOZNV4+ag8Xda69dk6w8VwEeswVy44w== google-p12-pem@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-1.0.2.tgz#c8a3843504012283a0dbffc7430b7c753ecd4b07" - integrity sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg== + version "1.0.5" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-1.0.5.tgz#0b4721cdfc818759d884f0c62803518decdaf0d0" + integrity sha512-50rTrqYPTPPwlu9TNl/HkJbBENEpbRzTOVLFJ4YWM86njZgXHFy+FP+tLRSd9m132Li9Dqi27Z3KIWDEv5y+EA== dependencies: - node-forge "^0.7.4" - pify "^3.0.0" + node-forge "^0.10.0" + pify "^4.0.0" google-p12-pem@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-2.0.2.tgz#39cae8f6fcbe66a01f00be4ddf2d56b95926fa7b" - integrity sha512-UfnEARfJKI6pbmC1hfFFm+UAcZxeIwTiEcHfqKe/drMsXD/ilnVjF7zgOGpHXyhuvX6jNJK3S8A0hOQjwtFxEw== - dependencies: - node-forge "^0.9.0" - -google-p12-pem@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.0.1.tgz#a220c05a8d7ee9751dd133ee72ecfc855820d5ab" - integrity sha512-VlQgtozgNVVVcYTXS36eQz4PXPt9gIPqLOhHN0QiV6W6h4qSCNVKPtKC5INtJsaHHF2r7+nOIa26MJeJMTaZEQ== + version "2.0.5" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-2.0.5.tgz#b1c44164d567ae894f7a19b4ff362a06be5b793b" + integrity sha512-7RLkxwSsMsYh9wQ5Vb2zRtkAHvqPvfoMGag+nugl1noYO7gf0844Yr9TIFA5NEBMAeVt2Z+Imu7CQMp3oNatzQ== dependencies: - node-forge "^0.9.0" + node-forge "^0.10.0" -google-p12-pem@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz#c3d61c2da8e10843ff830fdb0d2059046238c1d4" - integrity sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A== +google-p12-pem@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b" + integrity sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg== dependencies: - node-forge "^0.10.0" + node-forge "^1.3.1" google-proto-files@^0.20.0: version "0.20.0" @@ -13856,6 +15707,25 @@ googleapis@^39.2.0: google-auth-library "^3.0.0" googleapis-common "^0.7.0" +got@12.1.0: + version "12.1.0" + resolved "https://registry.yarnpkg.com/got/-/got-12.1.0.tgz#099f3815305c682be4fd6b0ee0726d8e4c6b0af4" + integrity sha512-hBv2ty9QN2RdbJJMK3hesmSkFTjVIHyIDDbssCKnSmq62edGgImJWD10Eb1k77TiV1bxloxqcFAVK8+9pkhOig== + dependencies: + "@sindresorhus/is" "^4.6.0" + "@szmarczak/http-timer" "^5.0.1" + "@types/cacheable-request" "^6.0.2" + "@types/responselike" "^1.0.0" + cacheable-lookup "^6.0.4" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + form-data-encoder "1.7.1" + get-stream "^6.0.1" + http2-wrapper "^2.1.10" + lowercase-keys "^3.0.0" + p-cancelable "^3.0.0" + responselike "^2.0.0" + got@9.6.0, got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -13876,7 +15746,7 @@ got@9.6.0, got@^9.6.0: got@^6.7.1: version "6.7.1" resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA= + integrity sha512-Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg== dependencies: create-error-class "^3.0.0" duplexer3 "^0.1.4" @@ -13910,33 +15780,35 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -graceful-fs@^4.1.3: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@~4.1.11: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= +graphql-tag@^2.11.0, graphql-tag@^2.12.6: + version "2.12.6" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" + integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== + dependencies: + tslib "^2.1.0" graphql@^14.1.1: - version "14.6.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.6.0.tgz#57822297111e874ea12f5cd4419616930cd83e49" - integrity sha512-VKzfvHEKybTKjQVpTFrA5yUq2S9ihcZvfJAtsDBBCuV6wauPu1xl/f9ehgVf0FcEJJs4vz6ysb/ZMkGigQZseg== + version "14.7.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz#7fa79a80a69be4a31c27dda824dc04dac2035a72" + integrity sha512-l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA== dependencies: iterall "^1.2.2" +graphql@^15.3.0: + version "15.8.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" + integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== + growl@1.10.5: version "1.10.5" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" @@ -13945,7 +15817,7 @@ growl@1.10.5: growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" - integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw== grpc-gcp@^0.1.1: version "0.1.1" @@ -13955,22 +15827,22 @@ grpc-gcp@^0.1.1: grpc "^1.16.0" protobufjs "^6.8.8" -grpc@1.24.2, grpc@^1.16.0: - version "1.24.2" - resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.2.tgz#76d047bfa7b05b607cbbe3abb99065dcefe0c099" - integrity sha512-EG3WH6AWMVvAiV15d+lr+K77HJ/KV/3FvMpjKjulXHbTwgDZkhkcWbwhxFAoTdxTkQvy0WFcO3Nog50QBbHZWw== +grpc@^1.16.0: + version "1.24.11" + resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.11.tgz#7039da9f6f22ce35168535a6d5dda618398a5966" + integrity sha512-8/AQdFCzCeCDWW3SoaMNp6ccbRvTQEH1O1u1uFtt29eWsg5gSZCJ3m6fbkduEIh3smY7WAPP+LgVJ5n3nZRxcA== dependencies: + "@mapbox/node-pre-gyp" "^1.0.4" "@types/bytebuffer" "^5.0.40" lodash.camelcase "^4.3.0" lodash.clone "^4.5.0" nan "^2.13.2" - node-pre-gyp "^0.14.0" protobufjs "^5.0.3" gtoken@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-2.3.2.tgz#49890a866c1f44e173099be95515db5872a92151" - integrity sha512-F8EObUGyC8Qd3WXTloNULZBwfUsOABoHElihB1F6zGhT/cy38iPL09wGLRY712I+hQnOyA+sYlgPFX2cOKz0qg== + version "2.3.3" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-2.3.3.tgz#8a7fe155c5ce0c4b71c886cfb282a9060d94a641" + integrity sha512-EaB49bu/TCoNeQjhCYKI/CurooBKkGxIqFHsWABW0b25fobBYVTMe84A8EBVVZhl8emiUdNypil9huMOTmyAnw== dependencies: gaxios "^1.0.4" google-p12-pem "^1.0.0" @@ -13979,38 +15851,28 @@ gtoken@^2.3.2: pify "^4.0.0" gtoken@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-4.1.0.tgz#0b315dd1a925e3ad3c82db1eb5b9e89bae875ba8" - integrity sha512-wqyn2gf5buzEZN4QNmmiiW2i2JkEdZnL7Z/9p44RtZqgt4077m4khRgAYNuu8cBwHWCc6MsP6eDUn/KkF6jFIw== + version "4.1.4" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-4.1.4.tgz#925ff1e7df3aaada06611d30ea2d2abf60fcd6a7" + integrity sha512-VxirzD0SWoFUo5p8RDP8Jt2AGyOmyYcT/pOUgDKJCK+iSw0TMqwrVfY37RXTNmoKwrzmDHSk0GMT9FsgVmnVSA== dependencies: - gaxios "^2.0.0" + gaxios "^2.1.0" google-p12-pem "^2.0.0" - jws "^3.1.5" - mime "^2.2.0" - -gtoken@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.0.1.tgz#b93f309d89adfe230bb0f24269b978284ba89e0f" - integrity sha512-33w4FNDkUcyIOq/TqyC+drnKdI4PdXmWp9lZzssyEQKuvu9ZFN3KttaSnDKo52U3E51oujVGop93mKxmqO8HHg== - dependencies: - gaxios "^3.0.0" - google-p12-pem "^3.0.0" jws "^4.0.0" mime "^2.2.0" gtoken@^5.0.4: - version "5.3.1" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.1.tgz#c1c2598a826f2b5df7c6bb53d7be6cf6d50c3c78" - integrity sha512-yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ== + version "5.3.2" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f" + integrity sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ== dependencies: gaxios "^4.0.0" - google-p12-pem "^3.0.3" + google-p12-pem "^3.1.3" jws "^4.0.0" gulp-cli@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc" - integrity sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f" + integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A== dependencies: ansi-colors "^1.0.1" archy "^1.0.0" @@ -14020,7 +15882,7 @@ gulp-cli@^2.2.0: copy-props "^2.0.1" fancy-log "^1.3.2" gulplog "^1.0.0" - interpret "^1.1.0" + interpret "^1.4.0" isobject "^3.0.1" liftoff "^3.1.0" matchdep "^2.0.0" @@ -14028,26 +15890,9 @@ gulp-cli@^2.2.0: pretty-hrtime "^1.0.0" replace-homedir "^1.0.0" semver-greatest-satisfied-range "^1.1.0" - v8flags "^3.0.1" + v8flags "^3.2.0" yargs "^7.1.0" -gulp-sourcemaps@^1.5.2: - version "1.12.1" - resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.12.1.tgz#b437d1f3d980cf26e81184823718ce15ae6597b6" - integrity sha1-tDfR89mAzyboEYSCNxjOFa5ll7Y= - dependencies: - "@gulp-sourcemaps/map-sources" "1.X" - acorn "4.X" - convert-source-map "1.X" - css "2.X" - debug-fabulous "0.0.X" - detect-newline "2.X" - graceful-fs "4.X" - source-map "~0.6.0" - strip-bom "2.X" - through2 "2.X" - vinyl "1.X" - gulp@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa" @@ -14061,11 +15906,11 @@ gulp@^4.0.2: gulplog@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" - integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U= + integrity sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw== dependencies: glogg "^1.0.0" -handlebars@^4.0.1, handlebars@^4.1.0, handlebars@^4.5.3, handlebars@^4.7.6, handlebars@^4.7.7: +handlebars@^4.0.1, handlebars@^4.7.6, handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -14080,7 +15925,7 @@ handlebars@^4.0.1, handlebars@^4.1.0, handlebars@^4.5.3, handlebars@^4.7.6, hand har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== har-validator@~5.1.3: version "5.1.5" @@ -14090,52 +15935,59 @@ har-validator@~5.1.3: ajv "^6.12.3" har-schema "^2.0.0" +hard-rejection@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" + integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== dependencies: ansi-regex "^2.0.0" -has-bigints@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== +has-bigints@^1.0.1, has-bigints@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== has-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" - integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= + integrity sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA== has-flag@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= + integrity sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng== has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + has-symbol-support-x@^1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== -has-symbols@^1.0.0, has-symbols@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" - integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== - -has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-to-string-tag-x@^1.2.0: version "1.4.1" @@ -14144,15 +15996,22 @@ has-to-string-tag-x@^1.2.0: dependencies: has-symbol-support-x "^1.4.1" -has-unicode@^2.0.0, has-unicode@^2.0.1, has-unicode@~2.0.1: +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== dependencies: get-value "^2.0.3" has-values "^0.1.4" @@ -14161,7 +16020,7 @@ has-value@^0.3.1: has-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== dependencies: get-value "^2.0.6" has-values "^1.0.0" @@ -14170,12 +16029,12 @@ has-value@^1.0.0: has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== has-values@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== dependencies: is-number "^3.0.0" kind-of "^4.0.0" @@ -14202,11 +16061,9 @@ hash-base@^3.0.0: safe-buffer "^5.2.0" hash-stream-validation@^0.2.1, hash-stream-validation@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/hash-stream-validation/-/hash-stream-validation-0.2.2.tgz#6b34c4fce5e9fce265f1d3380900049d92a10090" - integrity sha512-cMlva5CxWZOrlS/cY0C+9qAzesn5srhFA8IT1VPiHc9bWWBLkJfEUIZr7MWoi89oOOGmpg8ymchaOjiArsGu5A== - dependencies: - through2 "^2.0.0" + version "0.2.4" + resolved "https://registry.yarnpkg.com/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz#ee68b41bf822f7f44db1142ec28ba9ee7ccb7512" + integrity sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ== hash.js@1.1.3: version "1.1.3" @@ -14216,7 +16073,7 @@ hash.js@1.1.3: inherits "^2.0.3" minimalistic-assert "^1.0.0" -hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: +hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== @@ -14227,7 +16084,7 @@ hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: hdkey@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632" - integrity sha1-yu5L6BqneSHpCbjSKN0PKayu5jI= + integrity sha512-ADjIY5Bqdvp3Sh+SLSS1W3/gTJnlDwwM3UsM/5sHPojc4pLf6X3MfMMiTa96MgtADNhTPa+E+SAKMtqdv1zUfw== dependencies: coinstring "^2.0.0" secp256k1 "^3.0.1" @@ -14244,17 +16101,25 @@ hdkey@^1.1.1: he@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= + integrity sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA== he@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +header-case@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/header-case/-/header-case-1.0.1.tgz#9535973197c144b09613cd65d317ef19963bd02d" + integrity sha512-i0q9mkOeSuhXw6bGgiQCCBgY/jlZuV/7dZXyZ9c6LcBrqwvT8eT719E9uxE5LiZftdl+z81Ugbg/VvXV4OJOeQ== + dependencies: + no-case "^2.2.0" + upper-case "^1.1.3" + heap@0.2.6: version "0.2.6" resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.6.tgz#087e1f10b046932fc8594dd9e6d378afc9d1e5ac" - integrity sha1-CH4fELBGky/IWU3Z5tN4r8nR5aw= + integrity sha512-MzzWcnfB1e4EG2vHi3dXHoBupmuXNZzx6pY6HldVS55JKKBoq3xOyzfSaZRkJp37HIhEYC78knabHff3zc4dQQ== hermes-engine@~0.5.0: version "0.5.1" @@ -14268,34 +16133,34 @@ hermes-profile-transformer@^0.0.6: dependencies: source-map "^0.7.3" -highlight.js@^10.2.0: - version "10.3.2" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.3.2.tgz#135fd3619a00c3cbb8b4cd6dbc78d56bfcbc46f1" - integrity sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw== +highlight.js@^10.2.0, highlight.js@^10.4.1: + version "10.7.3" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" + integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== + +highlightjs-solidity@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/highlightjs-solidity/-/highlightjs-solidity-2.0.5.tgz#48b945f41886fa49af9f06023e6e87fffc243745" + integrity sha512-ReXxQSGQkODMUgHcWzVSnfDCDrL2HshOYgw3OlIYmfHeRzUPkfJTUIp95pK4CmbiNG2eMTOmNLpfCz9Zq7Cwmg== hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg== dependencies: hash.js "^1.0.3" minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoek@6.x.x, hoek@^6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c" - integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ== - home-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/home-dir/-/home-dir-1.0.0.tgz#2917eb44bdc9072ceda942579543847e3017fe4e" - integrity sha1-KRfrRL3JByztqUJXlUOEfjAX/k4= + integrity sha512-PPAP0BMY72XQ0sYwFow8EgHwUYfptkZusnZEGHkBjdKRXIYcVFsbEViqU4k8VrJWf0m7wMr9gscQX9klJYh7zg== home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= + integrity sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg== dependencies: os-homedir "^1.0.0" os-tmpdir "^1.0.1" @@ -14307,18 +16172,32 @@ homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" -hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== +hosted-git-info@^2.1.4, hosted-git-info@^2.6.0: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== hosted-git-info@^3.0.6: - version "3.0.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" + integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== + dependencies: + lru-cache "^6.0.0" + +hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" +hosted-git-info@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594" + integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q== + dependencies: + lru-cache "^7.5.1" + html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -14331,29 +16210,32 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -http-basic@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/http-basic/-/http-basic-7.0.0.tgz#82f0a506be942732ec8deebee80e746ef5736dba" - integrity sha1-gvClBr6UJzLsje6+6A50bvVzbbo= +htmlparser2@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" + integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== dependencies: - "@types/concat-stream" "^1.6.0" - "@types/node" "^9.4.1" - caseless "~0.12.0" - concat-stream "^1.4.6" + domelementtype "^2.3.0" + domhandler "^5.0.2" + domutils "^3.0.1" + entities "^4.3.0" + +http-basic@^8.1.1: + version "8.1.3" + resolved "https://registry.yarnpkg.com/http-basic/-/http-basic-8.1.3.tgz#a7cabee7526869b9b710136970805b1004261bbf" + integrity sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw== + dependencies: + caseless "^0.12.0" + concat-stream "^1.6.2" http-response-object "^3.0.1" parse-cache-control "^1.0.1" -http-cache-semantics@^3.8.0, http-cache-semantics@^3.8.1: - version "3.8.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" - integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== - -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -http-call@^5.1.2, http-call@^5.2.2: +http-call@^5.1.2, http-call@^5.2.2, http-call@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/http-call/-/http-call-5.3.0.tgz#4ded815b13f423de176eb0942d69c43b25b148db" integrity sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w== @@ -14376,34 +16258,37 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@1.7.3, http-errors@^1.7.1, http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + +http-errors@^1.7.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== dependencies: depd "~1.1.2" inherits "2.0.4" - setprototypeof "1.1.1" + setprototypeof "1.2.0" statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + toidentifier "1.0.1" http-https@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/http-https/-/http-https-1.0.0.tgz#2f908dd5f1db4068c058cd6e6d4ce392c913389b" - integrity sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs= - -http-parser-js@>=0.4.0: - version "0.4.12" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.12.tgz#b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f" - integrity sha1-uc+/Sizybw/DSxDKFImid3HjR08= + integrity sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg== -http-proxy-agent@^2.0.0, http-proxy-agent@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" - integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== - dependencies: - agent-base "4" - debug "3.1.0" +http-parser-js@>=0.5.1: + version "0.5.8" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" + integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1: version "4.0.1" @@ -14424,27 +16309,35 @@ http-proxy-agent@^5.0.0: debug "4" http-response-object@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-3.0.1.tgz#90174d44c27b5e797cf6efe51a043bc889ae64bf" - integrity sha512-6L0Fkd6TozA8kFSfh9Widst0wfza3U1Ex2RjJ6zNDK0vR1U1auUR6jY4Nn2Xl7CCy0ikFmxW1XcspVpb9RvwTg== + version "3.0.2" + resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-3.0.2.tgz#7f435bb210454e4360d074ef1f989d5ea8aa9810" + integrity sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA== dependencies: - "@types/node" "^9.3.0" + "@types/node" "^10.0.3" http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== dependencies: assert-plus "^1.0.0" jsprim "^1.2.2" sshpk "^1.7.0" +http2-wrapper@^2.1.10: + version "2.1.11" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-2.1.11.tgz#d7c980c7ffb85be3859b6a96c800b2951ae257ef" + integrity sha512-aNAk5JzLturWEUiuhAN73Jcbq96R7rTitAoXV54FYMatvihnpD2+6PUgU4ce3D/m5VDbw+F5CsyKSF176ptitQ== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.2.0" + https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= + integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg== -https-proxy-agent@5, https-proxy-agent@^2.1.0, https-proxy-agent@^2.2.0, https-proxy-agent@^2.2.1, https-proxy-agent@^4.0.0, https-proxy-agent@^5.0.0: +https-proxy-agent@5, https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== @@ -14452,20 +16345,33 @@ https-proxy-agent@5, https-proxy-agent@^2.1.0, https-proxy-agent@^2.2.0, https-p agent-base "6" debug "4" +https-proxy-agent@^2.2.1: + version "2.2.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" + integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + humanize-duration@^3.17.0, humanize-duration@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.21.0.tgz#ae5dc7e67640770cbf6a8d03a5d1138d47c7ce38" - integrity sha512-7BLsrQZ2nMGeakmGDUl1pDne6/7iAdvwf1RtDLCOPHNFIHjkOVW7lcu7xHkIM9HhZAlSSO5crhC1dHvtl4dIQw== + version "3.27.3" + resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.27.3.tgz#db654e72ebf5ccfe232c7f56bc58aa3a6fe4df88" + integrity sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw== humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== dependencies: ms "^2.0.0" @@ -14491,7 +16397,7 @@ hyperlinker@^1.0.0: resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ== -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -14499,12 +16405,19 @@ iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, ic safer-buffer ">= 2.1.2 < 3" iconv-lite@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550" - integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw== + version "0.5.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8" + integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag== dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2, iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + idb@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/idb/-/idb-3.0.2.tgz#c8e9122d5ddd40f13b60ae665e4862f8b13fa384" @@ -14517,70 +16430,82 @@ idna-uts46-hx@^2.3.1: dependencies: punycode "2.1.0" -ieee754@1.1.13, ieee754@^1.1.4: +ieee754@1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ieee754@^1.2.1: +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -iferr@^0.1.5, iferr@~0.1.5: +iferr@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= + integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA== ignore-by-default@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= + integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA== -ignore-walk@3.0.3, ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== +ignore-walk@3.0.4, ignore-walk@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== dependencies: minimatch "^3.0.4" +ignore-walk@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776" + integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw== + dependencies: + minimatch "^5.0.1" + ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== -ignore@^4.0.3, ignore@^4.0.6: +ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" - integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== +ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== image-size@^0.6.0: version "0.6.3" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" integrity sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA== -immediate@^3.2.3, immediate@~3.2.3: +immediate@3.3.0, immediate@^3.2.3: + version "3.3.0" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" + integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== + +immediate@~3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c" - integrity sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw= + integrity sha512-RrGCXRm/fRVqMIhqXrGEX9rRADavPiDFSoMb/k64i9XMk8uH4r/Omi5Ctierj6XzNecwDbO4WuFbDD1zmpl3Tg== import-fresh@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= + integrity sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg== dependencies: caller-path "^2.0.0" resolve-from "^3.0.0" -import-fresh@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" - integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -14588,9 +16513,9 @@ import-fresh@^3.0.0: import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== -import-local@2.0.0, import-local@^2.0.0: +import-local@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== @@ -14599,9 +16524,9 @@ import-local@2.0.0, import-local@^2.0.0: resolve-cwd "^2.0.0" import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -14609,19 +16534,12 @@ import-local@^3.0.2: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -indent-string@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" - integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= - dependencies: - repeating "^2.0.0" + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== -indent-string@^3.0.0, indent-string@^3.2.0: +indent-string@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= + integrity sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ== indent-string@^4.0.0: version "4.0.0" @@ -14636,12 +16554,12 @@ infer-owner@^1.0.3, infer-owner@^1.0.4: inflection@1.12.0: version "1.12.0" resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" - integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY= + integrity sha512-lRy4DxuIFWXlJU7ed8UiTJOSTqStqYdEb4CEbtXfNbkdj3nH1L+reUWiE10VWcJS2yR7tge8Z74pJjtBjNwj0w== -inflight@^1.0.4, inflight@~1.0.6: +inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" @@ -14654,12 +16572,12 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= + integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA== inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== ini@1.3.7: version "1.3.7" @@ -14672,23 +16590,22 @@ ini@2.0.0: integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -init-package-json@^1.10.3: - version "1.10.3" - resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe" - integrity sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw== +init-package-json@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69" + integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A== dependencies: - glob "^7.1.1" - npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0" + npm-package-arg "^9.0.1" promzard "^0.3.0" - read "~1.0.1" - read-package-json "1 || 2" - semver "2.x || 3.x || 4 || 5" - validate-npm-package-license "^3.0.1" - validate-npm-package-name "^3.0.0" + read "^1.0.7" + read-package-json "^5.0.0" + semver "^7.3.5" + validate-npm-package-license "^3.0.4" + validate-npm-package-name "^4.0.0" inquirer@^3.0.6: version "3.3.0" @@ -14710,10 +16627,10 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@^6.2.0, inquirer@^6.2.2: - version "6.5.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42" - integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA== +inquirer@^6.2.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== dependencies: ansi-escapes "^3.2.0" chalk "^2.4.2" @@ -14748,6 +16665,27 @@ inquirer@^7.0.5: strip-ansi "^6.0.0" through "^2.3.6" +inquirer@^8.2.4: + version "8.2.4" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.4.tgz#ddbfe86ca2f67649a67daa6f1051c128f684f0b4" + integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg== + dependencies: + ansi-escapes "^4.2.1" + chalk "^4.1.1" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash "^4.17.21" + mute-stream "0.0.8" + ora "^5.4.1" + run-async "^2.4.0" + rxjs "^7.5.5" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" + wrap-ansi "^7.0.0" + inquirer@~6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7" @@ -14767,20 +16705,34 @@ inquirer@~6.3.1: strip-ansi "^5.1.0" through "^2.3.6" -install-artifact-from-github@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.2.0.tgz#adcbd123c16a4337ec44ea76d0ebf253cc16b074" - integrity sha512-3OxCPcY55XlVM3kkfIpeCgmoSKnMsz2A3Dbhsq0RXpIknKQmrX1YiznCeW9cD2ItFmDxziA3w6Eg8d80AoL3oA== +install-artifact-from-github@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.1.tgz#eefaad9af35d632e5d912ad1569c1de38c3c2462" + integrity sha512-3l3Bymg2eKDsN5wQuMfgGEj2x6l5MCAv0zPL6rxHESufFVlEAKW/6oY9F1aGgvY/EgWm5+eWGRjINveL4X7Hgg== + +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" -interpret@1.2.0, interpret@^1.0.0, interpret@^1.1.0: +interpret@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -interpret@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.0.0.tgz#b783ffac0b8371503e9ab39561df223286aa5433" - integrity sha512-e0/LknJ8wpMMhTiWcjivB+ESwIuvHnBSlBbmP/pSb8CQJldoj1p2qv7xGZ/+BtbTziYRFSz8OsvdbiX45LtYQA== +interpret@^1.0.0, interpret@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" @@ -14792,7 +16744,7 @@ invariant@^2.2.2, invariant@^2.2.4: invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= + integrity sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ== invert-kv@^2.0.0: version "2.0.0" @@ -14807,12 +16759,22 @@ io-ts@2.0.1: ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + integrity sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw== -ip@^1.1.4, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= +ip-regex@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" + integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== + +ip@^1.1.5: + version "1.1.8" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" + integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== + +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== ipaddr.js@1.9.1: version "1.9.1" @@ -14822,7 +16784,7 @@ ipaddr.js@1.9.1: is-absolute@^0.2.2: version "0.2.6" resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb" - integrity sha1-IN5p89uULvLYe5wto28XIjWxtes= + integrity sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ== dependencies: is-relative "^0.2.1" is-windows "^0.2.0" @@ -14838,7 +16800,7 @@ is-absolute@^1.0.0: is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== dependencies: kind-of "^3.0.2" @@ -14849,15 +16811,18 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-arguments@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" - integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== +is-arguments@^1.0.4, is-arguments@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== is-arrayish@^0.3.1: version "0.3.2" @@ -14869,15 +16834,17 @@ is-base64@^1.1.0: resolved "https://registry.yarnpkg.com/is-base64/-/is-base64-1.1.0.tgz#8ce1d719895030a457c59a7dcaf39b66d99d56b4" integrity sha512-Nlhg7Z2dVC4/PTvIFkgVVNvPHSO2eR/Yd0XzhGiXCXEvWnptXlXa/clQ8aePPiMuxEGcWfzWbGw2Fe3d+Y3v1g== -is-bigint@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4" - integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g== +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q== dependencies: binary-extensions "^1.0.0" @@ -14891,39 +16858,30 @@ is-binary-path@~2.1.0: is-bluebird@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2" - integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI= + integrity sha512-PDRu1vVip5dGQg5tfn2qVCCyxbBYu5MhYUJwSfL/RoGBI97n1fxvilVazxzptZW0gcmsMH17H4EVZZI5E/RSeA== -is-boolean-object@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" - integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M= +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.0.2, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" - integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A== - -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74= - dependencies: - builtin-modules "^1.0.0" - -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" - integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== +is-buffer@^2.0.2, is-buffer@^2.0.5, is-buffer@~2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== is-ci@^1.0.10: version "1.2.1" @@ -14939,24 +16897,17 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-cidr@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-1.0.0.tgz#fb5aacf659255310359da32cae03e40c6a1c2afc" - integrity sha1-+1qs9lklUxA1naMsrgPkDGocKvw= - dependencies: - cidr-regex "1.0.6" - -is-core-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d" - integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw== +is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" + integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== dependencies: has "^1.0.3" is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== dependencies: kind-of "^3.0.2" @@ -14967,10 +16918,12 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= +is-date-object@^1.0.1, is-date-object@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" is-descriptor@^0.1.0: version "0.1.6" @@ -14993,36 +16946,36 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= + integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw== -is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== +is-docker@^2.0.0, is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-dotdir@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-dotdir/-/is-dotdir-0.1.0.tgz#da1e5464f59fc3a83c1d822b5ace091b45fe6b31" - integrity sha1-2h5UZPWfw6g8HYIrWs4JG0X+azE= + integrity sha512-o5DMjqNJBNvA8Irv57+jeEFf/15AP29DCpG157wABj6XjBBzJSJ8NpYsRwNSTkjBc9xw2OVGAMiqmef3EMpMvA== dependencies: dotdir-regex "^0.1.0" is-dotfile@^1.0.0, is-dotfile@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= + integrity sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg== is-equal-shallow@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= + integrity sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA== dependencies: is-primitive "^2.0.0" is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== is-extendable@^1.0.1: version "1.0.1" @@ -15034,36 +16987,34 @@ is-extendable@^1.0.1: is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= + integrity sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww== is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== is-fn@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fn/-/is-fn-1.0.0.tgz#9543d5de7bcf5b08a22ec8a20bae6e286d510d8c" - integrity sha1-lUPV3nvPWwiiLsiiC65uKG1RDYw= + integrity sha512-XoFPJQmsAShb3jEQRfzf2rqXavq7fIqF/jOekp308JlThqrODnMpweVSGilKTCXELfLhltGP2AGgbQGVP8F1dg== is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + integrity 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.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -15076,50 +17027,52 @@ is-function@^1.0.1: integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ== is-generator-fn@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e" - integrity sha512-elzyIdM7iKoFHzcrndIqjYomImhxrFRnGP3galODoII4TB9gI7mZ+FnlLQmmjf27SxHS2gKEeyhX5/+YRS6H9g== + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== is-generator-function@^1.0.7: - version "1.0.8" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b" - integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ== + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" is-glob@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-1.1.3.tgz#b4c64b8303d39114492a460d364ccfb0d3c0a045" - integrity sha1-tMZLgwPTkRRJKkYNNkzPsNPAoEU= + integrity sha512-tKLBgs6hhR6eI0mq8M2b91eUynY27ydu7MbY68IxVE1mlX2r7vbvXJ5qNz/KgDGMXAqMis156hxfvQVh7DcYTA== is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= + integrity sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg== dependencies: is-extglob "^1.0.0" is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= + integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw== dependencies: is-extglob "^2.1.0" is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" is-hex-prefixed@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" - integrity sha1-fY035q135dEnFIkTxXPggtd39VQ= + integrity sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA== is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" - integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA= + integrity sha512-ERNhMg+i/XgDwPIPF3u24qpajVreaiSuvpb1Uu0jugw7KKcxGyCX8cgp8P5fwTmAuXku6beDHHECdKArjlg7tw== dependencies: global-dirs "^0.1.0" is-path-inside "^1.0.0" @@ -15140,35 +17093,47 @@ is-installed-globally@^0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" -is-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" - integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + +is-lower-case@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-1.1.3.tgz#7e147be4768dc466db3bfb21cc60b31e6ad69393" + integrity sha512-+5A1e/WJpLLXZEDlgz4G//WYSHyQBD32qa4Jd3Lw06qQlv3fJHnp3YIHjTQSGzHMgzmVKz2ZP3rBxTHkPw/lxA== + dependencies: + lower-case "^1.1.0" + +is-map@^2.0.1, is-map@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" + integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== is-natural-number@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" - integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= + integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ== is-negated-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" - integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI= - -is-negative-zero@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" - integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug== -is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== +is-negative-zero@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ= + integrity sha512-9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg== is-npm@^4.0.0: version "4.0.0" @@ -15180,22 +17145,24 @@ is-npm@^5.0.0: resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== -is-number-object@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" - integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k= +is-number-object@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + dependencies: + has-tostringtag "^1.0.0" is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= + integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== dependencies: kind-of "^3.0.2" is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== dependencies: kind-of "^3.0.2" @@ -15212,7 +17179,7 @@ is-number@^7.0.0: is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg== is-obj@^2.0.0: version "2.0.0" @@ -15220,21 +17187,14 @@ is-obj@^2.0.0: integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== is-object@^1.0.1, is-object@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" - integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA= - -is-odd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" - integrity sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ== - dependencies: - is-number "^4.0.0" + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" + integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== is-path-inside@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - integrity sha1-jvW33lBDej/cprToZe96pVy0gDY= + integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g== dependencies: path-is-inside "^1.0.1" @@ -15246,9 +17206,9 @@ is-path-inside@^3.0.1, is-path-inside@^3.0.2: is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-plain-obj@^2.1.0: +is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== @@ -15260,17 +17220,15 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-plain-object@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928" - integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg== - dependencies: - isobject "^4.0.0" +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== is-posix-bracket@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= + integrity sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ== is-potential-custom-element-name@^1.0.1: version "1.0.1" @@ -15280,42 +17238,35 @@ is-potential-custom-element-name@^1.0.1: is-primitive@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= + integrity sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q== -is-promise@^2.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= +is-promise@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== -is-property@^1.0.0, is-property@^1.0.2: +is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" - integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= + integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g== is-redirect@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= - -is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== - dependencies: - has-symbols "^1.0.1" + integrity sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw== -is-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== +is-regex@^1.0.4, is-regex@^1.1.1, is-regex@^1.1.4, is-regex@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.1" + has-tostringtag "^1.0.0" is-relative@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" - integrity sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU= + integrity sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw== dependencies: is-unc-path "^0.1.1" @@ -15331,77 +17282,91 @@ is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== -is-set@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" - integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== +is-retry-allowed@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" + integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== -is-ssh@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" - integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg== +is-set@^2.0.1, is-set@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" + integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== + +is-shared-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" + +is-ssh@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2" + integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ== dependencies: - protocols "^1.1.0" + protocols "^2.0.1" is-stream-ended@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda" integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw== -is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0, is-stream@~1.1.0: +is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.4, is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" - integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= + integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw== -is-symbol@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.0" + has-symbols "^1.0.2" -is-text-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636" - integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw== +is-text-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" + integrity sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w== dependencies: - text-extensions "^2.0.0" + text-extensions "^1.0.0" -is-typed-array@^1.1.3: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e" - integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug== +is-typed-array@^1.1.3, is-typed-array@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67" + integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A== dependencies: - available-typed-arrays "^1.0.2" + available-typed-arrays "^1.0.5" call-bind "^1.0.2" - es-abstract "^1.18.0-next.2" - foreach "^2.0.5" - has-symbols "^1.0.1" + es-abstract "^1.20.0" + for-each "^0.3.3" + has-tostringtag "^1.0.0" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== is-unc-path@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9" - integrity sha1-arBTpyVzwQJQ/0FqOBTDUXivObk= + integrity sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w== dependencies: unc-path-regex "^0.1.0" @@ -15412,7 +17377,19 @@ is-unc-path@^1.0.0: dependencies: unc-path-regex "^0.1.2" -is-url@^1.2.2: +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + +is-upper-case@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-1.1.2.tgz#8d0b1fa7e7933a1e58483600ec7d9661cbaf756f" + integrity sha512-GQYSJMgfeAmVwh9ixyk888l7OIhNAGKtY6QA+IrWlu9MDTCaXmeozOZ2S9Knj7bQwBO/H6J2kb+pbyTUiMNbsw== + dependencies: + upper-case "^1.1.0" + +is-url@^1.2.2, is-url@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== @@ -15420,39 +17397,44 @@ is-url@^1.2.2: is-utf8@^0.2.0, is-utf8@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= - -is-valid-glob@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" - integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4= + integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== is-valid-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" - integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= + integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA== is-weakmap@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== +is-weakref@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + is-weakset@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" - integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" + integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" is-windows@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.1.1.tgz#be310715431cfabccc54ab3951210fa0b6d01abe" - integrity sha1-vjEHFUMc+rzMVKs5USEPoLbQGr4= + integrity sha512-3wf9CiLayWrH2O5E99jdTwVZyZwVckl+Gz4CkAtjssBPkawQBoPWDEyAHmwZnODQxqYduCBrlGfKQfvE/Mxh+A== is-windows@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" - integrity sha1-3hqm1j6indJIc3tp8f+LgALSEIw= + integrity sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q== -is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2: +is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== @@ -15460,7 +17442,7 @@ is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2: is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= + integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw== is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" @@ -15474,26 +17456,26 @@ is-yarn-global@^0.3.0: resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== -is2@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.1.tgz#8ac355644840921ce435d94f05d3a94634d3481a" - integrity sha512-+WaJvnaA7aJySz2q/8sLjMb2Mw14KTplHmSwcSpZ/fWJPkUmqw3YTzSWbPJ7OAwRvdYTWF2Wg+yYJ1AdP5Z8CA== +is2@^2.0.6: + version "2.0.7" + resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.7.tgz#d084e10cab3bd45d6c9dfde7a48599fcbb93fcac" + integrity sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA== dependencies: deep-is "^0.1.3" - ip-regex "^2.1.0" - is-url "^1.2.2" + ip-regex "^4.1.0" + is-url "^1.2.4" isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -isarray@^2.0.1, isarray@^2.0.5: +isarray@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== @@ -15501,49 +17483,49 @@ isarray@^2.0.1, isarray@^2.0.5: isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== isobject@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/isobject/-/isobject-1.0.2.tgz#f0f9b8ce92dd540fa0740882e3835a2e022ec78a" - integrity sha1-8Pm4zpLdVA+gdAiC44NaLgIux4o= + integrity sha512-WQQgFoML/sLgmhu9zTekYHZUJaPoa/fpVMQ8oxIuOvppzs70DxxyHZdAIjwcuuNDOVtNYsahhqtBbUvKwhRcGw== isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== dependencies: isarray "1.0.0" isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -isobject@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" - integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.0, isomorphic-fetch@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" - integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= + integrity sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA== dependencies: node-fetch "^1.0.1" whatwg-fetch ">=0.10.0" +isomorphic-ws@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" + integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== + isstream@0.1.x, isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== +istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== -istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: +istanbul-lib-instrument@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== @@ -15553,6 +17535,17 @@ istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: istanbul-lib-coverage "^3.0.0" semver "^6.3.0" +istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f" + integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A== + dependencies: + "@babel/core" "^7.12.3" + "@babel/parser" "^7.14.7" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.2.0" + semver "^6.3.0" + istanbul-lib-report@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" @@ -15563,18 +17556,18 @@ istanbul-lib-report@^3.0.0: supports-color "^7.1.0" istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + version "4.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" + integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== dependencies: debug "^4.1.1" istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" - integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== +istanbul-reports@^3.0.2, istanbul-reports@^3.1.3: + version "3.1.5" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" + integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -15582,7 +17575,7 @@ istanbul-reports@^3.0.2: istanbul@^0.4.5: version "0.4.5" resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b" - integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs= + integrity sha512-nMtdn4hvK0HjUlzr1DrKSUY8ychprt8dzHOgY2KXsIhHu5PuQQEOTM27gV9Xblyon7aUH/TSFIjRHEODF/FRPg== dependencies: abbrev "1.0.x" async "1.x" @@ -15607,17 +17600,24 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" +iter-tools@^7.0.2: + version "7.5.0" + resolved "https://registry.yarnpkg.com/iter-tools/-/iter-tools-7.5.0.tgz#061240dcac13668e66bb787b0fcd407a58ea39ab" + integrity sha512-L0p/RG3Hwk1urilryDKqU8pQ1t5AaaMc7CHmiwJD/uh63Lv7VyjNng/esstf+Tct1587IpetpcDFdufz8sG+sQ== + dependencies: + "@babel/runtime" "^7.12.1" + iterall@^1.2.2: version "1.3.0" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== iterate-iterator@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6" - integrity sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw== + version "1.0.2" + resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.2.tgz#551b804c9eaa15b847ea6a7cdc2f5bf1ec150f91" + integrity sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw== -iterate-value@^1.0.0: +iterate-value@^1.0.0, iterate-value@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.2.tgz#935115bd37d006a52046535ebc8d07e9c9337f57" integrity sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ== @@ -15628,7 +17628,7 @@ iterate-value@^1.0.0: j6@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/j6/-/j6-1.0.2.tgz#48088acb1c66f610baf2e50b4028d0932f35ed89" - integrity sha1-SAiKyxxm9hC68uULQCjQky817Yk= + integrity sha512-pKADWYWaJu2traMItqvGo9XUF7/FKUO0SaI7b7ddvsqKhHIsw6Y/CTUvhc0MBSt9M3Q8/ywvQc0+KYqxLJcMnw== dependencies: algebrite "^0.2.23" jStat "^1.5.2" @@ -15636,22 +17636,22 @@ j6@^1.0.2: numeric "^1.2.6" jStat@^1.5.2: - version "1.7.1" - resolved "https://registry.yarnpkg.com/jStat/-/jStat-1.7.1.tgz#e636dd87d72b305c060dfcc901de1732d15130c1" - integrity sha512-toueem/U5hyHM6pqe6OZOL/5P8MrY7Ss1K8Brg+TcfX+RAjDU/sbwy72fwzmLPQ5ykdBe1UEoWQHc7OSNWMUDQ== + version "1.8.6" + resolved "https://registry.yarnpkg.com/jStat/-/jStat-1.8.6.tgz#ab4d465b21f583d37a72ab2f97a300492da7575d" + integrity sha512-Oh/ePZVSoFigme69pHTQudcGh64cpNH9Lz3hBZcRJWLrDqpw7JfuYU9F3dj9py3tBYmHz7og7ZT8hXTNbYq9Rw== -java-parser@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/java-parser/-/java-parser-0.6.0.tgz#1d46762de98a66e453702e0eaba6c18b6bcd588e" - integrity sha512-oqazDAfGVrraBu/vMTboXPv1ZDeXYSJ1AdLGxR/BTRU6F2Va1HsV2WD41RhZJ0f0SOtFwzPrEuGoiNq+ZPTWQw== +java-parser@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/java-parser/-/java-parser-2.0.2.tgz#488160fbf4fd1351880134f9af832537f2124995" + integrity sha512-fwv1eDYE4OIAN+XS7cD8aB7UdQyAh3Uz36ydWqemvnDKXEdLbxq7qIbvsjpSvS1NHFR+r81N7AjGcpnamjVxJw== dependencies: chevrotain "6.5.0" - lodash "4.17.15" + lodash "4.17.21" -javascript-natural-sort@^0.7.1: +javascript-natural-sort@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" - integrity sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k= + integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== jest-changed-files@^26.6.2: version "26.6.2" @@ -15662,32 +17662,38 @@ jest-changed-files@^26.6.2: execa "^4.0.0" throat "^5.0.0" -jest-circus@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.6.3.tgz#3cc7ef2a6a3787e5d7bfbe2c72d83262154053e7" - integrity sha512-ACrpWZGcQMpbv13XbzRzpytEJlilP/Su0JtNCi5r/xLpOUhnaIJr8leYYpLEMgPFURZISEHrnnpmB54Q/UziPw== +jest-changed-files@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.0.0.tgz#aa238eae42d9372a413dd9a8dadc91ca1806dce0" + integrity sha512-28/iDMDrUpGoCitTURuDqUzWQoWmOmOKOFST1mi2lwh62X4BFf6khgH3uSuo1e49X/UDjuApAj3w0wLOex4VPQ== dependencies: - "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.6.2" - "@jest/test-result" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/babel__traverse" "^7.0.4" + execa "^5.0.0" + p-limit "^3.1.0" + +jest-circus@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.0.2.tgz#7dda94888a8d47edb58e85a8e5f688f9da6657a3" + integrity sha512-YTPEsoE1P1X0bcyDQi3QIkpt2Wl9om9k2DQRuLFdS5x8VvAKSdYAVJufgvudhnKgM8WHvvAzhBE+1DRQB8x1CQ== + dependencies: + "@jest/environment" "^29.0.2" + "@jest/expect" "^29.0.2" + "@jest/test-result" "^29.0.2" + "@jest/types" "^29.0.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^26.6.2" is-generator-fn "^2.0.0" - jest-each "^26.6.2" - jest-matcher-utils "^26.6.2" - jest-message-util "^26.6.2" - jest-runner "^26.6.3" - jest-runtime "^26.6.3" - jest-snapshot "^26.6.2" - jest-util "^26.6.2" - pretty-format "^26.6.2" - stack-utils "^2.0.2" - throat "^5.0.0" + jest-each "^29.0.2" + jest-matcher-utils "^29.0.2" + jest-message-util "^29.0.2" + jest-runtime "^29.0.2" + jest-snapshot "^29.0.2" + jest-util "^29.0.2" + p-limit "^3.1.0" + pretty-format "^29.0.2" + slash "^3.0.0" + stack-utils "^2.0.3" jest-cli@^26.6.3: version "26.6.3" @@ -15708,6 +17714,24 @@ jest-cli@^26.6.3: prompts "^2.0.1" yargs "^15.4.1" +jest-cli@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.0.2.tgz#adf341ee3a4fd6ad1f23e3c0eb4e466847407021" + integrity sha512-tlf8b+4KcUbBGr25cywIi3+rbZ4+G+SiG8SvY552m9sRZbXPafdmQRyeVE/C/R8K+TiBAMrTIUmV2SlStRJ40g== + dependencies: + "@jest/core" "^29.0.2" + "@jest/test-result" "^29.0.2" + "@jest/types" "^29.0.2" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.9" + import-local "^3.0.2" + jest-config "^29.0.2" + jest-util "^29.0.2" + jest-validate "^29.0.2" + prompts "^2.0.1" + yargs "^17.3.1" + jest-config@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" @@ -15732,7 +17756,35 @@ jest-config@^26.6.3: micromatch "^4.0.2" pretty-format "^26.6.2" -jest-diff@^26.0.0, jest-diff@^26.6.2: +jest-config@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.0.2.tgz#0ce168e1f74ca46c27285a7182ecb06c2d8ce7d9" + integrity sha512-RU4gzeUNZAFktYVzDGimDxeYoaiTnH100jkYYZgldqFamaZukF0IqmFx8+QrzVeEWccYg10EEJT3ox1Dq5b74w== + dependencies: + "@babel/core" "^7.11.6" + "@jest/test-sequencer" "^29.0.2" + "@jest/types" "^29.0.2" + babel-jest "^29.0.2" + chalk "^4.0.0" + ci-info "^3.2.0" + deepmerge "^4.2.2" + glob "^7.1.3" + graceful-fs "^4.2.9" + jest-circus "^29.0.2" + jest-environment-node "^29.0.2" + jest-get-type "^29.0.0" + jest-regex-util "^29.0.0" + jest-resolve "^29.0.2" + jest-runner "^29.0.2" + jest-util "^29.0.2" + jest-validate "^29.0.2" + micromatch "^4.0.4" + parse-json "^5.2.0" + pretty-format "^29.0.2" + slash "^3.0.0" + strip-json-comments "^3.1.1" + +jest-diff@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== @@ -15742,6 +17794,26 @@ jest-diff@^26.0.0, jest-diff@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" +jest-diff@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.0.2.tgz#1a99419efda66f9ee72f91e580e774df95de5ddc" + integrity sha512-b9l9970sa1rMXH1owp2Woprmy42qIwwll/htsw4Gf7+WuSp5bZxNhkKHDuCGKL+HoHn1KhcC+tNEeAPYBkD2Jg== + dependencies: + chalk "^4.0.0" + diff-sequences "^29.0.0" + jest-get-type "^29.0.0" + pretty-format "^29.0.2" + +jest-diff@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.1.2.tgz#bb7aaf5353227d6f4f96c5e7e8713ce576a607dc" + integrity sha512-4GQts0aUopVvecIT4IwD/7xsBaMhKTYoM4/njE/aVw9wpw+pIUVp8Vab/KnSzSilr84GnLBkaP3JLDnQYCKqVQ== + dependencies: + chalk "^4.0.0" + diff-sequences "^29.0.0" + jest-get-type "^29.0.0" + pretty-format "^29.1.2" + jest-docblock@^26.0.0: version "26.0.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" @@ -15749,6 +17821,13 @@ jest-docblock@^26.0.0: dependencies: detect-newline "^3.0.0" +jest-docblock@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.0.0.tgz#3151bcc45ed7f5a8af4884dcc049aee699b4ceae" + integrity sha512-s5Kpra/kLzbqu9dEjov30kj1n4tfu3e7Pl8v+f8jOkeWNqM6Ds8jRaJfZow3ducoQUrf2Z4rs2N5S3zXnb83gw== + dependencies: + detect-newline "^3.0.0" + jest-each@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" @@ -15760,7 +17839,18 @@ jest-each@^26.6.2: jest-util "^26.6.2" pretty-format "^26.6.2" -jest-environment-jsdom@^26.0.1, jest-environment-jsdom@^26.6.2: +jest-each@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.0.2.tgz#f98375a79a37761137e11d458502dfe1f00ba5b0" + integrity sha512-+sA9YjrJl35iCg0W0VCrgCVj+wGhDrrKQ+YAqJ/DHBC4gcDFAeePtRRhpJnX9gvOZ63G7gt52pwp2PesuSEx0Q== + dependencies: + "@jest/types" "^29.0.2" + chalk "^4.0.0" + jest-get-type "^29.0.0" + jest-util "^29.0.2" + pretty-format "^29.0.2" + +jest-environment-jsdom@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== @@ -15785,6 +17875,18 @@ jest-environment-node@^26.6.2: jest-mock "^26.6.2" jest-util "^26.6.2" +jest-environment-node@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.0.2.tgz#8196268c9f740f1d2e7ecccf212b4c1c5b0167e4" + integrity sha512-4Fv8GXVCToRlMzDO94gvA8iOzKxQ7rhAbs8L+j8GPyTxGuUiYkV+63LecGeVdVhsL2KXih1sKnoqmH6tp89J7Q== + dependencies: + "@jest/environment" "^29.0.2" + "@jest/fake-timers" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/node" "*" + jest-mock "^29.0.2" + jest-util "^29.0.2" + jest-get-type@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" @@ -15795,6 +17897,11 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== +jest-get-type@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.0.0.tgz#843f6c50a1b778f7325df1129a0fd7aa713aef80" + integrity sha512-83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw== + jest-haste-map@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d" @@ -15835,6 +17942,44 @@ jest-haste-map@^26.6.2: optionalDependencies: fsevents "^2.1.2" +jest-haste-map@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.0.2.tgz#cac403a595e6e43982c9776b5c4dae63e38b22c5" + integrity sha512-SOorh2ysQ0fe8gsF4gaUDhoMIWAvi2hXOkwThEO48qT3JqA8GLAUieQcIvdSEd6M0scRDe1PVmKc5tXR3Z0U0A== + dependencies: + "@jest/types" "^29.0.2" + "@types/graceful-fs" "^4.1.3" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.9" + jest-regex-util "^29.0.0" + jest-util "^29.0.2" + jest-worker "^29.0.2" + micromatch "^4.0.4" + walker "^1.0.8" + optionalDependencies: + fsevents "^2.3.2" + +jest-haste-map@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.1.2.tgz#93f3634aa921b6b654e7c94137b24e02e7ca6ac9" + integrity sha512-xSjbY8/BF11Jh3hGSPfYTa/qBFrm3TPM7WU8pU93m2gqzORVLkHFWvuZmFsTEBPRKndfewXhMOuzJNHyJIZGsw== + dependencies: + "@jest/types" "^29.1.2" + "@types/graceful-fs" "^4.1.3" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.9" + jest-regex-util "^29.0.0" + jest-util "^29.1.2" + jest-worker "^29.1.2" + micromatch "^4.0.4" + walker "^1.0.8" + optionalDependencies: + fsevents "^2.3.2" + jest-jasmine2@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" @@ -15859,15 +18004,14 @@ jest-jasmine2@^26.6.3: pretty-format "^26.6.2" throat "^5.0.0" -jest-junit@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-10.0.0.tgz#c94b91c24920a327c9d2a075e897b2dba4af494b" - integrity sha512-dbOVRyxHprdSpwSAR9/YshLwmnwf+RSl5hf0kCGlhAcEeZY9aRqo4oNmaT0tLC16Zy9D0zekDjWkjHGjXlglaQ== +jest-junit@^14.0.1: + version "14.0.1" + resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-14.0.1.tgz#5b357d6f5d333459585d628a24cd48b5bbc92ba2" + integrity sha512-h7/wwzPbllgpQhhVcRzRC76/cc89GlazThoV1fDxcALkf26IIlRsu/AcTG64f4nR2WPE3Cbd+i/sVf+NCUHrWQ== dependencies: - jest-validate "^24.9.0" - mkdirp "^0.5.1" - strip-ansi "^5.2.0" - uuid "^3.3.3" + mkdirp "^1.0.4" + strip-ansi "^6.0.1" + uuid "^8.3.2" xml "^1.0.1" jest-leak-detector@^26.6.2: @@ -15878,6 +18022,14 @@ jest-leak-detector@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" +jest-leak-detector@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.0.2.tgz#f88fd08e352b5fad3d33e48ecab39e97077ed8a8" + integrity sha512-5f0493qDeAxjUldkBSQg5D1cLadRgZVyWpTQvfJeQwQUpHQInE21AyVHVv64M7P2Ue8Z5EZ4BAcoDS/dSPPgMw== + dependencies: + jest-get-type "^29.0.0" + pretty-format "^29.0.2" + jest-matcher-utils@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" @@ -15888,6 +18040,26 @@ jest-matcher-utils@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" +jest-matcher-utils@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.0.2.tgz#0ffdcaec340a9810caee6c73ff90fb029b446e10" + integrity sha512-s62YkHFBfAx0JLA2QX1BlnCRFwHRobwAv2KP1+YhjzF6ZCbCVrf1sG8UJyn62ZUsDaQKpoo86XMTjkUyO5aWmQ== + dependencies: + chalk "^4.0.0" + jest-diff "^29.0.2" + jest-get-type "^29.0.0" + pretty-format "^29.0.2" + +jest-matcher-utils@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.1.2.tgz#e68c4bcc0266e70aa1a5c13fb7b8cd4695e318a1" + integrity sha512-MV5XrD3qYSW2zZSHRRceFzqJ39B2z11Qv0KPyZYxnzDHFeYZGJlgGi0SW+IXSJfOewgJp/Km/7lpcFT+cgZypw== + dependencies: + chalk "^4.0.0" + jest-diff "^29.1.2" + jest-get-type "^29.0.0" + pretty-format "^29.1.2" + jest-message-util@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" @@ -15917,6 +18089,36 @@ jest-message-util@^26.6.2: slash "^3.0.0" stack-utils "^2.0.2" +jest-message-util@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.0.2.tgz#b2781dfb6a2d1c63830d9684c5148ae3155c6154" + integrity sha512-kcJAgms3ckJV0wUoLsAM40xAhY+pb9FVSZwicjFU9PFkaTNmqh9xd99/CzKse48wPM1ANUQKmp03/DpkY+lGrA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^29.0.2" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^29.0.2" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-message-util@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.1.2.tgz#c21a33c25f9dc1ebfcd0f921d89438847a09a501" + integrity sha512-9oJ2Os+Qh6IlxLpmvshVbGUiSkZVc2FK+uGOm6tghafnB2RyjKAxMZhtxThRMxfX1J1SOMhTn9oK3/MutRWQJQ== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^29.1.2" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^29.1.2" + slash "^3.0.0" + stack-utils "^2.0.3" + jest-mock@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6" @@ -15932,6 +18134,14 @@ jest-mock@^26.6.2: "@jest/types" "^26.6.2" "@types/node" "*" +jest-mock@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.0.2.tgz#d7810966a6338aca6a440c3cd9f19276477840ad" + integrity sha512-giWXOIT23UCxHCN2VUfUJ0Q7SmiqQwfSFXlCaIhW5anITpNQ+3vuLPQdKt5wkuwM37GrbFyHIClce8AAK9ft9g== + dependencies: + "@jest/types" "^29.0.2" + "@types/node" "*" + jest-pnp-resolver@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" @@ -15942,6 +18152,11 @@ jest-regex-util@^26.0.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== +jest-regex-util@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.0.0.tgz#b442987f688289df8eb6c16fa8df488b4cd007de" + integrity sha512-BV7VW7Sy0fInHWN93MMPtlClweYv2qrSCwfeFWmpribGZtQPWNvRSq9XOVgOEjU1iBGRKXUZil0o2AH7Iy9Lug== + jest-resolve-dependencies@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" @@ -15951,6 +18166,14 @@ jest-resolve-dependencies@^26.6.3: jest-regex-util "^26.0.0" jest-snapshot "^26.6.2" +jest-resolve-dependencies@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.0.2.tgz#2d30199ed0059ff97712f4fa6320c590bfcd2061" + integrity sha512-fSAu6eIG7wtGdnPJUkVVdILGzYAP9Dj/4+zvC8BrGe8msaUMJ9JeygU0Hf9+Uor6/icbuuzQn5See1uajLnAqg== + dependencies: + jest-regex-util "^29.0.0" + jest-snapshot "^29.0.2" + jest-resolve@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" @@ -15965,6 +18188,21 @@ jest-resolve@^26.6.2: resolve "^1.18.1" slash "^3.0.0" +jest-resolve@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.0.2.tgz#dd097e1c8020fbed4a8c1e1889ccb56022288697" + integrity sha512-V3uLjSA+EHxLtjIDKTBXnY71hyx+8lusCqPXvqzkFO1uCGvVpjBfuOyp+KOLBNSuY61kM2jhepiMwt4eiJS+Vw== + dependencies: + chalk "^4.0.0" + graceful-fs "^4.2.9" + jest-haste-map "^29.0.2" + jest-pnp-resolver "^1.2.2" + jest-util "^29.0.2" + jest-validate "^29.0.2" + resolve "^1.20.0" + resolve.exports "^1.1.0" + slash "^3.0.0" + jest-runner@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" @@ -15991,6 +18229,33 @@ jest-runner@^26.6.3: source-map-support "^0.5.6" throat "^5.0.0" +jest-runner@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.0.2.tgz#64e4e6c88f74387307687b73a4688f93369d8d99" + integrity sha512-+D82iPZejI8t+SfduOO1deahC/QgLFf8aJBO++Znz3l2ETtOMdM7K4ATsGWzCFnTGio5yHaRifg1Su5Ybza5Nw== + dependencies: + "@jest/console" "^29.0.2" + "@jest/environment" "^29.0.2" + "@jest/test-result" "^29.0.2" + "@jest/transform" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.10.2" + graceful-fs "^4.2.9" + jest-docblock "^29.0.0" + jest-environment-node "^29.0.2" + jest-haste-map "^29.0.2" + jest-leak-detector "^29.0.2" + jest-message-util "^29.0.2" + jest-resolve "^29.0.2" + jest-runtime "^29.0.2" + jest-util "^29.0.2" + jest-watcher "^29.0.2" + jest-worker "^29.0.2" + p-limit "^3.1.0" + source-map-support "0.5.13" + jest-runtime@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" @@ -16024,6 +18289,34 @@ jest-runtime@^26.6.3: strip-bom "^4.0.0" yargs "^15.4.1" +jest-runtime@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.0.2.tgz#dc3de788b8d75af346ae163d59c585027a9d809c" + integrity sha512-DO6F81LX4okOgjJLkLySv10E5YcV5NHUbY1ZqAUtofxdQE+q4hjH0P2gNsY8x3z3sqgw7O/+919SU4r18Fcuig== + dependencies: + "@jest/environment" "^29.0.2" + "@jest/fake-timers" "^29.0.2" + "@jest/globals" "^29.0.2" + "@jest/source-map" "^29.0.0" + "@jest/test-result" "^29.0.2" + "@jest/transform" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/node" "*" + chalk "^4.0.0" + cjs-module-lexer "^1.0.0" + collect-v8-coverage "^1.0.0" + glob "^7.1.3" + graceful-fs "^4.2.9" + jest-haste-map "^29.0.2" + jest-message-util "^29.0.2" + jest-mock "^29.0.2" + jest-regex-util "^29.0.0" + jest-resolve "^29.0.2" + jest-snapshot "^29.0.2" + jest-util "^29.0.2" + slash "^3.0.0" + strip-bom "^4.0.0" + jest-serializer@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" @@ -16037,7 +18330,7 @@ jest-serializer@^26.6.2: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^26.1.0, jest-snapshot@^26.6.2: +jest-snapshot@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== @@ -16059,6 +18352,36 @@ jest-snapshot@^26.1.0, jest-snapshot@^26.6.2: pretty-format "^26.6.2" semver "^7.3.2" +jest-snapshot@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.0.2.tgz#5017d54db8369f01900d11e179513fa5839fb5ac" + integrity sha512-26C4PzGKaX5gkoKg8UzYGVy2HPVcTaROSkf0gwnHu3lGeTB7bAIJBovvVPZoiJ20IximJELQs/r8WSDRCuGX2A== + dependencies: + "@babel/core" "^7.11.6" + "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-jsx" "^7.7.2" + "@babel/plugin-syntax-typescript" "^7.7.2" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^29.0.2" + "@jest/transform" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/babel__traverse" "^7.0.6" + "@types/prettier" "^2.1.5" + babel-preset-current-node-syntax "^1.0.0" + chalk "^4.0.0" + expect "^29.0.2" + graceful-fs "^4.2.9" + jest-diff "^29.0.2" + jest-get-type "^29.0.0" + jest-haste-map "^29.0.2" + jest-matcher-utils "^29.0.2" + jest-message-util "^29.0.2" + jest-util "^29.0.2" + natural-compare "^1.4.0" + pretty-format "^29.0.2" + semver "^7.3.5" + jest-util@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162" @@ -16077,7 +18400,7 @@ jest-util@^24.9.0: slash "^2.0.0" source-map "^0.6.0" -jest-util@^26.1.0, jest-util@^26.6.2: +jest-util@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== @@ -16089,6 +18412,42 @@ jest-util@^26.1.0, jest-util@^26.6.2: is-ci "^2.0.0" micromatch "^4.0.2" +jest-util@^29.0.0: + version "29.0.3" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.0.3.tgz#06d1d77f9a1bea380f121897d78695902959fbc0" + integrity sha512-Q0xaG3YRG8QiTC4R6fHjHQPaPpz9pJBEi0AeOE4mQh/FuWOijFjGXMMOfQEaU9i3z76cNR7FobZZUQnL6IyfdQ== + dependencies: + "@jest/types" "^29.0.3" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-util@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.0.2.tgz#c75c5cab7f3b410782f9570a60c5558b5dfb6e3a" + integrity sha512-ozk8ruEEEACxqpz0hN9UOgtPZS0aN+NffwQduR5dVlhN+eN47vxurtvgZkYZYMpYrsmlAEx1XabkB3BnN0GfKQ== + dependencies: + "@jest/types" "^29.0.2" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-util@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.1.2.tgz#ac5798e93cb6a6703084e194cfa0898d66126df1" + integrity sha512-vPCk9F353i0Ymx3WQq3+a4lZ07NXu9Ca8wya6o4Fe4/aO1e1awMMprZ3woPFpKwghEOW+UXgd15vVotuNN9ONQ== + dependencies: + "@jest/types" "^29.1.2" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + jest-validate@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab" @@ -16113,6 +18472,18 @@ jest-validate@^26.6.2: leven "^3.1.0" pretty-format "^26.6.2" +jest-validate@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.0.2.tgz#ad86e157cc1735a3a3ea88995a611ebf8544bd67" + integrity sha512-AeRKm7cEucSy7tr54r3LhiGIXYvOILUwBM1S7jQkKs6YelwAlWKsmZGVrQR7uwsd31rBTnR5NQkODi1Z+6TKIQ== + dependencies: + "@jest/types" "^29.0.2" + camelcase "^6.2.0" + chalk "^4.0.0" + jest-get-type "^29.0.0" + leven "^3.1.0" + pretty-format "^29.0.2" + jest-watcher@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" @@ -16126,6 +18497,20 @@ jest-watcher@^26.6.2: jest-util "^26.6.2" string-length "^4.0.1" +jest-watcher@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.0.2.tgz#093c044e0d7462e691ec64ca6d977014272c9bca" + integrity sha512-ds2bV0oyUdYoyrUTv4Ga5uptz4cEvmmP/JzqDyzZZanvrIn8ipxg5l3SDOAIiyuAx1VdHd2FBzeXPFO5KPH8vQ== + dependencies: + "@jest/test-result" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + emittery "^0.10.2" + jest-util "^29.0.2" + string-length "^4.0.1" + jest-worker@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" @@ -16143,34 +18528,63 @@ jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" +jest-worker@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.0.2.tgz#46c9f2cb9a19663d22babbacf998e4b5d7c46574" + integrity sha512-EyvBlYcvd2pg28yg5A3OODQnqK9LI1kitnGUZUG5/NYIeaRgewtYBKB5wlr7oXj8zPCkzev7EmnTCsrXK7V+Xw== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest-worker@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.1.2.tgz#a68302af61bce82b42a9a57285ca7499d29b2afc" + integrity sha512-AdTZJxKjTSPHbXT/AIOjQVmoFx0LHFcVabWu0sxI7PAy7rFf8c0upyvgBKgguVXdM4vY74JdwkyD4hSmpTW8jA== + dependencies: + "@types/node" "*" + jest-util "^29.1.2" + merge-stream "^2.0.0" + supports-color "^8.0.0" + jest@26.6.3, jest@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== dependencies: - "@jest/core" "^26.6.3" + "@jest/core" "^26.6.3" + import-local "^3.0.2" + jest-cli "^26.6.3" + +jest@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.0.2.tgz#16e20003dbf8fb9ed7e6ab801579a77084e13fba" + integrity sha512-enziNbNUmXTcTaTP/Uq5rV91r0Yqy2UKzLUIabxMpGm9YHz8qpbJhiRnNVNvm6vzWfzt/0o97NEHH8/3udoClA== + dependencies: + "@jest/core" "^29.0.2" + "@jest/types" "^29.0.2" import-local "^3.0.2" - jest-cli "^26.6.3" + jest-cli "^29.0.2" jetifier@^1.6.2: - version "1.6.6" - resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.6.tgz#fec8bff76121444c12dc38d2dad6767c421dab68" - integrity sha512-JNAkmPeB/GS2tCRqUzRPsTOHpGDah7xP18vGJfIjZC+W2sxEHbxgJxetIjIqhjQ3yYbYNEELkM/spKLtwoOSUQ== + version "1.6.8" + resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.8.tgz#e88068697875cbda98c32472902c4d3756247798" + integrity sha512-3Zi16h6L5tXDRQJTb221cnRoVG9/9OvreLdLU2/ZjRv/GILL+2Cemt0IKvkowwkDpvouAU1DQPOJ7qaiHeIdrw== jju@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa" - integrity sha1-2t2e8BkkvHKLA/L3l5vb1i96Kqo= + version "1.4.0" + resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" + integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA== -jmespath@0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" - integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= +jmespath@0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" + integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== join-path@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/join-path/-/join-path-1.1.1.tgz#10535a126d24cbd65f7ffcdf15ef2e631076b505" - integrity sha1-EFNaEm0ky9Zff/zfFe8uYxB2tQU= + integrity sha512-jnt9OC34sLXMLJ6YfPQ2ZEKrR9mB5ZbSnQb4LPaOx1c5rTzxpR33L18jjp0r75mGGTJmsil3qwN1B5IBeTnSSA== dependencies: as-array "^2.0.0" url-join "0.0.1" @@ -16183,32 +18597,31 @@ jose@^2.0.5: dependencies: "@panva/asn1.js" "^1.0.0" +jose@^4.8.0: + version "4.9.2" + resolved "https://registry.yarnpkg.com/jose/-/jose-4.9.2.tgz#268994df4443b9c191de0b001c2e3796ac6cf368" + integrity sha512-EqKvu2PqJCD3Jrg3PvcYZVS7D21qMVLSYMDAFcOdGUEOpJSLNtJO7NjLANvu3SYHVl6pdP2ff7ve6EZW2nX7Nw== + js-beautify@^1.8.8: - version "1.10.2" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.2.tgz#88c9099cd6559402b124cfab18754936f8a7b178" - integrity sha512-ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ== + version "1.14.6" + resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz#b23ca5d74a462c282c7711bb51150bcc97f2b507" + integrity sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw== dependencies: - config-chain "^1.1.12" + config-chain "^1.1.13" editorconfig "^0.15.3" - glob "^7.1.3" - mkdirp "~0.5.1" - nopt "~4.0.1" + glob "^8.0.3" + nopt "^6.0.0" js-sha3@0.5.7, js-sha3@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" - integrity sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc= + integrity sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g== js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q== -js-sha3@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.6.1.tgz#5b89f77a7477679877f58c4a075240934b1f95c0" - integrity sha1-W4n3enR3Z5h39YxKB1JAk0sflcA= - js-sha3@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.7.0.tgz#0a5c57b36f79882573b2d84051f8bb85dd1bd63a" @@ -16222,9 +18635,9 @@ js-sha3@^0.7.0: js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= + integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== -js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^4.1.0: +js-yaml@3.13.1: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -16232,15 +18645,30 @@ js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1, argparse "^1.0.7" esprima "^4.0.0" +js-yaml@3.14.1, js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@4.1.0, js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbi@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.3.tgz#f024b340032f7c7caaa6ca4b32b55e8d33f6e897" - integrity sha512-nBJqA0C6Qns+ZxurbEoIR56wyjiUszpNy70FHvxO5ervMoCbZVE3z3kxr5nKGhlxr/9MhKTSUBs7cAwwuf3g9w== + version "3.2.5" + resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.2.5.tgz#b37bb90e0e5c2814c1c2a1bcd8c729888a2e37d6" + integrity sha512-aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ== jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== jsc-android@^245459.0.0: version "245459.0.0" @@ -16283,19 +18711,26 @@ jsdom@^16.4.0: jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= + integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== jsesc@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe" - integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4= + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== + +json-bigint@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-0.3.1.tgz#0c1729d679f580d550899d6a2226c228564afe60" + integrity sha512-DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ== + dependencies: + bignumber.js "^9.0.0" -json-bigint@^0.3.0, json-bigint@^1.0.0: +json-bigint@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1" integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ== @@ -16305,20 +18740,37 @@ json-bigint@^0.3.0, json-bigint@^1.0.0: json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== + +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-parse-helpfulerror@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc" - integrity sha1-E/FM4C7tTpgSl7ZOueO5MuLdE9w= + integrity sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg== dependencies: jju "^1.1.0" +json-pointer@^0.6.1: + version "0.6.2" + resolved "https://registry.yarnpkg.com/json-pointer/-/json-pointer-0.6.2.tgz#f97bd7550be5e9ea901f8c9264c9d436a22a93cd" + integrity sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw== + dependencies: + foreach "^2.0.4" + json-ptr@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json-ptr/-/json-ptr-2.2.0.tgz#a4de4ed638cb23ae4cd4b51f8bf972a1c2293f1e" @@ -16338,27 +18790,33 @@ json-rpc-engine@^3.4.0, json-rpc-engine@^3.6.0: promise-to-callback "^1.0.0" safe-event-emitter "^1.0.1" -json-rpc-engine@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.1.3.tgz#d7410b649e107ed3437db33797f44c51d507002c" - integrity sha512-/rQm6uts6JtjOVEaeSDCJgHDTlbfKDdoR1Uh3f+6za2SwhJyz+jL9iED2aapU9Yx7decLlI7wjVUIwxRg/R7WQ== +json-rpc-engine@^5.1.3, json-rpc-engine@^5.3.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.4.0.tgz#75758609d849e1dba1e09021ae473f3ab63161e5" + integrity sha512-rAffKbPoNDjuRnXkecTjnsE3xLLrb00rEkdgalINhaYVYIxDwWtvYBr9UFbhTvPB1B2qUOLoFd/cV6f4Q7mh7g== dependencies: - async "^2.0.1" - eth-json-rpc-errors "^1.0.1" - promise-to-callback "^1.0.0" + eth-rpc-errors "^3.0.0" safe-event-emitter "^1.0.1" +json-rpc-engine@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-6.1.0.tgz#bf5ff7d029e1c1bf20cb6c0e9f348dcd8be5a393" + integrity sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ== + dependencies: + "@metamask/safe-event-emitter" "^2.0.0" + eth-rpc-errors "^4.0.2" + json-rpc-error@2.0.0, json-rpc-error@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/json-rpc-error/-/json-rpc-error-2.0.0.tgz#a7af9c202838b5e905c7250e547f1aff77258a02" - integrity sha1-p6+cICg4tekFxyUOVH8a/3cligI= + integrity sha512-EwUeWP+KgAZ/xqFpaP6YDAXMtCJi+o/QQpCQFIYyxr01AdADi2y413eM8hSqJcoQym9WMePAJWoaODEJufC4Ug== dependencies: inherits "^2.0.1" json-rpc-random-id@^1.0.0, json-rpc-random-id@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-rpc-random-id/-/json-rpc-random-id-1.0.1.tgz#ba49d96aded1444dbb8da3d203748acbbcdec8c8" - integrity sha1-uknZat7RRE27jaPSA3SKy7zeyMg= + integrity sha512-RJ9YYNCkhVDBuP4zN5BBtYAzEl03yq/jIIsyif0JY9qyJuQQZNeDK7anAPKKlyEtLSj2s8h6hNh2F8zO5q7ScA== json-schema-traverse@^0.4.1: version "0.4.1" @@ -16370,46 +18828,57 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= +json-schema-typed@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" + integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== + +json-schema@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" + integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json-stable-stringify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= + integrity sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg== dependencies: jsonify "~0.0.0" +json-stringify-nice@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67" + integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw== + json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json-text-sequence@^0.1: version "0.1.1" resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2" - integrity sha1-py8hfcSvxGKf/1/rME3BvVGi89I= + integrity sha512-L3mEegEWHRekSHjc7+sc8eJhba9Clq1PZ8kMkzf8OxElhXc8O4TS5MwcVlj9aEbm5dr81N90WHC5nAz3UO971w== dependencies: delimit-stream "0.1.0" -json5@2.x, json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== +json-to-ast@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/json-to-ast/-/json-to-ast-2.1.0.tgz#041a9fcd03c0845036acb670d29f425cea4faaf9" + integrity sha512-W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ== dependencies: - minimist "^1.2.5" + code-error-fragment "0.0.230" + grapheme-splitter "^1.0.4" json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw== json5@^1.0.1: version "1.0.1" @@ -16418,59 +18887,58 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + +jsonc-parser@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" + integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== + jsonfile@^2.1.0: version "2.4.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" - integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug= + integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw== optionalDependencies: graceful-fs "^4.1.6" jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== optionalDependencies: graceful-fs "^4.1.6" jsonfile@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179" - integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg== + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== dependencies: - universalify "^1.0.0" + universalify "^2.0.0" optionalDependencies: graceful-fs "^4.1.6" jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= + integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA== -jsonparse@^1.2.0: +jsonparse@^1.2.0, jsonparse@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -jsonschema@^1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.4.tgz#a46bac5d3506a254465bc548876e267c6d0d6464" - integrity sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw== +jsonpointer@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" + integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== -jsonwebtoken@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.1.0.tgz#c6397cd2e5fd583d65c007a83dc7bb78e6982b83" - integrity sha1-xjl80uX9WD1lwAeoPce7eOaYK4M= - dependencies: - jws "^3.1.4" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" - ms "^2.0.0" - xtend "^4.0.1" +jsonschema@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" + integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== jsonwebtoken@^8.3.0, jsonwebtoken@^8.4.0, jsonwebtoken@^8.5.1: version "8.5.1" @@ -16489,19 +18957,29 @@ jsonwebtoken@^8.3.0, jsonwebtoken@^8.4.0, jsonwebtoken@^8.5.1: semver "^5.6.0" jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + version "1.4.2" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" + 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" just-debounce@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea" - integrity sha1-h/zPrv/AtozRnVX2cilD+SnqNeo= + version "1.1.0" + resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf" + integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ== + +just-diff-apply@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b" + integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g== + +just-diff@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202" + integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ== jwa@^1.4.1: version "1.4.1" @@ -16522,17 +19000,18 @@ jwa@^2.0.0: safe-buffer "^5.0.1" jwks-rsa@^2.0.2: - version "2.0.5" - resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-2.0.5.tgz#5dc911cdade803a149b7d4d41404a7c1bf2c221a" - integrity sha512-fliHfsiBRzEU0nXzSvwnh0hynzGB0WihF+CinKbSRlaqRxbqqKf2xbBPgwc8mzf18/WgwlG8e5eTpfSTBcU4DQ== + version "2.1.4" + resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-2.1.4.tgz#38ebfbe9cb4cdce3be070e6575796304917bae97" + integrity sha512-mpArfgPkUpX11lNtGxsF/szkasUcbWHGplZl/uFvFO2NuMHmt0dQXIihh0rkPU2yQd5niQtuUHbXnG/WKiXF6Q== dependencies: - "@types/express-jwt" "0.0.42" - debug "^4.3.2" + "@types/express" "^4.17.13" + "@types/jsonwebtoken" "^8.5.8" + debug "^4.3.4" jose "^2.0.5" limiter "^1.1.5" lru-memoizer "^2.1.4" -jws@3.x.x, jws@^3.1.4, jws@^3.1.5, jws@^3.2.2: +jws@3.x.x, jws@^3.1.5, jws@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== @@ -16549,14 +19028,24 @@ jws@^4.0.0: safe-buffer "^5.0.1" keccak256@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/keccak256/-/keccak256-1.0.0.tgz#1ba55ce78ed3d63fb7091d045469007da984171d" - integrity sha512-8qv2vJdQk+Aa2tFXo8zYodm+6DgXqUOqvNJhj1p1V2pxQJT1oNKxNF+zWfhtKXNLZdLvyxjB/dvd9GwcvTHSQQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/keccak256/-/keccak256-1.0.6.tgz#dd32fb771558fed51ce4e45a035ae7515573da58" + integrity sha512-8GLiM01PkdJVGUhR1e6M/AvWnSqYS0HaERI+K/QtStGDGlSTx2B1zTqZk4Zlqu5TxHJNTxWAdP9Y+WI50OApUw== dependencies: - bn.js "^4.11.8" - keccak "^1.4.0" + bn.js "^5.2.0" + buffer "^6.0.3" + keccak "^3.0.2" + +keccak@3.0.2, keccak@^3.0.0, keccak@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" + integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" -keccak@^1.0.2, keccak@^1.4.0: +keccak@^1.0.2: version "1.4.0" resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.4.0.tgz#572f8a6dbee8e7b3aa421550f9e6408ca2186f80" integrity sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw== @@ -16576,29 +19065,13 @@ keccak@^2.0.0: nan "^2.14.0" safe-buffer "^5.2.0" -keccak@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" - integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA== - dependencies: - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - -keccakjs@^0.2.0: - version "0.2.3" - resolved "https://registry.yarnpkg.com/keccakjs/-/keccakjs-0.2.3.tgz#5e4e969ce39689a3861f445d7752ee3477f9fe72" - integrity sha512-BjLkNDcfaZ6l8HBG9tH0tpmDv3sS2mA7FNQxFHpCdzP3Gb2MVruXBSuoM66SnVxKJpAr5dKGdkHD+bDokt8fTg== - dependencies: - browserify-sha3 "^0.0.4" - sha3 "^1.2.2" - -keytar@^5.4.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.6.0.tgz#7b5d4bd043d17211163640be6c4a27a49b12bb39" - integrity sha512-ueulhshHSGoryfRXaIvTj0BV1yB0KddBGhGoqCxSN9LR1Ks1GKuuCdVhF+2/YOs5fMl6MlTI9On1a4DHDXoTow== +keytar@^7.3.0: + version "7.9.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" + integrity sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ== dependencies: - nan "2.14.1" - prebuild-install "5.3.3" + node-addon-api "^4.3.0" + prebuild-install "^7.0.1" keyv@^3.0.0: version "3.1.0" @@ -16607,29 +19080,36 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" +keyv@^4.0.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.0.tgz#dbce9ade79610b6e641a9a65f2f6499ba06b9bc6" + integrity sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA== + dependencies: + json-buffer "3.0.1" + kind-of@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" - integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ= + integrity sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g== kind-of@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" - integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU= + integrity sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg== dependencies: is-buffer "^1.0.2" kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== dependencies: is-buffer "^1.1.5" kind-of@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== dependencies: is-buffer "^1.1.5" @@ -16638,7 +19118,7 @@ kind-of@^5.0.0, kind-of@^5.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -16653,7 +19133,7 @@ klaw-sync@^6.0.0: klaw@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk= + integrity sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw== optionalDependencies: graceful-fs "^4.1.9" @@ -16662,43 +19142,38 @@ kleur@^2.0.1: resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300" integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ== -kleur@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.1.tgz#4f5b313f5fa315432a400f19a24db78d451ede62" - integrity sha512-P3kRv+B+Ra070ng2VKQqW4qW7gd/v3iD8sy/zOdcYRsfiD+QBokQNOps/AfP6Hr48cBhIIBFWckB9aO+IZhrWg== +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== knex@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/knex/-/knex-0.21.1.tgz#4fba7e6c58c9f459846c3090be157a732fc75e41" - integrity sha512-uWszXC2DPaLn/YznGT9wFTWUG9+kqbL4DMz+hCH789GLcLuYzq8werHPDKBJxtKvxrW/S1XIXgrTWdMypiVvsw== + version "0.21.21" + resolved "https://registry.yarnpkg.com/knex/-/knex-0.21.21.tgz#b1335c75afd15ff83371b096e9cc4c4eafab8c05" + integrity sha512-cjw5qO1EzVKjbywcVa61IQJMLt7PfYBRI/2NwCA/B9beXgbw652wDNLz+JM+UKKNsfwprq0ugYqBYc9q4JN36A== dependencies: - colorette "1.1.0" - commander "^5.1.0" - debug "4.1.1" + colorette "1.2.1" + commander "^6.2.0" + debug "4.3.1" esm "^3.2.25" getopts "2.2.5" - inherits "~2.0.4" - interpret "^2.0.0" + interpret "^2.2.0" liftoff "3.1.0" - lodash "^4.17.15" - mkdirp "^1.0.4" - pg-connection-string "2.2.0" - tarn "^3.0.0" + lodash "^4.17.20" + pg-connection-string "2.4.0" + tarn "^3.0.1" tildify "2.0.0" - uuid "^7.0.3" - v8flags "^3.1.3" + v8flags "^3.2.0" -kuler@1.0.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6" - integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ== - dependencies: - colornames "^1.1.1" +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== last-run@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b" - integrity sha1-RblpQsF7HHnHchmCWbqUO+v4yls= + integrity sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ== dependencies: default-resolution "^2.0.0" es6-weak-map "^2.0.1" @@ -16706,7 +19181,7 @@ last-run@^1.1.0: latest-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU= + integrity sha512-Be1YRHWWlZaSsrz2U+VInk+tO0EwLIyV+23RhWLINJYwg/UIikxjlj3MhH37/6/EDCAusjajvMkMMUXRaMWl/w== dependencies: package-json "^4.0.0" @@ -16720,41 +19195,31 @@ latest-version@^5.0.0, latest-version@^5.1.0: lazy-cache@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.1.0.tgz#d6cd450251d415b70103765f63130a0049a03795" - integrity sha1-1s1FAlHUFbcBA3ZfYxMKAEmgN5U= + integrity sha512-WDBCsYgeOSNWVk8t3RYQ63PPnldXNdXg1ZIvPZ53XfueW0CHqmo462o4BmmpSuuxavJAXQl5ogRHVRiAIHti5Q== dependencies: ansi-yellow "^0.1.1" lazy-cache@^0.2.4: version "0.2.7" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" - integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U= + integrity sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ== lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= - -lazy-debug-legacy@0.0.X: - version "0.0.1" - resolved "https://registry.yarnpkg.com/lazy-debug-legacy/-/lazy-debug-legacy-0.0.1.tgz#537716c0776e4cf79e3ed1b621f7658c2911b1b1" - integrity sha1-U3cWwHduTPeePtG2IfdljCkRsbE= - -lazy-property@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147" - integrity sha1-hN3Es3Bnm6i9TNz6TAa0PVcREUc= + integrity sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ== lazystream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" - integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= + version "1.0.1" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" + integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw== dependencies: readable-stream "^2.0.5" lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= + integrity sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw== dependencies: invert-kv "^1.0.0" @@ -16768,43 +19233,55 @@ lcid@^2.0.0: lead@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" - integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI= + integrity sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow== dependencies: flush-write-stream "^1.0.2" -lerna@^3.16.0: - version "3.16.0" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.16.0.tgz#05e9c503ded1b64a0f806b380cab1031d2f73f42" - integrity sha512-ZOlkDc0pO1YZ+BK6EyVyFw0gNi0jvQkRdMzIHUNRHpx4glwctK2c+Snq2JiALVthY5WZqUpUyCZ7AUVkStvFoQ== - dependencies: - "@lerna/add" "3.16.0" - "@lerna/bootstrap" "3.16.0" - "@lerna/changed" "3.16.0" - "@lerna/clean" "3.16.0" - "@lerna/cli" "3.13.0" - "@lerna/create" "3.16.0" - "@lerna/diff" "3.16.0" - "@lerna/exec" "3.16.0" - "@lerna/import" "3.16.0" - "@lerna/init" "3.16.0" - "@lerna/link" "3.16.0" - "@lerna/list" "3.16.0" - "@lerna/publish" "3.16.0" - "@lerna/run" "3.16.0" - "@lerna/version" "3.16.0" - import-local "^2.0.0" - npmlog "^4.1.2" - -level-codec@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.1.tgz#042f4aa85e56d4328ace368c950811ba802b7247" - integrity sha512-ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q== +lerna@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-5.5.0.tgz#94ebc67ebe67079e5ac74f6ba7c0b130c88f3e90" + integrity sha512-1cZIijUWcI9ZqK+ejj1dBejTOLL64b0pIjYXb9KN8soNIONm/1zbJiSBiAyF4Hd6x4XuIC3kdFx7Ff3Pb9KsYA== + dependencies: + "@lerna/add" "5.5.0" + "@lerna/bootstrap" "5.5.0" + "@lerna/changed" "5.5.0" + "@lerna/clean" "5.5.0" + "@lerna/cli" "5.5.0" + "@lerna/create" "5.5.0" + "@lerna/diff" "5.5.0" + "@lerna/exec" "5.5.0" + "@lerna/import" "5.5.0" + "@lerna/info" "5.5.0" + "@lerna/init" "5.5.0" + "@lerna/link" "5.5.0" + "@lerna/list" "5.5.0" + "@lerna/publish" "5.5.0" + "@lerna/run" "5.5.0" + "@lerna/version" "5.5.0" + import-local "^3.0.2" + npmlog "^6.0.2" + nx ">=14.6.1 < 16" + typescript "^3 || ^4" + +level-codec@9.0.2, level-codec@^9.0.0: + version "9.0.2" + resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc" + integrity sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ== + dependencies: + buffer "^5.6.0" level-codec@~7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-7.0.1.tgz#341f22f907ce0f16763f24bddd681e395a0fb8a7" integrity sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ== +level-concat-iterator@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/level-concat-iterator/-/level-concat-iterator-3.1.0.tgz#5235b1f744bc34847ed65a50548aa88d22e881cf" + integrity sha512-BWRCMHBxbIqPxJ8vHOvKUsaO0v1sLYZtjN3K2iZJsRBYtp+ONsY6Jfi6hy9K3+zolgQRryhIn2NRZjZnWJ9NmQ== + dependencies: + catering "^2.1.0" + level-concat-iterator@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz#1d1009cf108340252cb38c51f9727311193e6263" @@ -16843,7 +19320,7 @@ level-iterator-stream@^2.0.3: level-iterator-stream@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz#e43b78b1a8143e6fa97a4f485eb8ea530352f2ed" - integrity sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0= + integrity sha512-1qua0RHNtr4nrZBgYlpV0qHHeHpcRRWTxEZJ8xsemoHAXNL5tbooh4tPEEqIqsbWCAJBmUmkwYK/sW5OrFjWWw== dependencies: inherits "^2.0.1" level-errors "^1.0.3" @@ -16868,6 +19345,16 @@ level-iterator-stream@~4.0.0: readable-stream "^3.4.0" xtend "^4.0.2" +level-js@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/level-js/-/level-js-5.0.2.tgz#5e280b8f93abd9ef3a305b13faf0b5397c969b55" + integrity sha512-SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg== + dependencies: + abstract-leveldown "~6.2.3" + buffer "^5.5.0" + inherits "^2.0.3" + ltgt "^2.1.2" + level-mem@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/level-mem/-/level-mem-3.0.1.tgz#7ce8cf256eac40f716eb6489654726247f5a89e5" @@ -16884,7 +19371,7 @@ level-mem@^5.0.1: level-packager "^5.0.3" memdown "^5.0.0" -level-packager@^5.0.3: +level-packager@^5.0.3, level-packager@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/level-packager/-/level-packager-5.1.1.tgz#323ec842d6babe7336f70299c14df2e329c18939" integrity sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ== @@ -16923,6 +19410,11 @@ level-sublevel@6.6.4: typewiselite "~1.0.0" xtend "~4.0.0" +level-supports@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-2.1.0.tgz#9af908d853597ecd592293b2fad124375be79c5f" + integrity sha512-E486g1NCjW5cF78KGPrMDRBYzPuueMZ6VBXHT6gC7A8UYWGiM14fGgp+s/L1oFfDWSPV/+SFkYCmZ0SiESkRKA== + level-supports@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-1.0.1.tgz#2f530a596834c7301622521988e2c36bb77d122d" @@ -16930,10 +19422,17 @@ level-supports@~1.0.0: dependencies: xtend "^4.0.2" +level-write-stream@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/level-write-stream/-/level-write-stream-1.0.0.tgz#3f7fbb679a55137c0feb303dee766e12ee13c1dc" + integrity sha512-bBNKOEOMl8msO+uIM9YX/gUO6ckokZ/4pCwTm/lwvs46x6Xs8Zy0sn3Vh37eDqse4mhy4fOMIb/JsSM2nyQFtw== + dependencies: + end-stream "~0.1.0" + level-ws@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/level-ws/-/level-ws-0.0.0.tgz#372e512177924a00424b0b43aef2bb42496d228b" - integrity sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos= + integrity sha512-XUTaO/+Db51Uiyp/t7fCMGVFOTdtLS/NIACxE/GHsij15mKzxksZifKVjlXDF41JMUP/oM1Oc4YNGdKnc3dVLw== dependencies: readable-stream "~1.0.15" xtend "~2.1.1" @@ -16947,6 +19446,33 @@ level-ws@^2.0.0: readable-stream "^3.1.0" xtend "^4.0.1" +level@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/level/-/level-6.0.1.tgz#dc34c5edb81846a6de5079eac15706334b0d7cd6" + integrity sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw== + dependencies: + level-js "^5.0.0" + level-packager "^5.1.0" + leveldown "^5.4.0" + +leveldown@5.6.0, leveldown@^5.4.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" + integrity sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ== + dependencies: + abstract-leveldown "~6.2.1" + napi-macros "~2.0.0" + node-gyp-build "~4.1.0" + +leveldown@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee" + integrity sha512-8C7oJDT44JXxh04aSSsfcMI8YiaGRhOFI9/pMEL7nWJLVsWajDPTRxsSHTM2WcTVY5nXM+SuRHzPPi0GbnDX+w== + dependencies: + abstract-leveldown "^7.2.0" + napi-macros "~2.0.0" + node-gyp-build "^4.3.0" + levelup@3.1.1, levelup@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/levelup/-/levelup-3.1.1.tgz#c2c0b3be2b4dc316647c53b42e2f559e232d2189" @@ -16957,6 +19483,17 @@ levelup@3.1.1, levelup@^3.0.0: level-iterator-stream "~3.0.0" xtend "~4.0.0" +levelup@4.4.0, levelup@^4.3.2: + version "4.4.0" + resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" + integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ== + dependencies: + deferred-leveldown "~5.3.0" + level-errors "~2.0.0" + level-iterator-stream "~4.0.0" + level-supports "~1.0.0" + xtend "~4.0.0" + levelup@^1.2.1: version "1.3.9" resolved "https://registry.yarnpkg.com/levelup/-/levelup-1.3.9.tgz#2dbcae845b2bb2b6bea84df334c475533bbd82ab" @@ -16970,17 +19507,6 @@ levelup@^1.2.1: semver "~5.4.1" xtend "~4.0.0" -levelup@^4.3.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" - integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ== - dependencies: - deferred-leveldown "~5.3.0" - level-errors "~2.0.0" - level-iterator-stream "~4.0.0" - level-supports "~1.0.0" - xtend "~4.0.0" - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -16994,38 +19520,26 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -libcipm@^1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-1.6.3.tgz#dc4052d710941547782d85bbdb3c77eedec733ff" - integrity sha512-WUEjQk1aZDECb2MFnAbx6o7sJbBJWrWwt9rbinOmpc0cLKWgYJOvKNqCUN3sl2P9LFqPsnVT4Aj5SPw4/xKI5A== +libnpmaccess@^6.0.3: + version "6.0.4" + resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.4.tgz#2dd158bd8a071817e2207d3b201d37cf1ad6ae6b" + integrity sha512-qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag== dependencies: - bin-links "^1.1.2" - bluebird "^3.5.1" - find-npm-prefix "^1.0.2" - graceful-fs "^4.1.11" - lock-verify "^2.0.2" - npm-lifecycle "^2.0.3" - npm-logical-tree "^1.2.1" - npm-package-arg "^6.1.0" - pacote "^8.1.6" - protoduck "^5.0.0" - read-package-json "^2.0.13" - rimraf "^2.6.2" - worker-farm "^1.6.0" + aproba "^2.0.0" + minipass "^3.1.1" + npm-package-arg "^9.0.1" + npm-registry-fetch "^13.0.0" -libnpx@^10.2.0: - version "10.2.4" - resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.4.tgz#ef0e3258e29aef2ec7ee3276115e20e67f67d4ee" - integrity sha512-BPc0D1cOjBeS8VIBKUu5F80s6njm0wbVt7CsGMrIcJ+SI7pi7V0uVPGpEMH9H5L8csOcclTxAXFE2VAsJXUhfA== +libnpmpublish@^6.0.4: + version "6.0.5" + resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.5.tgz#5a894f3de2e267d62f86be2a508e362599b5a4b1" + integrity sha512-LUR08JKSviZiqrYTDfywvtnsnxr+tOvBU0BF8H+9frt7HMvc6Qn6F8Ubm72g5hDTHbq8qupKfDvDAln2TVPvFg== dependencies: - dotenv "^5.0.1" - npm-package-arg "^6.0.0" - rimraf "^2.6.2" - safe-buffer "^5.1.0" - update-notifier "^2.3.0" - which "^1.3.0" - y18n "^4.0.0" - yargs "^14.2.3" + normalize-package-data "^4.0.0" + npm-package-arg "^9.0.1" + npm-registry-fetch "^13.0.0" + semver "^7.3.7" + ssri "^9.0.0" liftoff@3.1.0, liftoff@^3.1.0: version "3.1.0" @@ -17047,19 +19561,19 @@ limiter@^1.1.5: integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA== lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== listenercount@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" - integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= + integrity sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ== -load-json-file@^1.0.0, load-json-file@^1.1.0: +load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= + integrity sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A== dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" @@ -17067,27 +19581,17 @@ load-json-file@^1.0.0, load-json-file@^1.1.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw== dependencies: graceful-fs "^4.1.2" parse-json "^4.0.0" pify "^3.0.0" strip-bom "^3.0.0" -load-json-file@^5.0.0, load-json-file@^5.2.0, load-json-file@^5.3.0: +load-json-file@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-5.3.0.tgz#4d3c1e01fa1c03ea78a60ac7af932c9ce53403f3" integrity sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw== @@ -17098,12 +19602,22 @@ load-json-file@^5.0.0, load-json-file@^5.2.0, load-json-file@^5.3.0: strip-bom "^3.0.0" type-fest "^0.3.0" +load-json-file@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1" + integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ== + dependencies: + graceful-fs "^4.1.15" + parse-json "^5.0.0" + strip-bom "^4.0.0" + type-fest "^0.6.0" + loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-utils@1.2.3, loader-utils@^1.2.3: +loader-utils@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== @@ -17112,10 +19626,19 @@ loader-utils@1.2.3, loader-utils@^1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" +loader-utils@^1.2.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA== dependencies: p-locate "^2.0.0" path-exists "^3.0.0" @@ -17135,203 +19658,171 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lock-verify@^2.0.2: - version "2.2.1" - resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.1.tgz#81107948c51ed16f97b96ff8b60675affb243fc1" - integrity sha512-n0Zw2DVupKfZMazy/HIFVNohJ1z8fIoZ77WBnyyBGG6ixw83uJNyrbiJvvHWe1QKkGiBCjj8RCPlymltliqEww== - dependencies: - "@iarna/cli" "^1.2.0" - npm-package-arg "^6.1.0" - semver "^5.4.1" - -lockfile@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609" - integrity sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA== - dependencies: - signal-exit "^3.0.2" - -lodash._baseuniq@~4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" - integrity sha1-DrtE5FaBSveQXGIS+iybLVG4Qeg= +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== dependencies: - lodash._createset "~4.0.0" - lodash._root "~3.0.0" + p-locate "^5.0.0" -lodash._createset@~4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" - integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= +lodash-es@^4.2.1: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== lodash._isnative@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c" - integrity sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw= + integrity sha512-BOlKGKNHhCHswGOWtmVb5zBygyxN7EmTuzVOSQI6QSoGhG+kvv71gICFS1TBpnqvT1n53txK8CDK3u5D2/GZxQ== lodash._objecttypes@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11" - integrity sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE= + integrity sha512-XpqGh1e7hhkOzftBfWE7zt+Yn9mVHFkDhicVttvKLsoCMLVVL+xTQjfjB4X4vtznauxv0QZ5ZAeqjvat0dh62Q== -lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0: +lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= - -lodash._root@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" - integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI= + integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== lodash._shimkeys@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203" - integrity sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM= + integrity sha512-lBrglYxLD/6KAJ8IEa5Lg+YHgNAL7FyKqXg4XOUI+Du/vtniLs1ZqS+yHNKPkK54waAgkdUnDOYaWf+rv4B+AA== dependencies: lodash._objecttypes "~2.4.1" lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= - -lodash.assignin@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" - integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= - -lodash.assigninwith@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assigninwith/-/lodash.assigninwith-4.2.0.tgz#af02c98432ac86d93da695b4be801401971736af" - integrity sha1-rwLJhDKshtk9ppW0voAUAZcXNq8= + integrity sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw== lodash.at@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.at/-/lodash.at-4.6.0.tgz#93cdce664f0a1994ea33dd7cd40e23afd11b0ff8" - integrity sha1-k83OZk8KGZTqM9181A4jr9EbD/g= + integrity sha512-GOTh0SEp+Yosnlpjic+8cl2WM9MykorogkGA9xyIFkkObQ3H3kNZqZ+ohuq4K3FrSVo7hMcZBMataJemrxC3BA== lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" - integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= + integrity sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg== -lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0: +lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ== lodash.difference@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" - integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= - -lodash.flatmap@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e" - integrity sha1-74y/QI9uSCaGYzRTBcaswLd4cC4= + integrity sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA== lodash.flatten@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g== -lodash.get@^4.4.2, lodash.get@~4.4.2: +lodash.get@~4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= + integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== lodash.has@^4.5.2: version "4.5.2" resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" - integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI= + integrity sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g== lodash.includes@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8= + integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w== lodash.isarguments@2.4.x: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz#4931a9c08253adf091ae7ca192258a973876ecca" - integrity sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo= + integrity sha512-CyMQjsJqDgXL8M2xYAP6V2dlVXli8IhWXLsk19uXxiL9/qISjzQXyWtxsumR2q4CnR9FjCnxpuIO1d9KSKBcyA== lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= + integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg== lodash.isboolean@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= + integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg== -lodash.isequal@^4.0.0, lodash.isequal@^4.5.0: +lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== lodash.isinteger@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" - integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M= + integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA== lodash.ismatch@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" - integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc= + integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g== lodash.isnumber@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= + integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw== lodash.isobject@^2.4.1, lodash.isobject@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5" - integrity sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU= + integrity sha512-sTebg2a1PoicYEZXD5PBdQcTlIJ6hUslrlWr7iV0O7n+i4596s2NQ9I5CaZ5FbXSfya/9WQsrYLANUJv9paYVA== dependencies: lodash._objecttypes "~2.4.1" lodash.isobject@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d" - integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0= + integrity sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA== lodash.isplainobject@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== lodash.isstring@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= - -lodash.keys@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" - integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU= + integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw== lodash.keys@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727" - integrity sha1-SN6kbfj/djKxDXBrissmWR4rNyc= + integrity sha512-ZpJhwvUXHSNL5wYd1RM6CUa2ZuqorG9ngoJ9Ix5Cce+uX7I5O/E06FCJdhSZ33b5dVyeQDnIlWH7B2s5uByZ7g== dependencies: lodash._isnative "~2.4.1" lodash._shimkeys "~2.4.1" lodash.isobject "~2.4.1" +lodash.memoize@4.x: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== + lodash.merge@^4.6.0, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -17340,41 +19831,19 @@ lodash.merge@^4.6.0, lodash.merge@^4.6.2: lodash.once@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= - -lodash.rest@^4.0.0: - version "4.0.5" - resolved "https://registry.yarnpkg.com/lodash.rest/-/lodash.rest-4.0.5.tgz#954ef75049262038c96d1fc98b28fdaf9f0772aa" - integrity sha1-lU73UEkmIDjJbR/Jiyj9r58Hcqo= - -lodash.set@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" - integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= + integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== lodash.snakecase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" - integrity sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40= + integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - -lodash.template@4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.2.4.tgz#d053c19e8e74e38d965bf4fb495d80f109e7f7a4" - integrity sha1-0FPBno50442WW/T7SV2A8Qnn96Q= - dependencies: - lodash._reinterpolate "~3.0.0" - lodash.assigninwith "^4.0.0" - lodash.keys "^4.0.0" - lodash.rest "^4.0.0" - lodash.templatesettings "^4.0.0" - lodash.tostring "^4.0.0" + integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== -lodash.template@^4.0.2, lodash.template@^4.4.0, lodash.template@^4.5.0: +lodash.template@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== @@ -17383,55 +19852,40 @@ lodash.template@^4.0.2, lodash.template@^4.4.0, lodash.template@^4.5.0: lodash.templatesettings "^4.0.0" lodash.templatesettings@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316" - integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY= + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== dependencies: - lodash._reinterpolate "~3.0.0" + lodash._reinterpolate "^3.0.0" lodash.throttle@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" - integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= - -lodash.toarray@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" - integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= - -lodash.tostring@^4.0.0: - version "4.1.4" - resolved "https://registry.yarnpkg.com/lodash.tostring/-/lodash.tostring-4.1.4.tgz#560c27d1f8eadde03c2cce198fef5c031d8298fb" - integrity sha1-Vgwn0fjq3eA8LM4Zj+9cAx2CmPs= + integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== -lodash.union@^4.6.0, lodash.union@~4.6.0: +lodash.union@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= - -lodash.uniq@^4.5.0, lodash.uniq@~4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw== lodash.values@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4" - integrity sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ= + integrity sha512-fQwubKvj2Nox2gy6YnjFm8C1I6MIlzKUtBB+Pj7JGtloGqDDL5CPRr4DUUFWPwXWwAl2k3f4C3Aw8H1qAPB9ww== dependencies: lodash.keys "~2.4.1" lodash.values@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" - integrity sha1-o6bCsOvsxcLLocF+bmIP6BtT00c= + integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q== -lodash.without@~4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" - integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw= +lodash@4.17.14: + version "4.17.14" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" + integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== -lodash@4.17.14, lodash@4.17.15, lodash@4.x, lodash@^2.4.1, lodash@^3.10.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -17450,15 +19904,23 @@ log-symbols@3.0.0: dependencies: chalk "^2.4.2" -logform@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360" - integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ== +log-symbols@4.1.0, log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + +logform@^2.3.2, logform@^2.4.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.2.tgz#a617983ac0334d0c3b942c34945380062795b47c" + integrity sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw== dependencies: - colors "^1.2.1" - fast-safe-stringify "^2.0.4" - fecha "^2.3.3" + "@colors/colors" "1.5.0" + fecha "^4.2.0" ms "^2.1.1" + safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" logkitty@^0.7.1: @@ -17470,30 +19932,35 @@ logkitty@^0.7.1: dayjs "^1.8.15" yargs "^15.1.0" -loglevel@^1.6.1: - version "1.6.7" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56" - integrity sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A== +loglevel@^1.6.1, loglevel@^1.6.8: + version "1.8.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114" + integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA== long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== +long@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz#2696dadf4b4da2ce3f6f6b89186085d94d52fd61" + integrity sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w== + long@~3: version "3.2.0" resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" - integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= + integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== looper@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/looper/-/looper-2.0.0.tgz#66cd0c774af3d4fedac53794f742db56da8f09ec" - integrity sha1-Zs0Md0rz1P7axTeU90LbVtqPCew= + integrity sha512-6DzMHJcjbQX/UPHc1rRCBfKlLwDkvuGZ715cIR36wSdYqWXFT35uLXq5P/2orl3tz+t+VOVPxw4yPinQlUDGDQ== looper@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/looper/-/looper-3.0.0.tgz#2efa54c3b1cbaba9b94aee2e5914b0be57fbb749" - integrity sha1-LvpUw7HLq6m5Su4uWRSwvlf7t0k= + integrity sha512-LJ9wplN/uSn72oJRsXTx+snxPet5c8XiZmOKCm906NVYu+ag6SB6vUcnJcWxgnl2NfbIyeobAn7Bwv6xRj2XJg== loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" @@ -17502,13 +19969,24 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -loud-rejection@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" - integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= +loupe@^2.3.1: + version "2.3.4" + resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3" + integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ== dependencies: - currently-unhandled "^0.4.1" - signal-exit "^3.0.0" + get-func-name "^2.0.0" + +lower-case-first@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-1.0.2.tgz#e5da7c26f29a7073be02d52bac9980e5922adfa1" + integrity sha512-UuxaYakO7XeONbKrZf5FEgkantPf5DUqDayzP5VXZrtRPdH86s4kN47I8B3TW10S4QKiE3ziHNf3kRN//okHjA== + dependencies: + lower-case "^1.1.2" + +lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA== lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" @@ -17520,14 +19998,19 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +lowercase-keys@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" + integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== + lru-cache@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee" - integrity sha1-cXibO39Tmb7IVl3aOKow0qCX7+4= + integrity sha512-91gyOKTc2k66UG6kHiH4h3S2eltcPwE1STVfMYC/NG+nZwf8IIuiamfmpGZjpbbxzSyEJaLC0tNSmhjlQUTJow== dependencies: pseudomap "^1.0.1" -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5: +lru-cache@^4.0.1, lru-cache@^4.1.3, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -17549,10 +20032,15 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.10.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: + version "7.14.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" + integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ== + lru-cache@~4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e" - integrity sha1-HRdnnAac2l0ECZGgnbwsDbN35V4= + integrity sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw== dependencies: pseudomap "^1.0.1" yallist "^2.0.0" @@ -17565,33 +20053,28 @@ lru-memoizer@^2.1.4: lodash.clonedeep "^4.5.0" lru-cache "~4.0.0" -lru-queue@0.1: +lru-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" - integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM= + integrity sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ== dependencies: es5-ext "~0.10.2" -ltgt@^2.1.2, ltgt@~2.2.0: +ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" - integrity sha1-81ypHEk/e3PaDgdJUwTxezH4fuU= + integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA== ltgt@~2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34" - integrity sha1-EIUaBtmWS5cReEQcI8nlJpjuzjQ= + integrity sha512-5VjHC5GsENtIi5rbJd+feEpDKhfr7j0odoUR2Uh978g+2p93nd5o34cTjQWohXsPsCZeqoDnIqEf88mPCe0Pfw== lunr@^2.3.9: version "2.3.9" resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1" integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow== -macos-release@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" - integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA== - make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -17607,85 +20090,39 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392" - integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w== +make-dir@^3.0.0, make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== dependencies: semver "^6.0.0" make-error@1.x, make-error@^1.1.1: - version "1.3.5" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8" - integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g== - -"make-fetch-happen@^2.5.0 || 3 || 4", make-fetch-happen@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz#2d156b11696fb32bffbafe1ac1bc085dd6c78a79" - integrity sha512-YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA== - dependencies: - agentkeepalive "^3.4.1" - cacache "^11.3.3" - http-cache-semantics "^3.8.1" - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.1" - lru-cache "^5.1.1" - mississippi "^3.0.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^4.0.0" - ssri "^6.0.0" - -make-fetch-happen@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz#8474aa52198f6b1ae4f3094c04e8370d35ea8a38" - integrity sha512-FFq0lNI0ax+n9IWzWpH8A4JdgYiAp2DDYIZ3rsaav8JDe8I+72CzK6PQW/oom15YDZpV5bYW/9INd6nIJ2ZfZw== - dependencies: - agentkeepalive "^3.3.0" - cacache "^10.0.0" - http-cache-semantics "^3.8.0" - http-proxy-agent "^2.0.0" - https-proxy-agent "^2.1.0" - lru-cache "^4.1.1" - mississippi "^1.2.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^3.0.1" - ssri "^5.0.0" - -make-fetch-happen@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-3.0.0.tgz#7b661d2372fc4710ab5cc8e1fa3c290eea69a961" - integrity sha512-FmWY7gC0mL6Z4N86vE14+m719JKE4H0A+pyiOH18B025gF/C113pyfb4gHDDYP5cqnRMHOz06JGdmffC/SES+w== - dependencies: - agentkeepalive "^3.4.1" - cacache "^10.0.4" - http-cache-semantics "^3.8.1" - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.0" - lru-cache "^4.1.2" - mississippi "^3.0.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^3.0.1" - ssri "^5.2.4" + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz#a8e3fe41d3415dd656fe7b8e8172e1fb4458b38d" - integrity sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA== +make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6: + version "10.2.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" + integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== dependencies: - agentkeepalive "^3.4.1" - cacache "^12.0.0" - http-cache-semantics "^3.8.1" - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.1" - lru-cache "^5.1.1" - mississippi "^3.0.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^4.0.0" - ssri "^6.0.0" + agentkeepalive "^4.2.1" + cacache "^16.1.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-fetch "^2.0.3" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" make-iterator@^1.0.0: version "1.0.1" @@ -17694,12 +20131,12 @@ make-iterator@^1.0.0: dependencies: kind-of "^6.0.2" -makeerror@1.0.x: - version "1.0.11" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== dependencies: - tmpl "1.0.x" + tmpl "1.0.5" mamacro@^0.0.3: version "0.0.3" @@ -17707,41 +20144,36 @@ mamacro@^0.0.3: integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== map-age-cleaner@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74" - integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ== + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== dependencies: p-defer "^1.0.0" map-cache@^0.2.0, map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== -map-obj@^1.0.0, map-obj@^1.0.1: +map-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= - -map-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" - integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk= + integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== -map-stream@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.6.tgz#d2ef4eb811a28644c7a8989985c69c2fdd496827" - integrity sha1-0u9OuBGihkTHqJiZhcacL91JaCc= +map-obj@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" + integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== map-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" - integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg= + integrity sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ== map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== dependencies: object-visit "^1.0.0" @@ -17768,14 +20200,14 @@ marked@^0.7.0: integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg== marked@^1.1.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.4.tgz#94e99230b03496c9383b1322ac51bc17dd388a1d" - integrity sha512-6x5TFGCTKSQBLTZtOburGxCxFEBJEGYVLwCMTBCxzvyuisGcC20UNzDSJhCr/cJ/Kmh6ulfJm10g6WWEAJ3kvg== + version "1.2.9" + resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.9.tgz#53786f8b05d4c01a2a5a76b7d1ec9943d29d72dc" + integrity sha512-H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw== matchdep@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e" - integrity sha1-xvNINKDY28OzfCfui7yyfHd1WC4= + integrity sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA== dependencies: findup-sync "^2.0.0" micromatch "^3.0.4" @@ -17787,19 +20219,19 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -mathjs@^5.0.4, mathjs@^7.5.1: - version "7.6.0" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-7.6.0.tgz#f0b7579e0756b13422995d0c4f29bd17d65d4dcc" - integrity sha512-abywR28hUpKF4at5jE8Ys+Kigk40eKMT5mcBLD0/dtsqjfOLbtzd3WjlRqIopNo7oQ6FME51qph6lb8h/bhpUg== +mathjs@^5.0.4: + version "5.10.3" + resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-5.10.3.tgz#e998885f932ea8886db8b40f7f5b199f89b427f1" + integrity sha512-ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw== dependencies: - complex.js "^2.0.11" - decimal.js "^10.2.1" - escape-latex "^1.2.0" - fraction.js "^4.0.12" - javascript-natural-sort "^0.7.1" - seed-random "^2.2.0" - tiny-emitter "^2.1.0" - typed-function "^2.0.0" + complex.js "2.0.11" + decimal.js "10.2.0" + escape-latex "1.2.0" + fraction.js "4.0.12" + javascript-natural-sort "0.7.1" + seed-random "2.2.0" + tiny-emitter "2.1.0" + typed-function "1.1.0" md5.js@^1.3.4: version "1.3.5" @@ -17810,36 +20242,31 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" -meant@~1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.3.tgz#67769af9de1d158773e928ae82c456114903554c" - integrity sha512-88ZRGcNxAq4EH38cQ4D85PM57pikCwS8Z99EWHODxN7KBY+UuPiqzRTtZzS8KTXO/ywSWbdjjJST2Hly/EQxLw== - media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== mem@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= + integrity sha512-nOBDrc/wgpkd3X/JOhMqYR+/eLqlfLP4oQfoBA6QExIxEl+GU01oyEkwWyueyO8110pUKijtiHGhEmYoOn88oQ== dependencies: mimic-fn "^1.0.0" mem@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf" - integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" + integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== dependencies: map-age-cleaner "^0.1.1" - mimic-fn "^1.0.0" - p-is-promise "^1.1.0" + mimic-fn "^2.0.0" + p-is-promise "^2.0.0" -memdown@^1.0.0: +memdown@1.4.1, memdown@^1.0.0: version "1.4.1" resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215" - integrity sha1-tOThkhdGZP+65BNhqlAPMRnv4hU= + integrity sha512-iVrGHZB8i4OQfM155xx8akvG9FIj+ht14DX5CQkCTG4EHzZ3d3sgckIf/Lm9ivZalEsFuEVnWv2B2WZvbrro2w== dependencies: abstract-leveldown "~2.7.1" functional-red-black-tree "^1.0.1" @@ -17873,23 +20300,23 @@ memdown@~3.0.0: safe-buffer "~5.1.1" memoizee@^0.4.14: - version "0.4.14" - resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57" - integrity sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg== + version "0.4.15" + resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72" + integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ== dependencies: - d "1" - es5-ext "^0.10.45" - es6-weak-map "^2.0.2" + d "^1.0.1" + es5-ext "^0.10.53" + es6-weak-map "^2.0.3" event-emitter "^0.3.5" - is-promise "^2.1" - lru-queue "0.1" - next-tick "1" - timers-ext "^0.1.5" + is-promise "^2.2.2" + lru-queue "^0.1.0" + next-tick "^1.1.0" + timers-ext "^0.1.7" memory-fs@^0.4.0, memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= + integrity sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ== dependencies: errno "^0.1.3" readable-stream "^2.0.1" @@ -17905,48 +20332,34 @@ memory-fs@^0.5.0: memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" - integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI= - -meow@^3.3.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" - integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= - dependencies: - camelcase-keys "^2.0.0" - decamelize "^1.1.2" - loud-rejection "^1.0.0" - map-obj "^1.0.1" - minimist "^1.1.3" - normalize-package-data "^2.3.4" - object-assign "^4.0.1" - read-pkg-up "^1.0.1" - redent "^1.0.0" - trim-newlines "^1.0.0" - -meow@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975" - integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A== - dependencies: - camelcase-keys "^4.0.0" - decamelize-keys "^1.0.0" - loud-rejection "^1.0.0" - minimist "^1.1.3" - minimist-options "^3.0.1" - normalize-package-data "^2.3.4" - read-pkg-up "^3.0.0" - redent "^2.0.0" - trim-newlines "^2.0.0" + integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw== + +meow@^8.0.0: + version "8.1.2" + resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" + integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== + dependencies: + "@types/minimist" "^1.2.0" + camelcase-keys "^6.2.2" + decamelize-keys "^1.1.0" + hard-rejection "^2.1.0" + minimist-options "4.1.0" + normalize-package-data "^3.0.0" + read-pkg-up "^7.0.1" + redent "^3.0.0" + trim-newlines "^3.0.0" + type-fest "^0.18.0" + yargs-parser "^20.2.3" merge-descriptors@1.0.1, merge-descriptors@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== -merge-stream@^1.0.0, merge-stream@^1.0.1: +merge-stream@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE= + integrity sha512-e6RM36aegd4f+r8BZCcYXlO2P3H6xbUM6ktL2Xmf45GAOit9bI4z6/3VU7JwllVO1L7u0UDSg/EhzQ5lmMLolA== dependencies: readable-stream "^2.0.1" @@ -17955,10 +20368,10 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.2.3, merge2@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" - integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw== +merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== merkle-patricia-tree@2.3.2, merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.3.2: version "2.3.2" @@ -17988,17 +20401,18 @@ merkle-patricia-tree@4.0.0: semaphore-async-await "^1.5.1" messagebird@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/messagebird/-/messagebird-3.5.0.tgz#d4daf7a4f602698600603e53b500bb01c2ae8fe6" - integrity sha512-LNzMPr6PuZBHFjDdrAQR5aRad2QHv4C4BcumySyE3DKvsd0k2p8oYX2mFHzk8uMO5KstDJVe6Yz2/bNDADo4SQ== + version "3.8.1" + resolved "https://registry.yarnpkg.com/messagebird/-/messagebird-3.8.1.tgz#88442536363a4d96440f0aea34cdbc500370c677" + integrity sha512-qNt9tRlTin2JUkIGIqDCbC5hxP7+m+krfOpvTcTObxsJV4uZk4Lktg7pI/DZFB9vYYzNu9DaHT0At8jPIz1kpw== dependencies: - safe-buffer "^5.1.2" - scmp "^2.0.0" + jose "^4.8.0" + safe-buffer "^5.2.1" + scmp "^2.1.0" methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== metro-babel-register@0.59.0: version "0.59.0" @@ -18221,7 +20635,7 @@ metro@0.59.0, metro@^0.59.0: micromatch@^2.3.11, micromatch@^2.3.7: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + integrity sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA== dependencies: arr-diff "^2.0.0" array-unique "^0.2.1" @@ -18256,13 +20670,13 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== +micromatch@^4.0.2, micromatch@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.0.5" + braces "^3.0.2" + picomatch "^2.3.1" micromatch@jonschlinkert/micromatch#2.2.0: version "2.2.0" @@ -18288,12 +20702,7 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.44.0, "mime-db@>= 1.43.0 < 2": - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - -mime-db@1.52.0: +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== @@ -18301,23 +20710,16 @@ mime-db@1.52.0: mime-db@~1.23.0: version "1.23.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659" - integrity sha1-oxtAcK2uon1zLqMzdApk0OyaZlk= + integrity sha512-lsX3UhcJITPHDXGOXSglBSPoI2UbcsWMmgX1VTaeXJ11TjjxOSE/DHrCl23zJk75odJc8MVpdZzWxdWt1Csx5Q== mime-types@2.1.11: version "2.1.11" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c" - integrity sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw= + integrity sha512-14dD2ItPaGFLVyhddUE/Rrtg+g7v8RmBLjN5Xsb3fJJLKunoZOw3I3bK6csjoJKjaNjcXo8xob9kHDyOpJfgpg== dependencies: mime-db "~1.23.0" -mime-types@^2.0.8, mime-types@^2.1.16, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== - dependencies: - mime-db "1.44.0" - -mime-types@^2.1.12: +mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.16, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -18329,26 +20731,31 @@ mime@1.6.0, mime@^1.4.1: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.2.0: - version "2.4.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" - integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== +mime@^2.2.0, mime@^2.4.1, mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mime@^2.4.1, mime@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== +mime@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" + integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A== mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -mimic-fn@^2.1.0: +mimic-fn@^2.0.0, mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-fn@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" + integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== + mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -18359,17 +20766,27 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= + integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ== dependencies: dom-walk "^0.1.0" +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + mingo@1: version "1.3.3" resolved "https://registry.yarnpkg.com/mingo/-/mingo-1.3.3.tgz#6922c4d147efc771a01425a2c4c8f7784478c546" - integrity sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY= + integrity sha512-Y4wGTD/M7AMqF8QxKaBGps+axq/Z48hdtRAeiKtInkEXMLzUWUwT0OPDzrB26xrav9GF1AOYJfwVWPcLwnkgTA== minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" @@ -18379,29 +20796,110 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== + +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.4: +minimatch@3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" -minimist-options@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" - integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ== +minimatch@3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== + dependencies: + brace-expansion "^1.1.7" + +minimatch@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4" + integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g== + dependencies: + brace-expansion "^1.1.7" + +minimatch@^5.0.1, minimatch@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + dependencies: + brace-expansion "^2.0.1" + +minimist-options@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" + integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== dependencies: arrify "^1.0.1" is-plain-obj "^1.1.0" + kind-of "^6.0.3" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q== + +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" + integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== + dependencies: + minipass "^3.1.6" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" -minimist@0.0.5, minimist@0.0.8, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-json-stream@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" + integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== + dependencies: + jsonparse "^1.3.1" + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" -minipass@^2.3.3, minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -18409,44 +20907,27 @@ minipass@^2.3.3, minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2. safe-buffer "^5.1.2" yallist "^3.0.0" -minizlib@^1.2.1: +minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: + version "3.3.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" + integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== + dependencies: + yallist "^4.0.0" + +minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== dependencies: minipass "^2.9.0" -mississippi@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e" - integrity sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^1.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - -mississippi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f" - integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw== +minizlib@^2.1.1, minizlib@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^2.0.1" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" + minipass "^3.0.0" + yallist "^4.0.0" mississippi@^3.0.0: version "3.0.0" @@ -18464,27 +20945,44 @@ mississippi@^3.0.0: stream-each "^1.1.0" through2 "^2.0.0" -mixin-deep@^1.2.0, mixin-deep@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-2.0.1.tgz#9a6946bef4a368401b784970ae3caaaa6bab02fa" - integrity sha512-imbHQNRglyaplMmjBLL3V5R6Bfq5oM+ivds3SKgc6oRtzErEnBUUc5No11Z2pilkUvl42gJvi285xTNswcKCMA== +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" mixin-object@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e" - integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4= + integrity sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA== dependencies: for-in "^0.1.3" is-extendable "^0.1.1" +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +mkdirp-infer-owner@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316" + integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw== + dependencies: + chownr "^2.0.0" + infer-owner "^1.0.4" + mkdirp "^1.0.3" + mkdirp-promise@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1" - integrity sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE= + integrity sha512-Hepn5kb1lJPtVW84RFT40YG1OddBNTOVUZR2bzQUHc+Z03en8/3uX0+060JDhcEzyO08HmipsN9DcnFMxhIL9w== dependencies: mkdirp "*" -mkdirp@*, mkdirp@1.x, mkdirp@^1.0.4: +mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -18492,7 +20990,7 @@ mkdirp@*, mkdirp@1.x, mkdirp@^1.0.4: mkdirp@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + integrity sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA== dependencies: minimist "0.0.8" @@ -18503,42 +21001,81 @@ mkdirp@0.5.4: dependencies: minimist "^1.2.5" -mkdirp@0.5.5, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: minimist "^1.2.5" -mocha@5.2.0, mocha@^6.2.2: - version "6.2.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912" - integrity sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg== +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - ansi-colors "3.2.3" + minimist "^1.2.6" + +mocha@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.0.1.tgz#fe01f0530362df271aa8f99510447bc38b88d8ed" + integrity sha512-vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg== + dependencies: + ansi-colors "4.1.1" browser-stdout "1.3.1" + chokidar "3.3.1" debug "3.2.6" - diff "3.5.0" + diff "4.0.2" escape-string-regexp "1.0.5" - find-up "3.0.0" - glob "7.1.3" + find-up "4.1.0" + glob "7.1.6" growl "1.10.5" he "1.2.0" js-yaml "3.13.1" - log-symbols "2.2.0" + log-symbols "3.0.0" minimatch "3.0.4" - mkdirp "0.5.4" - ms "2.1.1" - node-environment-flags "1.0.5" + ms "2.1.2" object.assign "4.1.0" - strip-json-comments "2.0.1" - supports-color "6.0.0" - which "1.3.1" + promise.allsettled "1.0.2" + serialize-javascript "3.0.0" + strip-json-comments "3.0.1" + supports-color "7.1.0" + which "2.0.2" wide-align "1.1.3" + workerpool "6.0.0" yargs "13.3.2" yargs-parser "13.1.2" yargs-unparser "1.6.0" +mocha@9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9" + integrity sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g== + dependencies: + "@ungap/promise-all-settled" "1.1.2" + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.3" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.0" + growl "1.10.5" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "4.2.1" + ms "2.1.3" + nanoid "3.3.1" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + which "2.0.2" + workerpool "6.2.0" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + mocha@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" @@ -18556,6 +21093,35 @@ mocha@^5.2.0: mkdirp "0.5.1" supports-color "5.4.0" +mocha@^6.2.2: + version "6.2.3" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912" + integrity sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg== + dependencies: + ansi-colors "3.2.3" + browser-stdout "1.3.1" + debug "3.2.6" + diff "3.5.0" + escape-string-regexp "1.0.5" + find-up "3.0.0" + glob "7.1.3" + growl "1.10.5" + he "1.2.0" + js-yaml "3.13.1" + log-symbols "2.2.0" + minimatch "3.0.4" + mkdirp "0.5.4" + ms "2.1.1" + node-environment-flags "1.0.5" + object.assign "4.1.0" + strip-json-comments "2.0.1" + supports-color "6.0.0" + which "1.3.1" + wide-align "1.1.3" + yargs "13.3.2" + yargs-parser "13.1.2" + yargs-unparser "1.6.0" + mocha@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604" @@ -18587,11 +21153,11 @@ mocha@^7.1.1: yargs-unparser "1.6.0" mock-fs@^4.1.0: - version "4.13.0" - resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.13.0.tgz#31c02263673ec3789f90eb7b6963676aa407a598" - integrity sha512-DD0vOdofJdoaRNtnWcrXe6RQbpHkPPmtqGq14uRX0F8ZKJ5nv89CVTYl/BZdppDxBDaV0hl75htg3abpEWlPZA== + version "4.14.0" + resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18" + integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw== -mock-require@^3.0.2: +mock-require@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg== @@ -18604,31 +21170,10 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== -module-not-found-error@^1.0.0: +module-not-found-error@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0" - integrity sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA= - -module@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/module/-/module-1.2.5.tgz#b503eb06cdc13473f56818426974cde7ec59bf15" - integrity sha1-tQPrBs3BNHP1aBhCaXTN5+xZvxU= - dependencies: - chalk "1.1.3" - concat-stream "1.5.1" - lodash.template "4.2.4" - map-stream "0.0.6" - tildify "1.2.0" - vinyl-fs "2.4.3" - yargs "4.6.0" - -mold-source-map@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/mold-source-map/-/mold-source-map-0.4.0.tgz#cf67e0b31c47ab9badb5c9c25651862127bb8317" - integrity sha1-z2fgsxxHq5uttcnCVlGGISe7gxc= - dependencies: - convert-source-map "^1.1.0" - through "~2.2.7" + integrity sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g== moment-timezone@^0.5.21: version "0.5.37" @@ -18637,7 +21182,7 @@ moment-timezone@^0.5.21: dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.10.6, moment@^2.22.1, moment@^2.24.0, moment@^2.29.0: +"moment@>= 2.9.0", moment@^2.10.6, moment@^2.19.3, moment@^2.22.1, moment@^2.24.0, moment@^2.29.0: version "2.29.4" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -18656,7 +21201,7 @@ morgan@^1.10.0, morgan@^1.8.2: move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= + integrity sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ== dependencies: aproba "^1.1.1" copy-concurrently "^1.0.0" @@ -18666,16 +21211,16 @@ move-concurrently@^1.0.1: run-queue "^1.0.3" mri@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a" - integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w== + version "1.2.0" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" + integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== -ms@2.1.1, ms@^2.0.0, ms@^2.1.1: +ms@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== @@ -18685,26 +21230,31 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@2.1.3, ms@^2.0.0, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + msal@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/msal/-/msal-1.2.1.tgz#08133e37ab0b9741866c89a3fadc55aadb980723" - integrity sha512-Zo28eyRtT/Un+zcpMfPtTPD+eo/OqzsRER0k5dyk8Mje/K1oLlaEOAgZHlJs59Y2xyuVg8OrcKqSn/1MeNjZYw== + version "1.4.17" + resolved "https://registry.yarnpkg.com/msal/-/msal-1.4.17.tgz#b78171c0471ede506eeaabc86343f8f4e2d01634" + integrity sha512-RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ== dependencies: tslib "^1.9.3" mssql@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/mssql/-/mssql-6.3.1.tgz#b6da02f9d4dc8f105ef54528a806922bac4aa20d" - integrity sha512-ammxrhbdDpcBWhiZLiy6miiU7ELt9qFbGvwmPbiufn+tBHAYUFR/AgwE4/v4jzPzbatowscmhFx1U61L91uVzQ== + version "6.4.1" + resolved "https://registry.yarnpkg.com/mssql/-/mssql-6.4.1.tgz#24fcde0a32349aa6e1ba2123119ab254e355f8bb" + integrity sha512-G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw== dependencies: - debug "^4.3.1" + debug "^4.3.3" tarn "^1.1.5" - tedious "^6.7.0" + tedious "^6.7.1" multi-progress@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/multi-progress/-/multi-progress-2.0.0.tgz#29ccb42cf24874b1c6384f03127ce5dff7b22f2c" - integrity sha1-Kcy0LPJIdLHGOE8DEnzl3/eyLyw= + integrity sha512-ArGgS/Qib/X2FWfE6CVpic+Z0C9kQuhiK9HQtz5pcCfsXwMzoNnXP6FJlplNAMsJuoLtWA8bAoPV36ezT2IFGw== dependencies: progress "^1.1.8" @@ -18748,16 +21298,6 @@ multihashes@^0.4.15, multihashes@~0.4.15: multibase "^0.7.0" varint "^5.0.0" -multimatch@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b" - integrity sha512-22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA== - dependencies: - array-differ "^2.0.3" - array-union "^1.0.2" - arrify "^1.0.1" - minimatch "^3.0.4" - multimatch@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3" @@ -18769,10 +21309,21 @@ multimatch@^4.0.0: arrify "^2.0.1" minimatch "^3.0.4" +multimatch@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6" + integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA== + dependencies: + "@types/minimatch" "^3.0.3" + array-differ "^3.0.0" + array-union "^2.1.0" + arrify "^2.0.1" + minimatch "^3.0.4" + mustache@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31" - integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA== + version "4.2.0" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64" + integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== mute-stdout@^1.0.0: version "1.0.1" @@ -18782,7 +21333,7 @@ mute-stdout@^1.0.0: mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" @@ -18792,33 +21343,32 @@ mute-stream@0.0.8, mute-stream@~0.0.4: mv@~2: version "2.1.1" resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" - integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI= + integrity sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg== dependencies: mkdirp "~0.5.1" ncp "~2.0.0" rimraf "~2.4.0" mysql2@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.1.0.tgz#55ecfd4353114c148cc4c253192dbbfd000e6642" - integrity sha512-9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A== + version "2.3.3" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0" + integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA== dependencies: - cardinal "^2.1.1" - denque "^1.4.1" + denque "^2.0.1" generate-function "^2.3.1" - iconv-lite "^0.5.0" + iconv-lite "^0.6.3" long "^4.0.0" - lru-cache "^5.1.1" + lru-cache "^6.0.0" named-placeholders "^1.1.2" seq-queue "^0.0.5" - sqlstring "^2.3.1" + sqlstring "^2.3.2" mythxjs@^1.3.11: - version "1.3.11" - resolved "https://registry.yarnpkg.com/mythxjs/-/mythxjs-1.3.11.tgz#c900ccdbe3ad57a30829331cd5f041f2b6006728" - integrity sha512-1RDT45zoMFDSyLDJxu259Nd5qb5Z2RytuV+b0XbkmeJyivvAS99yYi/HpBESTxRoJc/3cgtvI+58E1Im2xmOqA== + version "1.3.13" + resolved "https://registry.yarnpkg.com/mythxjs/-/mythxjs-1.3.13.tgz#b27ec4170307a3f3bd3943e7e8628c2eb070d09d" + integrity sha512-dqFLPjEVxj99WJFwLEA4ULNXL992bfth4W9t63V6B/LQbPxHqOvGShbSaHblt/giaMi7mPLcd4WIgk2lBpzFlw== dependencies: - axios "^0.19.0" + axios "^0.25.0" chai-as-promised "^7.1.1" jsonwebtoken "^8.5.1" @@ -18838,37 +21388,36 @@ named-placeholders@^1.1.2: dependencies: lru-cache "^4.1.3" -nan@2.13.2: - version "2.13.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" - integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== - -nan@2.14.1, nan@^2.10.0, nan@^2.11.0, nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.2.1: - version "2.14.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" - integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== +nan@^2.11.0, nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.16.0, nan@^2.2.1: + version "2.16.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" + integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== -nan@^2.14.2: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== +nano-base32@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/nano-base32/-/nano-base32-1.0.1.tgz#ba548c879efcfb90da1c4d9e097db4a46c9255ef" + integrity sha512-sxEtoTqAPdjWVGv71Q17koMFGsOMSiHsIFEvzOM7cNp8BXB4AnEwmDabm5dorusJf/v1z7QxaZYxUorU9RKaAw== nano-json-stream-parser@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" - integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18= + integrity sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew== + +nanoid@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" + integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== nanomatch@^1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" - integrity sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA== + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== dependencies: arr-diff "^4.0.0" array-unique "^0.3.2" define-property "^2.0.2" extend-shallow "^3.0.2" fragment-cache "^0.2.1" - is-odd "^2.0.0" is-windows "^1.0.2" kind-of "^6.0.2" object.pick "^1.3.0" @@ -18877,9 +21426,14 @@ nanomatch@^1.2.9: to-regex "^3.0.1" napi-build-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508" - integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + +napi-macros@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" + integrity sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg== nash@^3.0.0: version "3.0.0" @@ -18894,12 +21448,12 @@ nash@^3.0.0: native-duplexpair@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/native-duplexpair/-/native-duplexpair-1.0.0.tgz#7899078e64bf3c8a3d732601b3d40ff05db58fa0" - integrity sha1-eJkHjmS/PIo9cyYBs9QP8F21j6A= + integrity sha512-E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA== natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== natural-orderby@^2.0.1: version "2.0.3" @@ -18909,38 +21463,35 @@ natural-orderby@^2.0.1: ncp@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" - integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= - -ndjson@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/ndjson/-/ndjson-1.5.0.tgz#ae603b36b134bcec347b452422b0bf98d5832ec8" - integrity sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= - dependencies: - json-stringify-safe "^5.0.1" - minimist "^1.2.0" - split2 "^2.1.0" - through2 "^2.0.3" + integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== needle@^2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" - integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA== + version "2.9.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" + integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== dependencies: - debug "^2.1.2" + debug "^3.2.6" iconv-lite "^0.4.4" sax "^1.2.4" -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +negotiator@0.6.3, negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +neodoc@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/neodoc/-/neodoc-2.0.2.tgz#ad00b30b9758379dcd3cf752a0659bacbab2c4fb" + integrity sha512-NAppJ0YecKWdhSXFYCHbo6RutiX8vOt/Jo3l46mUg6pQlpJNaqc5cGxdrW2jITQm5JIYySbFVPDl3RrREXNyPw== + dependencies: + ansi-regex "^2.0.0" -netmask@^2.0.1: +netmask@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== @@ -18954,44 +21505,68 @@ nexmo@2.4.2: request "^2.88.0" uuid "^2.0.2" -next-tick@1: +next-tick@1, next-tick@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== -next-tick@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +no-case@^2.2.0, no-case@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== + dependencies: + lower-case "^1.1.1" + nocache@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f" integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q== -node-abi@^2.7.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.9.0.tgz#ae4075b298dab2d92dd1e22c48ccc7ffd7f06200" - integrity sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA== +node-abi@^2.21.0, node-abi@^2.7.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== dependencies: semver "^5.4.1" +node-abi@^3.3.0: + version "3.24.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz#b9d03393a49f2c7e147d0c99f180e680c27c1599" + integrity sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw== + dependencies: + semver "^7.3.5" + +node-abort-controller@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" + integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== + node-addon-api@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== +node-addon-api@^3.0.2, node-addon-api@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + +node-addon-api@^4.2.0, node-addon-api@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + node-emoji@^1.4.1: - version "1.10.0" - resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da" - integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw== + version "1.11.0" + resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== dependencies: - lodash.toarray "^4.4.0" + lodash "^4.17.21" node-environment-flags@1.0.5: version "1.0.5" @@ -19009,16 +21584,17 @@ node-environment-flags@1.0.6: object.getownpropertydescriptors "^2.0.3" semver "^5.7.0" -node-fetch-npm@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7" - integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw== - dependencies: - encoding "^0.1.11" - json-parse-better-errors "^1.0.0" - safe-buffer "^5.1.1" +node-fetch@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + +node-fetch@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== -node-fetch@2.6.7: +node-fetch@2.6.7, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== @@ -19033,42 +21609,60 @@ node-fetch@^1.0.1, node-fetch@~1.7.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0, node-fetch@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - -node-forge@0.7.4, node-forge@^0.10.0, node-forge@^0.7.4, node-forge@^0.9.0: +node-forge@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-gyp-build@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739" - integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== +node-forge@^0.7.6: + version "0.7.6" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" + integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== -node-gyp-build@~3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.7.0.tgz#daa77a4f547b9aed3e2aac779eaf151afd60ec8d" - integrity sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w== +node-forge@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== -node-gyp@5.0.1, node-gyp@^3.6.2, node-gyp@^4.0.0, node-gyp@^5.0.2, node-gyp@^8.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.1.tgz#db211e9c5d7f611e79d1dcbdc53bca646b99ae4c" - integrity sha512-D68549U6EDVJLrAkSOZCWX/nmlYo0eCX2dYZoTOOZJ7bEIFrSE/MQgsgMFBKjByJ323hNzkifw2OuT3A5bR5mA== +node-gyp-build@4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4" + integrity sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ== + +node-gyp-build@^4.2.0, node-gyp-build@^4.3.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40" + integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg== + +node-gyp-build@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb" + integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ== + +node-gyp@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8" + integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g== dependencies: - env-paths "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - request "^2.87.0" - rimraf "2" - semver "~5.3.0" - tar "^4.4.8" - which "1" + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^10.0.3" + nopt "^5.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + +node-hid@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-2.1.1.tgz#f83c8aa0bb4e6758b5f7383542477da93f67359d" + integrity sha512-Skzhqow7hyLZU93eIPthM9yjot9lszg9xrKxESleEs05V2NcbUptZc5HFqzjOkSmL0sFlZFr3kmvaYebx06wrw== + dependencies: + bindings "^1.5.0" + node-addon-api "^3.0.2" + prebuild-install "^6.0.0" node-hid@^0.7.9: version "0.7.9" @@ -19079,19 +21673,17 @@ node-hid@^0.7.9: nan "^2.13.2" prebuild-install "^5.3.0" -node-hid@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-1.2.0.tgz#d084a9750832b28fd6de6fe2ccd8063fe8e3e7c0" - integrity sha512-ap06Wo1E0aGrZf0t1zvjWSk+IzI6yvKpTDYQRIrdxLHEelifnGDx6XOb2VVlrQhxzM4etma8jH/i0M1LUB55dA== - dependencies: - bindings "^1.5.0" - nan "^2.14.0" - prebuild-install "^5.3.3" - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== + +node-interval-tree@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/node-interval-tree/-/node-interval-tree-1.3.3.tgz#15ffb904cde08270214acace8dc7653e89ae32b7" + integrity sha512-K9vk96HdTK5fEipJwxSvIIqwTqr4e3HRJeJrNxBSeVMNSC/JWARRaX7etOLOuTmrRMeOI/K5TCJu3aWIwZiNTw== + dependencies: + shallowequal "^1.0.2" node-libs-browser@^2.2.1: version "2.2.1" @@ -19122,41 +21714,7 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-libs-react-native@1.0.3, node-libs-react-native@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/node-libs-react-native/-/node-libs-react-native-1.2.1.tgz#c9fd1d1b2cd2573d3e75633cea8bccd53b334f24" - integrity sha512-2LkPntNVa5MInMxtP7fW9F/uGo7KZCURI5/YoNn9/qOGIQpxEqnsndQWAPipsw8+ZVrIxPGkKEgJ2sSdvz0NKQ== - dependencies: - assert "^1.4.1" - base-64 "^0.1.0" - browserify-zlib "^0.2.0" - buffer "^6.0.3" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.0" - process "^0.11.0" - punycode "^2.1.0" - querystring-es3 "^0.2.0" - react-native-crypto "^2.0.1" - react-native-randombytes "^3.5.1" - readable-stream "^2.2.9" - stream-http "^2.3.1" - string_decoder "^1.0.3" - timers-browserify "^2.0.2" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - -node-notifier@^8.0.0, node-notifier@^8.0.2: +node-notifier@^8.0.0: version "8.0.2" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== @@ -19184,47 +21742,15 @@ node-pre-gyp@^0.11.0: semver "^5.3.0" tar "^4" -node-pre-gyp@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" - integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -node-pre-gyp@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - -node-releases@^1.1.70: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== +node-releases@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" + integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== node-stream-zip@^1.9.1: - version "1.13.2" - resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.13.2.tgz#2fce9d001fa7fda943a906eff239eb83fda124ba" - integrity sha512-159NUO3quDIRVSVOQiQ/0VG8NFrGvVyUa+MUUleiOys3NLtrGtNkodqYYTRHU/kiXu/ygHZcNy/tZ4NUCcDUmQ== + version "1.15.0" + resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea" + integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw== node-version@^1.0.0: version "1.2.0" @@ -19247,49 +21773,29 @@ nodemon@1.19.1: undefsafe "^2.0.2" update-notifier "^2.5.0" -nodent-compiler@^3.2.10: - version "3.2.11" - resolved "https://registry.yarnpkg.com/nodent-compiler/-/nodent-compiler-3.2.11.tgz#8f4bc703d7d8d0e563f5e09ea22efdce04dbaf9b" - integrity sha512-rfDrGWdgIJYomPUzR8nXiWNuIhJ7cVodPeZP3Ho65LEycuaX2uVNZ0ytpcfrmUKzdFeLRtye9+pHe8OynPZuPQ== - dependencies: - acorn ">= 2.5.2 <= 5.7.3" - acorn-es7-plugin "^1.1.7" - nodent-transform "^3.2.9" - source-map "^0.5.7" - -nodent-runtime@>=3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e" - integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA== - -nodent-transform@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/nodent-transform/-/nodent-transform-3.2.9.tgz#ec11a6116b5476e60bc212371cf6b8e4c74f40b6" - integrity sha512-4a5FH4WLi+daH/CGD5o/JWRR8W5tlCkd3nrDSkxbOzscJTyTUITltvOJeQjg3HJ1YgEuNyiPhQbvbtRjkQBByQ== - -nofilter@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.3.tgz#34e54b4cc9757de0cad38cc0d19462489b1b7f5d" - integrity sha512-FlUlqwRK6reQCaFLAhMcF+6VkVG2caYjKQY3YsRDTl4/SEch595Qb3oLjJRDr8dkHAAOVj2pOx3VknfnSgkE5g== +nofilter@^1.0.3, nofilter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e" + integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA== noncharacters@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/noncharacters/-/noncharacters-1.1.0.tgz#af33df30fd50ed3c53cd202258f25ada90b540d2" - integrity sha1-rzPfMP1Q7TxTzSAiWPJa2pC1QNI= + integrity sha512-U69XzMNq7UQXR27xT17tkQsHPsLc+5W9yfXvYzVCwFxghVf+7VttxFnCKFMxM/cHD+/QIyU009263hxIIurj4g== noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= + integrity sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ== -"nopt@2 || 3", nopt@3.x: +nopt@3.x: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg== dependencies: abbrev "1" -nopt@^4.0.1, nopt@~4.0.1: +nopt@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== @@ -19297,14 +21803,28 @@ nopt@^4.0.1, nopt@~4.0.1: abbrev "1" osenv "^0.1.4" +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + +nopt@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" + integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== + dependencies: + abbrev "^1.0.0" + nopt@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= + integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg== dependencies: abbrev "1" -normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0, "normalize-package-data@~1.0.1 || ^2.0.0": +normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -19315,29 +21835,29 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package- validate-npm-package-license "^3.0.1" normalize-package-data@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a" - integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" + integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== dependencies: - hosted-git-info "^3.0.6" - resolve "^1.17.0" - semver "^7.3.2" + hosted-git-info "^4.0.1" + is-core-module "^2.5.0" + semver "^7.3.4" validate-npm-package-license "^3.0.1" -normalize-package-data@~2.4.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.2.tgz#6b2abd85774e51f7936f1395e45acb905dc849b2" - integrity sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw== +normalize-package-data@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c" + integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg== dependencies: - hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" + hosted-git-info "^5.0.0" + is-core-module "^2.8.1" + semver "^7.3.5" + validate-npm-package-license "^3.0.4" normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w== dependencies: remove-trailing-separator "^1.0.1" @@ -19346,11 +21866,16 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-url@4.5.1, normalize-url@^3.3.0, normalize-url@^4.1.0: +normalize-url@^4.1.0: version "4.5.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== +normalize-url@^6.0.1, normalize-url@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== + now-and-later@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c" @@ -19358,80 +21883,57 @@ now-and-later@^2.0.0: dependencies: once "^1.3.2" -npm-audit-report@^1.0.9: - version "1.3.3" - resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.3.tgz#8226deeb253b55176ed147592a3995442f2179ed" - integrity sha512-8nH/JjsFfAWMvn474HB9mpmMjrnKb1Hx/oTAdjv4PT9iZBvBxiZ+wtDUapHCJwLqYGQVPaAfs+vL5+5k9QndXw== - dependencies: - cli-table3 "^0.5.0" - console-control-strings "^1.1.0" - -npm-bundled@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" - integrity sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow== - -npm-cache-filename@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11" - integrity sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE= - -npm-install-checks@~3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz#ab2e32ad27baa46720706908e5b14c1852de44d9" - integrity sha512-E4kzkyZDIWoin6uT5howP8VDvkM+E8IQDcHAycaAxMbwkqhIg5eEYALnXOl3Hq9MrkdQB/2/g1xwBINXdKSRkg== +npm-bundled@^1.0.1, npm-bundled@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" + integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== dependencies: - semver "^2.3.0 || 3.x || 4 || 5" + npm-normalize-package-bin "^1.0.1" -npm-lifecycle@^2.0.1, npm-lifecycle@^2.0.3: - version "2.1.1" - resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.1.tgz#0027c09646f0fd346c5c93377bdaba59c6748fdf" - integrity sha512-+Vg6I60Z75V/09pdcH5iUo/99Q/vop35PaI99elvxk56azSVVsdsSsS/sXqKDNwbRRNN1qSxkcO45ZOu0yOWew== +npm-bundled@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-2.0.1.tgz#94113f7eb342cd7a67de1e789f896b04d2c600f4" + integrity sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw== dependencies: - byline "^5.0.0" - graceful-fs "^4.1.15" - node-gyp "^4.0.0" - resolve-from "^4.0.0" - slide "^1.1.6" - uid-number "0.0.6" - umask "^1.1.0" - which "^1.3.1" + npm-normalize-package-bin "^2.0.0" -npm-lifecycle@^3.1.0: - version "3.1.5" - resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz#9882d3642b8c82c815782a12e6a1bfeed0026309" - integrity sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g== +npm-install-checks@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234" + integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA== dependencies: - byline "^5.0.0" - graceful-fs "^4.1.15" - node-gyp "^5.0.2" - resolve-from "^4.0.0" - slide "^1.1.6" - uid-number "0.0.6" - umask "^1.1.0" - which "^1.3.1" - -npm-logical-tree@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88" - integrity sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg== + semver "^7.1.1" -npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: +npm-normalize-package-bin@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== -"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7" - integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg== +npm-normalize-package-bin@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff" + integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ== + +npm-package-arg@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.1.tgz#00ebf16ac395c63318e67ce66780a06db6df1b04" + integrity sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg== dependencies: - hosted-git-info "^2.7.1" - osenv "^0.1.5" - semver "^5.6.0" + hosted-git-info "^3.0.6" + semver "^7.0.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.10, npm-packlist@^1.1.6, npm-packlist@^1.4.4: +npm-package-arg@^9.0.0, npm-package-arg@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987" + integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw== + dependencies: + hosted-git-info "^5.0.0" + proc-log "^2.0.1" + semver "^7.3.5" + validate-npm-package-name "^4.0.0" + +npm-packlist@^1.1.6: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -19440,66 +21942,43 @@ npm-packlist@^1.1.10, npm-packlist@^1.1.6, npm-packlist@^1.4.4: npm-bundled "^1.0.1" npm-normalize-package-bin "^1.0.1" -npm-packlist@~1.1.10: - version "1.1.12" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" - integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - -npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40" - integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA== +npm-packlist@^5.1.0, npm-packlist@^5.1.1: + version "5.1.3" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b" + integrity sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg== dependencies: - figgy-pudding "^3.5.1" - npm-package-arg "^6.0.0" - semver "^5.4.1" + glob "^8.0.1" + ignore-walk "^5.0.1" + npm-bundled "^2.0.0" + npm-normalize-package-bin "^2.0.0" -npm-profile@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-3.0.2.tgz#58d568f1b56ef769602fd0aed8c43fa0e0de0f57" - integrity sha512-rEJOFR6PbwOvvhGa2YTNOJQKNuc6RovJ6T50xPU7pS9h/zKPNCJ+VHZY2OFXyZvEi+UQYtHRTp8O/YM3tUD20A== +npm-pick-manifest@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.2.tgz#1d372b4e7ea7c6712316c0e99388a73ed3496e84" + integrity sha512-gk37SyRmlIjvTfcYl6RzDbSmS9Y4TOBXfsPnoYqTHARNgWbyDiCSMLUpmALDj4jjcTZpURiEfsSHJj9k7EV4Rw== dependencies: - aproba "^1.1.2 || 2" - make-fetch-happen "^2.5.0 || 3 || 4" + npm-install-checks "^5.0.0" + npm-normalize-package-bin "^2.0.0" + npm-package-arg "^9.0.0" + semver "^7.3.5" -npm-registry-client@^8.5.1: - version "8.6.0" - resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4" - integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg== +npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.3.0: + version "13.3.1" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e" + integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw== dependencies: - concat-stream "^1.5.2" - graceful-fs "^4.1.6" - normalize-package-data "~1.0.1 || ^2.0.0" - npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" - once "^1.3.3" - request "^2.74.0" - retry "^0.10.0" - safe-buffer "^5.1.1" - semver "2 >=2.2.1 || 3.x || 4 || 5" - slide "^1.1.3" - ssri "^5.2.4" - optionalDependencies: - npmlog "2 || ^3.1.0 || ^4.0.0" - -npm-registry-fetch@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-1.1.1.tgz#710bc5947d9ee2c549375072dab6d5d17baf2eb2" - integrity sha512-ev+zxOXsgAqRsR8Rk+ErjgWOlbrXcqGdme94/VNdjDo1q8TSy10Pp8xgDv/ZmMk2jG/KvGtXUNG4GS3+l6xbDw== - dependencies: - bluebird "^3.5.1" - figgy-pudding "^3.0.0" - lru-cache "^4.1.2" - make-fetch-happen "^3.0.0" - npm-package-arg "^6.0.0" - safe-buffer "^5.1.1" + make-fetch-happen "^10.0.6" + minipass "^3.1.6" + minipass-fetch "^2.0.3" + minipass-json-stream "^1.0.1" + minizlib "^2.1.2" + npm-package-arg "^9.0.1" + proc-log "^2.0.0" npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw== dependencies: path-key "^2.0.0" @@ -19517,133 +21996,7 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npm-user-validate@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561" - integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw== - -npm@^5.10.0: - version "5.10.0" - resolved "https://registry.yarnpkg.com/npm/-/npm-5.10.0.tgz#3bec62312c94a9b0f48f208e00b98bf0304b40db" - integrity sha512-lvjvjgR5wG2RJ2uqak1xtZcVAWMwVOzN5HkUlUj/n8rU1f3A0fNn+7HwOzH9Lyf0Ppyu9ApgsEpHczOSnx1cwA== - dependencies: - JSONStream "^1.3.2" - abbrev "~1.1.1" - ansi-regex "~3.0.0" - ansicolors "~0.3.2" - ansistyles "~0.1.3" - aproba "~1.2.0" - archy "~1.0.0" - bin-links "^1.1.0" - bluebird "~3.5.1" - byte-size "^4.0.2" - cacache "^10.0.4" - call-limit "~1.1.0" - chownr "~1.0.1" - cli-columns "^3.1.2" - cli-table2 "~0.2.0" - cmd-shim "~2.0.2" - columnify "~1.5.4" - config-chain "~1.1.11" - detect-indent "~5.0.0" - detect-newline "^2.1.0" - dezalgo "~1.0.3" - editor "~1.0.0" - find-npm-prefix "^1.0.2" - fs-vacuum "~1.2.10" - fs-write-stream-atomic "~1.0.10" - gentle-fs "^2.0.1" - glob "~7.1.2" - graceful-fs "~4.1.11" - has-unicode "~2.0.1" - hosted-git-info "^2.6.0" - iferr "~0.1.5" - inflight "~1.0.6" - inherits "~2.0.3" - ini "^1.3.5" - init-package-json "^1.10.3" - is-cidr "~1.0.0" - json-parse-better-errors "^1.0.2" - lazy-property "~1.0.0" - libcipm "^1.6.2" - libnpx "^10.2.0" - lock-verify "^2.0.2" - lockfile "^1.0.4" - lodash._baseuniq "~4.6.0" - lodash.clonedeep "~4.5.0" - lodash.union "~4.6.0" - lodash.uniq "~4.5.0" - lodash.without "~4.4.0" - lru-cache "^4.1.2" - meant "~1.0.1" - mississippi "^3.0.0" - mkdirp "~0.5.1" - move-concurrently "^1.0.1" - node-gyp "^3.6.2" - nopt "~4.0.1" - normalize-package-data "~2.4.0" - npm-audit-report "^1.0.9" - npm-cache-filename "~1.0.2" - npm-install-checks "~3.0.0" - npm-lifecycle "^2.0.1" - npm-package-arg "^6.1.0" - npm-packlist "~1.1.10" - npm-profile "^3.0.1" - npm-registry-client "^8.5.1" - npm-registry-fetch "^1.1.0" - npm-user-validate "~1.0.0" - npmlog "~4.1.2" - once "~1.4.0" - opener "~1.4.3" - osenv "^0.1.5" - pacote "^7.6.1" - path-is-inside "~1.0.2" - promise-inflight "~1.0.1" - qrcode-terminal "^0.12.0" - query-string "^6.1.0" - qw "~1.0.1" - read "~1.0.7" - read-cmd-shim "~1.0.1" - read-installed "~4.0.3" - read-package-json "^2.0.13" - read-package-tree "^5.2.1" - readable-stream "^2.3.6" - request "^2.85.0" - retry "^0.12.0" - rimraf "~2.6.2" - safe-buffer "^5.1.2" - semver "^5.5.0" - sha "~2.0.1" - slide "~1.1.6" - sorted-object "~2.0.1" - sorted-union-stream "~2.1.3" - ssri "^5.3.0" - strip-ansi "~4.0.0" - tar "^4.4.2" - text-table "~0.2.0" - tiny-relative-date "^1.3.0" - uid-number "0.0.6" - umask "~1.1.0" - unique-filename "~1.1.0" - unpipe "~1.0.0" - update-notifier "^2.5.0" - uuid "^3.2.1" - validate-npm-package-license "^3.0.3" - validate-npm-package-name "~3.0.0" - which "~1.3.0" - worker-farm "^1.6.0" - wrappy "~1.0.2" - write-file-atomic "^2.3.0" - -npmi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/npmi/-/npmi-4.0.0.tgz#02b669a79ef475578461811e4f51aac808169068" - integrity sha512-qNyW7pgCNbdhDFl3WmEEIZwp87RKwD9Y9SiJ/eZPGCUM7iwgvXXNVby+3JEYAfV6KxONnitDNFXuZlr2fSpV/g== - dependencies: - global-npm "^0.3.0" - semver "^5.4.1" - -"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2, npmlog@~4.1.2: +npmlog@^4.0.1, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -19653,6 +22006,33 @@ npmi@^4.0.0: gauge "~2.7.3" set-blocking "~2.0.0" +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" + +npmlog@^6.0.0, npmlog@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + +nth-check@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== + dependencies: + boolbase "^1.0.0" + nullthrows@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" @@ -19661,12 +22041,12 @@ nullthrows@^1.1.1: number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== number-to-bn@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/number-to-bn/-/number-to-bn-1.7.0.tgz#bb3623592f7e5f9e0030b1977bd41a0c53fe1ea0" - integrity sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA= + integrity sha512-wsJ9gfSz1/s4ZsJN01lyonwuxA1tml6X1yBDnfpMglypcBRFZZkus26EdPSlqS5GJfYddVZa22p3VNb3z5m5Ig== dependencies: bn.js "4.11.6" strip-hex-prefix "1.0.0" @@ -19674,17 +22054,53 @@ number-to-bn@1.7.0: numeral@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506" - integrity sha1-StCAk21EPCVhrtnyGX7//iX05QY= + integrity sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA== numeric@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/numeric/-/numeric-1.2.6.tgz#765b02bef97988fcf880d4eb3f36b80fa31335aa" - integrity sha1-dlsCvvl5iPz4gNTrPza4D6MTNao= + integrity sha512-avBiDAP8siMa7AfJgYyuxw1oyII4z2sswS23+O+ZfV28KrtNzy0wxUFwi4f3RyM4eeeXNs1CThxR7pb5QQcMiw== nwsapi@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c" - integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg== + version "2.2.2" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" + integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== + +nx@14.6.5, "nx@>=14.6.1 < 16": + version "14.6.5" + resolved "https://registry.yarnpkg.com/nx/-/nx-14.6.5.tgz#13524e7355803a8247278374063d8e82b845a621" + integrity sha512-egV8Zrec+0m+27wTENe9W/JKRMkBDx1N0xaFzKjL0WKj5WIe4asao5uwTJEwqi9iQyiijExxUFVU5MNGuF2c+A== + dependencies: + "@nrwl/cli" "14.6.5" + "@nrwl/tao" "14.6.5" + "@parcel/watcher" "2.0.4" + chalk "4.1.0" + chokidar "^3.5.1" + cli-cursor "3.1.0" + cli-spinners "2.6.1" + cliui "^7.0.2" + dotenv "~10.0.0" + enquirer "~2.3.6" + fast-glob "3.2.7" + figures "3.2.0" + flat "^5.0.2" + fs-extra "^10.1.0" + glob "7.1.4" + ignore "^5.0.4" + js-yaml "4.1.0" + jsonc-parser "3.0.0" + minimatch "3.0.5" + npm-run-path "^4.0.1" + open "^8.4.0" + semver "7.3.4" + string-width "^4.2.3" + tar-stream "~2.2.0" + tmp "~0.2.1" + tsconfig-paths "^3.9.0" + tslib "^2.3.0" + v8-compile-cache "2.3.0" + yargs "^17.4.0" + yargs-parser "21.0.1" oauth-sign@~0.9.0: version "0.9.0" @@ -19696,51 +22112,44 @@ ob1@0.59.0: resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.59.0.tgz#ee103619ef5cb697f2866e3577da6f0ecd565a36" integrity sha512-opXMTxyWJ9m68ZglCxwo0OPRESIC/iGmKFPXEXzMZqsVIrgoRXOHmoMDkQzz4y3irVjbyPJRAh5pI9fd0MJTFQ== -object-assign@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" - integrity sha1-ejs9DpgGPUP0wD8uiubNUahog6A= - object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" - integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= + integrity sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ== object-assign@^4, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== dependencies: copy-descriptor "^0.1.0" define-property "^0.2.5" kind-of "^3.0.3" -object-hash@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" - integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== - -object-inspect@^1.7.0, object-inspect@^1.8.0, object-inspect@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" - integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== +object-hash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" + integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== -object-inspect@~1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" - integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ== +object-inspect@^1.12.2, object-inspect@^1.9.0, object-inspect@~1.12.2: + version "1.12.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" + integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== -object-is@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" - integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY= +object-is@^1.0.1, object-is@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" -object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.0.11, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -19748,29 +22157,24 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: object-keys@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" - integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY= - -object-path@^0.11.5: - version "0.11.8" - resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742" - integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA== + integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw== object-treeify@^1.1.4: - version "1.1.26" - resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.26.tgz#80b882036cb5d0fddc16e8a2affa98ba96f89a74" - integrity sha512-0WTfU7SGM8umY4YPpOg+oHXL66E6dPVCr+sMR6KitPmvg8CkVrHUUZYEFtx0+5Wb0HjFEsBwBYXyGRNeX7c/oQ== + version "1.1.33" + resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.33.tgz#f06fece986830a3cba78ddd32d4c11d1f76cdf40" + integrity sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A== object-visit@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-0.1.0.tgz#b1bb6749f228ee76e0c42f3851d28a14d233ce26" - integrity sha1-sbtnSfIo7nbgxC84UdKKFNIzziY= + integrity sha512-gPvtDz6xoiDNPMp3e/5sQGua8cgevJULRMdrX9dcgFbeaTuqGOW3g4OgrLragDA6NSfvS2iNBXrs8CWgBQq83A== dependencies: isobject "^1.0.0" object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== dependencies: isobject "^3.0.0" @@ -19784,38 +22188,40 @@ object.assign@4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== +object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" + call-bind "^1.0.2" + define-properties "^1.1.4" + has-symbols "^1.0.3" object-keys "^1.1.1" object.defaults@^1.0.0, object.defaults@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" - integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= + integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA== dependencies: array-each "^1.0.1" array-slice "^1.0.0" for-own "^1.0.0" isobject "^3.0.0" -object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" - integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== +object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37" + integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ== dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + array.prototype.reduce "^1.0.4" + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.1" object.map@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" - integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= + integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w== dependencies: for-own "^1.0.0" make-iterator "^1.0.0" @@ -19823,7 +22229,7 @@ object.map@^1.0.0: object.omit@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-1.1.0.tgz#9d17ea16778e5057deba7752c6f55f1496829e94" - integrity sha1-nRfqFneOUFfeundSxvVfFJaCnpQ= + integrity sha512-oc6HJYjJhqPa0AsywIBlKNVd9ctu6lrDwr/N4HSpa3FKD1l3cF5pdgdLHm8Fn0zSKGKTKGwVOdoTTgUh1FQkKw== dependencies: for-own "^0.1.3" isobject "^1.0.0" @@ -19831,7 +22237,7 @@ object.omit@^1.1.0: object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= + integrity sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA== dependencies: for-own "^0.1.4" is-extendable "^0.1.1" @@ -19839,14 +22245,14 @@ object.omit@^2.0.0: object.pick@^1.2.0, object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== dependencies: isobject "^3.0.1" object.reduce@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad" - integrity sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60= + integrity sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw== dependencies: for-own "^1.0.0" make-iterator "^1.0.0" @@ -19854,22 +22260,17 @@ object.reduce@^1.0.0: oboe@2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.4.tgz#20c88cdb0c15371bb04119257d4fdd34b0aa49f6" - integrity sha1-IMiM2wwVNxuwQRklfU/dNLCqSfY= + integrity sha512-ymBJ4xSC6GBXLT9Y7lirj+xbqBLa+jADGJldGEYG7u8sZbS9GyG+u1Xk9c5cbriKwSpCg41qUhPjvU5xOpvIyQ== dependencies: http-https "^1.0.0" oboe@2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.5.tgz#5554284c543a2266d7a38f17e073821fbde393cd" - integrity sha1-VVQoTFQ6ImbXo48X4HOCH73jk80= + integrity sha512-zRFWiF+FoicxEs3jNI/WYUrVEgA7DeET/InK0XQuudGHRg8iIob3cNPrJTKaz4004uaA9Pbe+Dwa8iluhjLZWA== dependencies: http-https "^1.0.0" -octokit-pagination-methods@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" - integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== - omni-fetch@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/omni-fetch/-/omni-fetch-0.2.3.tgz#56a6f46ad170b6d978982cca5bd1c6b70597a58d" @@ -19879,10 +22280,17 @@ omni-fetch@^0.2.3: "@types/node" "^6.0.52" caw "^1.2.0" -on-finished@^2.2.0, on-finished@~2.3.0: +on-finished@2.4.1, on-finished@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== + dependencies: + ee-first "1.1.1" + +on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== dependencies: ee-first "1.1.1" @@ -19891,29 +22299,31 @@ on-headers@^1.0.0, on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0, once@~1.4.0: +once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" -one-time@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" - integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4= +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" onetime@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" @@ -19924,27 +22334,39 @@ open@^6.2.0, open@^6.3.0: dependencies: is-wsl "^1.1.0" -openapi3-ts@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/openapi3-ts/-/openapi3-ts-2.0.1.tgz#b270aecea09e924f1886bc02a72608fca5a98d85" - integrity sha512-v6X3iwddhi276siej96jHGIqTx3wzVfMTmpGJEQDt7GPI7pI6sywItURLzpEci21SBRpPN/aOWSF5mVfFVNmcg== +open@^7.0.0, open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== dependencies: - yaml "^1.10.0" + is-docker "^2.0.0" + is-wsl "^2.1.1" -opencollective-postinstall@^2.0.2: +open@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + +openapi3-ts@^2.0.1: version "2.0.2" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" - integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + resolved "https://registry.yarnpkg.com/openapi3-ts/-/openapi3-ts-2.0.2.tgz#a200dd838bf24c9086c8eedcfeb380b7eb31e82a" + integrity sha512-TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw== + dependencies: + yaml "^1.10.2" -opener@~1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8" - integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg= +opencollective-postinstall@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== openzeppelin-solidity@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/openzeppelin-solidity/-/openzeppelin-solidity-2.5.0.tgz#829a9bcfc928619dd96c44bd893b180044ff51aa" - integrity sha512-I0yRC3nff9Kn2LDWuz02fuw0EuomVQ9Z8lHzdqh8P9BiOUzIk8frQRxn/a1Kva3StF6hwPP+Dh3/SQ2ily1Pow== + version "2.5.1" + resolved "https://registry.yarnpkg.com/openzeppelin-solidity/-/openzeppelin-solidity-2.5.1.tgz#1cdcce30c4c6a7b6625dab62ccd0440a813ab597" + integrity sha512-oCGtQPLOou4su76IMr4XXJavy9a8OZmAXeUZ8diOdFznlL/mlkIlYr7wajqCzH4S47nlKPS7m0+a2nilCTpVPQ== optionator@^0.8.1, optionator@^0.8.2: version "0.8.3" @@ -19961,14 +22383,14 @@ optionator@^0.8.1, optionator@^0.8.2: options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" - integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= + integrity sha512-bOj3L1ypm++N+n7CEbbe473A414AB7z+amKYshRb//iuL3MpdDCLhPnw6aVTdKB9g5ZRVHIEp8eUln6L2NUStg== optjs@~3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee" - integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4= + integrity sha512-f8lTJm4LKirX+45xsFhuRNjA4f46QVLQKfGoNH7e2AEWS+24eM4XNH4pQ8Tw2LISCIvbST/wNcLdtgvgcqVaxA== -ora@^3.0.0, ora@^3.4.0: +ora@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg== @@ -19980,40 +22402,47 @@ ora@^3.0.0, ora@^3.4.0: strip-ansi "^5.2.0" wcwidth "^1.0.1" -ordered-read-streams@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b" - integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s= +ora@^5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== dependencies: - is-stream "^1.0.1" - readable-stream "^2.0.1" + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" ordered-read-streams@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" - integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4= + integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw== dependencies: readable-stream "^2.0.1" -original-require@1.0.1, original-require@^1.0.1: +original-require@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" - integrity sha1-DxMEcVhM0zURxew4yNWSE/msXiA= + integrity sha512-5vdKMbE58WaE61uVD+PKyh8xdM398UnjPBLotW2sjG5MzHARwta/+NtMBCBA0t2WQblGYBvq5vsiZpWokwno+A== os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A== os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== os-locale@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= + integrity sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g== dependencies: lcid "^1.0.0" @@ -20026,7 +22455,7 @@ os-locale@^2.0.0: lcid "^1.0.0" mem "^1.1.0" -os-locale@^3.0.0, os-locale@^3.1.0: +os-locale@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== @@ -20035,20 +22464,12 @@ os-locale@^3.0.0, os-locale@^3.1.0: lcid "^2.0.0" mem "^4.0.0" -os-name@^3.0.0, os-name@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" - integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== - dependencies: - macos-release "^2.2.0" - windows-release "^3.1.0" - os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== -osenv@^0.1.4, osenv@^0.1.5: +osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -20066,10 +22487,15 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-cancelable@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050" + integrity sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw== + p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= + integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw== p-defer@^3.0.0: version "3.0.0" @@ -20077,40 +22503,40 @@ p-defer@^3.0.0: integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== p-each-series@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" - integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" + integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== p-finally@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== -p-is-promise@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" - integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= +p-is-promise@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" + integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" - integrity sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng== + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== dependencies: p-try "^1.0.0" p-limit@^2.0.0, p-limit@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2" - integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" -p-limit@^3.0.1: +p-limit@^3.0.1, p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -20120,7 +22546,7 @@ p-limit@^3.0.1: p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg== dependencies: p-limit "^1.1.0" @@ -20138,58 +22564,73 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" -p-map-series@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca" - integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco= +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== dependencies: - p-reduce "^1.0.0" + p-limit "^3.0.2" -p-map@^2.1.0: +p-map-series@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" - integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== - -p-pipe@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9" - integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k= + resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-2.1.0.tgz#7560d4c452d9da0c07e692fdbfe6e2c81a2a91f2" + integrity sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q== -p-queue@^4.0.0: +p-map@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346" - integrity sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg== + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== dependencies: - eventemitter3 "^3.1.0" + aggregate-error "^3.0.0" -p-reduce@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" - integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= +p-pipe@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e" + integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw== + +p-queue@^6.6.2: + version "6.6.2" + resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426" + integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ== + dependencies: + eventemitter3 "^4.0.4" + p-timeout "^3.2.0" + +p-reduce@^2.0.0, p-reduce@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a" + integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw== p-timeout@^1.1.1: version "1.2.1" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" - integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y= + integrity sha512-gb0ryzr+K2qFqFv6qi3khoeqMZF/+ajxQipEF6NteZVnvz9tzdsfAVj3lYtn1gAXvH5lfLwfxEII799gt/mRIA== + dependencies: + p-finally "^1.0.0" + +p-timeout@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe" + integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg== dependencies: p-finally "^1.0.0" p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= + integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww== p-try@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" - integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -p-waterfall@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00" - integrity sha1-ftlLPOszMngjU69qrhGqn8I1uwA= +p-waterfall@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-2.1.1.tgz#63153a774f472ccdc4eb281cdb2967fcf158b2ee" + integrity sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw== dependencies: - p-reduce "^1.0.0" + p-reduce "^2.0.0" pac-proxy-agent@^5.0.0: version "5.0.0" @@ -20207,18 +22648,18 @@ pac-proxy-agent@^5.0.0: socks-proxy-agent "5" pac-resolver@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.0.tgz#1d717a127b3d7a9407a16d6e1b012b13b9ba8dc0" - integrity sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.1.tgz#c91efa3a9af9f669104fa2f51102839d01cde8e7" + integrity sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q== dependencies: - degenerator "^3.0.1" + degenerator "^3.0.2" ip "^1.1.5" - netmask "^2.0.1" + netmask "^2.0.2" package-json@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= + integrity sha512-q/R5GrMek0vzgoomq6rm9OX+3PQve8sLwTirmK30YB3Cu0Bbt9OX9M/SIUnroN5BGJkzwGsFwDaRGD9EwBOlCA== dependencies: got "^6.7.1" registry-auth-token "^3.0.1" @@ -20240,81 +22681,54 @@ packet-reader@1.0.0: resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== -pacote@^7.6.1: - version "7.6.1" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-7.6.1.tgz#d44621c89a5a61f173989b60236757728387c094" - integrity sha512-2kRIsHxjuYC1KRUIK80AFIXKWy0IgtFj76nKcaunozKAOSlfT+DFh3EfeaaKvNHCWixgi0G0rLg11lJeyEnp/Q== - dependencies: - bluebird "^3.5.1" - cacache "^10.0.4" - get-stream "^3.0.0" - glob "^7.1.2" - lru-cache "^4.1.1" - make-fetch-happen "^2.6.0" - minimatch "^3.0.4" - mississippi "^3.0.0" - mkdirp "^0.5.1" - normalize-package-data "^2.4.0" - npm-package-arg "^6.0.0" - npm-packlist "^1.1.10" - npm-pick-manifest "^2.1.0" - osenv "^0.1.5" - promise-inflight "^1.0.1" - promise-retry "^1.1.1" - protoduck "^5.0.0" - rimraf "^2.6.2" - safe-buffer "^5.1.1" - semver "^5.5.0" - ssri "^5.2.4" - tar "^4.4.0" - unique-filename "^1.1.0" - which "^1.3.0" - -pacote@^8.1.6: - version "8.1.6" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-8.1.6.tgz#8e647564d38156367e7a9dc47a79ca1ab278d46e" - integrity sha512-wTOOfpaAQNEQNtPEx92x9Y9kRWVu45v583XT8x2oEV2xRB74+xdqMZIeGW4uFvAyZdmSBtye+wKdyyLaT8pcmw== - dependencies: - bluebird "^3.5.1" - cacache "^11.0.2" - get-stream "^3.0.0" - glob "^7.1.2" - lru-cache "^4.1.3" - make-fetch-happen "^4.0.1" - minimatch "^3.0.4" - minipass "^2.3.3" - mississippi "^3.0.0" - mkdirp "^0.5.1" - normalize-package-data "^2.4.0" - npm-package-arg "^6.1.0" - npm-packlist "^1.1.10" - npm-pick-manifest "^2.1.0" - osenv "^0.1.5" - promise-inflight "^1.0.1" - promise-retry "^1.1.1" - protoduck "^5.0.0" - rimraf "^2.6.2" - safe-buffer "^5.1.2" - semver "^5.5.0" - ssri "^6.0.0" - tar "^4.4.3" - unique-filename "^1.1.0" - which "^1.3.0" - -pako@^1.0.4, pako@~1.0.5: +pacote@^13.0.3, pacote@^13.6.1: + version "13.6.2" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a" + integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg== + dependencies: + "@npmcli/git" "^3.0.0" + "@npmcli/installed-package-contents" "^1.0.7" + "@npmcli/promise-spawn" "^3.0.0" + "@npmcli/run-script" "^4.1.0" + cacache "^16.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + infer-owner "^1.0.4" + minipass "^3.1.6" + mkdirp "^1.0.4" + npm-package-arg "^9.0.0" + npm-packlist "^5.1.0" + npm-pick-manifest "^7.0.0" + npm-registry-fetch "^13.0.1" + proc-log "^2.0.0" + promise-retry "^2.0.1" + read-package-json "^5.0.0" + read-package-json-fast "^2.0.3" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + +pako@~1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== parallel-transform@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06" - integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY= + version "1.2.0" + resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" + integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== dependencies: - cyclist "~0.2.2" + cyclist "^1.0.1" inherits "^2.0.3" readable-stream "^2.1.5" +param-case@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" + integrity sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w== + dependencies: + no-case "^2.2.0" + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -20336,17 +22750,26 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5: parse-cache-control@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/parse-cache-control/-/parse-cache-control-1.0.1.tgz#8eeab3e54fa56920fe16ba38f77fa21aacc2d74e" - integrity sha1-juqz5U+laSD+Fro493+iGqzC104= + integrity sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg== parse-code-context@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-code-context/-/parse-code-context-1.0.0.tgz#718c295c593d0d19a37f898473268cc75e98de1e" integrity sha512-OZQaqKaQnR21iqhlnPfVisFjBWjhnMl5J9MgbP8xC+EwoVqbXrq78lp+9Zb3ahmLzrIX5Us/qbvBnaS3hkH6OA== +parse-conflict-json@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323" + integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA== + dependencies: + json-parse-even-better-errors "^2.3.1" + just-diff "^5.0.1" + just-diff-apply "^5.2.0" + parse-filepath@^0.6.1: version "0.6.3" resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-0.6.3.tgz#38e17a73e5e4e6776bae9506fc3ccb14bc3a2b80" - integrity sha1-OOF6c+Xk5ndrrpUG/DzLFLw6K4A= + integrity sha512-/8L5NPcGFMlZZ05LhvyKDQkCb8nX/5DPad9ZGvXrpAyGfk4Fop0PCEyCnwnB7PgnSW2JLCSId0ZNrBo7iAhXYQ== dependencies: is-absolute "^0.2.2" map-cache "^0.2.0" @@ -20354,21 +22777,16 @@ parse-filepath@^0.6.1: parse-filepath@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" - integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= + integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q== dependencies: is-absolute "^1.0.0" map-cache "^0.2.0" path-root "^0.1.1" -parse-github-repo-url@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50" - integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A= - parse-gitignore@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/parse-gitignore/-/parse-gitignore-0.2.0.tgz#98706d09f0f93ee86348b721ffee0606bc093d74" - integrity sha1-mHBtCfD5PuhjSLch/+4GBrwJPXQ= + integrity sha512-NB3206JVaagRmgpQCWymcXHd+bZyVxACtgehEL49jDptryTqGcDWo7YroucBXKePj9lGYz3guQVZIV/gqrsaOw== dependencies: ends-with "^0.2.0" is-glob "^2.0.0" @@ -20377,7 +22795,7 @@ parse-gitignore@^0.2.0: parse-glob@^3.0.1, parse-glob@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + integrity sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA== dependencies: glob-base "^0.3.0" is-dotfile "^1.0.0" @@ -20385,72 +22803,99 @@ parse-glob@^3.0.1, parse-glob@^3.0.4: is-glob "^2.0.0" parse-headers@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515" - integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA== + version "2.0.5" + resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.5.tgz#069793f9356a54008571eb7f9761153e6c770da9" + integrity sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA== parse-json@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= + integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ== dependencies: error-ex "^1.2.0" parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw== dependencies: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" -parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== +parse-json@^5.0.0, parse-json@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" + json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-node-version@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= + integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== -parse-path@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff" - integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA== +parse-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-5.0.0.tgz#f933152f3c6d34f4cf36cfc3d07b138ac113649d" + integrity sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A== dependencies: - is-ssh "^1.3.0" - protocols "^1.4.0" + protocols "^2.0.0" -parse-url@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f" - integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg== +parse-url@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-7.0.2.tgz#d21232417199b8d371c6aec0cedf1406fd6393f0" + integrity sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg== + dependencies: + is-ssh "^1.4.0" + normalize-url "^6.1.0" + parse-path "^5.0.0" + protocols "^2.0.1" + +parse5-htmlparser2-tree-adapter@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1" + integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g== dependencies: - is-ssh "^1.3.0" - normalize-url "^3.3.0" - parse-path "^4.0.0" - protocols "^1.4.0" + domhandler "^5.0.2" + parse5 "^7.0.0" parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== -parseurl@~1.3.2, parseurl@~1.3.3: +parse5@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" + integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== + dependencies: + entities "^4.4.0" + +parseurl@^1.3.3, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +pascal-case@^2.0.0, pascal-case@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-2.0.1.tgz#2d578d3455f660da65eca18ef95b4e0de912761e" + integrity sha512-qjS4s8rBOJa2Xm0jmxXiyh1+OFf6ekCWOvUaRgAQSktzlTbMotS0nmG9gyYAybCWBcuP4fsBeRCKNwGBnMe2OQ== + dependencies: + camel-case "^3.0.0" + upper-case-first "^1.1.0" + pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== password-prompt@^1.0.7, password-prompt@^1.1.2: version "1.1.2" @@ -20461,49 +22906,52 @@ password-prompt@^1.0.7, password-prompt@^1.1.2: cross-spawn "^6.0.5" patch-package@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.2.2.tgz#71d170d650c65c26556f0d0fbbb48d92b6cc5f39" - integrity sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg== + version "6.4.7" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148" + integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ== dependencies: "@yarnpkg/lockfile" "^1.1.0" chalk "^2.4.2" cross-spawn "^6.0.5" - find-yarn-workspace-root "^1.2.1" + find-yarn-workspace-root "^2.0.0" fs-extra "^7.0.1" is-ci "^2.0.0" klaw-sync "^6.0.0" minimist "^1.2.0" + open "^7.4.2" rimraf "^2.6.3" semver "^5.6.0" slash "^2.0.0" tmp "^0.0.33" -path-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" - integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo= - path-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== +path-case@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5" + integrity sha512-Ou0N05MioItesaLr9q8TtHVWmJ6fxWdqKB2RohFmNWVyJ+2zeKIeDNWAN6B/Pe7wpzWChhZX6nONYmOnMeJQ/Q== + dependencies: + no-case "^2.2.0" + path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= + integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q== path-exists@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ== dependencies: pinkie-promise "^2.0.0" path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== path-exists@^4.0.0: version "4.0.0" @@ -20513,44 +22961,44 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== -path-is-inside@^1.0.1, path-is-inside@^1.0.2, path-is-inside@~1.0.2: +path-is-inside@^1.0.1, path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= + integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w== path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.5, path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-root-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= + integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ== path-root@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= + integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg== dependencies: path-root-regex "^0.1.0" path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== path-to-regexp@^1.8.0: version "1.8.0" @@ -20567,19 +23015,12 @@ path-to-regexp@^2.2.1: path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= + integrity sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg== dependencies: graceful-fs "^4.1.2" pify "^2.0.0" pinkie-promise "^2.0.0" -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= - dependencies: - pify "^2.0.0" - path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -20595,34 +23036,27 @@ path-type@^4.0.0: path@^0.12.7: version "0.12.7" resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f" - integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8= + integrity sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q== dependencies: process "^0.11.1" util "^0.10.3" -pathval@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0" - integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA= +pathval@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" + integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== pause-stream@^0.0.11: version "0.0.11" resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= + integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A== dependencies: through "~2.3" -pbkdf2@3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.8.tgz#2f8abf16ebecc82277945d748aba1d78761f61e2" - integrity sha1-L4q/FuvsyCJ3lF10irodeHYfYeI= - dependencies: - create-hmac "^1.1.2" - pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.0.9: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" - integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -20633,27 +23067,27 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.0.9: pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== pg-connection-string@0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" - integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc= + integrity sha512-i0NV/CrSkFTaiOQs9AGy3tq0dkSjtTd4d7DfsjeDVZAA4aIHInwfFEmriNYGGJUfZ5x6IAC/QddoUpUJjQAi0w== -pg-connection-string@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.2.0.tgz#caab4d38a9de4fdc29c9317acceed752897de41c" - integrity sha512-xB/+wxcpFipUZOQcSzcgkjcNOosGhEoPSjz06jC89lv1dj7mc9bZv6wLVy8M2fVjP0a/xN0N988YDq1L0FhK3A== +pg-connection-string@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10" + integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ== -pg-connection-string@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.2.3.tgz#48e1158ec37eaa82e98dbcb7307103ec303fe0e7" - integrity sha512-I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ== +pg-connection-string@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" + integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== pg-hstore@2.3.3: version "2.3.3" @@ -20677,17 +23111,17 @@ pg-pool@^2.0.10, pg-pool@^2.0.4: resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a" integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg== -pg-pool@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.1.tgz#5f4afc0f58063659aeefa952d36af49fa28b30e0" - integrity sha512-BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA== +pg-pool@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178" + integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w== -pg-protocol@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.2.4.tgz#3139cac0e51347f1e21e03954b1bb9fe2c20962e" - integrity sha512-/8L/G+vW/VhWjTGXpGh8XVkXOFx1ZDY+Yuz//Ab8CfjInzFkreI+fDG3WjCeSra7fIZwAFxzbGptNbm8xSXenw== +pg-protocol@^1.2.0, pg-protocol@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" + integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== -pg-types@^2.1.0: +pg-types@^2.1.0, pg-types@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== @@ -20726,81 +23160,71 @@ pg@^7.18.0: semver "4.3.2" pg@^8.2.1: - version "8.2.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.2.1.tgz#f5a81f5e2025182fbe701514d3e1a43e68a616ac" - integrity sha512-DKzffhpkWRr9jx7vKxA+ur79KG+SKw+PdjMb1IRhMiKI9zqYUGczwFprqy+5Veh/DCcFs1Y6V8lRLN5I1DlleQ== + version "8.8.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686" + integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" - pg-connection-string "^2.2.3" - pg-pool "^3.2.1" - pg-protocol "^1.2.4" + pg-connection-string "^2.5.0" + pg-pool "^3.5.2" + pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" - semver "4.3.2" pgpass@1.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" - integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY= + version "1.0.5" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d" + integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug== dependencies: - split "^1.0.0" + split2 "^4.1.0" -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4, picomatch@^2.0.7, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== pify@^4.0.0, pify@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== +pify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" + integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw== dependencies: pinkie "^2.0.0" pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - -pirates@^4.0.0, pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" - -pkg-conf@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-1.1.3.tgz#378e56d6fd13e88bfb6f4a25df7a83faabddba5b" - integrity sha1-N45W1v0T6Iv7b0ol33qD+qvduls= - dependencies: - find-up "^1.0.0" - load-json-file "^1.1.0" - object-assign "^4.0.1" - symbol "^0.2.1" + integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" +pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== pkg-dir@^3.0.0: version "3.0.0" @@ -20816,6 +23240,13 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +pkg-up@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== + dependencies: + find-up "^3.0.0" + please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -20824,17 +23255,17 @@ please-upgrade-node@^3.2.0: semver-compare "^1.0.0" plist@^3.0.1, plist@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" - integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA== + version "3.0.6" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" + integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA== dependencies: base64-js "^1.5.1" - xmlbuilder "^9.0.7" + xmlbuilder "^15.1.1" plugin-error@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" - integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4= + integrity sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw== dependencies: ansi-cyan "^0.1.1" ansi-red "^0.1.1" @@ -20847,34 +23278,39 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== -pngjs@^3.3.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" - integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== +pluralize@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" + integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== + +pngjs@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb" + integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw== pop-iterate@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz#ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3" - integrity sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M= + integrity sha512-HRCx4+KJE30JhX84wBN4+vja9bNfysxg1y28l0DuJmkoaICiv2ZSilKddbS48pq50P8d2erAhqDLbp47yv3MbQ== popper.js@1.14.3: version "1.14.3" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095" - integrity sha1-FDj5jQRqz3tNeM1QK/QYrGTU8JU= + integrity sha512-3lmujhsHXzb83+sI0PzfrE3O1XHZG8m8MXNMTupvA6LrM1/nnsiqYaacYc/RIente9VqnTDPztGEM8uvPAMGyg== portfinder@^1.0.23: - version "1.0.23" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.23.tgz#894db4bcc5daf02b6614517ce89cd21a38226b82" - integrity sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ== + version "1.0.32" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81" + integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg== dependencies: - async "^1.5.2" - debug "^2.2.0" - mkdirp "0.5.x" + async "^2.6.4" + debug "^3.2.7" + mkdirp "^0.5.6" posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== postgres-array@~2.0.0: version "2.0.0" @@ -20884,12 +23320,12 @@ postgres-array@~2.0.0: postgres-bytea@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" - integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU= + integrity sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w== postgres-date@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728" - integrity sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA== + version "1.0.7" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" + integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== postgres-interval@^1.1.0: version "1.2.0" @@ -20898,31 +23334,254 @@ postgres-interval@^1.1.0: dependencies: xtend "^4.0.0" -prebuild-install@5.3.3, prebuild-install@^5.2.4, prebuild-install@^5.3.0, prebuild-install@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e" - integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g== +pouchdb-abstract-mapreduce@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.0.tgz#cc178cb5d07f73b7c3f0f47a7f963defd4872b1c" + integrity sha512-+2fVt3SDh7D776lIGbYZOsKX5js1aUyUw7iJaTGitxSdQ2ObWSTrr3SUrj5Qo1CkgPXwRM3Tdoq/53JYAa2qCA== + dependencies: + pouchdb-binary-utils "7.3.0" + pouchdb-collate "7.3.0" + pouchdb-collections "7.3.0" + pouchdb-errors "7.3.0" + pouchdb-fetch "7.3.0" + pouchdb-mapreduce-utils "7.3.0" + pouchdb-md5 "7.3.0" + pouchdb-utils "7.3.0" + +pouchdb-adapter-leveldb-core@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.3.0.tgz#91fa1fbc35e744252ae73f9e88911883c1841c9a" + integrity sha512-OyUsEae1JlqR2jSGMohP03gj6VANh9fDR/3nPIa1vYyoQWlwQzOS7knKqDaJm7Nui3JC5q/lWos7/FGZBFuF5Q== + dependencies: + argsarray "0.0.1" + buffer-from "1.1.2" + double-ended-queue "2.1.0-0" + levelup "4.4.0" + pouchdb-adapter-utils "7.3.0" + pouchdb-binary-utils "7.3.0" + pouchdb-collections "7.3.0" + pouchdb-errors "7.3.0" + pouchdb-json "7.3.0" + pouchdb-md5 "7.3.0" + pouchdb-merge "7.3.0" + pouchdb-utils "7.3.0" + sublevel-pouchdb "7.3.0" + through2 "3.0.2" + +pouchdb-adapter-memory@^7.1.1: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-memory/-/pouchdb-adapter-memory-7.3.0.tgz#ddd5b9ab9d30209d066374648abc761c68444db3" + integrity sha512-nUdYi5KpbUa0uv0L3IJorpiUnIOBPxX9qplCX9i7JE8OtLPeLyKuX3WC+3M1//8Lmmxg3b1wXSNIod6FJy4wAQ== + dependencies: + memdown "1.4.1" + pouchdb-adapter-leveldb-core "7.3.0" + pouchdb-utils "7.3.0" + +pouchdb-adapter-utils@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.3.0.tgz#1747e4ea0b519a9d817c6eda0e2f0ebc3dc18c41" + integrity sha512-mU1+smcagWSpInVx/VQk7VVjjnJlyagKtusUS3OdCMFZY35L6RbXC8eIhoNVDbkBfEv3cIwqQ3t7fdvkaa1odQ== + dependencies: + pouchdb-binary-utils "7.3.0" + pouchdb-collections "7.3.0" + pouchdb-errors "7.3.0" + pouchdb-md5 "7.3.0" + pouchdb-merge "7.3.0" + pouchdb-utils "7.3.0" + +pouchdb-binary-utils@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.0.tgz#ecc235d28e7f226c168affcf53959675f78d5aaf" + integrity sha512-xvBH/XGHGcou2vkEzszJxkCc7YElfRUrkLUg51Jbdmh1mogLDUO0bU3Tj6TOIIJfRkQrU/HV+dDkMAhsil0amQ== + dependencies: + buffer-from "1.1.2" + +pouchdb-collate@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.3.0.tgz#9276de7459a21a6aded71e3090d9b5d5488be19f" + integrity sha512-ys7rXKtEr6cfghgUjknwFJiOkITebV6JmeTybJKCzMV0r2luXu0OoPQsKVpE/wbM/3F5LxfpbFKGFpPcfGMvTA== + +pouchdb-collections@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.3.0.tgz#3197dfbee8d69c3760229705fc5a73d0c8a896f1" + integrity sha512-Xr54m2+fErShXn+qAT4xwqJ+8NwddNPeTMJT4z4k1sZsrwfHmZsWbsKAyGPMF04eQaaU+7DDRMciu2VzaBUXyg== + +pouchdb-debug@^7.1.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/pouchdb-debug/-/pouchdb-debug-7.2.1.tgz#f5f869f6113c12ccb97cddf5b0a32b6e0e67e961" + integrity sha512-eP3ht/AKavLF2RjTzBM6S9gaI2/apcW6xvaKRQhEdOfiANqerFuksFqHCal3aikVQuDO+cB/cw+a4RyJn/glBw== + dependencies: + debug "3.1.0" + +pouchdb-errors@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.3.0.tgz#23bc328108778be0bfe22d69c0df67eab94aeca5" + integrity sha512-dTBbIC1BbCy6J9W/Csg5xROgb3wJN3HpbgAJHHSEtAkb8oA45KZmU3ZwEpNhf0AfPuQm4XgW1936PvlDlGgJiw== + dependencies: + inherits "2.0.4" + +pouchdb-fetch@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.3.0.tgz#92b5d3b067d79ecbb9a61cbd52dce36e94dbbf28" + integrity sha512-8/lcg8iMDG+GVs1dHNXA4ktJSEpH71dHU3xesMJ25tNQOqfAaaWrkfz9j71ZYDDkveLYE6UjUzl/sDacu2hSjw== + dependencies: + abort-controller "3.0.0" + fetch-cookie "0.11.0" + node-fetch "2.6.7" + +pouchdb-find@^7.0.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.3.0.tgz#27291c3d069f4f1a1a4913f63b1a148dac1b345b" + integrity sha512-EwhnfyxCAkKf8PG4tfndTTygEmtuz+o1LiZkxfPrflfXA3m1jo1ithib0hwBYtEwEYWuZxH6B8pRZutbLoQCGA== + dependencies: + pouchdb-abstract-mapreduce "7.3.0" + pouchdb-collate "7.3.0" + pouchdb-errors "7.3.0" + pouchdb-fetch "7.3.0" + pouchdb-md5 "7.3.0" + pouchdb-selector-core "7.3.0" + pouchdb-utils "7.3.0" + +pouchdb-json@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.3.0.tgz#94c2d876202c6879cb525db05e7633b926346e5d" + integrity sha512-D4wyi20ltyiFpuziQeMk3CbXs/Q58VoGTYTJQY8MWBw37OidtHGQAt1Kh5yJ435wJqDzJZyxMA5RxGZxEOBDVg== + dependencies: + vuvuzela "1.0.3" + +pouchdb-mapreduce-utils@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.0.tgz#21d42ea9a376b0fa2e61c8c1ac53f886ffdf3409" + integrity sha512-KDVSd+H2r+XWTrQfKWV71SknDDYRjYXoeWs0ZQl3xITHCcTl+fIgqyagg/XN+Zy/U9LeLPGMe2JdgPx9H8lJgw== + dependencies: + argsarray "0.0.1" + inherits "2.0.4" + pouchdb-collections "7.3.0" + pouchdb-utils "7.3.0" + +pouchdb-md5@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.3.0.tgz#3a094e45ccce87271530ad3f37d7e82c53562bb0" + integrity sha512-wL04QgoKyd/L/TV5gxgcvlEyCJiZoXCOEFJklTzkdza/kBQNJGPH7i0ZhKa7Sb+AvZYoWZHddf1Zgv7rBScHkA== + dependencies: + pouchdb-binary-utils "7.3.0" + spark-md5 "3.0.2" + +pouchdb-merge@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.3.0.tgz#dfde5b54aa6dd203ac62d768fe33e7bdbd56e38e" + integrity sha512-E7LmchMzwYFm6V8OBxejzARLisanpksOju2LEfuiYnotGfNDeW7MByP0qBH0/zF8BfUyyjA1cl7ByaEpsapkeQ== + +pouchdb-selector-core@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.3.0.tgz#1860afeec069ba4d5b79583b4b520dd2b643e3a3" + integrity sha512-sK/cCrIGeL9ImcMhKGcwa54+bzX7Wv4hhVV+oUW3T1Nasaoxh+Muem1GuA+x1+SbTCE8y37rUg8i6DIOhX51ew== + dependencies: + pouchdb-collate "7.3.0" + pouchdb-utils "7.3.0" + +pouchdb-utils@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.3.0.tgz#782df5ab3309edd5dc8c0f8ae4663bf0e67962e2" + integrity sha512-HH+5IXXWn/ZgVCSnrlydBMYn6MabT7RS7SNoo9w8qVH9efpZSp3eLchw6yMQNLw8LQefWmbbskiHV9VgJmSVWQ== + dependencies: + argsarray "0.0.1" + clone-buffer "1.0.0" + immediate "3.3.0" + inherits "2.0.4" + pouchdb-collections "7.3.0" + pouchdb-errors "7.3.0" + pouchdb-md5 "7.3.0" + uuid "8.3.2" + +pouchdb@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.3.0.tgz#440fbef12dfd8f9002320802528665e883a3b7f8" + integrity sha512-OwsIQGXsfx3TrU1pLruj6PGSwFH+h5k4hGNxFkZ76Um7/ZI8F5TzUHFrpldVVIhfXYi2vP31q0q7ot1FSLFYOw== + dependencies: + abort-controller "3.0.0" + argsarray "0.0.1" + buffer-from "1.1.2" + clone-buffer "1.0.0" + double-ended-queue "2.1.0-0" + fetch-cookie "0.11.0" + immediate "3.3.0" + inherits "2.0.4" + level "6.0.1" + level-codec "9.0.2" + level-write-stream "1.0.0" + leveldown "5.6.0" + levelup "4.4.0" + ltgt "2.2.1" + node-fetch "2.6.7" + readable-stream "1.1.14" + spark-md5 "3.0.2" + through2 "3.0.2" + uuid "8.3.2" + vuvuzela "1.0.3" + +prebuild-install@^5.3.0: + version "5.3.6" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.6.tgz#7c225568d864c71d89d07f8796042733a3f54291" + integrity sha512-s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.7.0" + noop-logger "^0.1.1" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + which-pm-runs "^1.0.0" + +prebuild-install@^6.0.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" github-from-package "0.0.0" - minimist "^1.2.0" - mkdirp "^0.5.1" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" napi-build-utils "^1.0.1" - node-abi "^2.7.0" - noop-logger "^0.1.1" + node-abi "^2.21.0" npmlog "^4.0.1" pump "^3.0.0" rc "^1.2.7" simple-get "^3.0.3" tar-fs "^2.0.0" tunnel-agent "^0.6.0" - which-pm-runs "^1.0.0" + +prebuild-install@^7.0.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" + integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" precond@0.2: version "0.2.3" resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" - integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw= + integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ== prelude-ls@~1.1.2: version "1.1.2" @@ -20932,26 +23591,26 @@ prelude-ls@~1.1.2: prepend-http@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg== prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= + integrity sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ== -prettier-plugin-java@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/prettier-plugin-java/-/prettier-plugin-java-0.6.0.tgz#d655afc55072db053c82111d31cbb88ff0057917" - integrity sha512-iZOmKTN0N+/bulDTJI61TrYbu8fApstp+docHKxagFZDgOSW8CP246bTpJkgfLrsv91cSIIa9cYyDjwkz1pFGA== +prettier-plugin-java@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/prettier-plugin-java/-/prettier-plugin-java-1.6.2.tgz#ffa361eaa50056254eb6d3dbd53d449a5f281229" + integrity sha512-oVIUOkx50eb9skdRtEIU7MJUsizQ1ZocgXR1w1o8AnieNGpuPI/2pWnpjtbBm9wUG1dHtBGU8cVIr8h+xgzQIg== dependencies: - java-parser "^0.6.0" - lodash "4.17.15" - prettier "1.18.2" + java-parser "2.0.2" + lodash "4.17.21" + prettier "2.3.1" prettier-plugin-solidity@1.0.0-alpha.35: version "1.0.0-alpha.35" @@ -20967,10 +23626,32 @@ prettier-plugin-solidity@1.0.0-alpha.35: solidity-parser-antlr "^0.4.11" string-width "^4.1.0" -prettier@1.18.2, prettier@1.19.1, prettier@^1.14.2, prettier@^1.14.3, prettier@^1.15.3, prettier@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +prettier-plugin-solidity@^1.0.0-dev.23: + version "1.0.0-dev.23" + resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-dev.23.tgz#e1edf0693d69fe1518519ab704d5e46ee4f842fc" + integrity sha512-440/jZzvtDJcqtoRCQiigo1DYTPAZ85pjNg7gvdd+Lds6QYgID8RyOdygmudzHdFmV2UfENt//A8tzx7iS58GA== + dependencies: + "@solidity-parser/parser" "^0.14.3" + emoji-regex "^10.1.0" + escape-string-regexp "^4.0.0" + semver "^7.3.7" + solidity-comments-extractor "^0.0.7" + string-width "^4.2.3" + +prettier@1.19.1, prettier@^1.14.2, prettier@^1.14.3, prettier@^1.15.3: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== + +prettier@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6" + integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA== + +prettier@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== pretty-format@^24.9.0: version "24.9.0" @@ -20992,7 +23673,7 @@ pretty-format@^25.1.0, pretty-format@^25.2.0: ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^26.0.0, pretty-format@^26.6.2: +pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== @@ -21002,15 +23683,33 @@ pretty-format@^26.0.0, pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" +pretty-format@^29.0.0, pretty-format@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.1.2.tgz#b1f6b75be7d699be1a051f5da36e8ae9e76a8e6a" + integrity sha512-CGJ6VVGXVRP2o2Dorl4mAwwvDWT25luIsYhkyVQW32E4nL+TgW939J7LlKT/npq5Cpq6j3s+sy+13yk7xYpBmg== + dependencies: + "@jest/schemas" "^29.0.0" + ansi-styles "^5.0.0" + react-is "^18.0.0" + +pretty-format@^29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.0.2.tgz#7f7666a7bf05ba2bcacde61be81c6db64f6f3be6" + integrity sha512-wp3CdtUa3cSJVFn3Miu5a1+pxc1iPIQTenOAn+x5erXeN1+ryTcLesV5pbK/rlW5EKwp27x38MoYfNGaNXDDhg== + dependencies: + "@jest/schemas" "^29.0.0" + ansi-styles "^5.0.0" + react-is "^18.0.0" + pretty-hrtime@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= + integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A== pretty-quick@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.1.tgz#417ee605ade98ecc686e72f63b5d28a2c35b43e9" - integrity sha512-y7bJt77XadjUr+P1uKqZxFWLddvj3SKY6EU4BuQtMxmmEFSMpbN132pUWdSG1g1mtUfO0noBvn7wBf0BVeomHg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.2.tgz#4e44d6489ed513ef111bee501f63688d854584e6" + integrity sha512-aLb6vtOTEfJDwi1w+MBTeE20GwPVUYyn6IqNg6TtGpiOB1W3y6vKcsGFjqGeaaEtQgMLSPXTWONqh33UBuwG8A== dependencies: chalk "^2.4.2" execa "^2.1.0" @@ -21019,16 +23718,16 @@ pretty-quick@^2.0.1: mri "^1.1.4" multimatch "^4.0.0" -printj@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" - integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== - private@^0.1.6, private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== +proc-log@^2.0.0, proc-log@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685" + integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw== + process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -21037,22 +23736,17 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + integrity sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw== -process@^0.11.0, process@^0.11.1, process@^0.11.10: +process@^0.11.1, process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= - -process@~0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" - integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8= + integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== progress@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= + integrity sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw== progress@^2.0.0, progress@^2.0.3: version "2.0.3" @@ -21073,15 +23767,25 @@ prom-client@12.0.0: dependencies: tdigest "^0.1.1" +promise-all-reject-late@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2" + integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw== + promise-breaker@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/promise-breaker/-/promise-breaker-5.0.0.tgz#58e8541f1619554057da95a211794d7834d30c1d" integrity sha512-mgsWQuG4kJ1dtO6e/QlNDLFtMkMzzecsC69aI5hlLEjGHFNpHrvGhFi4LiK5jg2SMQj74/diH+wZliL9LpGsyA== -promise-inflight@^1.0.1, promise-inflight@~1.0.1: +promise-call-limit@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24" + integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q== + +promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== promise-polyfill@8.1.3: version "8.1.3" @@ -21091,25 +23795,25 @@ promise-polyfill@8.1.3: promise-polyfill@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057" - integrity sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc= + integrity sha512-g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ== -promise-retry@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d" - integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0= +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== dependencies: - err-code "^1.0.0" - retry "^0.10.0" + err-code "^2.0.2" + retry "^0.12.0" promise-to-callback@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/promise-to-callback/-/promise-to-callback-1.0.0.tgz#5d2a749010bfb67d963598fcd3960746a68feef7" - integrity sha1-XSp0kBC/tn2WNZj805YHRqaP7vc= + integrity sha512-uhMIZmKM5ZteDMfLgJnoSq9GCwsNKrYau73Awf1jIy6/eUcuuZ3P+CD9zUv0kJsIUbU+x6uLNIhXhLHDs1pNPA== dependencies: is-fn "^1.0.0" set-immediate-shim "^1.0.1" -promise.allsettled@^1.0.2: +promise.allsettled@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.2.tgz#d66f78fbb600e83e863d893e98b3d4376a9c47c9" integrity sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg== @@ -21120,6 +23824,18 @@ promise.allsettled@^1.0.2: function-bind "^1.1.1" iterate-value "^1.0.0" +promise.allsettled@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.5.tgz#2443f3d4b2aa8dfa560f6ac2aa6c4ea999d75f53" + integrity sha512-tVDqeZPoBC0SlzJHzWGZ2NKAguVq2oiYj7gbggbiTvH2itHohijTp7njOUA0aQ/nl+0lr/r6egmhoYu63UZ/pQ== + dependencies: + array.prototype.map "^1.0.4" + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + iterate-value "^1.0.2" + promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -21127,17 +23843,10 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -promise@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450" - integrity sha1-5F1osAoXZHttpxG/he1u1HII9FA= - dependencies: - asap "~2.0.3" - -promise@^8.0.3: - version "8.1.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" - integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== +promise@^8.0.0, promise@^8.0.3: + version "8.2.0" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.2.0.tgz#a1f6280ab67457fbfc8aad2b198c9497e9e5c806" + integrity sha512-+CMAlLHqwRYwBMXKCP+o8ns7DN+xHDUiI+0nArsiJ9y+kJVPLFxEaSw6Ha9s9H0tftxg2Yzl25wqj9G7m5wLZg== dependencies: asap "~2.0.6" @@ -21161,28 +23870,28 @@ prompts@1.2.0: sisteransi "^1.0.0" prompts@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.1.tgz#201b3718b4276fb407f037db48c0029d6465245c" - integrity sha512-8lnEOSIGQbgbnO47+13S+H204L8ISogGulyi0/NNEFAQ9D1VMNTrJ9SBX2Ra03V4iPn/zt36HQMndRYkaPoWiQ== + version "2.4.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== dependencies: - kleur "^3.0.0" - sisteransi "^1.0.0" + kleur "^3.0.3" + sisteransi "^1.0.5" promzard@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee" - integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4= + integrity sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw== dependencies: read "1" prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" - react-is "^16.8.1" + react-is "^16.13.1" proper-lockfile@^3.0.2: version "3.2.0" @@ -21196,14 +23905,16 @@ proper-lockfile@^3.0.2: proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= + integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -proto3-json-serializer@^0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.4.tgz#aa2dc4c9c9b7ea05631354b2c2e52c227539a7f0" - integrity sha512-bFzdsKU/zaTobWrRxRniMZIzzcgKYlmBWL1gAcTXZ2M7TQTGPI0JoYYs6bN7tpWj59ZCfwg7Ii/A2e8BbQGYnQ== +proto3-json-serializer@^0.1.8: + version "0.1.9" + resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.9.tgz#705ddb41b009dd3e6fcd8123edd72926abf65a34" + integrity sha512-A60IisqvnuI45qNRygJjrnNjX2TMdQGMY+57tR3nul3ZgO2zXkR9OGR8AXxJhkqx84g0FTnrfi3D5fWMSdANdQ== + dependencies: + protobufjs "^6.11.2" -protobufjs@6.11.2, protobufjs@^6.10.0: +protobufjs@6.11.2: version "6.11.2" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== @@ -21222,6 +23933,25 @@ protobufjs@6.11.2, protobufjs@^6.10.0: "@types/node" ">=13.7.0" long "^4.0.0" +protobufjs@6.11.3, protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8, protobufjs@^6.8.9: + version "6.11.3" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" + integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.1" + "@types/node" ">=13.7.0" + long "^4.0.0" + protobufjs@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" @@ -21232,10 +23962,10 @@ protobufjs@^5.0.3: glob "^7.0.5" yargs "^3.10.0" -protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8, protobufjs@^6.8.9, protobufjs@^6.9.0: - version "6.9.0" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.9.0.tgz#c08b2bf636682598e6fabbf0edb0b1256ff090bd" - integrity sha512-LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg== +protobufjs@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.0.tgz#5174b5f96fad4f7dea7dd4abd594042ac360e665" + integrity sha512-rCuxKlh0UQKSMjrpIcTLbR5TtGQ52cgs1a5nUoPBAKOccdPblN67BJtjrbtudUJK6HmBvUdsmymyYOzO7lxZEA== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -21247,28 +23977,20 @@ protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8, prot "@protobufjs/path" "^1.1.2" "@protobufjs/pool" "^1.1.0" "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" "^13.7.0" - long "^4.0.0" - -protocols@^1.1.0, protocols@^1.4.0: - version "1.4.7" - resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32" - integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg== + "@types/node" ">=13.7.0" + long "^5.0.0" -protoduck@^5.0.0, protoduck@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f" - integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg== - dependencies: - genfun "^5.0.0" +protocols@^2.0.0, protocols@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86" + integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q== -proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: - forwarded "~0.1.2" + forwarded "0.2.0" ipaddr.js "1.9.1" proxy-agent@^5.0.0: @@ -21291,38 +24013,33 @@ proxy-from-env@^1.0.0: integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== proxyquire@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/proxyquire/-/proxyquire-2.1.0.tgz#c2263a38bf0725f2ae950facc130e27510edce8d" - integrity sha512-kptdFArCfGRtQFv3Qwjr10lwbEV0TBJYvfqzhwucyfEXqVgmnAkyEw/S3FYzR5HI9i5QOq4rcqQjZ6AlknlCDQ== + version "2.1.3" + resolved "https://registry.yarnpkg.com/proxyquire/-/proxyquire-2.1.3.tgz#2049a7eefa10a9a953346a18e54aab2b4268df39" + integrity sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg== dependencies: fill-keys "^1.0.2" - module-not-found-error "^1.0.0" - resolve "~1.8.1" + module-not-found-error "^1.0.1" + resolve "^1.11.1" prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= + integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== pseudomap@^1.0.1, pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - -psl@^1.1.28: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== -psl@^1.1.33: +psl@^1.1.28, psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pstree.remy@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.7.tgz#c76963a28047ed61542dc361aa26ee55a7fa15f3" - integrity sha512-xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A== + version "1.1.8" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" + integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== public-encrypt@^4.0.0: version "4.0.3" @@ -21339,7 +24056,7 @@ public-encrypt@^4.0.0: pull-cat@^1.1.9: version "1.1.11" resolved "https://registry.yarnpkg.com/pull-cat/-/pull-cat-1.1.11.tgz#b642dd1255da376a706b6db4fa962f5fdb74c31b" - integrity sha1-tkLdElXaN2pwa220+pYvX9t0wxs= + integrity sha512-i3w+xZ3DCtTVz8S62hBOuNLRHqVDsHMNZmgrZsjPnsxXUgbWtXEee84lo1XswE7W2a3WHyqsNuDJTjVLAQR8xg== pull-defer@^0.2.2: version "0.2.3" @@ -21362,7 +24079,7 @@ pull-level@^2.0.3: pull-live@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pull-live/-/pull-live-1.0.1.tgz#a4ecee01e330155e9124bbbcf4761f21b38f51f5" - integrity sha1-pOzuAeMwFV6RJLu89HYfIbOPUfU= + integrity sha512-tkNz1QT5gId8aPhV5+dmwoIiA1nmfDOzJDlOOUpU5DNusj6neNd3EePybJ5+sITr2FwyCs/FVpx74YMCfc8YeA== dependencies: pull-cat "^1.1.9" pull-stream "^3.4.0" @@ -21370,17 +24087,17 @@ pull-live@^1.0.1: pull-pushable@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/pull-pushable/-/pull-pushable-2.2.0.tgz#5f2f3aed47ad86919f01b12a2e99d6f1bd776581" - integrity sha1-Xy867UethpGfAbEqLpnW8b13ZYE= + integrity sha512-M7dp95enQ2kaHvfCt2+DJfyzgCSpWVR2h2kWYnVsW6ZpxQBx5wOu0QWOvQPVoPnBLUZYitYP2y7HyHkLQNeGXg== pull-stream@^3.2.3, pull-stream@^3.4.0, pull-stream@^3.6.8: - version "3.6.13" - resolved "https://registry.yarnpkg.com/pull-stream/-/pull-stream-3.6.13.tgz#181435322841b0397c7ed44ee5a3fae32662ac1b" - integrity sha512-enbnbnO+czsPuCq9s9HTTzDzzVQD5TSe60aO3nBioeJ9mevh8RzE4Hxbujo9TReg1fJlmNEL8uyQTUgn8+rSHg== + version "3.6.14" + resolved "https://registry.yarnpkg.com/pull-stream/-/pull-stream-3.6.14.tgz#529dbd5b86131f4a5ed636fdf7f6af00781357ee" + integrity sha512-KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew== pull-window@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/pull-window/-/pull-window-2.1.4.tgz#fc3b86feebd1920c7ae297691e23f705f88552f0" - integrity sha1-/DuG/uvRkgx64pdpHiP3BfiFUvA= + integrity sha512-cbDzN76BMlcGG46OImrgpkMf/VkCnupj8JhsrpBw3aWBM9ye345aYnqitmZCgauBkc0HbbRRn9hCnsa3k2FNUg== dependencies: looper "^2.0.0" @@ -21392,7 +24109,7 @@ pump@^1.0.0: end-of-stream "^1.1.0" once "^1.3.1" -pump@^2.0.0, pump@^2.0.1: +pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== @@ -21418,9 +24135,9 @@ pumpify@^1.3.3, pumpify@^1.3.5, pumpify@^1.5.1: pump "^2.0.0" pumpify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-2.0.0.tgz#975519e5a9890ae0fb4724274e3fec97e43a30b6" - integrity sha512-ieN9HmpFPt4J4U4qnjN4BxrnqpPPXJyp3qFErxfwBtFOec6ewpIHdS2eu3TkmGW6S+RzFGEOGpm5ih/X/onRPQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-2.0.1.tgz#abfc7b5a621307c728b551decbbefb51f0e4aa1e" + integrity sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw== dependencies: duplexify "^4.1.1" inherits "^2.0.3" @@ -21429,17 +24146,17 @@ pumpify@^2.0.0: punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw== punycode@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" - integrity sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0= + integrity sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA== punycode@^1.2.4, punycode@^1.3.2: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" @@ -21453,15 +24170,20 @@ pupa@^2.0.1, pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -pvutils@latest: - version "1.0.17" - resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf" - integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ== +pure-rand@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-5.0.1.tgz#97a287b4b4960b2a3448c0932bf28f2405cac51d" + integrity sha512-ksWccjmXOHU2gJBnH0cK1lSYdvSZ0zLoCMSz/nTGh6hDvCSgcRxDyIcOBD6KNxFz3xhMPm/T267Tbe2JRymKEQ== + +pvutils@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3" + integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ== q@2.0.x: version "2.0.3" resolved "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz#75b8db0255a1a5af82f58c3f3aaa1efec7d0d134" - integrity sha1-dbjbAlWhpa+C9Yw/Oqoe/sfQ0TQ= + integrity sha512-gv6vLGcmAOg96/fgo3d9tvA4dJNZL3fMyBqVRrGxQ+Q/o4k9QzbJ3NQF9cOO/71wRodoXhaPgphvMFU68qVAJQ== dependencies: asap "^2.0.0" pop-iterate "^1.0.1" @@ -21470,66 +24192,60 @@ q@2.0.x: q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== qqjs@^0.3.10: - version "0.3.10" - resolved "https://registry.yarnpkg.com/qqjs/-/qqjs-0.3.10.tgz#ae3af7cb4c424242db4aa9b92c42d29fa9101562" - integrity sha1-rjr3y0xCQkLbSqm5LELSn6kQFWI= + version "0.3.11" + resolved "https://registry.yarnpkg.com/qqjs/-/qqjs-0.3.11.tgz#795b9f7d00807d75c391b1241b5be3077143d9ea" + integrity sha512-pB2X5AduTl78J+xRSxQiEmga1jQV0j43jOPs/MTgTLApGFEOn6NgdE2dEjp7nvDtjkIOZbvFIojAiYUx6ep3zg== dependencies: chalk "^2.4.1" - debug "^3.1.0" + debug "^4.1.1" execa "^0.10.0" fs-extra "^6.0.1" - get-stream "^3.0.0" + get-stream "^5.1.0" glob "^7.1.2" - globby "^8.0.1" + globby "^10.0.1" http-call "^5.1.2" - load-json-file "^5.0.0" - pkg-dir "^2.0.0" - tar-fs "^1.16.2" - tmp "^0.0.33" - write-json-file "^2.3.0" - -qrcode-terminal@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819" - integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ== + load-json-file "^6.2.0" + pkg-dir "^4.2.0" + tar-fs "^2.0.0" + tmp "^0.1.0" + write-json-file "^4.1.1" qrcode@^1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83" - integrity sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q== + version "1.5.1" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.1.tgz#0103f97317409f7bc91772ef30793a54cd59f0cb" + integrity sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg== dependencies: - buffer "^5.4.3" - buffer-alloc "^1.2.0" - buffer-from "^1.1.1" dijkstrajs "^1.0.1" - isarray "^2.0.1" - pngjs "^3.3.0" - yargs "^13.2.4" + encode-utf8 "^1.0.3" + pngjs "^5.0.0" + yargs "^15.3.1" + +qs@6.10.3: + version "6.10.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" + integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== + dependencies: + side-channel "^1.0.4" qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@^6.4.0, qs@^6.5.1, qs@^6.5.2, qs@^6.7.0, qs@^6.9.4: - version "6.9.4" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" - integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== - -qs@^6.6.0: - version "6.10.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" - integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== +qs@^6.4.0, qs@^6.5.1, qs@^6.5.2, qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.5.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== query-string@^5.0.1: version "5.1.1" @@ -21540,42 +24256,42 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -query-string@^6.1.0: - version "6.14.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a" - integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw== - dependencies: - decode-uri-component "^0.2.0" - filter-obj "^1.1.0" - split-on-first "^1.0.0" - strict-uri-encode "^2.0.0" - querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA== -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== + +querystring@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" + integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== -querystringify@^2.1.1: +querystringify@^2.0.0, querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== -quick-lru@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" - integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= +queue-microtask@^1.2.2, queue-microtask@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -qw@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.2.tgz#0c31a6f810320a91c58b05198679427103b03c4a" - integrity sha512-1PhZ/iLKwlVNq45dnerTMKFjMof49uqli7/0QsvPNbX5OJ3IZ8msa9lUpvPheVdP+IYYPrf6cOaVil7S35joVA== +quick-lru@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" + integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== + +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== -randomatic@^1.1.3, randomatic@^3.1.1: +randomatic@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== @@ -21602,7 +24318,7 @@ randomfill@^1.0.3: randomhex@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/randomhex/-/randomhex-0.1.5.tgz#baceef982329091400f2a2912c6cd02f1094f585" - integrity sha1-us7vmCMpCRQA8qKRLGzQLxCU9YU= + integrity sha512-2+Kkw7UiZGQWOz7rw8hPW44utkBYMEciQfziaZ71RcyDu+refQWzS/0DgfUSa5MwclrOD3sf3vI5vmrTYjwpjQ== range-parser@~1.2.1: version "1.2.1" @@ -21619,17 +24335,17 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-body@^2.2.0, raw-body@^2.3.3: - version "2.4.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c" - integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA== +raw-body@2.5.1, raw-body@^2.2.0, raw-body@^2.3.3: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== dependencies: - bytes "3.1.0" - http-errors "1.7.3" + bytes "3.1.2" + http-errors "2.0.0" iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: +rc@1.2.8, rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -21640,67 +24356,36 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: strip-json-comments "~2.0.1" re2@^1.15.8: - version "1.16.0" - resolved "https://registry.yarnpkg.com/re2/-/re2-1.16.0.tgz#f311eb4865b1296123800ea8e013cec8dab25590" - integrity sha512-eizTZL2ZO0ZseLqfD4t3Qd0M3b3Nr0MBWpX81EbPMIud/1d/CSfUIx2GQK8fWiAeHoSekO5EOeFib2udTZLwYw== + version "1.17.7" + resolved "https://registry.yarnpkg.com/re2/-/re2-1.17.7.tgz#e14cab85a177a5534c7215c322d1b043c55aa1e9" + integrity sha512-X8GSuiBoVWwcjuppqSjsIkRxNUKDdjhkO9SBekQbZ2ksqWUReCy7DQPWOVpoTnpdtdz5PIpTTxTFzvJv5UMfjA== dependencies: - install-artifact-from-github "^1.2.0" - nan "^2.14.2" - node-gyp "^8.0.0" + install-artifact-from-github "^1.3.1" + nan "^2.16.0" + node-gyp "^9.0.0" react-devtools-core@^4.6.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.10.1.tgz#6d57db291aeac9cc45ef9fb4636dd2ab97490daf" - integrity sha512-sXbBjGAWcf9HAblTP/zMtFhGHqxAfIR+GPxONZsSGN9FHnF4635dx1s2LdQWG9rJ+Ehr3nWg+BUAB6P78my5PA== + version "4.25.0" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.25.0.tgz#78b11a2c9f81dd9ebff3745ab4ee2147cc96c12a" + integrity sha512-iewRrnu0ZnmfL+jJayKphXj04CFh6i3ezVnpCtcnZbTPSQgN09XqHAzXbKbqNDl7aTg9QLNkQRP6M3DvdrinWA== dependencies: shell-quote "^1.6.1" ws "^7" -react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4: +react-is@^16.12.0, react-is@^16.13.1, react-is@^16.8.4: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== - -react-native-crypto@^2.0.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/react-native-crypto/-/react-native-crypto-2.2.0.tgz#c999ed7c96064f830e1f958687f53d0c44025770" - integrity sha512-eZu9Y8pa8BN9FU2pIex7MLRAi+Cd1Y6bsxfiufKh7sfraAACJvjQTeW7/zcQAT93WMfM+D0OVk+bubvkrbrUkw== - dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.4" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "3.0.8" - public-encrypt "^4.0.0" - randomfill "^1.0.3" - -react-native-flipper@^0.70.0: - version "0.70.0" - resolved "https://registry.yarnpkg.com/react-native-flipper/-/react-native-flipper-0.70.0.tgz#670ab2781d1f14141eaa12c3cd06f43ba2912425" - integrity sha512-/msQuZLXfe5OrfHFBJMN73RoiVRBvT4/oqfa7P641pqcLGMXl1cE2QxCY1qoBqk7d3erD+ufaGFYmT8G4OeRaw== - -react-native-ntp-client@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/react-native-ntp-client/-/react-native-ntp-client-1.0.3.tgz#822fbe44d5bfcca2e236f877832f98123aef448e" - integrity sha512-y6UlSKNZh0Qlga2OnTCMm0OMnbxoCzEEzHpHEKZGjZC7VOowu43dFQWyDY0zEUnXgcuBE7JLEmMxekrdVDv5rw== - dependencies: - node-libs-react-native "1.0.3" + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-native-randombytes@^3.5.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/react-native-randombytes/-/react-native-randombytes-3.6.1.tgz#cac578093b5ca38e3e085becffdc6cbcf6f0d654" - integrity sha512-qxkwMbOZ0Hff1V7VqpaWrR6ItkA+oF6bnI79Qp9F3Tk8WBsdKDi6m1mi3dEdFWePoRLrhJ2L03rU0yabst1tVw== - dependencies: - buffer "^4.9.1" - sjcl "^1.0.3" +react-is@^18.0.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== react-native@^0.63.4: version "0.63.4" @@ -21736,79 +24421,52 @@ react-native@^0.63.4: whatwg-fetch "^3.0.0" react-refresh@^0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.2.tgz#54a277a6caaac2803d88f1d6f13c1dcfbd81e334" - integrity sha512-kv5QlFFSZWo7OlJFNYbxRtY66JImuP2LcrFgyJfQaf85gSP+byzG21UbDQEYjU7f//ny8rwiEkO6py2Y+fEgAQ== - -read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16" - integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA== - dependencies: - graceful-fs "^4.1.2" + version "0.4.3" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.3.tgz#966f1750c191672e76e16c2efa569150cc73ab53" + integrity sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA== -read-installed@~4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067" - integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc= - dependencies: - debuglog "^1.0.1" - read-package-json "^2.0.0" - readdir-scoped-modules "^1.0.0" - semver "2 || 3 || 4 || 5" - slide "~1.1.3" - util-extend "^1.0.1" - optionalDependencies: - graceful-fs "^4.1.2" +read-cmd-shim@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087" + integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g== read-last-lines@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/read-last-lines/-/read-last-lines-1.7.2.tgz#d96d40566d70aca260a85acefb00d523ea3e74ad" - integrity sha512-K0yUvTYAYn6qpyLJufaJ7yC6BeL23qpgZ8SKM7/fA1R1rHotCDxB/zDp9i1I2JHvexWBW6/35jkt07iiIKKp4g== + version "1.8.0" + resolved "https://registry.yarnpkg.com/read-last-lines/-/read-last-lines-1.8.0.tgz#4f94d4345ece7b8083ebb71c5fcdf60bd7afb9cc" + integrity sha512-oPL0cnZkhsO2xF7DBrdzVhXSNajPP5TzzCim/2IAjeGb17ArLLTRriI/ceV6Rook3L27mvbrOvLlf9xYYnaftQ== dependencies: mz "^2.7.0" -"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13: - version "2.1.1" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1" - integrity sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A== +read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" + integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ== dependencies: - glob "^7.1.1" - json-parse-better-errors "^1.0.1" - normalize-package-data "^2.0.0" - npm-normalize-package-bin "^1.0.0" - optionalDependencies: - graceful-fs "^4.1.2" + json-parse-even-better-errors "^2.3.0" + npm-normalize-package-bin "^1.0.1" -read-package-tree@^5.1.6, read-package-tree@^5.2.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636" - integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw== +read-package-json@^5.0.0, read-package-json@^5.0.1: + version "5.0.2" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa" + integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q== dependencies: - read-package-json "^2.0.0" - readdir-scoped-modules "^1.0.0" - util-promisify "^2.1.0" + glob "^8.0.1" + json-parse-even-better-errors "^2.3.1" + normalize-package-data "^4.0.0" + npm-normalize-package-bin "^2.0.0" read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= + integrity sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A== dependencies: find-up "^1.0.0" read-pkg "^1.0.0" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" - integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= + integrity sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw== dependencies: find-up "^2.0.0" read-pkg "^3.0.0" @@ -21825,25 +24483,16 @@ read-pkg-up@^7.0.1: read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= + integrity sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ== dependencies: load-json-file "^1.0.0" normalize-package-data "^2.3.2" path-type "^1.0.0" -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= + integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA== dependencies: load-json-file "^4.0.0" normalize-package-data "^2.3.2" @@ -21859,17 +24508,17 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -read@1, read@1.0.x, read@~1.0.1, read@~1.0.7: +read@1, read@1.0.x, read@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" - integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ= + integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ== dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -21879,17 +24528,17 @@ read@1, read@1.0.x, read@~1.0.1, read@~1.0.7: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@1.1.x, readable-stream@^1.0.33, readable-stream@~1.1.10: +readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: version "1.1.14" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== dependencies: core-util-is "~1.0.0" inherits "~2.0.1" isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -21898,33 +24547,25 @@ readable-stream@1.1.x, readable-stream@^1.0.33, readable-stream@~1.1.10: string_decoder "^1.1.1" util-deprecate "^1.0.1" -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.15: +readable-stream@~0.0.2: + version "0.0.4" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" + integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw== + +readable-stream@~1.0.15: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== dependencies: core-util-is "~1.0.0" inherits "~2.0.1" isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.3.7: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - integrity sha1-j5A0HmilPMySh4jaz80Rs265t44= + integrity sha512-TXcFfb63BQe1+ySzsHZI/5v1aJPCShfqvWJ64ayNImXMsN1Cd0YGk/wm8KB7/OeessgPc9QvS9Zou8QTkFzsLw== dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -21934,13 +24575,13 @@ readable-stream@~2.0.0: util-deprecate "~1.0.1" readdir-glob@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" - integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.2.tgz#b185789b8e6a43491635b6953295c5c5e3fd224c" + integrity sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA== dependencies: - minimatch "^3.0.4" + minimatch "^5.1.0" -readdir-scoped-modules@^1.0.0: +readdir-scoped-modules@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== @@ -21966,69 +24607,87 @@ readdirp@~3.2.0: dependencies: picomatch "^2.0.4" -readdirp@~3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada" - integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ== +readdirp@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17" + integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ== + dependencies: + picomatch "^2.0.7" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= + integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw== dependencies: resolve "^1.1.6" -redent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" - integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= - dependencies: - indent-string "^2.1.0" - strip-indent "^1.0.1" - -redent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" - integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== dependencies: - indent-string "^3.0.0" - strip-indent "^2.0.0" + indent-string "^4.0.0" + strip-indent "^3.0.0" redeyed@~2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b" - integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs= + integrity sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ== dependencies: esprima "~4.0.0" -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== +redux-saga@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.0.0.tgz#acb8b3ed9180fecbe75f342011d75af3ac11045b" + integrity sha512-GvJWs/SzMvEQgeaw6sRMXnS2FghlvEGsHiEtTLpJqc/FHF3I5EE/B+Hq5lyHZ8LSoT2r/X/46uWvkdCnK9WgHA== dependencies: - regenerate "^1.4.0" + "@redux-saga/core" "^1.0.0" -regenerate@^1.2.1, regenerate@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" - integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== +redux@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" + integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== + dependencies: + lodash "^4.2.1" + lodash-es "^4.2.1" + loose-envify "^1.1.0" + symbol-observable "^1.0.3" + +redux@^4.0.4: + version "4.2.0" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13" + integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== + dependencies: + "@babel/runtime" "^7.9.2" + +regenerate-unicode-properties@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" + integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== + dependencies: + regenerate "^1.4.2" + +regenerate@^1.2.1, regenerate@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.2: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== - -regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== +regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4: + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== regenerator-transform@^0.10.0: version "0.10.1" @@ -22039,13 +24698,12 @@ regenerator-transform@^0.10.0: babel-types "^6.19.0" private "^0.1.6" -regenerator-transform@^0.14.2: - version "0.14.4" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7" - integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw== +regenerator-transform@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" + integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== dependencies: "@babel/runtime" "^7.8.4" - private "^0.1.8" regex-cache@^0.4.2: version "0.4.4" @@ -22067,13 +24725,14 @@ regexp-to-ast@0.4.0: resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.4.0.tgz#f3dbcb42726cd71902ba50193f63eab5325cd7cb" integrity sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw== -regexp.prototype.flags@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0, regexp.prototype.flags@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" + integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + functions-have-names "^1.2.2" regexpp@^2.0.1: version "2.0.1" @@ -22083,43 +24742,43 @@ regexpp@^2.0.1: regexpu-core@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA= + integrity sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ== dependencies: regenerate "^1.2.1" regjsgen "^0.2.0" regjsparser "^0.1.4" -regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== +regexpu-core@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d" + integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA== dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" + regenerate "^1.4.2" + regenerate-unicode-properties "^10.0.1" + regjsgen "^0.6.0" + regjsparser "^0.8.2" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.0.0" registry-auth-token@^3.0.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" - integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ== + version "3.4.0" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e" + integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A== dependencies: rc "^1.1.6" safe-buffer "^5.0.1" registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + version "4.2.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" + integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== dependencies: - rc "^1.2.8" + rc "1.2.8" registry-url@^3.0.3: version "3.1.0" resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI= + integrity sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA== dependencies: rc "^1.0.1" @@ -22133,48 +24792,48 @@ registry-url@^5.0.0: regjsgen@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= + integrity sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g== -regjsgen@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" - integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== +regjsgen@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" + integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== regjsparser@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= + integrity sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw== dependencies: jsesc "~0.5.0" -regjsparser@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" - integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw== +regjsparser@^0.8.2: + version "0.8.4" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" + integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== dependencies: jsesc "~0.5.0" relative@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha1-Dc2OxUpdNaPBXhBFA9ZTdbWlNn8= + integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== dependencies: isobject "^2.0.0" remix-lib@>=0.4.1: - version "0.4.6" - resolved "https://registry.yarnpkg.com/remix-lib/-/remix-lib-0.4.6.tgz#7d78fd07988eb6fcb0e8d9e2cbb65873f236b28e" - integrity sha512-NAKJQroGXTBTyqESJFIkWLyfF7HS6YnU8xj96T7vmbrbbLtDpDfdRLKUEIeMSMFowjs5i9qjt+DxfmhaBgwQ/A== + version "0.4.30" + resolved "https://registry.yarnpkg.com/remix-lib/-/remix-lib-0.4.30.tgz#2132c6f116afee7b427e4a18d98a30e608d4e015" + integrity sha512-FqJzWF1eKJDZIxiO2LmmTGo7cyQSO+Iq8NDnm/TJcRYR/1a5UKKHSgIZ6rzevA3igMC/RrEhovbE3A/9l7pVzw== dependencies: async "^2.1.2" - ethereumjs-block "^1.6.0" - ethereumjs-tx "^1.3.3" - ethereumjs-util "^5.1.2" - ethereumjs-vm "3.0.0" - ethers "^4.0.27" - fast-async "^6.1.2" - solc "^0.5.0" - web3 "0.20.6" + ethereumjs-block "^2.2.2" + ethereumjs-tx "^2.1.2" + ethereumjs-util "^6.2.0" + ethereumjs-vm "4.1.3" + ethers "^4.0.40" + events "^3.0.0" + solc "^0.6.0" + web3 "^1.2.4" remove-bom-buffer@^3.0.0: version "3.0.0" @@ -22187,7 +24846,7 @@ remove-bom-buffer@^3.0.0: remove-bom-stream@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" - integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM= + integrity sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA== dependencies: remove-bom-buffer "^3.0.0" safe-buffer "^5.1.0" @@ -22196,39 +24855,34 @@ remove-bom-stream@^1.2.0: remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo= + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.5.2, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== repeating@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== dependencies: is-finite "^1.0.0" -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= - replace-ext@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" - integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= + version "1.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" + integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== replace-homedir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c" - integrity sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw= + integrity sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg== dependencies: homedir-polyfill "^1.0.1" is-absolute "^1.0.0" @@ -22237,24 +24891,17 @@ replace-homedir@^1.0.0: req-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/req-cwd/-/req-cwd-2.0.0.tgz#d4082b4d44598036640fb73ddea01ed53db49ebc" - integrity sha1-1AgrTURZgDZkD7c93qAe1T20nrw= + integrity sha512-ueoIoLo1OfB6b05COxAA9UpeoscNpYyM+BqYlA7H6LVF4hKGPXQQSSaD2YmvDVJMkk4UDpAHIeU1zG53IqjvlQ== dependencies: req-from "^2.0.0" req-from@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/req-from/-/req-from-2.0.0.tgz#d74188e47f93796f4aa71df6ee35ae689f3e0e70" - integrity sha1-10GI5H+TeW9Kpx327jWuaJ8+DnA= + integrity sha512-LzTfEVDVQHBRfjOUMgNBA+V6DWsSnoeKzf42J7l0xa/B4jyPOuuF5MlNSmomLNGemWTnV2TIdjSSLnEn95fOQA== dependencies: resolve-from "^3.0.0" -request-promise-core@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" - integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag== - dependencies: - lodash "^4.17.11" - request-promise-core@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" @@ -22272,16 +24919,16 @@ request-promise-native@^1.0.5: tough-cookie "^2.3.3" request-promise@^4.2.2: - version "4.2.4" - resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.4.tgz#1c5ed0d71441e38ad58c7ce4ea4ea5b06d54b310" - integrity sha512-8wgMrvE546PzbR5WbYxUQogUnUDfM0S7QIFZMID+J73vdFARkFy+HElj4T+MWYhpXwlLp0EQ8Zoj8xUA0he4Vg== + version "4.2.6" + resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.6.tgz#7e7e5b9578630e6f598e3813c0f8eb342a27f0a2" + integrity sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ== dependencies: bluebird "^3.5.0" - request-promise-core "1.1.2" + request-promise-core "1.1.4" stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@2.x, "request@>= 2.52.0", request@^2.67.0, request@^2.74.0, request@^2.79.0, request@^2.85.0, request@^2.87.0, request@^2.88.0: +request@^2.67.0, request@^2.79.0, request@^2.85.0, request@^2.87.0, request@^2.88.0, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -22310,12 +24957,12 @@ request@2.x, "request@>= 2.52.0", request@^2.67.0, request@^2.74.0, request@^2.7 require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== require-from-string@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" - integrity sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg= + integrity sha512-H7AkJWMobeskkttHyhTVtS0fxpFLjxhbfMa6Bk3wimP7sdPRGL3EyCg3sAQenFfAe+xQ+oAc85Nmtvq0ROM83Q== require-from-string@^2.0.0, require-from-string@^2.0.1, require-from-string@^2.0.2: version "2.0.2" @@ -22325,7 +24972,7 @@ require-from-string@^2.0.0, require-from-string@^2.0.1, require-from-string@^2.0 require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= + integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug== require-main-filename@^2.0.0: version "2.0.0" @@ -22337,10 +24984,29 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== +reselect-tree@^1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/reselect-tree/-/reselect-tree-1.3.7.tgz#c3eca58765d9df96bae0017f6ff3504c304cdea0" + integrity sha512-kZN+C1cVJ6fFN2smSb0l4UvYZlRzttgnu183svH4NrU22cBY++ikgr2QT75Uuk4MYpv5gXSVijw4c5U6cx6GKg== + dependencies: + debug "^3.1.0" + json-pointer "^0.6.1" + reselect "^4.0.0" + +reselect@^4.0.0: + version "4.1.6" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.6.tgz#19ca2d3d0b35373a74dc1c98692cdaffb6602656" + integrity sha512-ZovIuXqto7elwnxyXbBtCPo9YFEr3uJqj2rRbcOOog1bmu2Ag85M4hixSwFWyaBMKXNgvPaJ9OSu9SkBPIeJHQ== + +resolve-alpn@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= + integrity sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg== dependencies: resolve-from "^3.0.0" @@ -22354,7 +25020,7 @@ resolve-cwd@^3.0.0: resolve-dir@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e" - integrity sha1-shklmlYC+sXFxJatiUpujMQwJh4= + integrity sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA== dependencies: expand-tilde "^1.2.2" global-modules "^0.2.3" @@ -22362,7 +25028,7 @@ resolve-dir@^0.1.0: resolve-dir@^1.0.0, resolve-dir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= + integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg== dependencies: expand-tilde "^2.0.0" global-modules "^1.0.0" @@ -22370,7 +25036,7 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1: resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= + integrity sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw== resolve-from@^4.0.0: version "4.0.0" @@ -22385,53 +25051,59 @@ resolve-from@^5.0.0: resolve-options@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" - integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE= + integrity sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A== dependencies: value-or-function "^3.0.0" resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== + +resolve.exports@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" + integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= - -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" - integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== - dependencies: - is-core-module "^2.0.0" - path-parse "^1.0.6" + integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg== -resolve@~1.11.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" - integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw== +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@~1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - path-parse "^1.0.6" + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" -resolve@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" - integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA== +responselike@*: + version "3.0.0" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-3.0.0.tgz#20decb6c298aff0dbee1c355ca95461d42823626" + integrity sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg== dependencies: - path-parse "^1.0.5" + lowercase-keys "^3.0.0" responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== dependencies: lowercase-keys "^1.0.0" +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== + dependencies: + lowercase-keys "^2.0.0" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== dependencies: onetime "^2.0.0" signal-exit "^3.0.2" @@ -22447,7 +25119,7 @@ restore-cursor@^3.1.0: resumer@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759" - integrity sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k= + integrity sha512-Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w== dependencies: through "~2.3.4" @@ -22463,14 +25135,7 @@ retry-as-promised@^3.2.0: dependencies: any-promise "^1.3.0" -retry-request@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.0.0.tgz#5c366166279b3e10e9d7aa13274467a05cb69290" - integrity sha512-S4HNLaWcMP6r8E4TMH52Y7/pM8uNayOcTDDQNBwsCccL1uI+Ol2TljxRDPzaNfbhOB30+XWP5NnZkB3LiJxi1w== - dependencies: - through2 "^2.0.0" - -retry-request@^4.2.2: +retry-request@^4.0.0, retry-request@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.2.2.tgz#b7d82210b6d2651ed249ba3497f07ea602f1a903" integrity sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg== @@ -22483,17 +25148,12 @@ retry@0.13.1: resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== -retry@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4" - integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q= - retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== -reusify@^1.0.0: +reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== @@ -22501,23 +25161,23 @@ reusify@^1.0.0: revalidator@0.1.x: version "0.1.8" resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b" - integrity sha1-/s5hv6DBtSoga9axgZgYS91SOjs= + integrity sha512-xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg== -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: glob "^7.1.3" -rimraf@2.6.3, rimraf@~2.6.2: +rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== dependencies: glob "^7.1.3" -rimraf@3.0.2, rimraf@^3.0.0: +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -22527,16 +25187,21 @@ rimraf@3.0.2, rimraf@^3.0.0: rimraf@~2.2.6: version "2.2.8" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" - integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI= + integrity sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg== rimraf@~2.4.0: version "2.4.5" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" - integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto= + integrity sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ== dependencies: glob "^6.0.1" -ripemd160@^2.0.0, ripemd160@^2.0.1: +ripemd160-min@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/ripemd160-min/-/ripemd160-min-0.0.6.tgz#a904b77658114474d02503e819dcc55853b67e62" + integrity sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A== + +ripemd160@^2.0.0, ripemd160@^2.0.1, ripemd160@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== @@ -22545,36 +25210,31 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: inherits "^2.0.1" rlp@^2.0.0, rlp@^2.2.1, rlp@^2.2.2, rlp@^2.2.3, rlp@^2.2.4: - version "2.2.6" - resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.6.tgz#c80ba6266ac7a483ef1e69e8e2f056656de2fb2c" - integrity sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg== + version "2.2.7" + resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.7.tgz#33f31c4afac81124ac4b283e2bd4d9720b30beaf" + integrity sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ== dependencies: - bn.js "^4.11.1" + bn.js "^5.2.0" rootpath@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/rootpath/-/rootpath-0.1.2.tgz#5b379a87dca906e9b91d690a599439bef267ea6b" - integrity sha1-Wzeah9ypBum5HWkKWZQ5vvJn6ms= + integrity sha512-R3wLbuAYejpxQjL/SjXo1Cjv4wcJECnMRT/FlcCfTwCBhaji9rWaRCoVEQ1SPiTJ4kKK+yh+bZLAV7SCafoDDw== router@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/router/-/router-1.3.2.tgz#bfaa16888a5283d5ee40d999da7a9fa15296a60c" - integrity sha1-v6oWiIpSg9XuQNmZ2nqfoVKWpgw= + version "1.3.7" + resolved "https://registry.yarnpkg.com/router/-/router-1.3.7.tgz#7d68cef5558febfd3438a23de07a0f8b92b873f1" + integrity sha512-bYnD9Vv2287+g3AIll2kHITLtHV5+fldq6hVzaul9RbdGme77mvBY/1cO+ahsgstA2RI6DSg/j4W1TYHm4Lz4g== dependencies: - array-flatten "2.1.1" + array-flatten "3.0.0" debug "2.6.9" methods "~1.1.2" - parseurl "~1.3.2" + parseurl "~1.3.3" path-to-regexp "0.1.7" - setprototypeof "1.1.0" + setprototypeof "1.2.0" utils-merge "1.0.1" -rsvp@^3.3.3: - version "3.6.2" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" - integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== - -rsvp@^4.8.5: +rsvp@^4.8.4, rsvp@^4.8.5: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== @@ -22590,14 +25250,16 @@ run-node@^1.0.0: integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== run-parallel@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" - integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= + integrity sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg== dependencies: aproba "^1.1.1" @@ -22609,23 +25271,30 @@ rustbn.js@~0.2.0: rx-lite-aggregates@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" - integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74= + integrity sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg== dependencies: rx-lite "*" rx-lite@*, rx-lite@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" - integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ= + integrity sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA== -rxjs@^6.4.0, rxjs@^6.5.2, rxjs@^6.5.4, rxjs@^6.6.0: - version "6.6.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" - integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== +rxjs@6, rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.6.0: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" -safe-buffer@*, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +rxjs@^7.5.5: + version "7.5.6" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc" + integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw== + dependencies: + tslib "^2.1.0" + +safe-buffer@*, safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -22650,23 +25319,28 @@ safe-json-stringify@~1: safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +safe-stable-stringify@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73" + integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== + +"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: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sane@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.3.tgz#e878c3f19e25cc57fbb734602f48f8a97818b181" - integrity sha512-hSLkC+cPHiBQs7LSyXkotC3UUtyn8C4FMn50TNaacRyvBlI+3ebcxMpqckmTdtXVtel87YS7GXN3UIOj7NiGVQ== + version "4.1.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" + integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA== dependencies: "@cnakazawa/watch" "^1.0.3" anymatch "^2.0.0" - capture-exit "^1.2.0" + capture-exit "^2.0.0" exec-sh "^0.3.2" execa "^1.0.0" fb-watchman "^2.0.0" @@ -22675,18 +25349,18 @@ sane@^4.0.3: walker "~1.0.5" sanitize-filename@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a" - integrity sha1-YS2hyWRz+gLczaktzVtKsWSmdyo= + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== dependencies: truncate-utf8-bytes "^1.0.0" save@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/save/-/save-2.4.0.tgz#af93ff9b3d7a41d0aff49a23433870613a460f9b" - integrity sha512-wd5L2uVnsKYkIUaK6i8Ie66IOHaI328gMF0MPuTJtYOjXgUolC33LSIk7Qr8WVA55QHaGwfiVS8a7EFIeGOR3w== + version "2.5.0" + resolved "https://registry.yarnpkg.com/save/-/save-2.5.0.tgz#426663ca04eeaf87f909656aec52a1ba5d7e6195" + integrity sha512-xiVLpKVbx8EmW0HDkNRjYL271OnIRCo8VGWAEq6/K+E0dgNrwKV2xvKXdfPj6HGYA6l760800LyewSY3ooljCg== dependencies: - async "^2.6.2" + async "^3.2.2" event-stream "^4.0.1" lodash.assign "^4.2.0" mingo "1" @@ -22694,9 +25368,9 @@ save@^2.4.0: sax@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" - integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o= + integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA== -sax@>=0.6.0, sax@^1.2.1, sax@^1.2.4: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -22725,7 +25399,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -scmp@^2.0.0, scmp@^2.1.0: +scmp@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a" integrity sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q== @@ -22733,14 +25407,14 @@ scmp@^2.0.0, scmp@^2.1.0: scrypt-js@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" - integrity sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q= + integrity sha512-d8DzQxNivoNDogyYmb/9RD5mEQE/Q7vG2dLDUgvfPmKL9xCVzgqUntOdS0me9Cq9Sh9VxIZuoNEFcsfyXRnyUw== scrypt-js@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.4.tgz#32f8c5149f0797672e551c07e230f834b6af5f16" integrity sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw== -scrypt-js@^3.0.0, scrypt-js@^3.0.1: +scrypt-js@3.0.1, scrypt-js@^3.0.0, scrypt-js@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312" integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA== @@ -22752,18 +25426,27 @@ scrypt-js@^3.0.0, scrypt-js@^3.0.1: scryptsy "^2.1.0" semver "^6.3.0" -scryptsy@2.1.0, scryptsy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" - integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== - scryptsy@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-1.2.1.tgz#a3225fa4b2524f802700761e2855bdf3b2d92163" - integrity sha1-oyJfpLJST4AnAHYeKFW987LZIWM= + integrity sha512-aldIRgMozSJ/Gl6K6qmJZysRP82lz83Wb42vl4PWN8SaLFHIaOzLPc9nUUW2jQN88CuGm5q5HefJ9jZ3nWSmTw== dependencies: pbkdf2 "^3.0.3" +scryptsy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" + integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== + +secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" + integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== + dependencies: + elliptic "^6.5.4" + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + secp256k1@^3.0.1: version "3.8.0" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.8.0.tgz#28f59f4b01dbee9575f56a47034b7d2e3b3b352d" @@ -22778,19 +25461,10 @@ secp256k1@^3.0.1: nan "^2.14.0" safe-buffer "^5.1.2" -secp256k1@^4.0.0, secp256k1@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.2.tgz#15dd57d0f0b9fdb54ac1fa1694f40e5e9a54f4a1" - integrity sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg== - dependencies: - elliptic "^6.5.2" - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - -seed-random@^2.2.0: +seed-random@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" - integrity sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ= + integrity sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ== seedrandom@3.0.1: version "3.0.1" @@ -22798,16 +25472,16 @@ seedrandom@3.0.1: integrity sha512-1/02Y/rUeU1CJBAGLebiC5Lbo5FnB22gQbIFFYTLkwvp1xdABZJH1sn4ZT1MzXmPpzv+Rf/Lu2NcsLJiK4rcDg== seek-bzip@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc" - integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w= + version "1.0.6" + resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" + integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== dependencies: - commander "~2.8.1" + commander "^2.8.1" semaphore-async-await@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz#857bef5e3644601ca4b9570b87e9df5ca12974fa" - integrity sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo= + integrity sha512-b/ptP11hETwYWpeilHXXQiV5UJNJl7ZWWooKRE5eBIYWoom6dZ0SluCIdCtKycsMtZgKWE01/qAw6jblw1YVhg== semaphore@>=1.0.1, semaphore@^1.0.3, semaphore@^1.1.0: version "1.1.0" @@ -22817,12 +25491,12 @@ semaphore@>=1.0.1, semaphore@^1.0.3, semaphore@^1.1.0: semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== semver-diff@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" - integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= + integrity sha512-gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw== dependencies: semver "^5.0.3" @@ -22836,11 +25510,11 @@ semver-diff@^3.1.1: semver-greatest-satisfied-range@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b" - integrity sha1-E+jCZYq5aRywzXEJMkAoDTb3els= + integrity sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ== dependencies: sver-compat "^1.5.0" -"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -22848,68 +25522,75 @@ semver-greatest-satisfied-range@^1.1.0: semver@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" - integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c= + integrity sha512-VyFUffiBx8hABJ9HYSTXLRwyZtdDHMzMtFmID1aiNAD2BZppBmJm0Hqw3p2jkgxP9BNt1pQ9RnC49P0EcXf6cA== semver@5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== -semver@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" - integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== +semver@7.3.4: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" -semver@7.3.5, semver@^7.0.0, semver@^7.3.4, semver@^7.3.5: +semver@7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" -semver@7.x, semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +semver@7.3.7, semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + dependencies: + lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - semver@~5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== dependencies: debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" + depd "2.0.0" + destroy "1.2.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.7.2" + http-errors "2.0.0" mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" + ms "2.1.3" + on-finished "2.4.1" range-parser "~1.2.1" - statuses "~1.5.0" + statuses "2.0.1" + +sentence-case@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-2.1.1.tgz#1f6e2dda39c168bf92d13f86d4a918933f667ed4" + integrity sha512-ENl7cYHaK/Ktwk5OTD+aDbQ3uC8IByu/6Bkg+HDv8Mm+XnBnppVNalcfJTNsp1ibstKh030/JKQQWglDvtKwEQ== + dependencies: + no-case "^2.2.0" + upper-case-first "^1.1.2" seq-queue@^0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" - integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4= + integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q== sequelize-cli@^5.5.1: version "5.5.1" @@ -22954,7 +25635,19 @@ sequelize@5.21.5: serialize-error@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a" - integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go= + integrity sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw== + +serialize-javascript@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e" + integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw== + +serialize-javascript@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" serialize-javascript@^4.0.0: version "4.0.0" @@ -22963,15 +25656,15 @@ serialize-javascript@^4.0.0: dependencies: randombytes "^2.1.0" -serve-static@1.14.1, serve-static@^1.13.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== +serve-static@1.15.0, serve-static@^1.13.1: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.1" + send "0.18.0" servify@^0.1.12: version "0.1.12" @@ -22987,41 +25680,52 @@ servify@^0.1.12: set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== set-immediate-shim@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= + integrity sha512-Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ== -set-value@^0.2.0, set-value@^0.4.3, set-value@^2.0.0, set-value@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90" - integrity sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA== +set-value@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.2.0.tgz#73b0a6825c158c6a16a82bbdc95775bf2a825fab" + integrity sha512-dJaeu7V8d1KwjePimg1oOpGp31cEw/uRcZlfL7wwemkr+A00ev/ZhikvSMiQ4hkf83d8JdY2AFoFmXsKzmHMSw== dependencies: - is-plain-object "^2.0.4" + isobject "^1.0.0" + noncharacters "^1.1.0" + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" setimmediate@1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f" - integrity sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48= + integrity sha512-/TjEmXQVEzdod/FFskf3o7oOAsGhHf2j1dZqRFbDzq4F3mvvxflIIi4Hd3bLQE9y/CpwqfSQam5JakI/mi3Pog== setimmediate@^1.0.4, setimmediate@^1.0.5, setimmediate@~1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== + integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== setprototypeof@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -sha.js@^2.4.0, sha.js@^2.4.8: +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== @@ -23032,30 +25736,34 @@ sha.js@^2.4.0, sha.js@^2.4.8: sha1@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz#addaa7a93168f393f19eb2b15091618e2700f848" - integrity sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg= + integrity sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA== dependencies: charenc ">= 0.0.1" crypt ">= 0.0.1" -sha3@1.2.3, sha3@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/sha3/-/sha3-1.2.3.tgz#ed5958fa8331df1b1b8529ca9fdf225a340c5418" - integrity sha512-sOWDZi8cDBRkLfWOw18wvJyNblXDHzwMGnRWut8zNNeIeLnmMRO17bjpLc7OzMuj1ASUgx2IyohzUCAl+Kx5vA== +sha3@^2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/sha3/-/sha3-2.1.4.tgz#000fac0fe7c2feac1f48a25e7a31b52a6492cc8f" + integrity sha512-S8cNxbyb0UGUM2VhRD4Poe5N58gJnJsLJ5vC7FYWGUmGhcsj4++WaIOBFVDxlG0W3To6xBuiRh+i0Qp2oNCOtg== dependencies: - nan "2.13.2" + buffer "6.0.3" -sha@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz#6030822fbd2c9823949f8f72ed6411ee5cf25aae" - integrity sha1-YDCCL70smCOUn49y7WQR7lzyWq4= +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== dependencies: - graceful-fs "^4.1.2" - readable-stream "^2.0.2" + kind-of "^6.0.2" + +shallowequal@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== dependencies: shebang-regex "^1.0.0" @@ -23069,7 +25777,7 @@ shebang-command@^2.0.0: shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== shebang-regex@^3.0.0: version "3.0.0" @@ -23079,7 +25787,7 @@ shebang-regex@^3.0.0: shell-quote@1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767" - integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c= + integrity sha512-V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg== dependencies: array-filter "~0.0.0" array-map "~0.0.0" @@ -23087,14 +25795,14 @@ shell-quote@1.6.1: jsonify "~0.0.0" shell-quote@^1.6.1, shell-quote@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" - integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== + version "1.7.3" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== shelljs@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" - integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ== + version "0.8.5" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" + integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== dependencies: glob "^7.0.0" interpret "^1.0.0" @@ -23110,15 +25818,7 @@ shimmer@^1.1.0: resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== -side-channel@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== - dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.0" - -side-channel@^1.0.4: +side-channel@^1.0.3, side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== @@ -23130,12 +25830,12 @@ side-channel@^1.0.4: sigmund@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= + integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g== -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== simple-concat@^1.0.0: version "1.0.1" @@ -23143,23 +25843,32 @@ simple-concat@^1.0.0: integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== simple-get@^2.7.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d" - integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw== + version "2.8.2" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.2.tgz#5708fb0919d440657326cd5fe7d2599d07705019" + integrity sha512-Ijd/rV5o+mSBBs4F/x9oDPtTx9Zb6X9brmnXvMW4J7IR15ngi9q5xxqWBKU744jTZiaXtxaPL7uHG6vtN8kUkw== dependencies: decompress-response "^3.3.0" once "^1.3.1" simple-concat "^1.0.0" simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55" + integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA== dependencies: decompress-response "^4.2.0" once "^1.3.1" simple-concat "^1.0.0" +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + simple-plist@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.3.1.tgz#16e1d8f62c6c9b691b8383127663d834112fb017" @@ -23172,24 +25881,19 @@ simple-plist@^1.0.0: simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== dependencies: is-arrayish "^0.3.1" -sisteransi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c" - integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ== - -sjcl@^1.0.3: - version "1.0.8" - resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a" - integrity sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ== +sisteransi@^1.0.0, sisteransi@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= + integrity sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg== slash@^2.0.0: version "2.0.0" @@ -23204,7 +25908,7 @@ slash@^3.0.0: sleep-promise@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/sleep-promise/-/sleep-promise-8.0.1.tgz#8d795a27ea23953df6b52b91081e5e22665993c5" - integrity sha1-jXlaJ+ojlT32tSuRCB5eImZZk8U= + integrity sha512-nfwyX+G1dsx2R1DMMKWLpNxuHMOCL7JIRBUw0fl7Z4nZ1YZK0apZuGY8MDexn0HDZzgbERgj/CrNtsYpo/B7eA== sleep@6.1.0: version "6.1.0" @@ -23222,30 +25926,22 @@ slice-ansi@^2.0.0, slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -slide@^1.1.3, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" - integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= - -smart-buffer@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d" - integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw== - -smart-buffer@^1.0.13: - version "1.1.15" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16" - integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY= - -smart-buffer@^4.1.0: +smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +snake-case@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f" + integrity sha512-FMR5YoPFwOLuh4rRz92dywJjyKYZNLpMn1R5ujVpIYkbA9p01fq8RMg0FkO4M+Yobt4MjHeLTJVm5xFFBHSV2Q== + dependencies: + no-case "^2.2.0" + snakeize@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/snakeize/-/snakeize-0.1.0.tgz#10c088d8b58eb076b3229bb5a04e232ce126422d" - integrity sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0= + integrity sha512-ot3bb6pQt6IVq5G/JQ640ceSYTPtriVrwNyfoUw1LmQQGzPMAGxE5F+ded2UwSUCyf2PW1fFAYUnVEX21PWbpQ== snapdragon-node@^2.0.1: version "2.1.1" @@ -23286,45 +25982,22 @@ socks-proxy-agent@5, socks-proxy-agent@^5.0.0: debug "4" socks "^2.3.3" -socks-proxy-agent@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz#2eae7cf8e2a82d34565761539a7f9718c5617659" - integrity sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA== - dependencies: - agent-base "^4.1.0" - socks "^1.1.10" - -socks-proxy-agent@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386" - integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg== - dependencies: - agent-base "~4.2.1" - socks "~2.3.2" - -socks@^1.1.10: - version "1.1.10" - resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a" - integrity sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o= - dependencies: - ip "^1.1.4" - smart-buffer "^1.0.13" - -socks@^2.3.3: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" -socks@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e" - integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ== +socks@^2.3.3, socks@^2.6.2: + version "2.7.0" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" + integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== dependencies: - ip "^1.1.5" - smart-buffer "4.0.2" + ip "^2.0.0" + smart-buffer "^4.2.0" solc@0.5.8: version "0.5.8" @@ -23340,7 +26013,20 @@ solc@0.5.8: tmp "0.0.33" yargs "^11.0.0" -solc@^0.4.2: +solc@0.8.17: + version "0.8.17" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.17.tgz#c748fec6a64bf029ec406aa9b37e75938d1115ae" + integrity sha512-Dtidk2XtTTmkB3IKdyeg6wLYopJnBVxdoykN8oP8VY3PQjN16BScYoUJTXFm2OP7P0hXNAqWiJNmmfuELtLf8g== + dependencies: + command-exists "^1.2.8" + commander "^8.1.0" + follow-redirects "^1.12.1" + js-sha3 "0.8.0" + memorystream "^0.3.1" + semver "^5.5.0" + tmp "0.0.33" + +solc@^0.4.2, solc@^0.4.20: version "0.4.26" resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.26.tgz#5390a62a99f40806b86258c737c1cf653cc35cb5" integrity sha512-o+c6FpkiHd+HPjmjEVpQgH7fqZ14tJpXhho+/bQXlXbliLIS/xjXb42Vxh+qQY1WCSTMQ0+a5vR9vi0MfhU6mA== @@ -23351,24 +26037,24 @@ solc@^0.4.2: semver "^5.3.0" yargs "^4.7.1" -solc@^0.5.0, solc@^0.5.5, solc@^0.5.8: - version "0.5.11" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.11.tgz#5905261191d01befd78ef52610a006820022ee8f" - integrity sha512-F8avCCVDYnJzvIm/ITsU11GFNdFI4HaNsME+zw9lK5a3ojD3LZN2Op2cIfWg7w1HeRYRiMOU1dM77saX6jUIKw== +solc@^0.5.5, solc@^0.5.8: + version "0.5.17" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.17.tgz#8a76c50e98d49ca7610cca2fdc78ff3016540c67" + integrity sha512-qpX+PGaU0Q3c6lh2vDzMoIbhv6bIrecI4bYsx+xUs01xsGFnY6Nr0L8y/QMyutTnrHN6Lb/Yl672ZVRqxka96w== dependencies: command-exists "^1.2.8" + commander "3.0.2" fs-extra "^0.30.0" js-sha3 "0.8.0" memorystream "^0.3.1" require-from-string "^2.0.0" semver "^5.5.0" tmp "0.0.33" - yargs "^13.2.0" solc@^0.6.0: - version "0.6.4" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.6.4.tgz#4b0f11fccd6f5ef9802c6bb1c007abb16881c2ca" - integrity sha512-HjUCys7ue9n7lGCa1XNf+wDdEY/wY64CpwnD4iPxW+BYYUX6ytwWXKitoolPXOOVxq4jewvwtL7Pngs+5k954A== + version "0.6.12" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.6.12.tgz#48ac854e0c729361b22a7483645077f58cba080e" + integrity sha512-Lm0Ql2G9Qc7yPP2Ba+WNmzw2jwsrd3u4PobHYlSOxaut3TtUbj9+5ZrT6f4DUpNPEoBaFUOEg9Op9C0mk7ge9g== dependencies: command-exists "^1.2.8" commander "3.0.2" @@ -23406,47 +26092,41 @@ solidity-bytes-utils@0.0.7: dependencies: truffle-hdwallet-provider "0.0.3" +solidity-comments-extractor@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/solidity-comments-extractor/-/solidity-comments-extractor-0.0.7.tgz#99d8f1361438f84019795d928b931f4e5c39ca19" + integrity sha512-wciNMLg/Irp8OKGrh3S2tfvZiZ0NEyILfcRCXCD4mp7SgK/i9gzLfhY2hY7VMCQJ3kH9UB9BzNdibIVMchzyYw== + solidity-parser-antlr@^0.4.11, solidity-parser-antlr@^0.4.2: version "0.4.11" resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.4.11.tgz#af43e1f13b3b88309a875455f5d6e565b05ee5f1" integrity sha512-4jtxasNGmyC0midtjH/lTFPZYvTTUMy6agYcF+HoMnzW8+cqo3piFrINb4ZCzpPW+7tTVFCGa5ubP34zOzeuMg== -solidity-parser-diligence@^0.4.17: - version "0.4.18" - resolved "https://registry.yarnpkg.com/solidity-parser-diligence/-/solidity-parser-diligence-0.4.18.tgz#1ec8c29d320afe048db941828f142dec3e97f657" - integrity sha512-mauO/qG2v59W9sOn5TYV2dS7+fvFKqIHwiku+TH82e1Yca4H8s6EDG12ZpXO2cmgLlCKX3FOqqC73aYLB8WwNg== - sort-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" - integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= + integrity sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg== dependencies: is-plain-obj "^1.0.0" -sorted-object@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz#7d631f4bd3a798a24af1dffcfbfe83337a5df5fc" - integrity sha1-fWMfS9OnmKJK8d/8+/6DM3pd9fw= - -sorted-union-stream@~2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz#c7794c7e077880052ff71a8d4a2dbb4a9a638ac7" - integrity sha1-x3lMfgd4gAUv9xqNSi27Sppjisc= +sort-keys@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18" + integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg== dependencies: - from2 "^1.3.0" - stream-iterate "^1.1.0" + is-plain-obj "^2.0.0" source-list-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" - integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A== + version "2.0.1" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== dependencies: - atob "^2.1.1" + atob "^2.1.2" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -23460,6 +26140,14 @@ source-map-support@0.5.12: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-support@^0.4.15: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" @@ -23467,71 +26155,76 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12: - version "0.5.16" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" - integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== +source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.12: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== -source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7: +source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" - integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50= + integrity sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA== dependencies: amdefine ">=0.0.4" +spark-md5@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" + integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== + sparkles@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw== spdx-correct@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" - integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g== + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" - integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" - integrity sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA== + version "3.0.12" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" + integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== spinnies@^0.4.2: version "0.4.3" @@ -23549,24 +26242,24 @@ split-array-stream@^2.0.0: dependencies: is-stream-ended "^0.1.4" -split-on-first@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" - integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== - -split-string@^3.0.2: +split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== dependencies: extend-shallow "^3.0.0" -split2@^2.0.0, split2@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" - integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw== +split2@^3.0.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== dependencies: - through2 "^2.0.2" + readable-stream "^3.0.0" + +split2@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" + integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== split@^1.0.0, split@^1.0.1: version "1.0.1" @@ -23583,7 +26276,7 @@ sprintf-js@^1.1.2: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sqlite3@4.0.9: version "4.0.9" @@ -23594,15 +26287,15 @@ sqlite3@4.0.9: node-pre-gyp "^0.11.0" request "^2.87.0" -sqlstring@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40" - integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= +sqlstring@^2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c" + integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg== sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + version "1.17.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" + integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -23614,41 +26307,43 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^5.0.0, ssri@^5.2.4, ssri@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06" - integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ== +ssri@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: - safe-buffer "^5.1.1" + figgy-pudding "^3.5.1" -ssri@^6.0.0, ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== +ssri@^9.0.0, ssri@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== dependencies: - figgy-pudding "^3.5.1" + minipass "^3.1.1" stack-trace@0.0.10, stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== stack-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" - integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== + version "1.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b" + integrity sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ== + dependencies: + escape-string-regexp "^2.0.0" -stack-utils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" - integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg== +stack-utils@^2.0.2, stack-utils@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" + integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== dependencies: escape-string-regexp "^2.0.0" -stackframe@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" - integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== +stackframe@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" + integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== stacktrace-parser@^0.1.3: version "0.1.10" @@ -23660,35 +26355,40 @@ stacktrace-parser@^0.1.3: starts-with@^1.0.0, starts-with@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/starts-with/-/starts-with-1.0.2.tgz#16793a729d89d4cf3d4fb2eda2f908ae357f196f" - integrity sha1-Fnk6cp2J1M89T7LtovkIrjV/GW8= + integrity sha512-QUw5X+IMTGDm1nrdowEdDaA0MNiUmRlQFwpTTXmhuPKQc+7b0h8fOHtlt1zZqcEK5x1Fsitrobo7KEusc+d1rg== static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== dependencies: define-property "^0.2.5" object-copy "^0.1.0" +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -statuses@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4= + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" - integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= + integrity sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g== + +stoppable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b" + integrity sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw== stream-browserify@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" - integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds= + version "2.0.2" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" + integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== dependencies: inherits "~2.0.1" readable-stream "^2.0.2" @@ -23701,15 +26401,15 @@ stream-buffers@2.2.x: stream-combiner@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" - integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg= + integrity sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ== dependencies: duplexer "~0.1.1" through "~2.3.4" stream-each@^1.1.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" - integrity sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" + integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== dependencies: end-of-stream "^1.1.0" stream-shift "^1.0.0" @@ -23726,40 +26426,21 @@ stream-exhaust@^1.0.1: resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw== -stream-http@^2.3.1: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - stream-http@^2.7.2: - version "2.8.1" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4" - integrity sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A== + version "2.8.3" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" + integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.3.3" + readable-stream "^2.3.6" to-arraybuffer "^1.0.0" xtend "^4.0.0" -stream-iterate@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stream-iterate/-/stream-iterate-1.2.0.tgz#2bd7c77296c1702a46488b8ad41f79865eecd4e1" - integrity sha1-K9fHcpbBcCpGSIuK1B95hl7s1OE= - dependencies: - readable-stream "^2.1.5" - stream-shift "^1.0.0" - stream-shift@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" - integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== stream-to-pull-stream@^1.7.1: version "1.7.3" @@ -23769,37 +26450,32 @@ stream-to-pull-stream@^1.7.1: looper "^3.0.0" pull-stream "^3.2.3" -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= +streamsearch@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" + integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" - integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= - -strict-uri-encode@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" - integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY= + integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== string-hash@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" - integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs= + integrity sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A== string-length@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" - integrity sha1-VpcPscOFWOnnC3KL894mmsRa36w= + integrity sha512-MNCACnufWUf3pQ57O5WTBMkKhzYIaKEcUioO0XHrTMafrbBaNk4IyDOLHBv5xbXO0jLLdsYWeFjpjG2hVHRDtw== dependencies: strip-ansi "^3.0.0" string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" strip-ansi "^6.0.0" @@ -23807,7 +26483,7 @@ string-length@^4.0.1: string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" @@ -23821,25 +26497,7 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - 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-width@^4.2.2: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -23848,64 +26506,43 @@ string-width@^4.2.2: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.trim@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea" - integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.0" - function-bind "^1.0.2" - -string.prototype.trimend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" - integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== +string.prototype.trim@~1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.6.tgz#824960787db37a9e24711802ed0c1d1c0254f83e" + integrity sha512-8lMR2m+U0VJTPp6JjvJTtGyc4FIGq9CdRt7O9p6T0e6K4vjU+OP+SQJpbe/SBmRcCUIvNUnjsbmY6lnMp8MhsQ== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - -string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - -string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" + define-properties "^1.1.4" + es-abstract "^1.19.5" -string.prototype.trimstart@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" - integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== +string.prototype.trimend@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" + integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.19.5" -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== +string.prototype.trimstart@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" + integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" + define-properties "^1.1.4" + es-abstract "^1.19.5" -string_decoder@^1.0.0, string_decoder@^1.0.3, string_decoder@^1.1.1: +string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== @@ -23915,7 +26552,7 @@ string_decoder@^1.0.0, string_decoder@^1.0.3, string_decoder@^1.1.1: string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== string_decoder@~1.1.1: version "1.1.1" @@ -23927,14 +26564,14 @@ string_decoder@~1.1.1: strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== dependencies: ansi-regex "^2.0.0" -strip-ansi@^4.0.0, strip-ansi@~4.0.0: +strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== dependencies: ansi-regex "^3.0.0" @@ -23945,39 +26582,24 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-ansi@^6.0.1: +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" -strip-bom-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" - integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4= - dependencies: - first-chunk-stream "^1.0.0" - strip-bom "^2.0.0" - -strip-bom@2.X, strip-bom@^2.0.0: +strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= + integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g== dependencies: is-utf8 "^0.2.0" strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== strip-bom@^4.0.0: version "4.0.0" @@ -23994,7 +26616,7 @@ strip-dirs@^2.0.0: strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== strip-final-newline@^2.0.0: version "2.0.0" @@ -24004,28 +26626,38 @@ strip-final-newline@^2.0.0: strip-hex-prefix@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz#0c5f155fef1151373377de9dbb588da05500e36f" - integrity sha1-DF8VX+8RUTczd96du1iNoFUA428= + integrity sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A== dependencies: is-hex-prefixed "1.0.0" -strip-indent@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" - integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= - dependencies: - get-stdin "^4.0.1" - strip-indent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" - integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= + integrity sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA== + +strip-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== + +strip-json-comments@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" + integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== + +strip-json-comments@3.1.1, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strong-log-transformer@^2.0.0: +strong-log-transformer@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA== @@ -24037,7 +26669,17 @@ strong-log-transformer@^2.0.0: stubs@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" - integrity sha1-6NK6H6nJBXAwPAMLaQD31fiavls= + integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== + +sublevel-pouchdb@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.3.0.tgz#d27138c34d98c3d5c8c3ee85c1662add3ad04525" + integrity sha512-zp7u4jmv2N/s+dXZkWTtL4BjREs3SZ1nGBNNJ8RWX4yqN59oHgKmti4CfVOqfsAW9RMasmTqQAEPxL9hX8+CIA== + dependencies: + inherits "2.0.4" + level-codec "9.0.2" + ltgt "2.2.1" + readable-stream "1.1.14" sudo-prompt@^9.0.0: version "9.2.1" @@ -24121,15 +26763,29 @@ supports-color@6.1.0, supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +supports-color@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + +supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== supports-color@^3.1.0: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= + integrity sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A== dependencies: has-flag "^1.0.0" @@ -24141,9 +26797,9 @@ supports-color@^5.0.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-co has-flag "^3.0.0" supports-color@^7.0.0, supports-color@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" @@ -24156,21 +26812,34 @@ supports-hyperlinks@^1.0.1: supports-color "^5.0.0" supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" + integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + sver-compat@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8" - integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg= + integrity sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg== dependencies: es6-iterator "^2.0.1" es6-symbol "^3.1.1" +swap-case@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3" + integrity sha512-BAmWG6/bx8syfc6qXPprof3Mn5vQgf5dwdUNJhsNqU9WdPt5P+ES/wQ5bxfijy8zwZgZZHslC3iAsxsuQMCzJQ== + dependencies: + lower-case "^1.1.1" + upper-case "^1.1.1" + swarm-js@0.1.39: version "0.1.39" resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.39.tgz#79becb07f291d4b2a178c50fee7aa6e10342c0e8" @@ -24206,72 +26875,74 @@ swarm-js@^0.1.40: tar "^4.0.2" xhr-request "^1.0.1" +symbol-observable@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -symbol@^0.2.1: - version "0.2.3" - resolved "https://registry.yarnpkg.com/symbol/-/symbol-0.2.3.tgz#3b9873b8a901e47c6efe21526a3ac372ef28bbc7" - integrity sha1-O5hzuKkB5Hxu/iFSajrDcu8ou8c= - sync-request@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.0.0.tgz#db867eccc4ed31bbcb9fa3732393a3413da582ed" - integrity sha512-jGNIAlCi9iU4X3Dm4oQnNQshDD3h0/1A7r79LyqjbjUnj69sX6mShAXlhRXgImsfVKtTcnra1jfzabdZvp+Lmw== + version "6.1.0" + resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.1.0.tgz#e96217565b5e50bbffe179868ba75532fb597e68" + integrity sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw== dependencies: http-response-object "^3.0.1" sync-rpc "^1.2.1" then-request "^6.0.0" sync-rpc@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/sync-rpc/-/sync-rpc-1.3.3.tgz#f72ec6da8aa6f1a7d4a69003711f528e275993f4" - integrity sha512-xtTZUAeFaescZALim6yqjMDsVQD7mKAkdZ0/FOvVjlrr4uQqrARlWxs4P7bKV2ZPnvOyTVyHyyxqztxtBF4iIw== + version "1.3.6" + resolved "https://registry.yarnpkg.com/sync-rpc/-/sync-rpc-1.3.6.tgz#b2e8b2550a12ccbc71df8644810529deb68665a7" + integrity sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw== dependencies: get-port "^3.1.0" table@^5.2.3: - version "5.4.0" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.0.tgz#d772a3216e68829920a41a32c18eda286c95d780" - integrity sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw== + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== dependencies: - ajv "^6.9.1" - lodash "^4.17.11" + ajv "^6.10.2" + lodash "^4.17.14" slice-ansi "^2.1.0" string-width "^3.0.0" tail@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/tail/-/tail-2.0.2.tgz#86073f3a9a568807b7fd886897a7350314275b5f" - integrity sha512-raFipiKWdGKEzxbvZwnhUGqjvsv0gpa/1A479rL//NOxnNwYZDN4MPk6xJJdUFs8P2Xrff3nbH5fcyYRLU4UHQ== + version "2.2.4" + resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.4.tgz#90dd4c5a174a3fa39dcb65a1df1950a4a0093a41" + integrity sha512-PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ== tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tape@^4.4.0, tape@^4.6.3, tape@^4.8.0: - version "4.11.0" - resolved "https://registry.yarnpkg.com/tape/-/tape-4.11.0.tgz#63d41accd95e45a23a874473051c57fdbc58edc1" - integrity sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA== +tape@^4.4.0, tape@^4.6.3: + version "4.16.0" + resolved "https://registry.yarnpkg.com/tape/-/tape-4.16.0.tgz#18310f57b71c0ac21b3ef94fe5c16033b3d6362b" + integrity sha512-mBlqYFr2mHysgCFXAuSarIQ+ffhielpb7a5/IbeOhMaLnQYhkJLUm6CwO1RszWeHRxnIpMessZ3xL2Cfo94BWw== dependencies: - deep-equal "~1.0.1" + call-bind "~1.0.2" + deep-equal "~1.1.1" defined "~1.0.0" + dotignore "~0.1.2" for-each "~0.3.3" - function-bind "~1.1.1" - glob "~7.1.4" + glob "~7.2.3" has "~1.0.3" inherits "~2.0.4" - minimist "~1.2.0" - object-inspect "~1.6.0" - resolve "~1.11.1" + is-regex "~1.1.4" + minimist "~1.2.6" + object-inspect "~1.12.2" + resolve "~1.22.1" resumer "~0.0.0" - string.prototype.trim "~1.1.2" + string.prototype.trim "~1.2.6" through "~2.3.8" -tar-fs@^1.16.2, tar-fs@^1.8.1: +tar-fs@^1.8.1: version "1.16.3" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509" integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw== @@ -24282,14 +26953,14 @@ tar-fs@^1.16.2, tar-fs@^1.8.1: tar-stream "^1.1.2" tar-fs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" - integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== dependencies: chownr "^1.1.1" - mkdirp "^0.5.1" + mkdirp-classic "^0.5.2" pump "^3.0.0" - tar-stream "^2.0.0" + tar-stream "^2.1.4" tar-stream@^1.1.2, tar-stream@^1.5.2: version "1.6.2" @@ -24304,18 +26975,7 @@ tar-stream@^1.1.2, tar-stream@^1.5.2: to-buffer "^1.1.1" xtend "^4.0.0" -tar-stream@^2.0.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz#6d5ef1a7e5783a95ff70b69b97455a5968dc1325" - integrity sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q== - dependencies: - bl "^4.0.1" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tar-stream@^2.2.0: +tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -24326,23 +26986,35 @@ tar-stream@^2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@4.4.15, tar@^4, tar@^4.0.2, tar@^4.3.0, tar@^4.4.0, tar@^4.4.10, tar@^4.4.2, tar@^4.4.3, tar@^4.4.8: - version "4.4.15" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8" - integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA== +tar@^4, tar@^4.0.2, tar@^4.3.0: + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" + +tar@^6.1.0, tar@^6.1.11, tar@^6.1.2: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" targz@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f" - integrity sha1-j3alI2lM3t+7XWCkB2/27uzFOY8= + integrity sha512-6q4tP9U55mZnRuMTBqnqc3nwYQY3kv+QthCFZuMk+Tn1qYUnMPmL/JZ/mzgXINzFpSqfU+242IFmFU9VPvqaQw== dependencies: tar-fs "^1.8.1" @@ -24351,32 +27023,32 @@ tarn@^1.1.5: resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.5.tgz#7be88622e951738b9fa3fb77477309242cdddc2d" integrity sha512-PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g== -tarn@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.0.tgz#a4082405216c0cce182b8b4cb2639c52c1e870d4" - integrity sha512-PKUnlDFODZueoA8owLehl8vLcgtA8u4dRuVbZc92tspDYZixjJL6TqYOmryf/PfP/EBX+2rgNcrj96NO+RPkdQ== +tarn@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693" + integrity sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ== tcp-port-used@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.1.tgz#46061078e2d38c73979a2c2c12b5a674e6689d70" - integrity sha512-rwi5xJeU6utXoEIiMvVBMc9eJ2/ofzB+7nLOdnZuFTmNCLqRiQh2sMG9MqCxHU/69VC/Fwp5dV9306Qd54ll1Q== + version "1.0.2" + resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.2.tgz#9652b7436eb1f4cfae111c79b558a25769f6faea" + integrity sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA== dependencies: - debug "4.1.0" - is2 "2.0.1" + debug "4.3.1" + is2 "^2.0.6" tdigest@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" - integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= + version "0.1.2" + resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.2.tgz#96c64bac4ff10746b910b0e23b515794e12faced" + integrity sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA== dependencies: - bintrees "1.0.1" + bintrees "1.0.2" -tedious@^6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz#ad02365f16f9e0416b216e13d3f83c53addd42ca" - integrity sha512-8qr7+sB0h4SZVQBRWUgHmYuOEflAOl2eihvxk0fVNvpvGJV4V5UC/YmSvebyfgyfwWcPO22/AnSbYVZZqf9wuQ== +tedious@^6.7.1: + version "6.7.1" + resolved "https://registry.yarnpkg.com/tedious/-/tedious-6.7.1.tgz#e581be8634a5268b37dffe8930ba2d781edd8a3d" + integrity sha512-61eg/mvUa5vIqZcRizcqw/82dY65kR2uTll1TaUFh0aJ45XOrgbc8axiVR48dva8BahIAlJByaHNfAJ/KmPV0g== dependencies: - "@azure/ms-rest-nodeauth" "2.0.2" + "@azure/ms-rest-nodeauth" "^3.0.10" "@types/node" "^12.12.17" "@types/readable-stream" "^2.3.5" bl "^3.0.0" @@ -24388,16 +27060,16 @@ tedious@^6.7.0: readable-stream "^3.4.0" sprintf-js "^1.1.2" -teeny-request@6.0.1, teeny-request@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.1.tgz#9b1f512cef152945827ba7e34f62523a4ce2c5b0" - integrity sha512-TAK0c9a00ELOqLrZ49cFxvPVogMUFaWY8dUsQc/0CuQPGF+BOxOQzXfE413BAk2kLomwNplvdtMpeaeGWmoc2g== +teeny-request@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-7.1.1.tgz#2b0d156f4a8ad81de44303302ba8d7f1f05e20e6" + integrity sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg== dependencies: http-proxy-agent "^4.0.0" - https-proxy-agent "^4.0.0" - node-fetch "^2.2.0" + https-proxy-agent "^5.0.0" + node-fetch "^2.6.1" stream-events "^1.0.5" - uuid "^3.3.2" + uuid "^8.0.0" teeny-request@^3.11.3: version "3.11.3" @@ -24408,10 +27080,21 @@ teeny-request@^3.11.3: node-fetch "^2.2.0" uuid "^3.3.2" -teeny-request@^7.0.0: - version "7.1.3" - resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-7.1.3.tgz#5a3d90c559a6c664a993477b138e331a518765ba" - integrity sha512-Ew3aoFzgQEatLA5OBIjdr1DWJUaC1xardG+qbPPo5k/y/3fMwXLxpjh5UB5dVfElktLaQbbMs80chkz53ByvSg== +teeny-request@^6.0.0: + version "6.0.3" + resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.3.tgz#b617f9d5b7ba95c76a3f257f6ba2342b70228b1f" + integrity sha512-TZG/dfd2r6yeji19es1cUIwAlVD8y+/svB1kAC2Y0bjEyysrfbO8EZvJBRwIE6WkwmUoB7uvWLwTIhJbMXZ1Dw== + dependencies: + http-proxy-agent "^4.0.0" + https-proxy-agent "^5.0.0" + node-fetch "^2.2.0" + stream-events "^1.0.5" + uuid "^7.0.0" + +teeny-request@^7.1.3: + version "7.2.0" + resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-7.2.0.tgz#41347ece068f08d741e7b86df38a4498208b2633" + integrity sha512-SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw== dependencies: http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" @@ -24429,24 +27112,12 @@ telnet-client@1.2.8: temp-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" - integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= - -temp-write@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492" - integrity sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI= - dependencies: - graceful-fs "^4.1.2" - is-stream "^1.1.0" - make-dir "^1.0.0" - pify "^3.0.0" - temp-dir "^1.0.0" - uuid "^3.0.1" + integrity sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ== temp@0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" - integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k= + integrity sha512-jtnWJs6B1cZlHs9wPG7BrowKxZw/rf6+UpGAkr8AaYmiTyTO7zQlLoST8zx/8TcUPnZmeBoB+H8ARuHZaSijVw== dependencies: os-tmpdir "^1.0.0" rimraf "~2.2.6" @@ -24454,7 +27125,7 @@ temp@0.8.3: tempfile@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" - integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= + integrity sha512-ZOn6nJUgvgC09+doCEF3oB+r3ag7kUvlsXEGX069QRD60p+P3uP7XG9N2/at+EyIRGSN//ZY3LyEotA1YpmjuA== dependencies: temp-dir "^1.0.0" uuid "^3.0.1" @@ -24462,7 +27133,7 @@ tempfile@^2.0.0: term-size@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk= + integrity sha512-7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ== dependencies: execa "^0.7.0" @@ -24495,9 +27166,9 @@ terser-webpack-plugin@^1.4.1: worker-farm "^1.7.0" terser@^4.1.2: - version "4.8.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" - integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== + version "4.8.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" + integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -24515,30 +27186,35 @@ test-exclude@^6.0.0: test-value@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/test-value/-/test-value-2.1.0.tgz#11da6ff670f3471a73b625ca4f3fdcf7bb748291" - integrity sha1-Edpv9nDzRxpztiXKTz/c97t0gpE= + integrity sha512-+1epbAxtKeXttkGFMTX9H42oqzOTufR1ceCF+GYA5aOmvaPq9wd4PUS8329fn2RRLGNeUkgRLnVpycjx8DsO2w== dependencies: array-back "^1.0.3" typical "^2.6.0" -text-extensions@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6" - integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ== +testrpc@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/testrpc/-/testrpc-0.0.1.tgz#83e2195b1f5873aec7be1af8cbe6dcf39edb7aed" + integrity sha512-afH1hO+SQ/VPlmaLUFj2636QMeDvPCeQMc/9RBMW0IfjNe9gFD9Ra3ShqYkB7py0do1ZcCna/9acHyzTJ+GcNA== + +text-extensions@^1.0.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" + integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== text-hex@1.0.x: version "1.0.0" resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== -text-table@^0.2.0, text-table@~0.2.0: +text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== then-request@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/then-request/-/then-request-6.0.0.tgz#2cab198e48f2d8e79c8c1ed260198368a4a0bcba" - integrity sha512-xA+7uEMc+jsQIoyySJ93Ad08Kuqnik7u6jLS5hR91Z3smAoCfL3M8/MqMlobAa9gzBfO9pA88A/AntfepkkMJQ== + version "6.0.2" + resolved "https://registry.yarnpkg.com/then-request/-/then-request-6.0.2.tgz#ec18dd8b5ca43aaee5cb92f7e4c1630e950d4f0c" + integrity sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA== dependencies: "@types/concat-stream" "^1.6.0" "@types/form-data" "0.0.33" @@ -24547,7 +27223,7 @@ then-request@^6.0.0: caseless "~0.12.0" concat-stream "^1.6.0" form-data "^2.2.0" - http-basic "^7.0.0" + http-basic "^8.1.1" http-response-object "^3.0.1" promise "^8.0.0" qs "^6.4.0" @@ -24555,35 +27231,27 @@ then-request@^6.0.0: thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== dependencies: thenify ">= 3.1.0 < 4" "thenify@>= 3.1.0 < 4": - version "3.3.0" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" - integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== dependencies: any-promise "^1.0.0" throat@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" - integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= + integrity sha512-wCVxLDcFxw7ujDxaeJC6nfl2XfHJNYs8yUYJnvMgtPEFlttP9tHSfRUv2vBe6C4hkVFPWoP1P6ZccbYjmSEkKA== throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -through2-filter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec" - integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw= - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - through2-filter@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" @@ -24595,12 +27263,20 @@ through2-filter@^3.0.0: through2@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9" - integrity sha1-OE51MU1J8y3hLuu4E2uOtrXVnak= + integrity sha512-/vp02SIbpmVHapNMjox4hDBzykPdAOmH5y3INcKaxGfpEPSCMqzdWXyGfqPYyxoBLo1JpxBrlh3Z9esv0vWUYw== dependencies: readable-stream "~2.0.0" xtend "~4.0.0" -through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0: +through2@3.0.2, through2@^3.0.0, through2@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" + integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== + dependencies: + inherits "^2.0.4" + readable-stream "2 || 3" + +through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -24608,38 +27284,17 @@ through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3 readable-stream "~2.3.6" xtend "~4.0.1" -through2@^0.6.0: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -through2@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.0.tgz#468b461df9cd9fcc170f22ebf6852e467e578ff2" - integrity sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ== +through2@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" + integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== dependencies: - readable-stream "2 || 3" - xtend "~4.0.1" + readable-stream "3" through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.4, through@~2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -through@~2.2.7: - version "2.2.7" - resolved "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz#6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd" - integrity sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0= - -tildify@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" - integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo= - dependencies: - os-homedir "^1.0.0" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== tildify@2.0.0: version "2.0.0" @@ -24649,28 +27304,21 @@ tildify@2.0.0: time-stamp@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" - integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= + integrity sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw== timed-out@^4.0.0, timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" - integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= + integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== -timers-browserify@^2.0.2: +timers-browserify@^2.0.4: version "2.0.12" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== dependencies: setimmediate "^1.0.4" -timers-browserify@^2.0.4: - version "2.0.10" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae" - integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg== - dependencies: - setimmediate "^1.0.4" - -timers-ext@^0.1.5: +timers-ext@^0.1.5, timers-ext@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6" integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ== @@ -24679,27 +27327,28 @@ timers-ext@^0.1.5: next-tick "1" tiny-async-pool@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-1.0.4.tgz#bbac28a39a754576d8d0615d4e2ad35c87da6169" - integrity sha512-4gdLvReS3WwmPCxZjj38Go673xhEXlK77fVFA2x+dE2Bf9QzDkVQb3rdO1iJt337ybhir42m4zM2GHJjiuFwoA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz#c013e1b369095e7005db5595f95e646cca6ef8a5" + integrity sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA== dependencies: semver "^5.5.0" - yaassertion "^1.0.0" -tiny-emitter@^2.1.0: +tiny-emitter@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== -tiny-relative-date@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" - integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A== +tiny-secp256k1@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tiny-secp256k1/-/tiny-secp256k1-2.2.1.tgz#a61d4791b7031aa08a9453178a131349c3e10f9b" + integrity sha512-/U4xfVqnVxJXN4YVsru0E6t5wVncu2uunB8+RVR40fYUxkKYUPS10f+ePQZgFBoE/Jbf9H1NBveupF2VmB58Ng== + dependencies: + uint8array-tools "0.0.7" tiny-secp256k1@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/tiny-secp256k1/-/tiny-secp256k1-1.1.4.tgz#772a7711baaa9e2bffa92708cafadc9d372907a3" - integrity sha512-O7NfGzBdBy/jamehZ1ptutZsh2c+9pq2Pu+KPv75+yzk5/Q/6lppQGMUJucHdRGdkeBcAUeLAOdJInEAZgZ53A== + version "1.1.6" + resolved "https://registry.yarnpkg.com/tiny-secp256k1/-/tiny-secp256k1-1.1.6.tgz#7e224d2bee8ab8283f284e40e6b4acb74ffe047c" + integrity sha512-FmqJZGduTyvsr2cF3375fqGHUovSwDi/QytexX1Se4BPuPZpTE5Ftp5fg+EFSuEf3lhZqgCRjEG3ydUQ/aNiwA== dependencies: bindings "^1.3.0" bn.js "^4.11.8" @@ -24707,6 +27356,19 @@ tiny-secp256k1@^1.1.3: elliptic "^6.4.0" nan "^2.13.2" +tiny-typed-emitter@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz#b3b027fdd389ff81a152c8e847ee2f5be9fad7b5" + integrity sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA== + +title-case@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa" + integrity sha512-EkJoZ2O3zdCz3zJsYCsxyq2OC5hrxR9mfdd5I+w8h/tmFfeOxJ+vvkxsKxdmN0WtS9zLdHEgfgVOiMVgv+Po4Q== + dependencies: + no-case "^2.2.0" + upper-case "^1.0.3" + tmp@0.0.33, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -24721,29 +27383,22 @@ tmp@0.1.0, tmp@^0.1.0: dependencies: rimraf "^2.6.3" -tmp@^0.2.1: +tmp@^0.2.1, tmp@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== dependencies: rimraf "^3.0.0" -tmpl@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= - -to-absolute-glob@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" - integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38= - dependencies: - extend-shallow "^2.0.1" +tmpl@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-absolute-glob@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" - integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs= + integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA== dependencies: is-absolute "^1.0.0" is-negated-glob "^1.0.0" @@ -24751,7 +27406,7 @@ to-absolute-glob@^2.0.0: to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= + integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA== to-buffer@^1.1.1: version "1.1.1" @@ -24761,17 +27416,17 @@ to-buffer@^1.1.1: to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= + integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== dependencies: kind-of "^3.0.2" @@ -24783,7 +27438,7 @@ to-readable-stream@^1.0.0: to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== dependencies: is-number "^3.0.0" repeat-string "^1.6.1" @@ -24808,7 +27463,7 @@ to-regex@^3.0.1, to-regex@^3.0.2: to-through@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" - integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY= + integrity sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q== dependencies: through2 "^2.0.3" @@ -24817,10 +27472,15 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + toposort-class@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" - integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg= + integrity sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg== touch@^3.1.0: version "3.1.0" @@ -24829,7 +27489,7 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" -tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0: +tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -24837,27 +27497,36 @@ tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.0.tgz#039b203b2ad95cd9d2a2aae07b238cb83adc46c7" - integrity sha512-IVX6AagLelGwl6F0E+hoRpXzuD192cZhAcmT7/eoLr0PnsB1wv2E5c+A2O+V8xth9FlL2p0OstFsWn0bZpVn4w== +"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== dependencies: psl "^1.1.33" punycode "^2.1.1" universalify "^0.2.0" url-parse "^1.5.3" +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + toxic@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toxic/-/toxic-1.0.0.tgz#f1154d8b6ac21875ac943a9f7408df2dfe164ea2" - integrity sha1-8RVNi2rCGHWslDqfdAjfLf4WTqI= + version "1.0.1" + resolved "https://registry.yarnpkg.com/toxic/-/toxic-1.0.1.tgz#8c2e2528da591100adc3883f2c0e56acfb1c7288" + integrity sha512-WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg== dependencies: - lodash "^2.4.1" + lodash "^4.17.10" tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= + integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA== dependencies: punycode "^2.1.0" @@ -24871,75 +27540,45 @@ tr46@^2.1.0: tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== "traverse@>=0.3.0 <0.4": version "0.3.9" resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= + integrity sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ== treeify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8" integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A== -trim-newlines@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" - integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= - -trim-newlines@^2.0.0: +treeverse@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" - integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= + resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca" + integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A== -trim-off-newlines@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" - integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM= +trim-newlines@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" + integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== trim-right@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - -triple-beam@^1.2.0, triple-beam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" - integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== - -truffle-artifactor@^4.0.30: - version "4.0.30" - resolved "https://registry.yarnpkg.com/truffle-artifactor/-/truffle-artifactor-4.0.30.tgz#c06448fbf3406f8f697dae86c281e0f8cd7e5f69" - integrity sha512-3ZriLaKQ1UZ7Fhf70PUAWq0/0461oiYOLheabdQrNiggwzAwt1URMoLLByqDGmCmVBimbf/RHA4VYGd62343aA== - dependencies: - "@truffle/contract-schema" "^3.0.14" - fs-extra "6.0.1" - lodash "^4.17.13" - -truffle-contract@^4.0.31: - version "4.0.31" - resolved "https://registry.yarnpkg.com/truffle-contract/-/truffle-contract-4.0.31.tgz#e43b7f648e2db352c857d1202d710029b107b68d" - integrity sha512-u3q+p1wiX5C2GpnluGx/d2iaJk7bcWshk2/TohiJyA2iQiTfkS7M4n9D9tY3JqpXR8PmD/TrA69RylO0RhITFA== - dependencies: - "@truffle/blockchain-utils" "^0.0.11" - "@truffle/contract-schema" "^3.0.14" - "@truffle/error" "^0.0.6" - bignumber.js "^7.2.1" - ethers "^4.0.0-beta.1" - truffle-interface-adapter "^0.2.5" - web3 "1.2.1" - web3-core-promievent "1.2.1" - web3-eth-abi "1.2.1" - web3-utils "1.2.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== + +triple-beam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" + integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== truffle-flattener@^1.4.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/truffle-flattener/-/truffle-flattener-1.4.4.tgz#747a99204001f7d6dce43ea92771e1ff6ac3eafb" - integrity sha512-S/WmvubzlUj1mn56wEI6yo1bmPpKDNdEe5rtyVC1C5iNfZWobD/V69pAYI15IBDJrDqUyh+iXgpTkzov50zpQw== + version "1.6.0" + resolved "https://registry.yarnpkg.com/truffle-flattener/-/truffle-flattener-1.6.0.tgz#abb64488b711e6cca0a9d3e449f6a85e35964c5d" + integrity sha512-scS5Bsi4CZyvlrmD4iQcLHTiG2RQFUXVheTgWeH6PuafmI+Lk5U87Es98loM3w3ImqC9/fPHq+3QIXbcPuoJ1Q== dependencies: "@resolver-engine/imports-fs" "^0.2.2" - "@solidity-parser/parser" "^0.6.0" + "@solidity-parser/parser" "^0.14.1" find-up "^2.1.0" mkdirp "^1.0.4" tsort "0.0.1" @@ -24947,43 +27586,17 @@ truffle-flattener@^1.4.0: truffle-hdwallet-provider@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/truffle-hdwallet-provider/-/truffle-hdwallet-provider-0.0.3.tgz#0e1de02104b73d3875e1cf7093305b4ea8a2d843" - integrity sha1-Dh3gIQS3PTh14c9wkzBbTqii2EM= + integrity sha512-oF00yd5jwGcHn0F063fhdE+pcw8No+idoX2vvR/3SuSJri54vdW/f/qBEc5BpJMjhVJtoAmw+ITI9ZhC+UJuFw== dependencies: bip39 "^2.2.0" ethereumjs-wallet "^0.6.0" web3 "^0.18.2" web3-provider-engine "^8.4.0" -truffle-interface-adapter@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/truffle-interface-adapter/-/truffle-interface-adapter-0.2.5.tgz#aa0bee635517b4a8e06adcdc99eacb993e68c243" - integrity sha512-EL39OpP8FcZ99ne1Rno3jImfb92Nectd4iVsZzoEUCBfbwHe7sr0k+i45guoruSoP8nMUE81Mov2s8I5pi6d9Q== - dependencies: - bn.js "^4.11.8" - ethers "^4.0.32" - lodash "^4.17.13" - web3 "1.2.1" - -truffle-provisioner@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/truffle-provisioner/-/truffle-provisioner-0.1.5.tgz#f940b2e0aa3a26d5227dfc4ebe8d29ebc68a9e03" - integrity sha512-XSzD4Tj1T16E8qwoIHnQ9sOuvoemP1yqxX9Jg0VvvoLTdl8X17uau6dN08JgNR09hJroTrXPbkAi5Y8IfKhVMw== - -truffle-resolver@^5.0.16: - version "5.0.16" - resolved "https://registry.yarnpkg.com/truffle-resolver/-/truffle-resolver-5.0.16.tgz#5488a5431ce2ea81782780f0b9ee3836f3b56c4b" - integrity sha512-ek8y6KSGLvqDZhTXzDlwFaUtwSCBtDZ4k624xNAj/RZIyqodGs1a9MBTQZ6BzpQ6uc4yC9ZlSzdClhNHugYwqg== - dependencies: - "@truffle/expect" "^0.0.10" - async "2.6.1" - detect-installed "^2.0.4" - get-installed-path "^4.0.8" - truffle-provisioner "^0.1.5" - -truffle-security@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/truffle-security/-/truffle-security-1.7.1.tgz#612969c5df68f29307778b338a944f96adc32036" - integrity sha512-oV4zK/hY60HA2o9oCJOi3KckfRhhzooJFf0GAD3t5fuzyNymC9ajrDqwB2dnZVAPdaNA+DCGYxqmH6j875Gxlw== +truffle-security@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/truffle-security/-/truffle-security-1.7.3.tgz#c9dd7a0e7f35adb36d40878fa6939cf9446d210d" + integrity sha512-eruRvUBTBwO3anVW5o8qCWf/TGDVnNsKbM9cS6bxSI99MfXh5G0jw3Sy5m8Xeq6P9Y0QkqrmO/Sb+67vaX9bAw== dependencies: "@truffle/artifactor" "^4.0.36" "@truffle/compile-vyper" "^1.0.33" @@ -25014,26 +27627,32 @@ truffle-security@^1.7.1: uuid "^3.3.3" truffle-typings@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/truffle-typings/-/truffle-typings-1.0.6.tgz#762ca7cb3a8b78535043b4a11dabbb7b72179189" - integrity sha512-oGAXGKCpf3FoxFcf000ICJf67eOFvyX3UgIgXucmECleQ4ymD+fdMkK1Qgniwi6HSBVQS6brdUiXHq8Q5A5PPA== + version "1.0.8" + resolved "https://registry.yarnpkg.com/truffle-typings/-/truffle-typings-1.0.8.tgz#0b92d86a86a77c43771cdbce2544b67a25e3f2e2" + integrity sha512-75yFYNt0ws1TTehrGxhOqH3tutvBCAs+RG2SrhVIqQvU72kLAb4ercl32dES8yKbXBVHjzv3OXNg5gsbak+3Dg== dependencies: "@types/chai" "^4.1.4" "@types/mocha" "^5.2.5" + "@types/web3" "^1.0.18" -truffle@5.1.18: - version "5.1.18" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.18.tgz#2fefaed849698b7fb865b417a197d1b6d9229db3" - integrity sha512-9oxmLmyTXML5Auxl8adPd3kLcOZVhYNapCmPUcMnYCOXthxa3NEOW9y3PTcoDnwFyuIOETGIiJp4Ew9bmY8v6Q== +truffle@5.6.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.6.1.tgz#6791f0fc4b6e15afb5c0e440b6cdf83d6d399ef4" + integrity sha512-hu3Kbz5G6AmBrxOZB8XxY3d7LngwXSwwZ/kkdNfyKSFhdaYaWS3POLeRqbZSR0x61n17wRwzV5nKKxsEqnFDhg== dependencies: + "@truffle/db-loader" "^0.2.1" + "@truffle/debugger" "^11.0.12" app-module-path "^2.2.0" - mocha "5.2.0" - original-require "1.0.1" + ganache "7.4.4" + mocha "9.2.2" + original-require "^1.0.1" + optionalDependencies: + "@truffle/db" "^2.0.1" truncate-utf8-bytes@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== dependencies: utf8-byte-length "^1.0.1" @@ -25062,21 +27681,19 @@ ts-generator@^0.0.8: resolve "^1.8.1" ts-essentials "^1.0.0" -ts-jest@^26.5.4: - version "26.5.4" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.4.tgz#207f4c114812a9c6d5746dd4d1cdf899eafc9686" - integrity sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg== +ts-jest@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.0.tgz#3617e10c39a76380fe521d0c26186a773f5f1e46" + integrity sha512-OxUaigbv5Aon3OMLY9HBtwkGMs1upWE/URrmmVQFzzOcGlEPVuWzGmXUIkWGt/95Dj/T6MGuTrHHGL6kT6Yn8g== dependencies: bs-logger "0.x" - buffer-from "1.x" fast-json-stable-stringify "2.x" - jest-util "^26.1.0" - json5 "2.x" - lodash "4.x" + jest-util "^29.0.0" + json5 "^2.2.1" + lodash.memoize "4.x" make-error "1.x" - mkdirp "1.x" semver "7.x" - yargs-parser "20.x" + yargs-parser "^21.0.1" ts-mockito@^2.6.1: version "2.6.1" @@ -25085,6 +27702,17 @@ ts-mockito@^2.6.1: dependencies: lodash "^4.17.5" +ts-node@8.10.2, ts-node@^8.3.0, ts-node@^8.4.1, ts-node@^8.5.4: + version "8.10.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" + integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== + dependencies: + arg "^4.1.0" + diff "^4.0.1" + make-error "^1.1.1" + source-map-support "^0.5.17" + yn "3.1.1" + ts-node@8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57" @@ -25096,52 +27724,49 @@ ts-node@8.3.0: source-map-support "^0.5.6" yn "^3.0.0" -ts-node@^8.3.0, ts-node@^8.4.1, ts-node@^8.5.4: - version "8.5.4" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.5.4.tgz#a152add11fa19c221d0b48962c210cf467262ab2" - integrity sha512-izbVCRV68EasEPQ8MSIGBNK9dc/4sYJJKYA+IarMQct1RtEot6Xp0bXuClsbUSnKpg50ho+aOAx8en5c+y4OFw== - dependencies: +ts-node@^10.9.1: + version "10.9.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" + integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== + dependencies: + "@cspotcode/source-map-support" "^0.8.0" + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" arg "^4.1.0" + create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" - source-map-support "^0.5.6" - yn "^3.0.0" + v8-compile-cache-lib "^3.0.1" + yn "3.1.1" -tsconfig-paths@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.8.0.tgz#4e34202d5b41958f269cf56b01ed95b853d59f72" - integrity sha512-zZEYFo4sjORK8W58ENkRn9s+HmQFkkwydDG7My5s/fnfr2YYCaiyXe/HBUcIgU8epEKOXwiahOO+KZYjiXlWyQ== +tsconfig-paths@^3.8.0, tsconfig-paths@^3.9.0: + version "3.14.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" + integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== dependencies: "@types/json5" "^0.0.29" - deepmerge "^2.0.1" json5 "^1.0.1" - minimist "^1.2.0" + minimist "^1.2.6" strip-bom "^3.0.0" -tslib@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== - tslib@1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ== -tslib@^1, tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.2, tslib@^1.9.3: - version "1.13.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" - integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== - -tslib@^2.0.0, tslib@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" - integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== +tslib@^1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1, tslib@^2.1.0, tslib@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@~2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== tslint-config-prettier@^1.18.0: version "1.18.0" @@ -25165,21 +27790,21 @@ tslint-microsoft-contrib@^6.2.0: tsutils "^2.27.2 <2.29.0" tslint-react-hooks@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tslint-react-hooks/-/tslint-react-hooks-2.2.1.tgz#c52c7df65ee1517b2d6c92bc716e9ef72ccdf208" - integrity sha512-bqIg2uZe+quJMfSOGc4OOZ4awo6TP1ejGDGS6IKg2WIrS0XnWfhUJ99i3B8rUpnZhuD4vRSvyYIbXPUmEqQxxQ== + version "2.2.2" + resolved "https://registry.yarnpkg.com/tslint-react-hooks/-/tslint-react-hooks-2.2.2.tgz#4dc9b3986196802d45c11cc0bf6319a8116fe2ed" + integrity sha512-gtwA14+WevNUtlBhvAD5Ukpxt2qMegYI7IDD8zN/3JXLksdLdEuU/T/oqlI1CtZhMJffqyNn+aqq2oUqUFXiNA== tslint-react@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-4.1.0.tgz#7153b724a8cfbea52423d0ffa469e8eba3bcc834" - integrity sha512-Y7CbFn09X7Mpg6rc7t/WPbmjx9xPI8p1RsQyiGCLWgDR6sh3+IBSlT+bEkc0PSZcWwClOkqq2wPsID8Vep6szQ== + version "4.2.0" + resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-4.2.0.tgz#41b16e0438365f8d3ed4120501f02cabff9fd1e4" + integrity sha512-lO22+FKr9ZZGueGiuALzvZE/8ANoDoCHGCknX1Ge3ALrfcLQHQ1VGdyb1scZXQFdEQEfwBTIU40r5BUlJpn0JA== dependencies: tsutils "^3.9.1" tslint@^5.20.0: - version "5.20.0" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.0.tgz#fac93bfa79568a5a24e7be9cdde5e02b02d00ec1" - integrity sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g== + version "5.20.1" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d" + integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg== dependencies: "@babel/code-frame" "^7.0.0" builtin-modules "^1.1.1" @@ -25198,7 +27823,7 @@ tslint@^5.20.0: tsort@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786" - integrity sha1-4igPXoF/i/QnVlf9D5rr1E9aJ4Y= + integrity sha512-Tyrf5mxF8Ofs1tNoxA13lFeZ2Zrbd6cKbuH3V+MQ5sb6DtBj5FjrXVsRWT8YvNAQTqNoz66dz1WsbigI22aEnw== "tsutils@^2.27.2 <2.29.0": version "2.28.0" @@ -25215,50 +27840,45 @@ tsutils@^2.29.0: tslib "^1.8.1" tsutils@^3.0.0, tsutils@^3.9.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" - integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= + integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw== tunnel-agent@^0.4.0: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" - integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us= + integrity sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ== tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== dependencies: safe-buffer "^5.0.1" -tunnel@0.0.6, tunnel@^0.0.6: +tunnel@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== tweetnacl-util@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/tweetnacl-util/-/tweetnacl-util-0.15.0.tgz#4576c1cee5e2d63d207fee52f1ba02819480bc75" - integrity sha1-RXbBzuXi1j0gf+5S8boCgZSAvHU= + version "0.15.1" + resolved "https://registry.yarnpkg.com/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz#b80fcdb5c97bcc508be18c44a4be50f022eea00b" + integrity sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw== tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -tweetnacl@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.1.tgz#2594d42da73cd036bd0d2a54683dd35a6b55ca17" - integrity sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A== + integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== -tweetnacl@^1.0.1: +tweetnacl@^1.0.0, tweetnacl@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== @@ -25272,20 +27892,20 @@ tweetsodium@0.0.5: tweetnacl "^1.0.1" twilio@^3.57.0: - version "3.57.0" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.57.0.tgz#626d212fb86c5d73abf23e7d39cb83f25d477a49" - integrity sha512-gt1NtEM647c/+KGcPiBEY2YCCrvm7nKXfd2bOT6PNYUAbBF5n0s3Ed0lYQW5BngpJEjeZROMZjfp9ikwehS/pg== + version "3.82.0" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.82.0.tgz#591c3964675ed01bd21f0a511f26c05f8033d564" + integrity sha512-7j21FIb0tq3udzlOitrnMaIBIMrnB0gO9sDzxHytNfZlMAZXWVIRSP3SodU9lxLTVjyZeFLfr7Qqs1Xafo36uQ== dependencies: - axios "^0.21.1" + axios "^0.26.1" dayjs "^1.8.29" https-proxy-agent "^5.0.0" jsonwebtoken "^8.5.1" - lodash "^4.17.19" + lodash "^4.17.21" q "2.0.x" qs "^6.9.4" rootpath "^0.1.2" scmp "^2.1.0" - url-parse "^1.4.7" + url-parse "^1.5.9" xmlbuilder "^13.0.2" type-check@~0.3.2: @@ -25300,21 +27920,31 @@ type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.18.0: + version "0.18.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" + integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== +type-fest@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8" + integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw== + type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -25343,10 +27973,10 @@ type@^1.0.1: resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== -type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== +type@^2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" + integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== typechain-target-truffle@1.0.2: version "1.0.2" @@ -25380,10 +28010,10 @@ typechain@2.0.0: ts-essentials "^6.0.3" ts-generator "^0.0.8" -typed-function@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-2.0.0.tgz#15ab3825845138a8b1113bd89e60cd6a435739e8" - integrity sha512-Hhy1Iwo/e4AtLZNK10ewVVcP2UEs408DS35ubP825w/YgSBK1KVLwALvvIG4yX75QJrxjCpcWkzkVRB0BwwYlA== +typed-function@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-1.1.0.tgz#ea149706e0fb42aca1791c053a6d94ccd6c4fdcb" + integrity sha512-TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA== typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -25392,10 +28022,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typedarray@^0.0.6, typedarray@~0.0.5: +typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== typedoc-default-themes@^0.11.4: version "0.11.4" @@ -25403,12 +28033,12 @@ typedoc-default-themes@^0.11.4: integrity sha512-Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw== typedoc-plugin-markdown@^2.2.16: - version "2.2.16" - resolved "https://registry.yarnpkg.com/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.2.16.tgz#baac77e7278e1417f645c063d25f285ec06afdb8" - integrity sha512-0Y1zBqL8EQGnwMGoh82LtvioaVs1BGMr1qzINXWwh0R769Awg17vjnKZ8pBY9VHVc6yINB6ZvrLhJsfZuzJxkw== + version "2.4.2" + resolved "https://registry.yarnpkg.com/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.4.2.tgz#2d83fe4f279643436ebc44ca2f937855b0fd9f12" + integrity sha512-BBH+9/Uq5XbsqfzCDl8Jq4iaLXRMXRuAHZRFarAZX7df8+F3vUjDx/WHWoWqbZ/XUFzduLC2Iuy2qwsJX8SQ7A== dependencies: - fs-extra "^8.1.0" - handlebars "^4.5.3" + fs-extra "^9.0.1" + handlebars "^4.7.6" typedoc@^0.19.2: version "0.19.2" @@ -25432,14 +28062,33 @@ typeforce@^1.11.5: resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc" integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g== +typescript-compare@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425" + integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA== + dependencies: + typescript-logic "^0.0.0" + +typescript-logic@^0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196" + integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q== + typescript-tslint-plugin@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.4.tgz#febe0cca1fe65133f4f688841eba68262a1d55a5" - integrity sha512-CQEfGC+p0SoBARI4N2LrGsWJsp4/OE+uKZ68xsWYKHWqMFq4DFQHqOVlK0deEricSN01NmDTqjap63Pw/DHieg== + version "0.5.5" + resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c" + integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA== dependencies: minimatch "^3.0.4" - mock-require "^3.0.2" - vscode-languageserver "^5.1.0" + mock-require "^3.0.3" + vscode-languageserver "^5.2.1" + +typescript-tuple@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2" + integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q== + dependencies: + typescript-compare "^0.0.2" typescript@4.4.3: version "4.4.3" @@ -25451,42 +28100,47 @@ typescript@4.7.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== +"typescript@^3 || ^4": + version "4.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" + integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== + typescript@^3.6.4: - version "3.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== + version "3.9.10" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" + integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== typewise-core@^1.2, typewise-core@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195" - integrity sha1-l+uRgFx/VdL5QXSPpQ0xXZke8ZU= + integrity sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg== typewise@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/typewise/-/typewise-1.0.3.tgz#1067936540af97937cc5dcf9922486e9fa284651" - integrity sha1-EGeTZUCvl5N8xdz5kiSG6fooRlE= + integrity sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ== dependencies: typewise-core "^1.2.0" typewiselite@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typewiselite/-/typewiselite-1.0.0.tgz#c8882fa1bb1092c06005a97f34ef5c8508e3664e" - integrity sha1-yIgvobsQksBgBal/NO9chQjjZk4= + integrity sha512-J9alhjVHupW3Wfz6qFRGgQw0N3gr8hOkw6zm7FZ6UR1Cse/oD9/JVok7DNE9TT9IbciDHX2Ex9+ksE6cRmtymw== typical@^2.6.0, typical@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" - integrity sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0= + integrity sha512-ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg== u2f-api@0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-0.2.7.tgz#17bf196b242f6bf72353d9858e6a7566cc192720" integrity sha512-fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg== -ua-parser-js@0.7.28, ua-parser-js@^0.7.18: - version "0.7.28" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" - integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== +ua-parser-js@^0.7.18: + version "0.7.31" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6" + integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ== uglify-es@^3.1.9: version "3.3.9" @@ -25497,140 +28151,154 @@ uglify-es@^3.1.9: source-map "~0.6.1" uglify-js@^3.1.4: - version "3.4.9" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3" - integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q== - dependencies: - commander "~2.17.1" - source-map "~0.6.1" + version "3.17.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.0.tgz#55bd6e9d19ce5eef0d5ad17cd1f587d85b180a85" + integrity sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg== -uid-number@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" - integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE= +uint8array-tools@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/uint8array-tools/-/uint8array-tools-0.0.7.tgz#a7a2bb5d8836eae2fade68c771454e6a438b390d" + integrity sha512-vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ== ultron@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" - integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po= + integrity sha512-QMpnpVtYaWEeY+MwKDN/UdKlE/LsFZXM5lO1u7GaZzNgmIbGixHEmVMIKT+vqYOALu3m5GYQy9kz4Xu4IVn7Ow== ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== -umask@^1.1.0, umask@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" - integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0= - umzug@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e" - integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184" + integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw== dependencies: - babel-runtime "^6.23.0" - bluebird "^3.5.3" + bluebird "^3.7.2" -unbox-primitive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f" - integrity sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA== +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.0" - has-symbols "^1.0.0" - which-boxed-primitive "^1.0.1" + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" + which-boxed-primitive "^1.0.2" unbzip2-stream@^1.0.9: - version "1.2.5" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47" - integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og== + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== dependencies: - buffer "^3.0.1" - through "^2.3.6" + buffer "^5.2.1" + through "^2.3.8" unc-path-regex@^0.1.0, unc-path-regex@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== undefsafe@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" - integrity sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY= - dependencies: - debug "^2.2.0" + version "2.0.5" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c" + integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA== + +underscore@1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e" + integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw== -underscore@1.12.1, underscore@1.9.1, underscore@>1.4.4, "underscore@>= 1.3.1", underscore@^1.12.1, underscore@^1.7.0, underscore@^1.8.3: - version "1.13.2" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz#276cea1e8b9722a8dbed0100a407dda572125881" - integrity sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g== +underscore@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" + integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== + +underscore@>1.4.4, "underscore@>= 1.3.1", underscore@^1.7.0: + version "1.13.4" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee" + integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ== undertaker-registry@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50" - integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA= + integrity sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw== undertaker@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.1.tgz#701662ff8ce358715324dfd492a4f036055dfe4b" - integrity sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18" + integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg== dependencies: arr-flatten "^1.0.1" arr-map "^2.0.0" bach "^1.0.0" collection-map "^1.0.0" es6-weak-map "^2.0.1" + fast-levenshtein "^1.0.0" last-run "^1.1.0" object.defaults "^1.0.0" object.reduce "^1.0.0" undertaker-registry "^1.0.0" -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== +unicode-canonical-property-names-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== +unicode-match-property-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" + unicode-canonical-property-names-ecmascript "^2.0.0" + unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== +unicode-match-property-value-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== -unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0" - integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg== +unicode-property-aliases-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== dependencies: arr-union "^3.1.0" get-value "^2.0.6" is-extendable "^0.1.1" - set-value "^0.4.3" + set-value "^2.0.1" -unique-filename@^1.1.0, unique-filename@^1.1.1, unique-filename@~1.1.0: +unique-filename@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== dependencies: unique-slug "^2.0.0" +unique-filename@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" + integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== + dependencies: + unique-slug "^3.0.0" + unique-slug@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab" - integrity sha1-22Z258fMBimHj/GWCXx4hVrp9Ks= + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + +unique-slug@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" + integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== dependencies: imurmurhash "^0.1.4" @@ -25645,7 +28313,7 @@ unique-stream@^2.0.2: unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" - integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= + integrity sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg== dependencies: crypto-random-string "^1.0.0" @@ -25657,26 +28325,18 @@ unique-string@^2.0.0: crypto-random-string "^2.0.0" universal-analytics@^0.4.16: - version "0.4.16" - resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.16.tgz#c567eced53cc99ae40d88668464da0950a713731" - integrity sha512-I9vK/S6NI2rbPs4UMJs5uAJR7WKUnSQliN0EEl48j7XpVjR87n2wEXp1pMBGGSI5sIIJrKFyVg/nyGomXPPVCg== + version "0.4.23" + resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac" + integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A== dependencies: - request "2.x" + debug "^4.1.1" + request "^2.88.2" uuid "^3.0.0" -universal-user-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-3.0.0.tgz#4cc88d68097bffd7ac42e3b7c903e7481424b4b9" - integrity sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA== - dependencies: - os-name "^3.0.0" - -universal-user-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-5.0.0.tgz#a3182aa758069bf0e79952570ca757de3579c1d9" - integrity sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q== - dependencies: - os-name "^3.1.0" +universal-user-agent@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee" + integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w== universalify@^0.1.0: version "0.1.2" @@ -25688,30 +28348,25 @@ universalify@^0.2.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== unorm@^1.3.3: - version "1.4.1" - resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300" - integrity sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA= + version "1.6.0" + resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af" + integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA== unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== dependencies: has-value "^0.3.1" isobject "^3.0.0" @@ -25719,12 +28374,12 @@ unset-value@^1.0.0: unzip-response@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= + integrity sha512-N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw== unzipper@^0.10.10: - version "0.10.10" - resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.10.tgz#d82d41fbdfa1f0731123eb11c2cfc028b45d3d42" - integrity sha512-wEgtqtrnJ/9zIBsQb8UIxOhAH1eTHfi7D/xvmrUoMEePeI6u24nq1wigazbIFtHt6ANYXdEVTvc8XYNlTurs7A== + version "0.10.11" + resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e" + integrity sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw== dependencies: big-integer "^1.6.17" binary "~0.3.0" @@ -25742,7 +28397,20 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-notifier@^2.2.0, update-notifier@^2.3.0, update-notifier@^2.5.0: +upath@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" + integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== + +update-browserslist-db@^1.0.5: + version "1.0.7" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz#16279639cff1d0f800b14792de43d97df2d11b7d" + integrity sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + +update-notifier@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw== @@ -25797,41 +28465,61 @@ update-notifier@^5.1.0: semver-diff "^3.1.1" xdg-basedir "^4.0.0" +upper-case-first@^1.1.0, upper-case-first@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-1.1.2.tgz#5d79bedcff14419518fd2edb0a0507c9b6859115" + integrity sha512-wINKYvI3Db8dtjikdAqoBbZoP6Q+PZUyfMR7pmwHzjC2quzSkUq5DmPrTtPEqHaz8AGtmsB4TqwapMTM1QAQOQ== + dependencies: + upper-case "^1.1.1" + +upper-case@^1.0.3, upper-case@^1.1.0, upper-case@^1.1.1, upper-case@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" + integrity sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA== + uri-js@^4.2.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" - integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== url-join@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" - integrity sha1-HbSK1CLTQCRpqH99l73r/k+x48g= + integrity sha512-H6dnQ/yPAAVzMQRvEvyz01hhfQL5qRWSEt7BX8t9DqnPw9BjMb64fjIRq76Uvf1hkHp+mTZvEVJ5guXOT0Xqaw== url-parse-lax@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" - integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= + integrity sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA== dependencies: prepend-http "^1.0.1" url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== dependencies: prepend-http "^2.0.0" -url-parse@1.4.4, url-parse@^1.4.7, url-parse@^1.5.0, url-parse@^1.5.3: - version "1.5.4" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd" - integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg== +url-parse@1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8" + integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg== + dependencies: + querystringify "^2.0.0" + requires-port "^1.0.0" + +url-parse@^1.5.3, url-parse@^1.5.9: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -25839,22 +28527,22 @@ url-parse@1.4.4, url-parse@^1.4.7, url-parse@^1.5.0, url-parse@^1.5.3: url-set-query@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-set-query/-/url-set-query-1.0.0.tgz#016e8cfd7c20ee05cafe7795e892bd0702faa339" - integrity sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk= + integrity sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg== url-template@^2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= + integrity sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw== url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" - integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= + integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A== url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" - integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ= + integrity sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ== dependencies: punycode "1.3.2" querystring "0.2.0" @@ -25862,55 +28550,66 @@ url@0.10.3: url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ== dependencies: punycode "1.3.2" querystring "0.2.0" -urlgrey@0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f" - integrity sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8= +urlgrey@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-1.0.0.tgz#72d2f904482d0b602e3c7fa599343d699bbe1017" + integrity sha512-hJfIzMPJmI9IlLkby8QrsCykQ+SXDeO2W5Q9QTW3QpqZVTx4a/K7p8/5q+/isD8vsbVaFgql/gvAoQCRQ2Cb5w== + dependencies: + fast-url-parser "^1.1.3" -usb@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/usb/-/usb-1.6.0.tgz#bc5d4decf4ffca32d1136717edcf73366137a789" - integrity sha512-52DyWlCk9K+iw3LnvY95WXSnpHjxJoI++aGkV8HiMNPc4zmvDQlYvWAzrkbJ2JH3oUcx26XfU5sZcG4RAcVkMg== +usb@^1.6.0, usb@^1.7.0: + version "1.9.2" + resolved "https://registry.yarnpkg.com/usb/-/usb-1.9.2.tgz#fb6b36f744ecc707a196c45a6ec72442cb6f2b73" + integrity sha512-dryNz030LWBPAf6gj8vyq0Iev3vPbCLHCT8dBw3gQRXRzVNsIdeuU+VjPp3ksmSPkeMAl1k+kQ14Ij0QHyeiAg== dependencies: - bindings "^1.4.0" - nan "2.13.2" - prebuild-install "^5.2.4" + node-addon-api "^4.2.0" + node-gyp-build "^4.3.0" use-subscription@^1.0.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1" - integrity sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA== + version "1.8.0" + resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.8.0.tgz#f118938c29d263c2bce12fc5585d3fe694d4dbce" + integrity sha512-LISuG0/TmmoDoCRmV5XAqYkd3UCBNM0ML3gGBndze65WITcsExCD3DTvXXTLyNcOC0heFQZzluW88bN/oC1DQQ== dependencies: - object-assign "^4.1.1" + use-sync-external-store "^1.2.0" + +use-sync-external-store@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" + integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== use@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544" - integrity sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw== + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +utf-8-validate@5.0.7: + version "5.0.7" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922" + integrity sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q== dependencies: - kind-of "^6.0.2" + node-gyp-build "^4.3.0" utf-8-validate@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.2.tgz#63cfbccd85dc1f2b66cf7a1d0eebc08ed056bfb3" - integrity sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw== + version "5.0.9" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.9.tgz#ba16a822fbeedff1a58918f2a6a6b36387493ea3" + integrity sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q== dependencies: - node-gyp-build "~3.7.0" + node-gyp-build "^4.3.0" utf8-byte-length@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= + integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== utf8@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" - integrity sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g= + integrity sha512-FzZp4f0vPa0AfWf+eav6hqZEqbn7TU1my/GUexpF9e0Afe/fnuLQvgdq5KgD3ggUpu3DpwRUGC0iS8q35eVBLQ== utf8@3.0.0, utf8@^3.0.0: version "3.0.0" @@ -25920,42 +28619,38 @@ utf8@3.0.0, utf8@^3.0.0: utf8@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" - integrity sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY= + integrity sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg== util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -util-extend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" - integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= - -util-promisify@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53" - integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM= - dependencies: - object.getownpropertydescriptors "^2.0.3" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util.promisify@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" - integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" + integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.2" + for-each "^0.3.3" has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.0" + object.getownpropertydescriptors "^2.1.1" -util@0.10.3, util@^0.10.3: +util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= + integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ== dependencies: inherits "2.0.1" +util@^0.10.3: + version "0.10.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" + integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== + dependencies: + inherits "2.0.3" + util@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" @@ -25963,10 +28658,10 @@ util@^0.11.0: dependencies: inherits "2.0.3" -util@^0.12.0: - version "0.12.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" - integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== +util@^0.12.0, util@^0.12.4: + version "0.12.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" + integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== dependencies: inherits "^2.0.3" is-arguments "^1.0.4" @@ -25978,70 +28673,94 @@ util@^0.12.0: utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== uuid@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac" - integrity sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w= + integrity sha512-nWg9+Oa3qD2CQzHIP4qKUqwNfzKn8P0LtFhotaCTFchsV7ZfDhAybeip/HZVeMIpZi9JgY1E3nUlwaCmZT1sEg== uuid@3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== +uuid@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" + integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== + +uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= + integrity sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg== uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.3: +uuid@^7.0.0, uuid@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== -uuid@^8.0.0, uuid@^8.1.0, uuid@^8.3.0: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuid@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" + integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" + integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== v8-compile-cache@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== +v8-compile-cache@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + v8-to-istanbul@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" - integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" source-map "^0.7.3" -v8flags@^3.0.1, v8flags@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8" - integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w== +v8-to-istanbul@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" + integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== dependencies: - homedir-polyfill "^1.0.1" + "@jridgewell/trace-mapping" "^0.3.12" + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" -vali-date@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6" - integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY= +v8flags@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" + integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== + dependencies: + homedir-polyfill "^1.0.1" valid-url@^1, valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" - integrity sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA= + integrity sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA== -validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3: +validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== @@ -26049,13 +28768,20 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0: +validate-npm-package-name@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" - integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34= + integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw== dependencies: builtins "^1.0.3" +validate-npm-package-name@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747" + integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q== + dependencies: + builtins "^5.0.0" + validator@^10.11.0: version "10.11.0" resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228" @@ -26064,50 +28790,32 @@ validator@^10.11.0: value-or-function@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" - integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM= + integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg== + +value-or-promise@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" + integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== varint@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.0.tgz#d826b89f7490732fabc0c0ed693ed475dcb29ebf" - integrity sha1-2Ca4n3SQcy+rwMDtaT7Uddyynr8= + version "5.0.2" + resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4" + integrity sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow== vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" extsprintf "^1.2.0" -vinyl-fs@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.3.tgz#3d97e562ebfdd4b66921dea70626b84bde9d2d07" - integrity sha1-PZflYuv91LZpId6nBia4S96dLQc= - dependencies: - duplexify "^3.2.0" - glob-stream "^5.3.2" - graceful-fs "^4.0.0" - gulp-sourcemaps "^1.5.2" - is-valid-glob "^0.3.0" - lazystream "^1.0.0" - lodash.isequal "^4.0.0" - merge-stream "^1.0.0" - mkdirp "^0.5.0" - object-assign "^4.0.0" - readable-stream "^2.0.4" - strip-bom "^2.0.0" - strip-bom-stream "^1.0.0" - through2 "^2.0.0" - through2-filter "^2.0.0" - vali-date "^1.0.0" - vinyl "^1.0.0" - vinyl-fs@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" @@ -26134,7 +28842,7 @@ vinyl-fs@^3.0.0: vinyl-sourcemap@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" - integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY= + integrity sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA== dependencies: append-buffer "^1.0.2" convert-source-map "^1.5.0" @@ -26144,19 +28852,10 @@ vinyl-sourcemap@^1.1.0: remove-bom-buffer "^3.0.0" vinyl "^2.0.0" -vinyl@1.X, vinyl@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" - integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - vinyl@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" - integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== + version "2.2.1" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" + integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== dependencies: clone "^2.1.1" clone-buffer "^1.0.0" @@ -26175,10 +28874,13 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vm2@^3.9.3: - version "3.9.5" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.5.tgz#5288044860b4bbace443101fcd3bddb2a0aa2496" - integrity sha512-LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng== +vm2@^3.9.8: + version "3.9.11" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" + integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" vscode-jsonrpc@^4.0.0: version "4.0.0" @@ -26198,7 +28900,7 @@ vscode-languageserver-types@3.14.0: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== -vscode-languageserver@^5.1.0: +vscode-languageserver@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb" integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A== @@ -26211,6 +28913,11 @@ vscode-uri@^1.0.6: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== +vuvuzela@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" + integrity sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ== + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -26225,6 +28932,11 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" +walk-up-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" + integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg== + walkdir@^0.3.0, walkdir@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.3.2.tgz#ac8437a288c295656848ebc19981ebc677a5f590" @@ -26235,51 +28947,42 @@ walkdir@^0.4.0: resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39" integrity sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ== -walker@^1.0.7, walker@~1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" - integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= +walker@^1.0.7, walker@^1.0.8, walker@~1.0.5: + version "1.0.8" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== dependencies: - makeerror "1.0.x" + makeerror "1.0.12" -watchpack-chokidar2@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0" - integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA== +watchpack-chokidar2@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" + integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== dependencies: chokidar "^2.1.8" watchpack@^1.6.0: - version "1.7.4" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b" - integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg== + version "1.7.5" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" + integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== dependencies: graceful-fs "^4.1.2" neo-async "^2.5.0" optionalDependencies: chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.0" + watchpack-chokidar2 "^2.0.1" wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= + integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== dependencies: defaults "^1.0.3" weak-map@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb" - integrity sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes= - -web3-bzz@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.1.tgz#c3bd1e8f0c02a13cd6d4e3c3e9e1713f144f6f0d" - integrity sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw== - dependencies: - got "9.6.0" - swarm-js "0.1.39" - underscore "1.9.1" + version "1.0.8" + resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" + integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== web3-bzz@1.2.2: version "1.2.2" @@ -26298,17 +29001,7 @@ web3-bzz@1.2.4: dependencies: "@types/node" "^10.12.18" got "9.6.0" - swarm-js "0.1.39" - underscore "1.9.1" - -web3-bzz@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.0.tgz#83dfd77fa8a64bbb660462dffd0fee2a02ef1051" - integrity sha512-ibYAnKab+sgTo/UdfbrvYfWblXjjgSMgyy9/FHa6WXS14n/HVB+HfWqGz2EM3fok8Wy5XoKGMvdqvERQ/mzq1w== - dependencies: - "@types/node" "^12.12.6" - got "9.6.0" - swarm-js "^0.1.40" + swarm-js "0.1.39" underscore "1.9.1" web3-bzz@1.3.6: @@ -26321,6 +29014,24 @@ web3-bzz@1.3.6: swarm-js "^0.1.40" underscore "1.12.1" +web3-bzz@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.7.4.tgz#9419e606e38a9777443d4ce40506ebd796e06075" + integrity sha512-w9zRhyEqTK/yi0LGRHjZMcPCfP24LBjYXI/9YxFw9VqsIZ9/G0CRCnUt12lUx0A56LRAMpF7iQ8eA73aBcO29Q== + dependencies: + "@types/node" "^12.12.6" + got "9.6.0" + swarm-js "^0.1.40" + +web3-bzz@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.7.5.tgz#edeb262c3a6619109763077a94172513cf07cdde" + integrity sha512-Z53sY0YK/losqjJncmL4vP0zZI9r6tiXg6o7R6e1JD2Iy7FH3serQvU+qXmPjqEBzsnhf8wTG+YcBPB3RHpr0Q== + dependencies: + "@types/node" "^12.12.6" + got "12.1.0" + swarm-js "^0.1.40" + web3-core-helpers@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.55.tgz#832b8499889f9f514b1d174f00172fd3683d63de" @@ -26332,15 +29043,6 @@ web3-core-helpers@1.0.0-beta.55: web3-eth-iban "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-core-helpers@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz#f5f32d71c60a4a3bd14786118e633ce7ca6d5d0d" - integrity sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.2.1" - web3-utils "1.2.1" - web3-core-helpers@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz#484974f4bd4a487217b85b0d7cfe841af0907619" @@ -26359,15 +29061,6 @@ web3-core-helpers@1.2.4: web3-eth-iban "1.2.4" web3-utils "1.2.4" -web3-core-helpers@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.0.tgz#697cc3246a7eaaaac64ea506828d861c981c3f31" - integrity sha512-+MFb1kZCrRctf7UYE7NCG4rGhSXaQJ/KF07di9GVK1pxy1K0+rFi61ZobuV1ky9uQp+uhhSPts4Zp55kRDB5sw== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.3.0" - web3-utils "1.3.0" - web3-core-helpers@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.6.tgz#c478246a9abe4e5456acf42657dac2f7c330be74" @@ -26377,6 +29070,22 @@ web3-core-helpers@1.3.6: web3-eth-iban "1.3.6" web3-utils "1.3.6" +web3-core-helpers@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.7.4.tgz#f8f808928560d3e64e0c8d7bdd163aa4766bcf40" + integrity sha512-F8PH11qIkE/LpK4/h1fF/lGYgt4B6doeMi8rukeV/s4ivseZHHslv1L6aaijLX/g/j4PsFmR42byynBI/MIzFg== + dependencies: + web3-eth-iban "1.7.4" + web3-utils "1.7.4" + +web3-core-helpers@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.7.5.tgz#e97b3ecac787ade4b9390807a86aca78ed97872b" + integrity sha512-lDDjTks6Q6aNUO87RYrY2xub3UWTKr/RIWxpHJODEqkLxZS1dWdyliJ6aIx3031VQwsNT5HE7NvABe/t0p3iDQ== + dependencies: + web3-eth-iban "1.7.5" + web3-utils "1.7.5" + web3-core-method@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.55.tgz#0af994295ac2dd64ccd53305b7df8da76e11da49" @@ -26391,17 +29100,6 @@ web3-core-method@1.0.0-beta.55: web3-core-subscriptions "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-core-method@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.1.tgz#9df1bafa2cd8be9d9937e01c6a47fc768d15d90a" - integrity sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-core-promievent "1.2.1" - web3-core-subscriptions "1.2.1" - web3-utils "1.2.1" - web3-core-method@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.2.tgz#d4fe2bb1945b7152e5f08e4ea568b171132a1e56" @@ -26424,18 +29122,6 @@ web3-core-method@1.2.4: web3-core-subscriptions "1.2.4" web3-utils "1.2.4" -web3-core-method@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.0.tgz#a71387af842aec7dbad5dbbd1130c14cc6c8beb3" - integrity sha512-h0yFDrYVzy5WkLxC/C3q+hiMnzxdWm9p1T1rslnuHgOp6nYfqzu/6mUIXrsS4h/OWiGJt+BZ0xVZmtC31HDWtg== - dependencies: - "@ethersproject/transactions" "^5.0.0-beta.135" - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-core-promievent "1.3.0" - web3-core-subscriptions "1.3.0" - web3-utils "1.3.0" - web3-core-method@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.6.tgz#4b0334edd94b03dfec729d113c69a4eb6ebc68ae" @@ -26448,13 +29134,27 @@ web3-core-method@1.3.6: web3-core-subscriptions "1.3.6" web3-utils "1.3.6" -web3-core-promievent@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz#003e8a3eb82fb27b6164a6d5b9cad04acf733838" - integrity sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw== - dependencies: - any-promise "1.3.0" - eventemitter3 "3.1.2" +web3-core-method@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.7.4.tgz#3873c6405e1a0a8a1efc1d7b28de8b7550b00c15" + integrity sha512-56K7pq+8lZRkxJyzf5MHQPI9/VL3IJLoy4L/+q8HRdZJ3CkB1DkXYaXGU2PeylG1GosGiSzgIfu1ljqS7CP9xQ== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.7.4" + web3-core-promievent "1.7.4" + web3-core-subscriptions "1.7.4" + web3-utils "1.7.4" + +web3-core-method@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.7.5.tgz#ffe8883c169468f0e4d13509377f2d8876d9b7be" + integrity sha512-ApTvq1Llzlbxmy0n4L7QaE6NodIsR80VJqk8qN4kLg30SGznt/pNJFebryLI2kpyDmxSgj1TjEWzmHJBp6FhYg== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.7.5" + web3-core-promievent "1.7.5" + web3-core-subscriptions "1.7.5" + web3-utils "1.7.5" web3-core-promievent@1.2.2: version "1.2.2" @@ -26472,13 +29172,6 @@ web3-core-promievent@1.2.4: any-promise "1.3.0" eventemitter3 "3.1.2" -web3-core-promievent@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.0.tgz#e0442dd0a8989b6bdce09293976cee6d9237a484" - integrity sha512-blv69wrXw447TP3iPvYJpllkhW6B18nfuEbrfcr3n2Y0v1Jx8VJacNZFDFsFIcgXcgUIVCtOpimU7w9v4+rtaw== - dependencies: - eventemitter3 "4.0.4" - web3-core-promievent@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.6.tgz#6c27dc79de8f71b74f5d17acaf9aaf593d3cb0c9" @@ -26486,16 +29179,19 @@ web3-core-promievent@1.3.6: dependencies: eventemitter3 "4.0.4" -web3-core-requestmanager@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz#fa2e2206c3d738db38db7c8fe9c107006f5c6e3d" - integrity sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg== +web3-core-promievent@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.7.4.tgz#80a75633fdfe21fbaae2f1e38950edb2f134868c" + integrity sha512-o4uxwXKDldN7ER7VUvDfWsqTx9nQSP1aDssi1XYXeYC2xJbVo0n+z6ryKtmcoWoRdRj7uSpVzal3nEmlr480mA== dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-providers-http "1.2.1" - web3-providers-ipc "1.2.1" - web3-providers-ws "1.2.1" + eventemitter3 "4.0.4" + +web3-core-promievent@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.7.5.tgz#56a9b06a20e20a0a89d2ab7f88d44c8ae01d5b62" + integrity sha512-uZ1VRErVuhiLtHlyt3oEH/JSvAf6bWPndChHR9PG7i1Zfqm6ZVCeM91ICTPmiL8ddsGQOxASpnJk4vhApcTIww== + dependencies: + eventemitter3 "4.0.4" web3-core-requestmanager@1.2.2: version "1.2.2" @@ -26519,17 +29215,6 @@ web3-core-requestmanager@1.2.4: web3-providers-ipc "1.2.4" web3-providers-ws "1.2.4" -web3-core-requestmanager@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.0.tgz#c5b9a0304504c0e6cce6c90bc1a3bff82732aa1f" - integrity sha512-3yMbuGcomtzlmvTVqNRydxsx7oPlw3ioRL6ReF9PeNYDkUsZaUib+6Dp5eBt7UXh5X+SIn/xa1smhDHz5/HpAw== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-providers-http "1.3.0" - web3-providers-ipc "1.3.0" - web3-providers-ws "1.3.0" - web3-core-requestmanager@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.6.tgz#4fea269fe913fd4fca464b4f7c65cb94857b5b2a" @@ -26542,6 +29227,28 @@ web3-core-requestmanager@1.3.6: web3-providers-ipc "1.3.6" web3-providers-ws "1.3.6" +web3-core-requestmanager@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.7.4.tgz#2dc8a526dab8183dca3fef54658621801b1d0469" + integrity sha512-IuXdAm65BQtPL4aI6LZJJOrKAs0SM5IK2Cqo2/lMNvVMT9Kssq6qOk68Uf7EBDH0rPuINi+ReLP+uH+0g3AnPA== + dependencies: + util "^0.12.0" + web3-core-helpers "1.7.4" + web3-providers-http "1.7.4" + web3-providers-ipc "1.7.4" + web3-providers-ws "1.7.4" + +web3-core-requestmanager@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.7.5.tgz#be18fc99642689aeb2e016fa43fb47bb9e8c94ce" + integrity sha512-3KpfxW/wVH4mgwWEsSJGHKrtRVoijWlDxtUrm17xgtqRNZ2mFolifKnHAUKa0fY48C9CrxmcCiMIi3W4G6WYRw== + dependencies: + util "^0.12.0" + web3-core-helpers "1.7.5" + web3-providers-http "1.7.5" + web3-providers-ipc "1.7.5" + web3-providers-ws "1.7.5" + web3-core-subscriptions@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.55.tgz#105902c13db53466fc17d07a981ad3d41c700f76" @@ -26551,15 +29258,6 @@ web3-core-subscriptions@1.0.0-beta.55: eventemitter3 "^3.1.0" lodash "^4.17.11" -web3-core-subscriptions@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz#8c2368a839d4eec1c01a4b5650bbeb82d0e4a099" - integrity sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g== - dependencies: - eventemitter3 "3.1.2" - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-core-subscriptions@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz#bf4ba23a653a003bdc3551649958cc0b080b068e" @@ -26578,15 +29276,6 @@ web3-core-subscriptions@1.2.4: underscore "1.9.1" web3-core-helpers "1.2.4" -web3-core-subscriptions@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.0.tgz#c2622ccd2b84f4687475398ff966b579dba0847e" - integrity sha512-MUUQUAhJDb+Nz3S97ExVWveH4utoUnsbPWP+q1HJH437hEGb4vunIb9KvN3hFHLB+aHJfPeStM/4yYTz5PeuyQ== - dependencies: - eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-core-subscriptions@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.6.tgz#ee24e7974d1d72ff6c992c599deba4ef9b308415" @@ -26596,6 +29285,22 @@ web3-core-subscriptions@1.3.6: underscore "1.12.1" web3-core-helpers "1.3.6" +web3-core-subscriptions@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.7.4.tgz#cfbd3fa71081a8c8c6f1a64577a1a80c5bd9826f" + integrity sha512-VJvKWaXRyxk2nFWumOR94ut9xvjzMrRtS38c4qj8WBIRSsugrZr5lqUwgndtj0qx4F+50JhnU++QEqUEAtKm3g== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.7.4" + +web3-core-subscriptions@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.7.5.tgz#c0e25610768ea9d9f9107b4ac74b6b6573125e00" + integrity sha512-YK6utQ7Wwjbe4XZOIA8quWGBPi1lFDS1A+jQYwxKKrCvm6BloBNc3FhvrcSYlDhLe/kOy8+2Je8i9amndgT4ww== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.7.5" + web3-core@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.55.tgz#26b9abbf1bc1837c9cc90f06ecbc4ed714f89b53" @@ -26609,16 +29314,6 @@ web3-core@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-core@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.1.tgz#7278b58fb6495065e73a77efbbce781a7fddf1a9" - integrity sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg== - dependencies: - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-requestmanager "1.2.1" - web3-utils "1.2.1" - web3-core@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.2.tgz#334b99c8222ef9cfd0339e27352f0b58ea789a2f" @@ -26644,19 +29339,6 @@ web3-core@1.2.4: web3-core-requestmanager "1.2.4" web3-utils "1.2.4" -web3-core@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.0.tgz#b818903738461c1cca0163339e1d6d3fa51242cf" - integrity sha512-BwWvAaKJf4KFG9QsKRi3MNoNgzjI6szyUlgme1qNPxUdCkaS3Rdpa0VKYNHP7M/YTk82/59kNE66mH5vmoaXjA== - dependencies: - "@types/bn.js" "^4.11.5" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-core-requestmanager "1.3.0" - web3-utils "1.3.0" - web3-core@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.6.tgz#a6a761d1ff2f3ee462b8dab679229d2f8e267504" @@ -26670,14 +29352,31 @@ web3-core@1.3.6: web3-core-requestmanager "1.3.6" web3-utils "1.3.6" -web3-eth-abi@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz#9b915b1c9ebf82f70cca631147035d5419064689" - integrity sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g== +web3-core@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.7.4.tgz#943fff99134baedafa7c65b4a0bbd424748429ff" + integrity sha512-L0DCPlIh9bgIED37tYbe7bsWrddoXYc897ANGvTJ6MFkSNGiMwDkTLWSgYd9Mf8qu8b4iuPqXZHMwIo4atoh7Q== dependencies: - ethers "4.0.0-beta.3" - underscore "1.9.1" - web3-utils "1.2.1" + "@types/bn.js" "^5.1.0" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.7.4" + web3-core-method "1.7.4" + web3-core-requestmanager "1.7.4" + web3-utils "1.7.4" + +web3-core@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.7.5.tgz#8ee2ca490230a30ca970cb9f308eb65b76405e1d" + integrity sha512-UgOWXZr1fR/3cUQJKWbfMwRxj1/N7o6RSd/dHqdXBlOD+62EjNZItFmLRg5veq5kp9YfXzrNw9bnDkXfsL+nKQ== + dependencies: + "@types/bn.js" "^5.1.0" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.7.5" + web3-core-method "1.7.5" + web3-core-requestmanager "1.7.5" + web3-utils "1.7.5" web3-eth-abi@1.2.2: version "1.2.2" @@ -26697,15 +29396,6 @@ web3-eth-abi@1.2.4: underscore "1.9.1" web3-utils "1.2.4" -web3-eth-abi@1.3.0, web3-eth-abi@^1.0.0-beta.24: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.0.tgz#387b7ea9b38be69ad8856bc7b4e9a6a69bb4d22b" - integrity sha512-1OrZ9+KGrBeBRd3lO8upkpNua9+7cBsQAgor9wbA25UrcUYSyL8teV66JNRu9gFxaTbkpdrGqM7J/LXpraXWrg== - dependencies: - "@ethersproject/abi" "5.0.0-beta.153" - underscore "1.9.1" - web3-utils "1.3.0" - web3-eth-abi@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.6.tgz#4272ca48d817aa651bbf97b269f5ff10abc2b8a9" @@ -26715,22 +29405,21 @@ web3-eth-abi@1.3.6: underscore "1.12.1" web3-utils "1.3.6" -web3-eth-accounts@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz#2741a8ef337a7219d57959ac8bd118b9d68d63cf" - integrity sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ== +web3-eth-abi@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.7.4.tgz#3fee967bafd67f06b99ceaddc47ab0970f2a614a" + integrity sha512-eMZr8zgTbqyL9MCTCAvb67RbVyN5ZX7DvA0jbLOqRWCiw+KlJKTGnymKO6jPE8n5yjk4w01e165Qb11hTDwHgg== dependencies: - any-promise "1.3.0" - crypto-browserify "3.12.0" - eth-lib "0.2.7" - scryptsy "2.1.0" - semver "6.2.0" - underscore "1.9.1" - uuid "3.3.2" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-utils "1.2.1" + "@ethersproject/abi" "^5.6.3" + web3-utils "1.7.4" + +web3-eth-abi@1.7.5, web3-eth-abi@^1.0.0-beta.24: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.7.5.tgz#db9d6dbcc043a6e922252f3228686e9bbd50d7c9" + integrity sha512-qWHvF7sayxql9BD1yqK9sZRLBQ66eJzGeaU53Y1PRq2iFPrhY6NUWxQ3c3ps0rg+dyObvRbloviWpKXcS4RE/A== + dependencies: + "@ethersproject/abi" "^5.6.3" + web3-utils "1.7.5" web3-eth-accounts@1.2.2: version "1.2.2" @@ -26768,23 +29457,6 @@ web3-eth-accounts@1.2.4: web3-core-method "1.2.4" web3-utils "1.2.4" -web3-eth-accounts@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.0.tgz#010acf389b2bee6d5e1aecb2fe78bfa5c8f26c7a" - integrity sha512-/Q7EVW4L2wWUbNRtOTwAIrYvJid/5UnKMw67x/JpvRMwYC+e+744P536Ja6SG4X3MnzFvd3E/jruV4qa6k+zIw== - dependencies: - crypto-browserify "3.12.0" - eth-lib "0.2.8" - ethereumjs-common "^1.3.2" - ethereumjs-tx "^2.1.1" - scrypt-js "^3.0.1" - underscore "1.9.1" - uuid "3.3.2" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-utils "1.3.0" - web3-eth-accounts@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.6.tgz#f9fcb50b28ee58090ab292a10d996155caa2b474" @@ -26802,6 +29474,40 @@ web3-eth-accounts@1.3.6: web3-core-method "1.3.6" web3-utils "1.3.6" +web3-eth-accounts@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.7.4.tgz#7a24a4dfe947f7e9d1bae678529e591aa146167a" + integrity sha512-Y9vYLRKP7VU7Cgq6wG1jFaG2k3/eIuiTKAG8RAuQnb6Cd9k5BRqTm5uPIiSo0AP/u11jDomZ8j7+WEgkU9+Btw== + dependencies: + "@ethereumjs/common" "^2.5.0" + "@ethereumjs/tx" "^3.3.2" + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-util "^7.0.10" + scrypt-js "^3.0.1" + uuid "3.3.2" + web3-core "1.7.4" + web3-core-helpers "1.7.4" + web3-core-method "1.7.4" + web3-utils "1.7.4" + +web3-eth-accounts@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.7.5.tgz#b37ee3aeebcc6bce3337636aeb272cbba0ece547" + integrity sha512-AzMLoTj3RGwKpyp3x3TtHrEeU4VpR99iMOD6NKrWSDumS6QEi0lCo+y7QZhdTlINw3iIA3SFIdvbAOO4NCHSDg== + dependencies: + "@ethereumjs/common" "^2.5.0" + "@ethereumjs/tx" "^3.3.2" + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-util "^7.0.10" + scrypt-js "^3.0.1" + uuid "3.3.2" + web3-core "1.7.5" + web3-core-helpers "1.7.5" + web3-core-method "1.7.5" + web3-utils "1.7.5" + web3-eth-admin@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-eth-admin/-/web3-eth-admin-1.0.0-beta.55.tgz#dcbcc5be4e3a008ce367c2ac83432b9a711f39e9" @@ -26815,7 +29521,37 @@ web3-eth-admin@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-eth-contract@1.2.1, web3-eth-contract@1.2.2, web3-eth-contract@1.2.4, web3-eth-contract@1.3.0, web3-eth-contract@1.3.6: +web3-eth-contract@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz#84e92714918a29e1028ee7718f0712536e14e9a1" + integrity sha512-EKT2yVFws3FEdotDQoNsXTYL798+ogJqR2//CaGwx3p0/RvQIgfzEwp8nbgA6dMxCsn9KOQi7OtklzpnJMkjtA== + dependencies: + "@types/bn.js" "^4.11.4" + underscore "1.9.1" + web3-core "1.2.2" + web3-core-helpers "1.2.2" + web3-core-method "1.2.2" + web3-core-promievent "1.2.2" + web3-core-subscriptions "1.2.2" + web3-eth-abi "1.2.2" + web3-utils "1.2.2" + +web3-eth-contract@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.4.tgz#68ef7cc633232779b0a2c506a810fbe903575886" + integrity sha512-b/9zC0qjVetEYnzRA1oZ8gF1OSSUkwSYi5LGr4GeckLkzXP7osEnp9lkO/AQcE4GpG+l+STnKPnASXJGZPgBRQ== + dependencies: + "@types/bn.js" "^4.11.4" + underscore "1.9.1" + web3-core "1.2.4" + web3-core-helpers "1.2.4" + web3-core-method "1.2.4" + web3-core-promievent "1.2.4" + web3-core-subscriptions "1.2.4" + web3-eth-abi "1.2.4" + web3-utils "1.2.4" + +web3-eth-contract@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.6.tgz#cccf4d32dc56917fb6923e778498a9ba2a5ba866" integrity sha512-8gDaRrLF2HCg+YEZN1ov0zN35vmtPnGf3h1DxmJQK5Wm2lRMLomz9rsWsuvig3UJMHqZAQKD7tOl3ocJocQsmA== @@ -26830,19 +29566,33 @@ web3-eth-contract@1.2.1, web3-eth-contract@1.2.2, web3-eth-contract@1.2.4, web3- web3-eth-abi "1.3.6" web3-utils "1.3.6" -web3-eth-ens@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz#a0e52eee68c42a8b9865ceb04e5fb022c2d971d5" - integrity sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q== +web3-eth-contract@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.7.4.tgz#e5761cfb43d453f57be4777b2e5e7e1082078ff7" + integrity sha512-ZgSZMDVI1pE9uMQpK0T0HDT2oewHcfTCv0osEqf5qyn5KrcQDg1GT96/+S0dfqZ4HKj4lzS5O0rFyQiLPQ8LzQ== dependencies: - eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-promievent "1.2.1" - web3-eth-abi "1.2.1" - web3-eth-contract "1.2.1" - web3-utils "1.2.1" + "@types/bn.js" "^5.1.0" + web3-core "1.7.4" + web3-core-helpers "1.7.4" + web3-core-method "1.7.4" + web3-core-promievent "1.7.4" + web3-core-subscriptions "1.7.4" + web3-eth-abi "1.7.4" + web3-utils "1.7.4" + +web3-eth-contract@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.7.5.tgz#a032419579bcec062513a3d089ad0e89ac63d731" + integrity sha512-qab7NPJRKRlTs58ozsqK8YIEwWpxIm3vD/okSIKBGkFx5gIHWW+vGmMh5PDSfefLJM9rCd+T+Lc0LYvtME7uqg== + dependencies: + "@types/bn.js" "^5.1.0" + web3-core "1.7.5" + web3-core-helpers "1.7.5" + web3-core-method "1.7.5" + web3-core-promievent "1.7.5" + web3-core-subscriptions "1.7.5" + web3-eth-abi "1.7.5" + web3-utils "1.7.5" web3-eth-ens@1.2.2: version "1.2.2" @@ -26872,21 +29622,6 @@ web3-eth-ens@1.2.4: web3-eth-contract "1.2.4" web3-utils "1.2.4" -web3-eth-ens@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.0.tgz#0887ba38473c104cf5fb8a715828b3b354fa02a2" - integrity sha512-WnOru+EcuM5dteiVYJcHXo/I7Wq+ei8RrlS2nir49M0QpYvUPGbCGgTbifcjJQTWamgORtWdljSA1s2Asdb74w== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-promievent "1.3.0" - web3-eth-abi "1.3.0" - web3-eth-contract "1.3.0" - web3-utils "1.3.0" - web3-eth-ens@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.6.tgz#0d28c5d4ea7b4462ef6c077545a77956a6cdf175" @@ -26902,6 +29637,34 @@ web3-eth-ens@1.3.6: web3-eth-contract "1.3.6" web3-utils "1.3.6" +web3-eth-ens@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.7.4.tgz#346720305379c0a539e226141a9602f1da7bc0c8" + integrity sha512-Gw5CVU1+bFXP5RVXTCqJOmHn71X2ghNk9VcEH+9PchLr0PrKbHTA3hySpsPco1WJAyK4t8SNQVlNr3+bJ6/WZA== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.7.4" + web3-core-helpers "1.7.4" + web3-core-promievent "1.7.4" + web3-eth-abi "1.7.4" + web3-eth-contract "1.7.4" + web3-utils "1.7.4" + +web3-eth-ens@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.7.5.tgz#fa0e287f5e6fae20531117b7467e21b482d58cab" + integrity sha512-k1Q0msdRv/wac2egpZBIwG3n/sa/KdrVmVJvFm471gLTL4xfUizV5qJjkDVf+ikf9JyDvWJTs5eWNUUbOFIw/A== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.7.5" + web3-core-helpers "1.7.5" + web3-core-promievent "1.7.5" + web3-eth-abi "1.7.5" + web3-eth-contract "1.7.5" + web3-utils "1.7.5" + web3-eth-iban@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.55.tgz#15146a69de21addc99e7dbfb2920555b1e729637" @@ -26911,14 +29674,6 @@ web3-eth-iban@1.0.0-beta.55: bn.js "4.11.8" web3-utils "1.0.0-beta.55" -web3-eth-iban@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz#2c3801718946bea24e9296993a975c80b5acf880" - integrity sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ== - dependencies: - bn.js "4.11.8" - web3-utils "1.2.1" - web3-eth-iban@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz#76bec73bad214df7c4192388979a59fc98b96c5a" @@ -26935,14 +29690,6 @@ web3-eth-iban@1.2.4: bn.js "4.11.8" web3-utils "1.2.4" -web3-eth-iban@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.0.tgz#15b782dfaf273ebc4e3f389f1367f4e88ddce4a5" - integrity sha512-v9mZWhR4fPF17/KhHLiWir4YHWLe09O3B/NTdhWqw3fdAMJNztzMHGzgHxA/4fU+rhrs/FhDzc4yt32zMEXBZw== - dependencies: - bn.js "^4.11.9" - web3-utils "1.3.0" - web3-eth-iban@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.6.tgz#0d6ba21fe78f190af8919e9cd5453882457209e0" @@ -26951,16 +29698,21 @@ web3-eth-iban@1.3.6: bn.js "^4.11.9" web3-utils "1.3.6" -web3-eth-personal@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz#244e9911b7b482dc17c02f23a061a627c6e47faf" - integrity sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg== +web3-eth-iban@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.7.4.tgz#711fb2547fdf0f988060027331b2b6c430505753" + integrity sha512-XyrsgWlZQMv5gRcjXMsNvAoCRvV5wN7YCfFV5+tHUCqN8g9T/o4XUS20vDWD0k4HNiAcWGFqT1nrls02MGZ08w== dependencies: - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-net "1.2.1" - web3-utils "1.2.1" + bn.js "^5.2.1" + web3-utils "1.7.4" + +web3-eth-iban@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.7.5.tgz#1a50efa42cabf1b731396d38bef6a8bf92b5ee1f" + integrity sha512-mn2W5t/1IpL8OZvzAabLKT4kvwRnZSJ9K0tctndl9sDNWkfITYQibEEhUaNNA50Q5fJKgVudHI/m0gwIVTyG8Q== + dependencies: + bn.js "^5.2.1" + web3-utils "1.7.5" web3-eth-personal@1.2.2: version "1.2.2" @@ -26986,18 +29738,6 @@ web3-eth-personal@1.2.4: web3-net "1.2.4" web3-utils "1.2.4" -web3-eth-personal@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.0.tgz#d376e03dc737d961ff1f8d1aca866efad8477135" - integrity sha512-2czUhElsJdLpuNfun9GeLiClo5O6Xw+bLSjl3f4bNG5X2V4wcIjX2ygep/nfstLLtkz8jSkgl/bV7esANJyeRA== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-net "1.3.0" - web3-utils "1.3.0" - web3-eth-personal@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.6.tgz#226137916754c498f0284f22c55924c87a2efcf0" @@ -27010,24 +29750,29 @@ web3-eth-personal@1.3.6: web3-net "1.3.6" web3-utils "1.3.6" -web3-eth@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.1.tgz#b9989e2557c73a9e8ffdc107c6dafbe72c79c1b0" - integrity sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA== +web3-eth-personal@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.7.4.tgz#22c399794cb828a75703df8bb4b3c1331b471546" + integrity sha512-O10C1Hln5wvLQsDhlhmV58RhXo+GPZ5+W76frSsyIrkJWLtYQTCr5WxHtRC9sMD1idXLqODKKgI2DL+7xeZ0/g== dependencies: - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-subscriptions "1.2.1" - web3-eth-abi "1.2.1" - web3-eth-accounts "1.2.1" - web3-eth-contract "1.2.1" - web3-eth-ens "1.2.1" - web3-eth-iban "1.2.1" - web3-eth-personal "1.2.1" - web3-net "1.2.1" - web3-utils "1.2.1" + "@types/node" "^12.12.6" + web3-core "1.7.4" + web3-core-helpers "1.7.4" + web3-core-method "1.7.4" + web3-net "1.7.4" + web3-utils "1.7.4" + +web3-eth-personal@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.7.5.tgz#615a3ddcf97aeea93e2a4569753c033fd7a495c5" + integrity sha512-txh2P/eN8I4AOUKFi9++KKddoD0tWfCuu9Y1Kc41jSRbk6smO88Fum0KWNmYFYhSCX2qiknS1DfqsONl3igoKQ== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.7.5" + web3-core-helpers "1.7.5" + web3-core-method "1.7.5" + web3-net "1.7.5" + web3-utils "1.7.5" web3-eth@1.2.2: version "1.2.2" @@ -27067,25 +29812,6 @@ web3-eth@1.2.4: web3-net "1.2.4" web3-utils "1.2.4" -web3-eth@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.0.tgz#898e5f5a8827f9bc6844e267a52eb388916a6771" - integrity sha512-/bzJcxXPM9EM18JM5kO2JjZ3nEqVo3HxqU93aWAEgJNqaP/Lltmufl2GpvIB2Hvj+FXAjAXquxUdQ2/xP7BzHQ== - dependencies: - underscore "1.9.1" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-core-subscriptions "1.3.0" - web3-eth-abi "1.3.0" - web3-eth-accounts "1.3.0" - web3-eth-contract "1.3.0" - web3-eth-ens "1.3.0" - web3-eth-iban "1.3.0" - web3-eth-personal "1.3.0" - web3-net "1.3.0" - web3-utils "1.3.0" - web3-eth@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.6.tgz#2c650893d540a7a0eb1365dd5b2dca24ac919b7c" @@ -27105,6 +29831,42 @@ web3-eth@1.3.6: web3-net "1.3.6" web3-utils "1.3.6" +web3-eth@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.7.4.tgz#a7c1d3ccdbba4de4a82df7e3c4db716e4a944bf2" + integrity sha512-JG0tTMv0Ijj039emXNHi07jLb0OiWSA9O24MRSk5vToTQyDNXihdF2oyq85LfHuF690lXZaAXrjhtLNlYqb7Ug== + dependencies: + web3-core "1.7.4" + web3-core-helpers "1.7.4" + web3-core-method "1.7.4" + web3-core-subscriptions "1.7.4" + web3-eth-abi "1.7.4" + web3-eth-accounts "1.7.4" + web3-eth-contract "1.7.4" + web3-eth-ens "1.7.4" + web3-eth-iban "1.7.4" + web3-eth-personal "1.7.4" + web3-net "1.7.4" + web3-utils "1.7.4" + +web3-eth@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.7.5.tgz#36906f50a6c35570cbc08871a33caa83dc131c9c" + integrity sha512-BucjvqZyDWYkGlsFX+OnOBub0YutlC1KZiNGibdmvtNX0NQK+8iw1uzAoL9yTTwCSszL7lnkFe8N+HCOl9B4Dw== + dependencies: + web3-core "1.7.5" + web3-core-helpers "1.7.5" + web3-core-method "1.7.5" + web3-core-subscriptions "1.7.5" + web3-eth-abi "1.7.5" + web3-eth-accounts "1.7.5" + web3-eth-contract "1.7.5" + web3-eth-ens "1.7.5" + web3-eth-iban "1.7.5" + web3-eth-personal "1.7.5" + web3-net "1.7.5" + web3-utils "1.7.5" + web3-net@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.55.tgz#daf24323df16a890a0bac6c6eda48b6e8c7e96ef" @@ -27118,15 +29880,6 @@ web3-net@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-net@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.1.tgz#edd249503315dd5ab4fa00220f6509d95bb7ab10" - integrity sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw== - dependencies: - web3-core "1.2.1" - web3-core-method "1.2.1" - web3-utils "1.2.1" - web3-net@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.2.tgz#5c3226ca72df7c591422440ce6f1203fd42ddad9" @@ -27145,15 +29898,6 @@ web3-net@1.2.4: web3-core-method "1.2.4" web3-utils "1.2.4" -web3-net@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.0.tgz#b69068cccffab58911c2f08ca4abfbefb0f948c6" - integrity sha512-Xz02KylOyrB2YZzCkysEDrY7RbKxb7LADzx3Zlovfvuby7HBwtXVexXKtoGqksa+ns1lvjQLLQGb+OeLi7Sr7w== - dependencies: - web3-core "1.3.0" - web3-core-method "1.3.0" - web3-utils "1.3.0" - web3-net@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.6.tgz#a56492e2227475e38db29394f8bac305a2446e41" @@ -27163,6 +29907,24 @@ web3-net@1.3.6: web3-core-method "1.3.6" web3-utils "1.3.6" +web3-net@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.7.4.tgz#3153dfd3423262dd6fbec7aae5467202c4cad431" + integrity sha512-d2Gj+DIARHvwIdmxFQ4PwAAXZVxYCR2lET0cxz4KXbE5Og3DNjJi+MoPkX+WqoUXqimu/EOd4Cd+7gefqVAFDg== + dependencies: + web3-core "1.7.4" + web3-core-method "1.7.4" + web3-utils "1.7.4" + +web3-net@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.7.5.tgz#87fbc00a9ca40515bf60c847c0092498887cfdc8" + integrity sha512-xwuCb2YWw49PmW81AJQ/G+Xi2ikRsYyZXSgyPt4LmZuKjiqg/6kSdK8lZvUi3Pi3wM+QDBXbpr73M/WEkW0KvA== + dependencies: + web3-core "1.7.5" + web3-core-method "1.7.5" + web3-utils "1.7.5" + web3-provider-engine@14.0.6: version "14.0.6" resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz#cbdd66fe20c0136a3a495cbe40d18b6c4160d5f0" @@ -27217,17 +29979,17 @@ web3-provider-engine@14.2.1: xtend "^4.0.1" web3-provider-engine@^15.0.0: - version "15.0.3" - resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-15.0.3.tgz#462d2439dafa6fdc3550696be8cdb80c44593c96" - integrity sha512-E2/j0iEA1JJVijV84bPpiFKZPA6jFkcCKJtzDCl/CUn8CeqtkGykpjP55pnQtzxszzmpGgSZlThMEFUzBU7X2g== + version "15.0.12" + resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-15.0.12.tgz#24d7f2f6fb6de856824c7306291018c4fc543ac3" + integrity sha512-/OfhQalKPND1iB5ggvGuYF0+SIb2Qj5OFTrT2VrZWP79UhMTdP7T+L2FtblmRdCeOetoAzZHdBaIwLOZsmIX+w== dependencies: async "^2.5.0" backoff "^2.5.0" clone "^2.0.0" cross-fetch "^2.1.0" eth-block-tracker "^4.4.2" - eth-json-rpc-errors "^1.0.1" - eth-json-rpc-filters "^4.1.0" + eth-json-rpc-errors "^2.0.2" + eth-json-rpc-filters "^4.1.1" eth-json-rpc-infura "^4.0.1" eth-json-rpc-middleware "^4.1.5" eth-sig-util "^1.4.2" @@ -27247,7 +30009,7 @@ web3-provider-engine@^15.0.0: web3-provider-engine@^8.4.0: version "8.6.1" resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-8.6.1.tgz#4d86e19e30caaf97df351511ec0f60136e5b30eb" - integrity sha1-TYbhnjDKr5ffNRUR7A9gE25bMOs= + integrity sha512-atTQJ14QBvd5N+71DKZHKCjHqCXfYQEcisLJHsZwvPmU5F3oRMydBXFmPU3sySHXgxASbV7Q9eEQAaPy+7rcHA== dependencies: async "^2.1.2" clone "^2.0.0" @@ -27264,14 +30026,6 @@ web3-provider-engine@^8.4.0: xhr "^2.2.0" xtend "^4.0.1" -web3-providers-http@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.1.tgz#c93ea003a42e7b894556f7e19dd3540f947f5013" - integrity sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ== - dependencies: - web3-core-helpers "1.2.1" - xhr2-cookies "1.1.0" - web3-providers-http@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.2.tgz#155e55c1d69f4c5cc0b411ede40dea3d06720956" @@ -27288,14 +30042,6 @@ web3-providers-http@1.2.4: web3-core-helpers "1.2.4" xhr2-cookies "1.1.0" -web3-providers-http@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.0.tgz#88227f64c88b32abed4359383c2663616e0dc531" - integrity sha512-cMKhUI6PqlY/EC+ZDacAxajySBu8AzW8jOjt1Pe/mbRQgS0rcZyvLePGTTuoyaA8C21F8UW+EE5jj7YsNgOuqA== - dependencies: - web3-core-helpers "1.3.0" - xhr2-cookies "1.1.0" - web3-providers-http@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.6.tgz#36e8724a7424d52827819d53fd75dbf31f5422c2" @@ -27304,14 +30050,23 @@ web3-providers-http@1.3.6: web3-core-helpers "1.3.6" xhr2-cookies "1.1.0" -web3-providers-ipc@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz#017bfc687a8fc5398df2241eb98f135e3edd672c" - integrity sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA== +web3-providers-http@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.7.4.tgz#8209cdcb115db5ccae1f550d1c4e3005e7538d02" + integrity sha512-AU+/S+49rcogUER99TlhW+UBMk0N2DxvN54CJ2pK7alc2TQ7+cprNPLHJu4KREe8ndV0fT6JtWUfOMyTvl+FRA== dependencies: - oboe "2.1.4" - underscore "1.9.1" - web3-core-helpers "1.2.1" + web3-core-helpers "1.7.4" + xhr2-cookies "1.1.0" + +web3-providers-http@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.7.5.tgz#144bb0c29007d1b766bafb0e20f80be050c7aa80" + integrity sha512-vPgr4Kzy0M3CHtoP/Bh7qwK/D9h2fhjpoqctdMWVJseOfeTgfOphCKN0uwV8w2VpZgDPXA8aeTdBx5OjmDdStA== + dependencies: + abortcontroller-polyfill "^1.7.3" + cross-fetch "^3.1.4" + es6-promise "^4.2.8" + web3-core-helpers "1.7.5" web3-providers-ipc@1.2.2: version "1.2.2" @@ -27331,32 +30086,30 @@ web3-providers-ipc@1.2.4: underscore "1.9.1" web3-core-helpers "1.2.4" -web3-providers-ipc@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.0.tgz#d7c2b203733b46f7b4e7b15633d891648cf9a293" - integrity sha512-0CrLuRofR+1J38nEj4WsId/oolwQEM6Yl1sOt41S/6bNI7htdkwgVhSloFIMJMDFHtRw229QIJ6wIaKQz0X1Og== - dependencies: - oboe "2.1.5" - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-providers-ipc@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.6.tgz#cef8d12c1ebb47adce5ebf597f553c623362cb4a" integrity sha512-+TVsSd2sSVvVgHG4s6FXwwYPPT91boKKcRuEFXqEfAbUC5t52XOgmyc2LNiD9LzPhed65FbV4LqICpeYGUvSwA== dependencies: oboe "2.1.5" - underscore "1.12.1" - web3-core-helpers "1.3.6" + underscore "1.12.1" + web3-core-helpers "1.3.6" + +web3-providers-ipc@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.7.4.tgz#02e85e99e48f432c9d34cee7d786c3685ec9fcfa" + integrity sha512-jhArOZ235dZy8fS8090t60nTxbd1ap92ibQw5xIrAQ9m7LcZKNfmLAQUVsD+3dTFvadRMi6z1vCO7zRi84gWHw== + dependencies: + oboe "2.1.5" + web3-core-helpers "1.7.4" -web3-providers-ws@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz#2d941eaf3d5a8caa3214eff8dc16d96252b842cb" - integrity sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA== +web3-providers-ipc@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.7.5.tgz#5b0f9b4f7340416953b8816d2e42e3f548d47372" + integrity sha512-aNHx+RAROzO+apDEzy8Zncj78iqWBadIXtpmFDg7uiTn8i+oO+IcP1Yni7jyzkltsysVJHgHWG4kPx50ANCK3Q== dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" + oboe "2.1.5" + web3-core-helpers "1.7.5" web3-providers-ws@1.2.2: version "1.2.2" @@ -27376,16 +30129,6 @@ web3-providers-ws@1.2.4: underscore "1.9.1" web3-core-helpers "1.2.4" -web3-providers-ws@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.0.tgz#84adeff65acd4624d7f5bb43c5b2b22d8f0f63a4" - integrity sha512-Im5MthhJnJst8nSoq0TgbyOdaiFQFa5r6sHPOVllhgIgViDqzbnlAFW9sNzQ0Q8VXPNfPIQKi9cOrHlSRNPjRw== - dependencies: - eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.0" - websocket "^1.0.32" - web3-providers-ws@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.6.tgz#e1df617bc89d66165abdf2191da0014c505bfaac" @@ -27396,6 +30139,24 @@ web3-providers-ws@1.3.6: web3-core-helpers "1.3.6" websocket "^1.0.32" +web3-providers-ws@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.7.4.tgz#6e60bcefb456f569a3e766e386d7807a96f90595" + integrity sha512-g72X77nrcHMFU8hRzQJzfgi/072n8dHwRCoTw+WQrGp+XCQ71fsk2qIu3Tp+nlp5BPn8bRudQbPblVm2uT4myQ== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.7.4" + websocket "^1.0.32" + +web3-providers-ws@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.7.5.tgz#196b9e56a4a48f9bee54def56875ea53dec7c711" + integrity sha512-9uJNVVkIGC8PmM9kNbgPth56HDMSSsxZh3ZEENdwO3LNWemaADiQYUDCsD/dMVkn0xsGLHP5dgAy4Q5msqySLg== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.7.5" + websocket "^1.0.32" + web3-providers@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-providers/-/web3-providers-1.0.0-beta.55.tgz#639503517741b69baaa82f1f940630df6a25992b" @@ -27413,16 +30174,6 @@ web3-providers@1.0.0-beta.55: websocket "^1.0.28" xhr2-cookies "1.1.0" -web3-shh@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.1.tgz#4460e3c1e07faf73ddec24ccd00da46f89152b0c" - integrity sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA== - dependencies: - web3-core "1.2.1" - web3-core-method "1.2.1" - web3-core-subscriptions "1.2.1" - web3-net "1.2.1" - web3-shh@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.2.tgz#44ed998f2a6ba0ec5cb9d455184a0f647826a49c" @@ -27443,16 +30194,6 @@ web3-shh@1.2.4: web3-core-subscriptions "1.2.4" web3-net "1.2.4" -web3-shh@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.0.tgz#62d15297da8fb5f733dd1b98f9ade300590f4d49" - integrity sha512-IZTojA4VCwVq+7eEIHuL1tJXtU+LJDhO8Y2QmuwetEWW1iBgWCGPHZasipWP+7kDpSm/5lo5GRxL72FF/Os/tA== - dependencies: - web3-core "1.3.0" - web3-core-method "1.3.0" - web3-core-subscriptions "1.3.0" - web3-net "1.3.0" - web3-shh@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.6.tgz#4e3486c7eca5cbdb87f88910948223a5b7ea6c20" @@ -27463,6 +30204,26 @@ web3-shh@1.3.6: web3-core-subscriptions "1.3.6" web3-net "1.3.6" +web3-shh@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.7.4.tgz#bee91cce2737c529fd347274010b548b6ea060f1" + integrity sha512-mlSZxSYcMkuMCxqhTYnZkUdahZ11h+bBv/8TlkXp/IHpEe4/Gg+KAbmfudakq3EzG/04z70XQmPgWcUPrsEJ+A== + dependencies: + web3-core "1.7.4" + web3-core-method "1.7.4" + web3-core-subscriptions "1.7.4" + web3-net "1.7.4" + +web3-shh@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.7.5.tgz#742e27f5c44bea6d7adef3a49b085e0fcd6aa621" + integrity sha512-aCIWJyLMH5H76OybU4ZpUCJ93yNOPATGhJ+KboRPU8QZDzS2CcVhtEzyl27bbvw+rSnVroMLqBgTXBB4mmKI7A== + dependencies: + web3-core "1.7.5" + web3-core-method "1.7.5" + web3-core-subscriptions "1.7.5" + web3-net "1.7.5" + web3-utils@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.55.tgz#beb40926b7c04208b752d36a9bc959d27a04b308" @@ -27520,10 +30281,10 @@ web3-utils@1.2.4: underscore "1.9.1" utf8 "3.0.0" -web3-utils@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.0.tgz#5bac16e5e0ec9fe7bdcfadb621655e8aa3cf14e1" - integrity sha512-2mS5axFCbkhicmoDRuJeuo0TVGQDgC2sPi/5dblfVC+PMtX0efrb8Xlttv/eGkq7X4E83Pds34FH98TP2WOUZA== +web3-utils@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.6.tgz#390bc9fa3a7179746963cfaca55bb80ac4d8dc10" + integrity sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg== dependencies: bn.js "^4.11.9" eth-lib "0.2.8" @@ -27531,59 +30292,47 @@ web3-utils@1.3.0: ethjs-unit "0.1.6" number-to-bn "1.7.0" randombytes "^2.1.0" - underscore "1.9.1" + underscore "1.12.1" utf8 "3.0.0" -web3-utils@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.6.tgz#390bc9fa3a7179746963cfaca55bb80ac4d8dc10" - integrity sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg== +web3-utils@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.7.4.tgz#eb6fa3706b058602747228234453811bbee017f5" + integrity sha512-acBdm6Evd0TEZRnChM/MCvGsMwYKmSh7OaUfNf5OKG0CIeGWD/6gqLOWIwmwSnre/2WrA1nKGId5uW2e5EfluA== dependencies: - bn.js "^4.11.9" - eth-lib "0.2.8" + bn.js "^5.2.1" ethereum-bloom-filters "^1.0.6" + ethereumjs-util "^7.1.0" ethjs-unit "0.1.6" number-to-bn "1.7.0" randombytes "^2.1.0" - underscore "1.12.1" utf8 "3.0.0" -web3@*, web3@^1.0.0-beta.34: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.0.tgz#8fe4cd6e2a21c91904f343ba75717ee4c76bb349" - integrity sha512-4q9dna0RecnrlgD/bD1C5S+81Untbd6Z/TBD7rb+D5Bvvc0Wxjr4OP70x+LlnwuRDjDtzBwJbNUblh2grlVArw== - dependencies: - web3-bzz "1.3.0" - web3-core "1.3.0" - web3-eth "1.3.0" - web3-eth-personal "1.3.0" - web3-net "1.3.0" - web3-shh "1.3.0" - web3-utils "1.3.0" - -web3@0.20.6: - version "0.20.6" - resolved "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz#3e97306ae024fb24e10a3d75c884302562215120" - integrity sha1-PpcwauAk+yThCj11yIQwJWIhUSA= - dependencies: - bignumber.js "git+https://github.com/frozeman/bignumber.js-nolookahead.git" - crypto-js "^3.1.4" - utf8 "^2.1.1" - xhr2 "*" - xmlhttprequest "*" +web3-utils@1.7.5, web3-utils@^1.0.0-beta.31: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.7.5.tgz#081a952ac6e0322e25ac97b37358a43c7372ef6a" + integrity sha512-9AqNOziQky4wNQadEwEfHiBdOZqopIHzQQVzmvvv6fJwDSMhP+khqmAZC7YTiGjs0MboyZ8tWNivqSO1699XQw== + dependencies: + bn.js "^5.2.1" + ethereum-bloom-filters "^1.0.6" + ethereumjs-util "^7.1.0" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + utf8 "3.0.0" -web3@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.1.tgz#5d8158bcca47838ab8c2b784a2dee4c3ceb4179b" - integrity sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw== - dependencies: - web3-bzz "1.2.1" - web3-core "1.2.1" - web3-eth "1.2.1" - web3-eth-personal "1.2.1" - web3-net "1.2.1" - web3-shh "1.2.1" - web3-utils "1.2.1" +web3@*, web3@^1.2.4: + version "1.7.5" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.7.5.tgz#4e185d2058195b5775109b3f27cdea65a34a036e" + integrity sha512-3jHZTWyXt975AOXgnZKayiSWDLpoSKk9fZtLk1hURQtt7AdSbXPT8AK9ooBCm0Dt3GYaOeNcHGaiHC3gtyqhLg== + dependencies: + web3-bzz "1.7.5" + web3-core "1.7.5" + web3-eth "1.7.5" + web3-eth-personal "1.7.5" + web3-net "1.7.5" + web3-shh "1.7.5" + web3-utils "1.7.5" web3@1.2.2: version "1.2.2" @@ -27626,10 +30375,23 @@ web3@1.3.6: web3-shh "1.3.6" web3-utils "1.3.6" +web3@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.7.4.tgz#00c9aef8e13ade92fd773d845fff250535828e93" + integrity sha512-iFGK5jO32vnXM/ASaJBaI0+gVR6uHozvYdxkdhaeOCD6HIQ4iIXadbO2atVpE9oc/H8l2MovJ4LtPhG7lIBN8A== + dependencies: + web3-bzz "1.7.4" + web3-core "1.7.4" + web3-eth "1.7.4" + web3-eth-personal "1.7.4" + web3-net "1.7.4" + web3-shh "1.7.4" + web3-utils "1.7.4" + web3@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019" - integrity sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk= + integrity sha512-8vET/GI2qDtShXNtPkuWByWvPNou9ecuYI9OJswBdA+NUwe5WZKirHUWakS0y4mK6lGmOhv7mLN7cHCBhmQRyA== dependencies: bignumber.js "git+https://github.com/debris/bignumber.js#master" crypto-js "^3.1.4" @@ -27639,7 +30401,7 @@ web3@^0.16.0: web3@^0.18.2: version "0.18.4" resolved "https://registry.yarnpkg.com/web3/-/web3-0.18.4.tgz#81ec1784145491f2eaa8955b31c06049e07c5e7d" - integrity sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0= + integrity sha512-TG+CtszzJHRHq+1T0AJVN4ATDvNn4QIAIEnErTgx2jj9oCa5ggOqZv3Ub0RAF+Yr2F/e5F6UFpEUSH9QK7w50Q== dependencies: bignumber.js "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" crypto-js "^3.1.4" @@ -27650,7 +30412,7 @@ web3@^0.18.2: webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== webidl-conversions@^4.0.2: version "4.0.2" @@ -27722,14 +30484,15 @@ webpack@4.39.1: webpack-sources "^1.4.1" websocket-driver@>=0.5.1: - version "0.7.0" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" - integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs= + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== dependencies: - http-parser-js ">=0.4.0" + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" websocket-extensions ">=0.1.1" -websocket-extensions@>=0.1.1, websocket-extensions@^0.1.4: +websocket-extensions@>=0.1.1: version "0.1.4" resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== @@ -27746,9 +30509,9 @@ websocket@1.0.29: yaeti "^0.0.6" websocket@^1.0.28, websocket@^1.0.32: - version "1.0.32" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.32.tgz#1f16ddab3a21a2d929dec1687ab21cfdc6d3dbb1" - integrity sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q== + version "1.0.34" + resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111" + integrity sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ== dependencies: bufferutil "^4.0.1" debug "^2.2.0" @@ -27759,7 +30522,7 @@ websocket@^1.0.28, websocket@^1.0.32: "websocket@github:web3-js/WebSocket-Node#polyfill/globalThis": version "1.0.29" - resolved "https://codeload.github.com/web3-js/WebSocket-Node/tar.gz/905deb4812572b344f5801f8c9ce8bb02799d82e" + resolved "https://codeload.github.com/web3-js/WebSocket-Node/tar.gz/ef5ea2f41daf4a2113b80c9223df884b4d56c400" dependencies: debug "^2.2.0" es5-ext "^0.10.50" @@ -27774,17 +30537,17 @@ whatwg-encoding@^1.0.5: dependencies: iconv-lite "0.4.24" -whatwg-fetch@2.0.4: +whatwg-fetch@2.0.4, whatwg-fetch@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== -whatwg-fetch@>=0.10.0: +whatwg-fetch@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== -whatwg-fetch@^3.0.0: +whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0: version "3.6.2" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== @@ -27794,10 +30557,15 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0" @@ -27811,15 +30579,6 @@ whatwg-url@^6.5.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -whatwg-url@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd" - integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - whatwg-url@^8.0.0, whatwg-url@^8.5.0: version "8.7.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" @@ -27829,18 +30588,18 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0: tr46 "^2.1.0" webidl-conversions "^6.1.0" -which-boxed-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1" - integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ== +which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== dependencies: - is-bigint "^1.0.0" - is-boolean-object "^1.0.0" - is-number-object "^1.0.3" - is-string "^1.0.4" - is-symbol "^1.0.2" + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" -which-collection@^1.0.0: +which-collection@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== @@ -27853,52 +30612,58 @@ which-collection@^1.0.0: which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= + integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ== which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== which-pm-runs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" - integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= + version "1.1.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35" + integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA== which-typed-array@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff" - integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA== + version "1.1.8" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" + integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw== dependencies: - available-typed-arrays "^1.0.2" - call-bind "^1.0.0" - es-abstract "^1.18.0-next.1" - foreach "^2.0.5" - function-bind "^1.1.1" - has-symbols "^1.0.1" - is-typed-array "^1.1.3" + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + es-abstract "^1.20.0" + for-each "^0.3.3" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.9" -which@1, which@1.3.1, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1, which@~1.3.0: +which@1.3.1, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" -which@^2.0.1, which@^2.0.2: +which@2.0.2, which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -wide-align@1.1.3, wide-align@^1.1.0: +wide-align@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== dependencies: string-width "^1.0.2 || 2" +wide-align@^1.1.0, wide-align@^1.1.2, wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + widest-line@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" @@ -27916,49 +30681,35 @@ widest-line@^3.1.0: wif@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/wif/-/wif-2.0.6.tgz#08d3f52056c66679299726fade0d432ae74b4704" - integrity sha1-CNP1IFbGZnkplyb63g1DKudLRwQ= + integrity sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ== dependencies: bs58check "<3.0.0" window-size@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= + integrity sha512-2thx4pB0cV3h+Bw7QmMXcEbdmOzv9t0HFplJH/Lz6yu60hXYy5RT8rUu+wlIreVxWsGN20mo+MHeCSfUpQBwPw== window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" - integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU= - -windows-release@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f" - integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA== - dependencies: - execa "^1.0.0" - -winston-transport@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66" - integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A== - dependencies: - readable-stream "^2.3.6" - triple-beam "^1.2.0" + integrity sha512-UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw== -winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== +winston-transport@^4.4.0, winston-transport@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa" + integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q== dependencies: - readable-stream "^2.3.7" - triple-beam "^1.2.0" + logform "^2.3.2" + readable-stream "^3.6.0" + triple-beam "^1.3.0" winston@2.x: - version "2.4.5" - resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz#f2e431d56154c4ea765545fc1003bd340c95b59a" - integrity sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A== + version "2.4.6" + resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.6.tgz#da616f332928f70aac482f59b43d62228f29e478" + integrity sha512-J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w== dependencies: - async "~1.0.0" + async "^3.2.3" colors "1.0.x" cycle "1.0.x" eyes "0.1.x" @@ -27966,19 +30717,21 @@ winston@2.x: stack-trace "0.0.x" winston@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07" - integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw== + version "3.8.2" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.2.tgz#56e16b34022eb4cff2638196d9646d7430fdad50" + integrity sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew== dependencies: - async "^2.6.1" - diagnostics "^1.1.1" - is-stream "^1.1.0" - logform "^2.1.1" - one-time "0.0.4" - readable-stream "^3.1.1" + "@colors/colors" "1.5.0" + "@dabh/diagnostics" "^2.0.2" + async "^3.2.3" + is-stream "^2.0.0" + logform "^2.4.0" + one-time "^1.0.0" + readable-stream "^3.4.0" + safe-stable-stringify "^2.3.1" stack-trace "0.0.x" triple-beam "^1.3.0" - winston-transport "^4.3.0" + winston-transport "^4.5.0" wkx@^0.4.8: version "0.4.8" @@ -27995,19 +30748,29 @@ word-wrap@~1.2.3: wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -worker-farm@^1.6.0, worker-farm@^1.7.0: +worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== dependencies: errno "~0.1.7" +workerpool@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58" + integrity sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA== + +workerpool@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" + integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= + integrity sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw== dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -28015,17 +30778,8 @@ wrap-ansi@^2.0.0: wrap-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" - integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= - dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - -wrap-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-4.0.0.tgz#b3570d7c70156159a2d42be5cc942e957f7b1131" - integrity sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg== + integrity sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ== dependencies: - ansi-styles "^3.2.0" string-width "^2.1.1" strip-ansi "^4.0.0" @@ -28056,12 +30810,12 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrappy@1, wrappy@~1.0.2: +wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2: +write-file-atomic@^2.0.0, write-file-atomic@^2.4.2: version "2.4.3" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== @@ -28071,26 +30825,22 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2: signal-exit "^3.0.2" write-file-atomic@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.0.tgz#1b64dbbf77cb58fd09056963d63e62667ab4fb21" - integrity sha512-EIgkf60l2oWsffja2Sf2AL384dx328c0B+cIYPTQq5q2rOYuDV00/iPFBOUiDKKwKMOhkymH8AidPaRvzfxY+Q== + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== dependencies: imurmurhash "^0.1.4" is-typedarray "^1.0.0" signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -write-json-file@^2.2.0, write-json-file@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" - integrity sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8= +write-file-atomic@^4.0.0, write-file-atomic@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" + integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== dependencies: - detect-indent "^5.0.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - pify "^3.0.0" - sort-keys "^2.0.0" - write-file-atomic "^2.0.0" + imurmurhash "^0.1.4" + signal-exit "^3.0.7" write-json-file@^3.2.0: version "3.2.0" @@ -28104,13 +30854,33 @@ write-json-file@^3.2.0: sort-keys "^2.0.0" write-file-atomic "^2.4.2" -write-pkg@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9" - integrity sha1-AwqZlMyZk9JbTnWp8aGSNgcpHOk= +write-json-file@^4.1.1, write-json-file@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d" + integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ== + dependencies: + detect-indent "^6.0.0" + graceful-fs "^4.1.15" + is-plain-obj "^2.0.0" + make-dir "^3.0.0" + sort-keys "^4.0.0" + write-file-atomic "^3.0.0" + +write-pkg@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-4.0.0.tgz#675cc04ef6c11faacbbc7771b24c0abbf2a20039" + integrity sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA== dependencies: sort-keys "^2.0.0" - write-json-file "^2.2.0" + type-fest "^0.4.1" + write-json-file "^3.2.0" + +write-stream@~0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/write-stream/-/write-stream-0.4.3.tgz#83cc8c0347d0af6057a93862b4e3ae01de5c81c1" + integrity sha512-IJrvkhbAnj89W/GAVdVgbnPiVw5Ntg/B4tc/MUCIEwj/g6JIww1DWJyB/yBMT3yw2/TkT6IUZ0+IYef3flEw8A== + dependencies: + readable-stream "~0.0.2" write@1.0.3: version "1.0.3" @@ -28119,6 +30889,11 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" +ws@7.4.6: + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== + ws@^1.1.0, ws@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" @@ -28137,13 +30912,13 @@ ws@^3.0.0, ws@^3.3.1: ultron "~1.1.0" ws@^5.1.1: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" - integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA== + version "5.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" + integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA== dependencies: async-limiter "~1.0.0" -ws@^7, ws@^7.2.3, ws@^7.4.6: +ws@^7, ws@^7.2.0, ws@^7.2.3, ws@^7.4.6: version "7.5.9" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== @@ -28159,7 +30934,7 @@ xcode@^2.0.0: xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" - integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= + integrity sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ== xdg-basedir@^4.0.0: version "4.0.0" @@ -28189,21 +30964,21 @@ xhr-request@^1.0.1, xhr-request@^1.1.0: xhr2-cookies@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz#7d77449d0999197f155cb73b23df72505ed89d48" - integrity sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg= + integrity sha512-hjXUA6q+jl/bd8ADHcVfFsSPIf+tyLIjuO9TwJC9WI6JP2zKcS7C+p56I9kCLLsaCiNT035iYvEUUzdEFj/8+g== dependencies: cookiejar "^2.1.1" xhr2@*: - version "0.1.4" - resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" - integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8= + version "0.2.1" + resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93" + integrity sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw== xhr@^2.0.4, xhr@^2.2.0, xhr@^2.3.3: - version "2.5.0" - resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd" - integrity sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ== + version "2.6.0" + resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d" + integrity sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA== dependencies: - global "~4.3.0" + global "~4.4.0" is-function "^1.0.1" parse-headers "^2.0.0" xtend "^4.0.0" @@ -28232,44 +31007,44 @@ xml2js@^0.4.19: xml@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" - integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU= + integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw== xmlbuilder@^13.0.2: version "13.0.2" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7" integrity sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ== -xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlbuilder@^15.1.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== xmlbuilder@~11.0.0: version "11.0.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== + xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== xmldoc@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-1.1.2.tgz#6666e029fe25470d599cd30e23ff0d1ed50466d7" - integrity sha512-ruPC/fyPNck2BD1dpz0AZZyrEwMOrWTO5lDdIXS91rs3wtm4j+T8Rp2o+zoOYkkAxJTZRPOSnOGei1egoRmKMQ== + version "1.2.0" + resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-1.2.0.tgz#7554371bfd8c138287cff01841ae4566d26e5541" + integrity sha512-2eN8QhjBsMW2uVj7JHLHkMytpvGHLHxKXBy4J3fAT/HujsEtM6yU84iGjpESYGHg6XwK0Vu4l+KgqQ2dv2cCqg== dependencies: - sax "^1.2.1" - -"xmldom@>= 0.1.x": - version "0.3.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.3.0.tgz#e625457f4300b5df9c2e1ecb776147ece47f3e5a" - integrity sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g== + sax "^1.2.4" xmlhttprequest@*, xmlhttprequest@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" - integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw= + integrity sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA== xpath.js@~1.1.0: version "1.1.0" @@ -28279,14 +31054,22 @@ xpath.js@~1.1.0: xpipe@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf" - integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98= + integrity sha512-tuqoLk8xPl0o+7ny9iPlEZuzjfy1zC5ZJtAGjDDZWmVTVBK5PJP0arMGVu3Y53zSyeYK+YonMVSUv0DJgGN/ig== xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" - integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM= + integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA== + +xss@^1.0.8: + version "1.0.14" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694" + integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw== + dependencies: + commander "^2.20.3" + cssfilter "0.0.10" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -28294,31 +31077,36 @@ xregexp@2.0.0: xtend@~2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" - integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os= + integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ== dependencies: object-keys "~0.4.0" -y18n@^3.2.0, y18n@^3.2.1, "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0, y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== +y18n@^3.2.0, y18n@^3.2.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== -yaassertion@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/yaassertion/-/yaassertion-1.0.0.tgz#630c5c44c660d064006f1f15d79bd256d373fc9e" - integrity sha512-fepEqRG+/2ZkJBf2ioA4LTOZUWrBN3F2EuKms3zE47M0zqph5aWs6SGiyz9wyzPkowhtiKapHV52IsRBfYCDwA== +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" - integrity sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc= + integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug== yallist@^2.0.0, yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -28328,7 +31116,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0: +yaml@^1.10.0, yaml@^1.10.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== @@ -28341,23 +31129,20 @@ yargs-parser@13.1.2, yargs-parser@^13.1.0, yargs-parser@^13.1.1, yargs-parser@^1 camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@20.x: - version "20.2.7" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs-parser@^11.1.1: - version "11.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" - integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" +yargs-parser@21.0.1: + version "21.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" + integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== yargs-parser@^15.0.1: - version "15.0.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3" - integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw== + version "15.0.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.3.tgz#316e263d5febe8b38eef61ac092b33dfcc9b1115" + integrity sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -28370,32 +31155,31 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^2.4.0, yargs-parser@^2.4.1: +yargs-parser@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" - integrity sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ= + integrity sha512-9pIKIJhnI5tonzG6OnCFlz/yln8xHYcGl+pn3xR0Vzff0vzN1PbNRaelgfgRUwZ3s4i3jvxT9WhmUGL4whnasA== dependencies: camelcase "^3.0.0" lodash.assign "^4.0.6" -yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== +yargs-parser@^20.2.2, yargs-parser@^20.2.3: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo= - dependencies: - camelcase "^3.0.0" +yargs-parser@^21.0.0, yargs-parser@^21.0.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" - integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k= +yargs-parser@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394" + integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA== dependencies: - camelcase "^4.1.0" + camelcase "^3.0.0" + object.assign "^4.1.0" yargs-parser@^8.1.0: version "8.1.0" @@ -28407,7 +31191,7 @@ yargs-parser@^8.1.0: yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" - integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc= + integrity sha512-CswCfdOgCr4MMsT1GzbEJ7Z2uYudWyrGX8Bgh/0eyCzj/DXWdKq6a/ADufkzI1WAOIW6jYaXJvRyLhDO0kfqBw== dependencies: camelcase "^4.1.0" @@ -28420,7 +31204,7 @@ yargs-unparser@1.6.0: lodash "^4.17.15" yargs "^13.3.0" -yargs-unparser@^2.0.0: +yargs-unparser@2.0.0, yargs-unparser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== @@ -28463,7 +31247,7 @@ yargs@13.3.0: y18n "^4.0.0" yargs-parser "^13.1.1" -yargs@13.3.2, yargs@^13.1.0, yargs@^13.2.0, yargs@^13.2.4, yargs@^13.3.0: +yargs@13.3.2, yargs@^13.1.0, yargs@^13.3.0: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== @@ -28496,23 +31280,18 @@ yargs@14.0.0: y18n "^4.0.0" yargs-parser "^13.1.1" -yargs@4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.6.0.tgz#cb4050c0159bfb6bb649c0f4af550526a84619dc" - integrity sha1-y0BQwBWb+2u2ScD0r1UFJqhGGdw= +yargs@16.2.0, yargs@^16.0.3, yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== dependencies: - camelcase "^2.0.1" - cliui "^3.2.0" - decamelize "^1.1.1" - lodash.assign "^4.0.3" - os-locale "^1.4.0" - pkg-conf "^1.1.2" - read-pkg-up "^1.0.1" - require-main-filename "^1.0.1" - string-width "^1.0.1" - window-size "^0.2.0" - y18n "^3.2.1" - yargs-parser "^2.4.0" + 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@^10.0.3: version "10.1.2" @@ -28533,15 +31312,15 @@ yargs@^10.0.3: yargs-parser "^8.1.0" yargs@^11.0.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" - integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A== + version "11.1.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766" + integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw== dependencies: cliui "^4.0.0" decamelize "^1.1.1" find-up "^2.1.0" get-caller-file "^1.0.1" - os-locale "^2.0.0" + os-locale "^3.1.0" require-directory "^2.1.1" require-main-filename "^1.0.1" set-blocking "^2.0.0" @@ -28550,25 +31329,7 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^12.0.1: - version "12.0.5" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== - dependencies: - cliui "^4.0.0" - decamelize "^1.2.0" - find-up "^3.0.0" - get-caller-file "^1.0.1" - os-locale "^3.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1 || ^4.0.0" - yargs-parser "^11.1.1" - -yargs@^14.0.0, yargs@^14.2.0, yargs@^14.2.3: +yargs@^14.0.0, yargs@^14.2.0: version "14.2.3" resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414" integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg== @@ -28585,7 +31346,7 @@ yargs@^14.0.0, yargs@^14.2.0, yargs@^14.2.3: y18n "^4.0.0" yargs-parser "^15.0.1" -yargs@^15.1.0, yargs@^15.4.1: +yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== @@ -28602,36 +31363,23 @@ yargs@^15.1.0, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.0.3: - version "16.1.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.1.1.tgz#5a4a095bd1ca806b0a50d0c03611d38034d219a1" - integrity sha512-hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w== - 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@^16.1.1, yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== +yargs@^17.3.1, yargs@^17.4.0: + version "17.5.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" + integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== 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" + string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^20.2.2" + yargs-parser "^21.0.0" yargs@^3.10.0: version "3.32.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= + integrity sha512-ONJZiimStfZzhKamYvR/xvmgW3uEkAUFSP91y2caTEPhzF6uP2JfPiVZcq66b/YR0C3uitxSV7+T1x8p5bkmMg== dependencies: camelcase "^2.0.1" cliui "^3.0.3" @@ -28644,7 +31392,7 @@ yargs@^3.10.0: yargs@^4.7.1: version "4.8.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" - integrity sha1-wMQpJMpKqmsObaFznfshZDn53cA= + integrity sha512-LqodLrnIDM3IFT+Hf/5sxBnEGECrfdC1uIbgZeJmESCSo4HoCAaKEus8MylXHAkdacGc0ye+Qa+dpkuom8uVYA== dependencies: cliui "^3.2.0" decamelize "^1.1.1" @@ -28662,9 +31410,9 @@ yargs@^4.7.1: yargs-parser "^2.4.1" yargs@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg= + version "7.1.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db" + integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA== dependencies: camelcase "^3.0.0" cliui "^3.2.0" @@ -28678,44 +31426,25 @@ yargs@^7.1.0: string-width "^1.0.2" which-module "^1.0.0" y18n "^3.2.1" - yargs-parser "^5.0.0" - -yargs@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" - integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A= - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" + yargs-parser "^5.0.1" yarn@^1.21.1: - version "1.22.10" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.10.tgz#c99daa06257c80f8fa2c3f1490724e394c26b18c" - integrity sha512-IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA== + version "1.22.19" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" + integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ== yauzl@^2.4.2: - version "2.9.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f" - integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8= + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== dependencies: buffer-crc32 "~0.2.3" - fd-slicer "~1.0.1" + fd-slicer "~1.1.0" -yn@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114" - integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg== +yn@3.1.1, yn@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== yocto-queue@^0.1.0: version "0.1.0" From f834eb072444a42d71ca564e93ffce8971b79b3e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 25 Feb 2023 15:04:50 -0500 Subject: [PATCH 002/184] update truffle-ganache-ethereumjs dependencies --- package.json | 5 +- packages/protocol/package-lock.json | 26695 ------------------------ packages/protocol/package.json | 16 +- packages/sdk/contractkit/package.json | 4 +- packages/sdk/identity/package.json | 6 +- yarn.lock | 1698 +- 6 files changed, 1372 insertions(+), 27052 deletions(-) delete mode 100644 packages/protocol/package-lock.json diff --git a/package.json b/package.json index 01a5d25b5be..0b3aa2e98c6 100644 --- a/package.json +++ b/package.json @@ -83,10 +83,9 @@ "typescript-tslint-plugin": "^0.5.4" }, "resolutions": { - "@celo/ganache-core": "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b", - "ganache-core": "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" + "ganache": "npm:@soloseng/ganache@7.7.5-beta.3" }, "dependencies": { - "@celo/ganache-core": "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" + } } diff --git a/packages/protocol/package-lock.json b/packages/protocol/package-lock.json deleted file mode 100644 index ab13eaa4d5b..00000000000 --- a/packages/protocol/package-lock.json +++ /dev/null @@ -1,26695 +0,0 @@ -{ - "name": "@celo/protocol", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@0x/assert": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@0x/assert/-/assert-2.1.6.tgz", - "integrity": "sha512-Gu8eBnFdEuIAH2GubWYOSVz/BIoRccKof68AziduYDHxh4nSPM6NUH52xtfUGk4nXljiOXU1XHZJhcjTObI+8Q==", - "requires": { - "@0x/json-schemas": "^4.0.2", - "@0x/typescript-typings": "^4.3.0", - "@0x/utils": "^4.5.2", - "lodash": "^4.17.11", - "valid-url": "^1.0.9" - } - }, - "@0x/dev-utils": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@0x/dev-utils/-/dev-utils-2.3.3.tgz", - "integrity": "sha512-Pi664W/jj1U6WU+kHEPyKpflBnmKRsclB69RaL7wpnvOOFjAPhFV2/0FvIZ25w62rMzKEpfD1/1NcZ7NjAk7OQ==", - "requires": { - "@0x/subproviders": "^5.0.4", - "@0x/types": "^2.4.3", - "@0x/typescript-typings": "^4.3.0", - "@0x/utils": "^4.5.2", - "@0x/web3-wrapper": "^6.0.13", - "@types/web3-provider-engine": "^14.0.0", - "chai": "^4.0.1", - "ethereum-types": "^2.1.6", - "lodash": "^4.17.11" - } - }, - "@0x/json-schemas": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@0x/json-schemas/-/json-schemas-4.0.2.tgz", - "integrity": "sha512-JHOwESZeWKAzT5Z42ZNvOvQUQ5vuRIFQWS0FNjYwV8Cv4/dRlLHd7kwxxsvlm9NxgXnOW0ddEDBbVGxhVSYNIg==", - "requires": { - "@0x/typescript-typings": "^4.3.0", - "@types/node": "*", - "jsonschema": "^1.2.0", - "lodash.values": "^4.3.0" - } - }, - "@0x/sol-compiler": { - "version": "3.1.15", - "resolved": "https://registry.npmjs.org/@0x/sol-compiler/-/sol-compiler-3.1.15.tgz", - "integrity": "sha512-IobhcQ/whFRL942/ykKc0fV6/YstHhvnQJ0noUZ9GabMDtaBlW6k5vAerSkXZU/YyOd8sD9nw7QSm295D6HoTA==", - "requires": { - "@0x/assert": "^2.1.6", - "@0x/json-schemas": "^4.0.2", - "@0x/sol-resolver": "^2.0.11", - "@0x/types": "^2.4.3", - "@0x/typescript-typings": "^4.3.0", - "@0x/utils": "^4.5.2", - "@0x/web3-wrapper": "^6.0.13", - "@types/yargs": "^11.0.0", - "chalk": "^2.3.0", - "chokidar": "^3.0.2", - "ethereum-types": "^2.1.6", - "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.11", - "mkdirp": "^0.5.1", - "pluralize": "^7.0.0", - "require-from-string": "^2.0.1", - "semver": "5.5.0", - "solc": "^0.5.5", - "source-map-support": "^0.5.0", - "web3-eth-abi": "^1.0.0-beta.24", - "yargs": "^10.0.3" - }, - "dependencies": { - "@types/yargs": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-11.1.3.tgz", - "integrity": "sha512-moBUF6X8JsK5MbLZGP3vCfG/TVHZHsaePj3EimlLKp8+ESUjGjpXalxyn90a2L9fTM2ZGtW4swb6Am1DvVRNGA==" - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" - }, - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" - }, - "solc": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.12.tgz", - "integrity": "sha512-OX/AGZT04tuUsagoVXSZBiBZYJReA02hdwZOfRkB03/eeYP9Dl3pr+M+au+1MhssgiuWBlFPN7sRXFiqwkAW2g==", - "requires": { - "command-exists": "^1.2.8", - "fs-extra": "^0.30.0", - "js-sha3": "0.8.0", - "memorystream": "^0.3.1", - "require-from-string": "^2.0.0", - "semver": "^5.5.0", - "tmp": "0.0.33", - "yargs": "^13.2.0" - }, - "dependencies": { - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - } - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "yargs": { - "version": "10.1.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz", - "integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==", - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^8.1.0" - }, - "dependencies": { - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yargs-parser": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz", - "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==", - "requires": { - "camelcase": "^4.1.0" - } - } - } - } - } - }, - "@0x/sol-coverage": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@0x/sol-coverage/-/sol-coverage-3.0.12.tgz", - "integrity": "sha512-V4Iq8LU8HWNctVCt+gMHKcZ0moiawpna7bd3SWQuiQIig0iNpXBBCQl9SEIwpboTcv4Xhzo4cZuCGsWwKAQSpw==", - "requires": { - "@0x/sol-tracing-utils": "^6.0.19", - "@0x/subproviders": "^5.0.4", - "@0x/typescript-typings": "^4.3.0", - "@types/minimatch": "^3.0.3", - "ethereum-types": "^2.1.6", - "lodash": "^4.17.11", - "minimatch": "^3.0.4", - "web3-provider-engine": "14.0.6" - }, - "dependencies": { - "eth-block-tracker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-3.0.1.tgz", - "integrity": "sha512-WUVxWLuhMmsfenfZvFO5sbl1qFY2IqUlw/FPVmjjdElpqLsZtSG+wPe9Dz7W/sB6e80HgFKknOmKk2eNlznHug==", - "requires": { - "eth-query": "^2.1.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.3", - "ethjs-util": "^0.1.3", - "json-rpc-engine": "^3.6.0", - "pify": "^2.3.0", - "tape": "^4.6.3" - } - }, - "eth-json-rpc-infura": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz", - "integrity": "sha512-W7zR4DZvyTn23Bxc0EWsq4XGDdD63+XPUCEhV2zQvQGavDVC4ZpFDK4k99qN7bd7/fjj37+rxmuBOBeIqCA5Mw==", - "requires": { - "cross-fetch": "^2.1.1", - "eth-json-rpc-middleware": "^1.5.0", - "json-rpc-engine": "^3.4.0", - "json-rpc-error": "^2.0.0" - } - }, - "eth-json-rpc-middleware": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.6.0.tgz", - "integrity": "sha512-tDVCTlrUvdqHKqivYMjtFZsdD7TtpNLBCfKAcOpaVs7orBMS/A8HWro6dIzNtTZIR05FAbJ3bioFOnZpuCew9Q==", - "requires": { - "async": "^2.5.0", - "eth-query": "^2.1.2", - "eth-tx-summary": "^3.1.2", - "ethereumjs-block": "^1.6.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.2", - "ethereumjs-vm": "^2.1.0", - "fetch-ponyfill": "^4.0.0", - "json-rpc-engine": "^3.6.0", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "tape": "^4.6.3" - } - }, - "json-rpc-engine": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz", - "integrity": "sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA==", - "requires": { - "async": "^2.0.1", - "babel-preset-env": "^1.7.0", - "babelify": "^7.3.0", - "json-rpc-error": "^2.0.0", - "promise-to-callback": "^1.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "web3-provider-engine": { - "version": "14.0.6", - "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz", - "integrity": "sha512-tr5cGSyxfSC/JqiUpBlJtfZpwQf1yAA8L/zy1C6fDFm0ntR974pobJ4v4676atpZne4Ze5VFy3kPPahHe9gQiQ==", - "requires": { - "async": "^2.5.0", - "backoff": "^2.5.0", - "clone": "^2.0.0", - "cross-fetch": "^2.1.0", - "eth-block-tracker": "^3.0.0", - "eth-json-rpc-infura": "^3.1.0", - "eth-sig-util": "^1.4.2", - "ethereumjs-block": "^1.2.2", - "ethereumjs-tx": "^1.2.0", - "ethereumjs-util": "^5.1.5", - "ethereumjs-vm": "^2.3.4", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "readable-stream": "^2.2.9", - "request": "^2.67.0", - "semaphore": "^1.0.3", - "tape": "^4.4.0", - "ws": "^5.1.1", - "xhr": "^2.2.0", - "xtend": "^4.0.1" - } - } - } - }, - "@0x/sol-profiler": { - "version": "3.1.14", - "resolved": "https://registry.npmjs.org/@0x/sol-profiler/-/sol-profiler-3.1.14.tgz", - "integrity": "sha512-XGBNgG6p5il8d831jrm9Xt3BQgjZxcywX1r5TOquHlBnfae9RFf/klNA60w8dW3GygugnIc9PzKtgR1EgWN3Ng==", - "requires": { - "@0x/sol-tracing-utils": "^6.0.19", - "@0x/subproviders": "^5.0.4", - "@0x/typescript-typings": "^4.3.0", - "@0x/utils": "^4.5.2", - "ethereum-types": "^2.1.6", - "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.11", - "web3-provider-engine": "14.0.6" - }, - "dependencies": { - "eth-block-tracker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-3.0.1.tgz", - "integrity": "sha512-WUVxWLuhMmsfenfZvFO5sbl1qFY2IqUlw/FPVmjjdElpqLsZtSG+wPe9Dz7W/sB6e80HgFKknOmKk2eNlznHug==", - "requires": { - "eth-query": "^2.1.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.3", - "ethjs-util": "^0.1.3", - "json-rpc-engine": "^3.6.0", - "pify": "^2.3.0", - "tape": "^4.6.3" - } - }, - "eth-json-rpc-infura": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz", - "integrity": "sha512-W7zR4DZvyTn23Bxc0EWsq4XGDdD63+XPUCEhV2zQvQGavDVC4ZpFDK4k99qN7bd7/fjj37+rxmuBOBeIqCA5Mw==", - "requires": { - "cross-fetch": "^2.1.1", - "eth-json-rpc-middleware": "^1.5.0", - "json-rpc-engine": "^3.4.0", - "json-rpc-error": "^2.0.0" - } - }, - "eth-json-rpc-middleware": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.6.0.tgz", - "integrity": "sha512-tDVCTlrUvdqHKqivYMjtFZsdD7TtpNLBCfKAcOpaVs7orBMS/A8HWro6dIzNtTZIR05FAbJ3bioFOnZpuCew9Q==", - "requires": { - "async": "^2.5.0", - "eth-query": "^2.1.2", - "eth-tx-summary": "^3.1.2", - "ethereumjs-block": "^1.6.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.2", - "ethereumjs-vm": "^2.1.0", - "fetch-ponyfill": "^4.0.0", - "json-rpc-engine": "^3.6.0", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "tape": "^4.6.3" - } - }, - "json-rpc-engine": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz", - "integrity": "sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA==", - "requires": { - "async": "^2.0.1", - "babel-preset-env": "^1.7.0", - "babelify": "^7.3.0", - "json-rpc-error": "^2.0.0", - "promise-to-callback": "^1.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "web3-provider-engine": { - "version": "14.0.6", - "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz", - "integrity": "sha512-tr5cGSyxfSC/JqiUpBlJtfZpwQf1yAA8L/zy1C6fDFm0ntR974pobJ4v4676atpZne4Ze5VFy3kPPahHe9gQiQ==", - "requires": { - "async": "^2.5.0", - "backoff": "^2.5.0", - "clone": "^2.0.0", - "cross-fetch": "^2.1.0", - "eth-block-tracker": "^3.0.0", - "eth-json-rpc-infura": "^3.1.0", - "eth-sig-util": "^1.4.2", - "ethereumjs-block": "^1.2.2", - "ethereumjs-tx": "^1.2.0", - "ethereumjs-util": "^5.1.5", - "ethereumjs-vm": "^2.3.4", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "readable-stream": "^2.2.9", - "request": "^2.67.0", - "semaphore": "^1.0.3", - "tape": "^4.4.0", - "ws": "^5.1.1", - "xhr": "^2.2.0", - "xtend": "^4.0.1" - } - } - } - }, - "@0x/sol-resolver": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/@0x/sol-resolver/-/sol-resolver-2.0.11.tgz", - "integrity": "sha512-TGvkuWoEMghPB4OZaPz49OJ/J0cw/I3yV7VLbE/OeN0K/J2P8uOkzhNgWLOVSi8EK3hcJ1JVc0iDSkCnzGj4xQ==", - "requires": { - "@0x/types": "^2.4.3", - "@0x/typescript-typings": "^4.3.0", - "lodash": "^4.17.11" - } - }, - "@0x/sol-trace": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/@0x/sol-trace/-/sol-trace-2.0.20.tgz", - "integrity": "sha512-lkw+8l+InqXKoyVFPCxdLA0oZnLLPvmpFm+lIJwEkPjrbwIyhvQbwSwyzPW/1XUWj0wIwWOpq6PSyofWZgt4KA==", - "requires": { - "@0x/sol-tracing-utils": "^6.0.19", - "@0x/subproviders": "^5.0.4", - "@0x/typescript-typings": "^4.3.0", - "chalk": "^2.3.0", - "ethereum-types": "^2.1.6", - "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.11", - "loglevel": "^1.6.1", - "web3-provider-engine": "14.0.6" - }, - "dependencies": { - "eth-block-tracker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-3.0.1.tgz", - "integrity": "sha512-WUVxWLuhMmsfenfZvFO5sbl1qFY2IqUlw/FPVmjjdElpqLsZtSG+wPe9Dz7W/sB6e80HgFKknOmKk2eNlznHug==", - "requires": { - "eth-query": "^2.1.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.3", - "ethjs-util": "^0.1.3", - "json-rpc-engine": "^3.6.0", - "pify": "^2.3.0", - "tape": "^4.6.3" - } - }, - "eth-json-rpc-infura": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz", - "integrity": "sha512-W7zR4DZvyTn23Bxc0EWsq4XGDdD63+XPUCEhV2zQvQGavDVC4ZpFDK4k99qN7bd7/fjj37+rxmuBOBeIqCA5Mw==", - "requires": { - "cross-fetch": "^2.1.1", - "eth-json-rpc-middleware": "^1.5.0", - "json-rpc-engine": "^3.4.0", - "json-rpc-error": "^2.0.0" - } - }, - "eth-json-rpc-middleware": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.6.0.tgz", - "integrity": "sha512-tDVCTlrUvdqHKqivYMjtFZsdD7TtpNLBCfKAcOpaVs7orBMS/A8HWro6dIzNtTZIR05FAbJ3bioFOnZpuCew9Q==", - "requires": { - "async": "^2.5.0", - "eth-query": "^2.1.2", - "eth-tx-summary": "^3.1.2", - "ethereumjs-block": "^1.6.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.2", - "ethereumjs-vm": "^2.1.0", - "fetch-ponyfill": "^4.0.0", - "json-rpc-engine": "^3.6.0", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "tape": "^4.6.3" - } - }, - "json-rpc-engine": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz", - "integrity": "sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA==", - "requires": { - "async": "^2.0.1", - "babel-preset-env": "^1.7.0", - "babelify": "^7.3.0", - "json-rpc-error": "^2.0.0", - "promise-to-callback": "^1.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "web3-provider-engine": { - "version": "14.0.6", - "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz", - "integrity": "sha512-tr5cGSyxfSC/JqiUpBlJtfZpwQf1yAA8L/zy1C6fDFm0ntR974pobJ4v4676atpZne4Ze5VFy3kPPahHe9gQiQ==", - "requires": { - "async": "^2.5.0", - "backoff": "^2.5.0", - "clone": "^2.0.0", - "cross-fetch": "^2.1.0", - "eth-block-tracker": "^3.0.0", - "eth-json-rpc-infura": "^3.1.0", - "eth-sig-util": "^1.4.2", - "ethereumjs-block": "^1.2.2", - "ethereumjs-tx": "^1.2.0", - "ethereumjs-util": "^5.1.5", - "ethereumjs-vm": "^2.3.4", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "readable-stream": "^2.2.9", - "request": "^2.67.0", - "semaphore": "^1.0.3", - "tape": "^4.4.0", - "ws": "^5.1.1", - "xhr": "^2.2.0", - "xtend": "^4.0.1" - } - } - } - }, - "@0x/sol-tracing-utils": { - "version": "6.0.19", - "resolved": "https://registry.npmjs.org/@0x/sol-tracing-utils/-/sol-tracing-utils-6.0.19.tgz", - "integrity": "sha512-5tQOEo+dUYWiclT7UDy5IRm/EPEwDzCqAY3J8l0ecIsssBk0r2YLKKf/ugWkdwASGeAxiepjYpC+mxcxOT6yDA==", - "requires": { - "@0x/dev-utils": "^2.3.3", - "@0x/sol-compiler": "^3.1.15", - "@0x/sol-resolver": "^2.0.11", - "@0x/subproviders": "^5.0.4", - "@0x/typescript-typings": "^4.3.0", - "@0x/utils": "^4.5.2", - "@0x/web3-wrapper": "^6.0.13", - "@types/solidity-parser-antlr": "^0.2.3", - "chalk": "^2.3.0", - "ethereum-types": "^2.1.6", - "ethereumjs-util": "^5.1.1", - "ethers": "~4.0.4", - "glob": "^7.1.2", - "istanbul": "^0.4.5", - "lodash": "^4.17.11", - "loglevel": "^1.6.1", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.2", - "semaphore-async-await": "^1.5.1", - "solc": "^0.5.5", - "solidity-parser-antlr": "^0.4.2" - }, - "dependencies": { - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "solc": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.12.tgz", - "integrity": "sha512-OX/AGZT04tuUsagoVXSZBiBZYJReA02hdwZOfRkB03/eeYP9Dl3pr+M+au+1MhssgiuWBlFPN7sRXFiqwkAW2g==", - "requires": { - "command-exists": "^1.2.8", - "fs-extra": "^0.30.0", - "js-sha3": "0.8.0", - "memorystream": "^0.3.1", - "require-from-string": "^2.0.0", - "semver": "^5.5.0", - "tmp": "0.0.33", - "yargs": "^13.2.0" - } - }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - } - } - }, - "@0x/subproviders": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/@0x/subproviders/-/subproviders-5.0.4.tgz", - "integrity": "sha512-1LiGcOXkP5eUOl/0JRqkrqYtCvIL4NJj1GbbLIRq4TvkfqrRbF7zJM2SaayxPo3Z48zVsqk0ZE5+RrNAdK/Rrg==", - "requires": { - "@0x/assert": "^2.1.6", - "@0x/types": "^2.4.3", - "@0x/typescript-typings": "^4.3.0", - "@0x/utils": "^4.5.2", - "@0x/web3-wrapper": "^6.0.13", - "@ledgerhq/hw-app-eth": "^4.3.0", - "@ledgerhq/hw-transport-node-hid": "^4.3.0", - "@ledgerhq/hw-transport-u2f": "4.24.0", - "@types/hdkey": "^0.7.0", - "@types/web3-provider-engine": "^14.0.0", - "bip39": "^2.5.0", - "bn.js": "^4.11.8", - "ethereum-types": "^2.1.6", - "ethereumjs-tx": "^1.3.5", - "ethereumjs-util": "^5.1.1", - "ganache-core": "^2.6.0", - "hdkey": "^0.7.1", - "json-rpc-error": "2.0.0", - "lodash": "^4.17.11", - "semaphore-async-await": "^1.5.1", - "web3-provider-engine": "14.0.6" - }, - "dependencies": { - "eth-block-tracker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-3.0.1.tgz", - "integrity": "sha512-WUVxWLuhMmsfenfZvFO5sbl1qFY2IqUlw/FPVmjjdElpqLsZtSG+wPe9Dz7W/sB6e80HgFKknOmKk2eNlznHug==", - "requires": { - "eth-query": "^2.1.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.3", - "ethjs-util": "^0.1.3", - "json-rpc-engine": "^3.6.0", - "pify": "^2.3.0", - "tape": "^4.6.3" - } - }, - "eth-json-rpc-infura": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz", - "integrity": "sha512-W7zR4DZvyTn23Bxc0EWsq4XGDdD63+XPUCEhV2zQvQGavDVC4ZpFDK4k99qN7bd7/fjj37+rxmuBOBeIqCA5Mw==", - "requires": { - "cross-fetch": "^2.1.1", - "eth-json-rpc-middleware": "^1.5.0", - "json-rpc-engine": "^3.4.0", - "json-rpc-error": "^2.0.0" - } - }, - "eth-json-rpc-middleware": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.6.0.tgz", - "integrity": "sha512-tDVCTlrUvdqHKqivYMjtFZsdD7TtpNLBCfKAcOpaVs7orBMS/A8HWro6dIzNtTZIR05FAbJ3bioFOnZpuCew9Q==", - "requires": { - "async": "^2.5.0", - "eth-query": "^2.1.2", - "eth-tx-summary": "^3.1.2", - "ethereumjs-block": "^1.6.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.2", - "ethereumjs-vm": "^2.1.0", - "fetch-ponyfill": "^4.0.0", - "json-rpc-engine": "^3.6.0", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "tape": "^4.6.3" - } - }, - "hdkey": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/hdkey/-/hdkey-0.7.1.tgz", - "integrity": "sha1-yu5L6BqneSHpCbjSKN0PKayu5jI=", - "requires": { - "coinstring": "^2.0.0", - "secp256k1": "^3.0.1" - } - }, - "json-rpc-engine": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz", - "integrity": "sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA==", - "requires": { - "async": "^2.0.1", - "babel-preset-env": "^1.7.0", - "babelify": "^7.3.0", - "json-rpc-error": "^2.0.0", - "promise-to-callback": "^1.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "web3-provider-engine": { - "version": "14.0.6", - "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz", - "integrity": "sha512-tr5cGSyxfSC/JqiUpBlJtfZpwQf1yAA8L/zy1C6fDFm0ntR974pobJ4v4676atpZne4Ze5VFy3kPPahHe9gQiQ==", - "requires": { - "async": "^2.5.0", - "backoff": "^2.5.0", - "clone": "^2.0.0", - "cross-fetch": "^2.1.0", - "eth-block-tracker": "^3.0.0", - "eth-json-rpc-infura": "^3.1.0", - "eth-sig-util": "^1.4.2", - "ethereumjs-block": "^1.2.2", - "ethereumjs-tx": "^1.2.0", - "ethereumjs-util": "^5.1.5", - "ethereumjs-vm": "^2.3.4", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "readable-stream": "^2.2.9", - "request": "^2.67.0", - "semaphore": "^1.0.3", - "tape": "^4.4.0", - "ws": "^5.1.1", - "xhr": "^2.2.0", - "xtend": "^4.0.1" - } - } - } - }, - "@0x/types": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@0x/types/-/types-2.4.3.tgz", - "integrity": "sha512-3z4ca9fb9pyTu9lJhTSll5EuEthkA3tLAayyZixCoCnwi4ok6PJ83PnMMsSxlRY2iXr7QGbrQr6nU64YWk2WjA==", - "requires": { - "@types/node": "*", - "bignumber.js": "~8.0.2", - "ethereum-types": "^2.1.6" - }, - "dependencies": { - "bignumber.js": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.0.2.tgz", - "integrity": "sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw==" - } - } - }, - "@0x/typescript-typings": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@0x/typescript-typings/-/typescript-typings-4.3.0.tgz", - "integrity": "sha512-6IH2JyKyl33+40tJ5rEhaMPTS2mVuRvoNmoXlCd/F0GPYSsDHMGObIXOkx+Qsw5SyCmqNs/3CTLeeCCqiSUdaw==", - "requires": { - "@types/bn.js": "^4.11.0", - "@types/react": "*", - "bignumber.js": "~8.0.2", - "ethereum-types": "^2.1.6", - "popper.js": "1.14.3" - }, - "dependencies": { - "bignumber.js": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.0.2.tgz", - "integrity": "sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw==" - } - } - }, - "@0x/utils": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/@0x/utils/-/utils-4.5.2.tgz", - "integrity": "sha512-NWfNcvyiOhouk662AWxX0ZVe4ednBZJS9WZT/by3DBCY/WvN7WHMpEy9M5rBCxO+JJndLYeB5eBztDp7W+Ytkw==", - "requires": { - "@0x/types": "^2.4.3", - "@0x/typescript-typings": "^4.3.0", - "@types/node": "*", - "abortcontroller-polyfill": "^1.1.9", - "bignumber.js": "~8.0.2", - "chalk": "^2.3.0", - "detect-node": "2.0.3", - "ethereum-types": "^2.1.6", - "ethereumjs-util": "^5.1.1", - "ethers": "~4.0.4", - "isomorphic-fetch": "2.2.1", - "js-sha3": "^0.7.0", - "lodash": "^4.17.11" - }, - "dependencies": { - "bignumber.js": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.0.2.tgz", - "integrity": "sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw==" - } - } - }, - "@0x/web3-wrapper": { - "version": "6.0.13", - "resolved": "https://registry.npmjs.org/@0x/web3-wrapper/-/web3-wrapper-6.0.13.tgz", - "integrity": "sha512-LQjKBCCNdkJuhcJld+/sy+G0+sJu5qp9VDNNwJGLDxWIJpgoshhUpBPi7vUnZ79UY4SYuNcC4yM9yI61cs7ZiA==", - "requires": { - "@0x/assert": "^2.1.6", - "@0x/json-schemas": "^4.0.2", - "@0x/typescript-typings": "^4.3.0", - "@0x/utils": "^4.5.2", - "ethereum-types": "^2.1.6", - "ethereumjs-util": "^5.1.1", - "ethers": "~4.0.4", - "lodash": "^4.17.11" - } - }, - "@babel/code-frame": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", - "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", - "requires": { - "@babel/highlight": "^7.0.0" - } - }, - "@babel/helper-module-imports": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz", - "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==", - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz", - "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==" - }, - "@babel/highlight": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", - "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - } - } - }, - "@babel/plugin-transform-runtime": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz", - "integrity": "sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA==", - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0", - "resolve": "^1.8.1", - "semver": "^5.5.1" - } - }, - "@babel/runtime": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz", - "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==", - "requires": { - "regenerator-runtime": "^0.13.2" - } - }, - "@babel/types": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz", - "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" - } - } - }, - "@celo/ganache-cli": { - "version": "git+https://github.com/celo-org/ganache-cli.git#9d77e022286739c3a453d90b85f15d1efe8cd089", - "from": "git+https://github.com/celo-org/ganache-cli.git#9d77e02", - "dev": true, - "requires": { - "ethereumjs-util": "6.1.0", - "source-map-support": "0.5.12", - "yargs": "13.2.4" - }, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "dev": true, - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "source-map-support": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", - "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "yargs": { - "version": "13.2.4", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", - "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.0" - } - } - } - }, - "@celo/typescript": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@celo/typescript/-/typescript-0.0.1.tgz", - "integrity": "sha512-C6IP2wp8DyZDdGNNEIqTfuVsL25AwxNGg3Sqej0ZJjQD/SrjVMaSjJhiEm3KMQ6H+hqDiVVEfMyD2AYCgwCV3Q==", - "dev": true - }, - "@celo/utils": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@celo/utils/-/utils-0.1.2.tgz", - "integrity": "sha512-sD5nbCP4a+weMLlp0Q3qHNfbpdilvND1E4kvos6wXnwLrLjCqpC3k53B4CMUh5eRhJyyC4CA89UpjYx9SznR9Q==", - "requires": { - "@umpirsky/country-list": "github:umpirsky/country-list.git#05fda51", - "bigi": "^1.1.0", - "bignumber.js": "^7.2.0", - "bn.js": "4.11.8", - "buffer-reverse": "^1.0.1", - "country-data": "^0.0.31", - "crypto-js": "^3.1.9-1", - "elliptic": "^6.4.1", - "ethereumjs-util": "^5.2.0", - "futoin-hkdf": "^1.0.3", - "google-libphonenumber": "^3.2.4", - "keccak256": "^1.0.0", - "lodash": "^4.17.14", - "web3-utils": "1.0.0-beta.37" - }, - "dependencies": { - "bignumber.js": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz", - "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==" - }, - "crypto-js": { - "version": "3.1.9-1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", - "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" - }, - "eth-lib": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.27.tgz", - "integrity": "sha512-B8czsfkJYzn2UIEMwjc7Mbj+Cy72V+/OXH/tb44LV8jhrjizQJJ325xMOMyk3+ETa6r6oi0jsUY14+om8mQMWA==", - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "keccakjs": "^0.2.1", - "nano-json-stream-parser": "^0.1.2", - "servify": "^0.1.12", - "ws": "^3.0.0", - "xhr-request-promise": "^0.1.2" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" - }, - "utf8": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz", - "integrity": "sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g=" - }, - "web3-utils": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.37.tgz", - "integrity": "sha512-kA1fyhO8nKgU21wi30oJQ/ssvu+9srMdjOTKbHYbQe4ATPcr5YNwwrxG3Bcpbu1bEwRUVKHCkqi+wTvcAWBdlQ==", - "requires": { - "bn.js": "4.11.6", - "eth-lib": "0.1.27", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.8.3", - "utf8": "2.1.1" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - } - } - }, - "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - } - } - } - }, - "@hapi/address": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz", - "integrity": "sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==" - }, - "@hapi/formula": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-1.2.0.tgz", - "integrity": "sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==" - }, - "@hapi/hoek": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.2.tgz", - "integrity": "sha512-NP5SG4bzix+EtSMtcudp8TvI0lB46mXNo8uFpTDw6tqxGx4z5yx+giIunEFA0Z7oUO4DuWrOJV9xqR2tJVEdyA==" - }, - "@hapi/joi": { - "version": "16.1.7", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.7.tgz", - "integrity": "sha512-anaIgnZhNooG3LJLrTFzgGALTiO97zRA1UkvQHm9KxxoSiIzCozB3RCNCpDnfhTJD72QlrHA8nwGmNgpFFCIeg==", - "requires": { - "@hapi/address": "^2.1.2", - "@hapi/formula": "^1.2.0", - "@hapi/hoek": "^8.2.4", - "@hapi/pinpoint": "^1.0.2", - "@hapi/topo": "^3.1.3" - } - }, - "@hapi/pinpoint": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-1.0.2.tgz", - "integrity": "sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==" - }, - "@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", - "requires": { - "@hapi/hoek": "^8.3.0" - } - }, - "@ledgerhq/devices": { - "version": "4.73.3", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-4.73.3.tgz", - "integrity": "sha512-5l4Qx028ybS8KRJF+7jI+xq0sTRPMVgbA1pdFfeT5emlx5gZa2L88EC8hanSXLB5DocqPY3B/x4/ONtZs9x8hQ==", - "requires": { - "@ledgerhq/errors": "^4.73.2", - "@ledgerhq/logs": "^4.72.0", - "rxjs": "^6.5.3" - } - }, - "@ledgerhq/errors": { - "version": "4.73.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-4.73.2.tgz", - "integrity": "sha512-OkzL02yZF+neB3UWIS/Dgb0bLKE3ohUfBsVSfYsj3mXlxmtKkjhvrOH41MwjZnzaPsl16Xb5K4DZMlojBhqIsA==" - }, - "@ledgerhq/hw-app-eth": { - "version": "4.73.3", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-app-eth/-/hw-app-eth-4.73.3.tgz", - "integrity": "sha512-kbNLjeJ1CEaeJPhnOQQSyH4Tgr/SbvdBy7mSTIq8hbPFZX1bJSnx1uE/TRv/tdOJqxF2ChAg5WPcJaBtb7pkYg==", - "requires": { - "@ledgerhq/errors": "^4.73.2", - "@ledgerhq/hw-transport": "^4.73.3" - } - }, - "@ledgerhq/hw-transport": { - "version": "4.73.3", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-4.73.3.tgz", - "integrity": "sha512-qWYRmEM48vgcr6ZMibLr1+M+iVaLZw/wU5H15e3/XHLSWbvmoFyyu5Z7fMrJC375PExgAnCjxnsPJGObvNy6jg==", - "requires": { - "@ledgerhq/devices": "^4.73.3", - "@ledgerhq/errors": "^4.73.2", - "events": "^3.0.0" - } - }, - "@ledgerhq/hw-transport-node-hid": { - "version": "4.73.3", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.73.3.tgz", - "integrity": "sha512-oZo2C0Cjg+62LrUKn5ah/aGal3rpXgEL9MJucPrtZCRJOBhVb/Re+D7Mex/nUPMBPDQTTeAagABGRc58wlk98w==", - "optional": true, - "requires": { - "@ledgerhq/devices": "^4.73.3", - "@ledgerhq/errors": "^4.73.2", - "@ledgerhq/hw-transport": "^4.73.3", - "@ledgerhq/hw-transport-node-hid-noevents": "^4.73.3", - "@ledgerhq/logs": "^4.72.0", - "lodash": "^4.17.15", - "node-hid": "^0.7.9", - "usb": "^1.6.0" - } - }, - "@ledgerhq/hw-transport-node-hid-noevents": { - "version": "4.73.3", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.73.3.tgz", - "integrity": "sha512-jUknfm5vVUwhgPyDrcc/S3m921p2iimuZsMgECTcVyONInKXMJ7my3p2+RwVCktyVLrKFfM4Ug6zQ6B4Bsj6AA==", - "optional": true, - "requires": { - "@ledgerhq/devices": "^4.73.3", - "@ledgerhq/errors": "^4.73.2", - "@ledgerhq/hw-transport": "^4.73.3", - "@ledgerhq/logs": "^4.72.0", - "node-hid": "^0.7.9" - } - }, - "@ledgerhq/hw-transport-u2f": { - "version": "4.24.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.24.0.tgz", - "integrity": "sha512-/gFjhkM0sJfZ7iUf8HoIkGufAWgPacrbb1LW0TvWnZwvsATVJ1BZJBtrr90Wo401PKsjVwYtFt3Ce4gOAUv9jQ==", - "requires": { - "@ledgerhq/hw-transport": "^4.24.0", - "u2f-api": "0.2.7" - } - }, - "@ledgerhq/logs": { - "version": "4.72.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-4.72.0.tgz", - "integrity": "sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA==" - }, - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" - }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "requires": { - "defer-to-connect": "^1.0.1" - } - }, - "@truffle/blockchain-utils": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.0.11.tgz", - "integrity": "sha512-9MyQ/20M96clhIcC7fVFIckGSB8qMsmcdU6iYt98HXJ9GOLNKsCaJFz1OVsJncVreYwTUhoEXTrVBc8zrmPDJQ==" - }, - "@truffle/contract-schema": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.0.16.tgz", - "integrity": "sha512-E88YTZNVvnSprvKS8qMx7e5zm3VAgkCAciQrX1VC+h14EbCJxHyg/9iBVm26ySKgghRzV3Ia8Y6ZJQt6o2iSJw==", - "requires": { - "ajv": "^6.10.0", - "crypto-js": "^3.1.9-1", - "debug": "^4.1.0" - }, - "dependencies": { - "crypto-js": { - "version": "3.1.9-1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", - "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, - "@truffle/error": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@truffle/error/-/error-0.0.6.tgz", - "integrity": "sha512-QUM9ZWiwlXGixFGpV18g5I6vua6/r+ZV9W/5DQA5go9A3eZUNPHPaTKMIQPJLYn6+ZV5jg5H28zCHq56LHF3yA==" - }, - "@truffle/expect": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@truffle/expect/-/expect-0.0.10.tgz", - "integrity": "sha512-9jnqWyyqDUpO9wulBF7s+vUvOh3hjxzaFtuP7yeNRNx80svlB5GsUTLr11atRda02zrBmEo8hzFrU/DKacr4/w==" - }, - "@types/bignumber.js": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/bignumber.js/-/bignumber.js-5.0.0.tgz", - "integrity": "sha512-0DH7aPGCClywOFaxxjE6UwpN2kQYe9LwuDQMv+zYA97j5GkOMo8e66LYT+a8JYU7jfmUFRZLa9KycxHDsKXJCA==", - "dev": true, - "requires": { - "bignumber.js": "*" - } - }, - "@types/bn.js": { - "version": "4.11.5", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.5.tgz", - "integrity": "sha512-AEAZcIZga0JgVMHNtl1CprA/hXX7/wPt79AgR4XqaDt7jyj3QWYw6LPoOiznPtugDmlubUnAahMs2PFxGcQrng==", - "requires": { - "@types/node": "*" - } - }, - "@types/body-parser": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz", - "integrity": "sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==", - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/chai": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.4.tgz", - "integrity": "sha512-7qvf9F9tMTzo0akeswHPGqgUx/gIaJqrOEET/FCD8CFRkSUHlygQiM5yB6OvjrtdxBVLSyw7COJubsFYs0683g==", - "dev": true - }, - "@types/concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0=", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/connect": { - "version": "3.4.32", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz", - "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==", - "requires": { - "@types/node": "*" - } - }, - "@types/ethereum-protocol": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/ethereum-protocol/-/ethereum-protocol-1.0.0.tgz", - "integrity": "sha512-3DiI3Zxf81CgX+VhxNNFJBv/sfr1BFBKQK2sQ85hU9FwWJJMWV5gRDV79OUNShiwj3tYYIezU94qpucsb3dThQ==", - "requires": { - "bignumber.js": "7.2.1" - }, - "dependencies": { - "bignumber.js": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz", - "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==" - } - } - }, - "@types/express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz", - "integrity": "sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==", - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.16.10", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.10.tgz", - "integrity": "sha512-gM6evDj0OvTILTRKilh9T5dTaGpv1oYiFcJAfgSejuMJgGJUsD9hKEU2lB4aiTNy4WwChxRnjfYFuBQsULzsJw==", - "requires": { - "@types/node": "*", - "@types/range-parser": "*" - } - }, - "@types/form-data": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz", - "integrity": "sha1-yayFsqX9GENbjIXZ7LUObWyJP/g=", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/hdkey": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@types/hdkey/-/hdkey-0.7.1.tgz", - "integrity": "sha512-4Kkr06hq+R8a9EzVNqXGOY2x1xA7dhY6qlp6OvaZ+IJy1BCca1Cv126RD9X7CMJoXoLo8WvAizy8gQHpqW6K0Q==", - "requires": { - "@types/node": "*" - } - }, - "@types/isomorphic-fetch": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.31.tgz", - "integrity": "sha1-7BIBZs4i8LE06HcPQMl80HYGj64=" - }, - "@types/mathjs": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/@types/mathjs/-/mathjs-4.4.5.tgz", - "integrity": "sha512-Z9XyD6ORkE/dTwCGQ4htXaB8D/OkcRhQy4EtEvJ6lRmbgcYoS2q3CAMoB3s2mgQZmyQy85gtJcfbCz85LV1w+Q==", - "dev": true, - "requires": { - "decimal.js": "^10.0.0" - } - }, - "@types/mime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz", - "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==" - }, - "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" - }, - "@types/mkdirp": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz", - "integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==", - "requires": { - "@types/node": "*" - } - }, - "@types/mocha": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", - "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", - "dev": true - }, - "@types/node": { - "version": "12.11.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.7.tgz", - "integrity": "sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==" - }, - "@types/nodemailer": { - "version": "4.6.8", - "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-4.6.8.tgz", - "integrity": "sha512-IX1P3bxDP1VIdZf6/kIWYNmSejkYm9MOyMEtoDFi4DVzKjJ3kY4GhOcOAKs6lZRjqVVmF9UjPOZXuQczlpZThw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/prettier": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.18.3.tgz", - "integrity": "sha512-48rnerQdcZ26odp+HOvDGX8IcUkYOCuMc2BodWYTe956MqkHlOGAG4oFQ83cjZ0a4GAgj7mb4GUClxYd2Hlodg==" - }, - "@types/prop-types": { - "version": "15.7.3", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", - "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" - }, - "@types/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==", - "dev": true - }, - "@types/range-parser": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" - }, - "@types/react": { - "version": "16.9.11", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.11.tgz", - "integrity": "sha512-UBT4GZ3PokTXSWmdgC/GeCGEJXE5ofWyibCcecRLUVN2ZBpXQGVgQGtG2foS7CrTKFKlQVVswLvf7Js6XA/CVQ==", - "requires": { - "@types/prop-types": "*", - "csstype": "^2.2.0" - } - }, - "@types/resolve": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", - "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==", - "requires": { - "@types/node": "*" - } - }, - "@types/serve-static": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz", - "integrity": "sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==", - "requires": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" - } - }, - "@types/solidity-parser-antlr": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@types/solidity-parser-antlr/-/solidity-parser-antlr-0.2.3.tgz", - "integrity": "sha512-FoSyZT+1TTaofbEtGW1oC9wHND1YshvVeHerME/Jh6gIdHbBAWFW8A97YYqO/dpHcFjIwEPEepX0Efl2ckJgwA==" - }, - "@types/underscore": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.8.8.tgz", - "integrity": "sha512-EquzRwzAAs04anQ8/6MYXFKvHoD+MIlF+gu87EDda7dN9zrKvQYHsc9VFAPB1xY4tUHQVvBMtjsHrvof2EE1Mg==", - "dev": true - }, - "@types/web3": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/@types/web3/-/web3-1.0.20.tgz", - "integrity": "sha512-KTDlFuYjzCUlBDGt35Ir5QRtyV9klF84MMKUsEJK10sTWga/71V+8VYLT7yysjuBjaOx2uFYtIWNGoz3yrNDlg==", - "dev": true, - "requires": { - "@types/bn.js": "*", - "@types/underscore": "*" - } - }, - "@types/web3-provider-engine": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/@types/web3-provider-engine/-/web3-provider-engine-14.0.0.tgz", - "integrity": "sha512-yHr8mX2SoX3JNyfqdLXdO1UobsGhfiwSgtekbVxKLQrzD7vtpPkKbkIVsPFOhvekvNbPsCmDyeDCLkpeI9gSmA==", - "requires": { - "@types/ethereum-protocol": "*" - } - }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz", - "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==", - "dev": true - }, - "@types/zen-observable": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz", - "integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==" - }, - "@umpirsky/country-list": { - "version": "https://codeload.github.com/umpirsky/country-list.git#05fda51cd97b3294e8175ffed06104c44b3c71d7", - "from": "https://codeload.github.com/umpirsky/country-list.git#05fda51" - }, - "@wry/equality": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.1.9.tgz", - "integrity": "sha512-mB6ceGjpMGz1ZTza8HYnrPGos2mC6So4NhS1PtZ8s4Qt0K7fBiIGhpSxUbQmhwcSWE3no+bYxmI2OL6KuXYmoQ==", - "requires": { - "tslib": "^1.9.3" - } - }, - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" - }, - "abi-decoder": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/abi-decoder/-/abi-decoder-1.2.0.tgz", - "integrity": "sha512-y2OKSEW4gf2838Eavc56vQY9V46zaXkf3Jl1WpTfUBbzAVrXSr4JRZAAWv55Tv9s5WNz1rVgBgz5d2aJIL1QCg==", - "dev": true, - "requires": { - "web3": "^0.18.4" - }, - "dependencies": { - "utf8": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=", - "dev": true - }, - "web3": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/web3/-/web3-0.18.4.tgz", - "integrity": "sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0=", - "dev": true, - "requires": { - "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", - "crypto-js": "^3.1.4", - "utf8": "^2.1.1", - "xhr2": "*", - "xmlhttprequest": "*" - } - } - } - }, - "abortcontroller-polyfill": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.3.0.tgz", - "integrity": "sha512-lbWQgf+eRvku3va8poBlDBO12FigTQr9Zb7NIjXrePrhxWVKdCP2wbDl1tLDaYa18PWTom3UEWwdH13S46I+yA==" - }, - "abstract-leveldown": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz", - "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==", - "requires": { - "xtend": "~4.0.0" - } - }, - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==" - }, - "acorn-es7-plugin": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz", - "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" - }, - "acorn-jsx": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", - "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==" - }, - "aes-js": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz", - "integrity": "sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==" - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "algebrite": { - "version": "0.2.23", - "resolved": "https://registry.npmjs.org/algebrite/-/algebrite-0.2.23.tgz", - "integrity": "sha1-4EkNfG6n3bDcRvyY0QJkFd/i2FM=", - "requires": { - "big-integer": "^1.6.15" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "optional": true - }, - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" - }, - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" - }, - "ansi-yellow": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-yellow/-/ansi-yellow-0.1.1.tgz", - "integrity": "sha1-y5NW8vRscy8OMZnmEClVp32oPB0=", - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "antlr4": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.7.1.tgz", - "integrity": "sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ==" - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" - }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "apollo-cache": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.2.tgz", - "integrity": "sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==", - "requires": { - "apollo-utilities": "^1.3.2", - "tslib": "^1.9.3" - } - }, - "apollo-client": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.4.tgz", - "integrity": "sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ==", - "requires": { - "@types/zen-observable": "^0.8.0", - "apollo-cache": "1.3.2", - "apollo-link": "^1.0.0", - "apollo-utilities": "1.3.2", - "symbol-observable": "^1.0.2", - "ts-invariant": "^0.4.0", - "tslib": "^1.9.3", - "zen-observable": "^0.8.0" - } - }, - "apollo-link": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz", - "integrity": "sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==", - "requires": { - "apollo-utilities": "^1.3.0", - "ts-invariant": "^0.4.0", - "tslib": "^1.9.3", - "zen-observable-ts": "^0.8.20" - } - }, - "apollo-utilities": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.2.tgz", - "integrity": "sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==", - "requires": { - "@wry/equality": "^0.1.2", - "fast-json-stable-stringify": "^2.0.0", - "ts-invariant": "^0.4.0", - "tslib": "^1.9.3" - } - }, - "app-module-path": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz", - "integrity": "sha1-ZBqlXft9am8KgUHEucCqULbCTdU=" - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "armlet": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/armlet/-/armlet-2.7.0.tgz", - "integrity": "sha512-+j89VqGIf/E9a6aBaJa1OG9AZ93OnlfBzZz76TegU40ELcHcKb5b05XU7a1xKJsikdt6Da/fRaYHQ36oyLLj9Q==", - "requires": { - "http-errors": "^1.7.1", - "humanize-duration": "^3.17.0", - "isomorphic-fetch": "^2.2.1", - "omni-fetch": "^0.2.3", - "request": "^2.88.0" - } - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "array-back": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", - "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==", - "requires": { - "typical": "^2.6.1" - } - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" - }, - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=" - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" - }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==" - }, - "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==" - }, - "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "requires": { - "lodash": "^4.17.11" - }, - "dependencies": { - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" - } - } - }, - "async-eventemitter": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz", - "integrity": "sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==", - "requires": { - "async": "^2.4.0" - } - }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "await-semaphore": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/await-semaphore/-/await-semaphore-0.1.3.tgz", - "integrity": "sha512-d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q==" - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" - }, - "axios": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", - "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", - "requires": { - "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" - } - } - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "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" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - } - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-define-map": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", - "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-optimise-call-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-replace-supers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=" - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=" - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=" - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoping": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", - "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", - "requires": { - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-plugin-transform-es2015-classes": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-computed-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-for-of": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-modules-amd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.2", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", - "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", - "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-systemjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-umd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-object-super": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-template-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-regenerator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", - "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", - "requires": { - "regenerator-transform": "^0.10.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-preset-env": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", - "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", - "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-to-generator": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.23.0", - "babel-plugin-transform-es2015-classes": "^6.23.0", - "babel-plugin-transform-es2015-computed-properties": "^6.22.0", - "babel-plugin-transform-es2015-destructuring": "^6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-function-name": "^6.22.0", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-umd": "^6.23.0", - "babel-plugin-transform-es2015-object-super": "^6.22.0", - "babel-plugin-transform-es2015-parameters": "^6.23.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", - "babel-plugin-transform-exponentiation-operator": "^6.22.0", - "babel-plugin-transform-regenerator": "^6.22.0", - "browserslist": "^3.2.6", - "invariant": "^2.2.2", - "semver": "^5.3.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "requires": { - "source-map": "^0.5.6" - } - } - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - } - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - }, - "dependencies": { - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" - } - } - }, - "babelify": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz", - "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=", - "requires": { - "babel-core": "^6.0.14", - "object-assign": "^4.0.0" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" - }, - "backoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz", - "integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=", - "requires": { - "precond": "0.2" - } - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base-x": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.7.tgz", - "integrity": "sha512-zAKJGuQPihXW22fkrfOclUUZXM2g92z5GzlSMHxhO6r6Qj+Nm0ccaGNBzDZojzwOMkpjAv4J0fOv1U4go+a4iw==", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "big-integer": { - "version": "1.6.47", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.47.tgz", - "integrity": "sha512-9t9f7X3as2XGX8b52GqG6ox0GvIdM86LyIXASJnDCFhYNgt+A+MByQZ3W2PyMRZjEvG5f8TEbSPfEotVuMJnQg==" - }, - "bigi": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/bigi/-/bigi-1.4.2.tgz", - "integrity": "sha1-nGZalfiLiwj8Bc/XMfVhhZ1yWCU=" - }, - "bignumber.js": { - "version": "2.0.7", - "resolved": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" - }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "requires": { - "file-uri-to-path": "1.0.0" - } - }, - "bip39": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/bip39/-/bip39-2.6.0.tgz", - "integrity": "sha512-RrnQRG2EgEoqO24ea+Q/fftuPUZLmrEM3qNhhGsA3PbaXaCW791LTzPuVyx/VprXQcTbPJ3K3UeTna8ZnVl2sg==", - "requires": { - "create-hash": "^1.1.0", - "pbkdf2": "^3.0.9", - "randombytes": "^2.0.1", - "safe-buffer": "^5.0.1", - "unorm": "^1.3.3" - } - }, - "bip66": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", - "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "bl": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", - "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", - "optional": true, - "requires": { - "readable-stream": "^3.0.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", - "optional": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "string_decoder": { - "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==", - "optional": true, - "requires": { - "safe-buffer": "~5.2.0" - } - } - } - }, - "blake2s-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/blake2s-js/-/blake2s-js-1.3.0.tgz", - "integrity": "sha512-+H4oLkODOSeDfDD11PxaZ3Gqi9mtr0QribQRPkQ+v29ZQ689mK/rk5hUVtEjgh3Vq8c4uHPALV0rWjfC6ygrug==" - }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "requires": { - "inherits": "~2.0.0" - } - }, - "bls12377js": { - "version": "git+https://github.com/celo-org/bls12377js.git#cee721830e78bffcc03a660649b12c62386fb4bc", - "from": "git+https://github.com/celo-org/bls12377js.git#cee721830e78bffcc03a660649b12c62386fb4bc", - "requires": { - "big-integer": "^1.6.44", - "blake2s-js": "^1.3.0" - } - }, - "bluebird": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", - "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=" - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" - }, - "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "dependencies": { - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==" - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sha3": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/browserify-sha3/-/browserify-sha3-0.0.4.tgz", - "integrity": "sha1-CGxHuMgjFsnUcCLCYYWVRXbdjiY=", - "requires": { - "js-sha3": "^0.6.1", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "js-sha3": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.6.1.tgz", - "integrity": "sha1-W4n3enR3Z5h39YxKB1JAk0sflcA=" - } - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" - } - }, - "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" - } - }, - "bs58": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz", - "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=", - "requires": { - "base-x": "^3.0.2" - } - }, - "bs58check": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz", - "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==", - "requires": { - "bs58": "^4.0.0", - "create-hash": "^1.1.0", - "safe-buffer": "^5.1.2" - } - }, - "btoa": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", - "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==" - }, - "buffer": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz", - "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==", - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4" - } - }, - "buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" - }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" - }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" - }, - "buffer-reverse": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-reverse/-/buffer-reverse-1.0.1.tgz", - "integrity": "sha1-SSg8jvpvkBvAH6MwTQYCeXGuL2A=" - }, - "buffer-to-arraybuffer": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", - "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=" - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" - }, - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" - }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" - } - } - }, - "caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "requires": { - "callsites": "^2.0.0" - } - }, - "caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "requires": { - "caller-callsite": "^2.0.0" - } - }, - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "caniuse-lite": { - "version": "1.0.30001005", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001005.tgz", - "integrity": "sha512-g78miZm1Z5njjYR216a5812oPiLgV1ssndgGxITHWUopmjUrCswMisA0a2kSB7a0vZRox6JOKhM51+efmYN8Mg==" - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, - "caw": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz", - "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=", - "requires": { - "get-proxy": "^1.0.1", - "is-obj": "^1.0.0", - "object-assign": "^3.0.0", - "tunnel-agent": "^0.4.0" - }, - "dependencies": { - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" - }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" - } - } - }, - "chai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", - "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.0", - "type-detect": "^4.0.5" - } - }, - "chai-subset": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/chai-subset/-/chai-subset-1.6.0.tgz", - "integrity": "sha1-pdDKFOMpp5WW7XAFi2ZGvWmIz+k=" - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" - }, - "charenc": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", - "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", - "dev": true - }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=" - }, - "checkpoint-store": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/checkpoint-store/-/checkpoint-store-1.1.0.tgz", - "integrity": "sha1-BOTLUWuRQziTWB5tRgGnjpVS6gY=", - "requires": { - "functional-red-black-tree": "^1.0.1" - } - }, - "chokidar": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.3.tgz", - "integrity": "sha512-GtrxGuRf6bzHQmXWRepvsGnXpkQkVU+D2/9a7dAe4a7v1NhrfZOZ2oKf76M3nOs46fFYL8D+Q8JYA4GYeJ8Cjw==", - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.1", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.2.0" - } - }, - "chownr": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", - "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==" - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-spinners": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz", - "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==" - }, - "cli-table3": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", - "dev": true, - "requires": { - "colors": "^1.1.2", - "object-assign": "^4.1.0", - "string-width": "^2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "requires": { - "mimic-response": "^1.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "coinstring": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/coinstring/-/coinstring-2.3.0.tgz", - "integrity": "sha1-zbYzY6lhUCQEolr7gsLibV/2J6Q=", - "requires": { - "bs58": "^2.0.1", - "create-hash": "^1.1.1" - }, - "dependencies": { - "bs58": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-2.0.1.tgz", - "integrity": "sha1-VZCNWPGYKrogCPob7Y+RmYopv40=" - } - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "command-exists": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz", - "integrity": "sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==" - }, - "command-line-args": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-4.0.7.tgz", - "integrity": "sha512-aUdPvQRAyBvQd2n7jXcsMDz68ckBJELXNzBybCHOibUWEg0mWTnaYCSRU8h9R+aNRSvDihJtssSRCiDRpLaezA==", - "requires": { - "array-back": "^2.0.0", - "find-replace": "^1.0.3", - "typical": "^2.6.1" - } - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" - }, - "complex.js": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz", - "integrity": "sha512-6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw==" - }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "configstore": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", - "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==", - "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "optional": true - }, - "content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "requires": { - "safe-buffer": "5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" - }, - "convert-source-map": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", - "requires": { - "safe-buffer": "~5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" - }, - "cookiejar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==" - }, - "core-js": { - "version": "2.6.10", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz", - "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "requires": { - "object-assign": "^4", - "vary": "^1" - } - }, - "cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - }, - "dependencies": { - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - } - } - }, - "country-data": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/country-data/-/country-data-0.0.31.tgz", - "integrity": "sha1-gJZrjh0Uf6bWpYnTKTP4eTd0lW0=", - "requires": { - "currency-symbol-map": "~2", - "underscore": ">1.4.4" - } - }, - "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "cross-env": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", - "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.5" - }, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - } - } - }, - "cross-fetch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.3.tgz", - "integrity": "sha512-PrWWNH3yL2NYIb/7WF/5vFG3DCQiXDOVf8k3ijatbrtnwNuhMWLC7YF7uqf53tbTFDzHIUD8oITw4Bxt8ST3Nw==", - "requires": { - "node-fetch": "2.1.2", - "whatwg-fetch": "2.0.4" - }, - "dependencies": { - "node-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", - "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=" - } - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "crypt": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", - "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=", - "dev": true - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, - "crypto-js": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz", - "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=" - }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" - }, - "csstype": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.7.tgz", - "integrity": "sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ==" - }, - "csv-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/csv-parser/-/csv-parser-2.3.1.tgz", - "integrity": "sha512-/u51FlBo75BcY/IL0WGibT628rr/xn4cXS9jX+AwT4x9yE7kqGqss7YgXpbdFai6m3uNbr4g1F19BoXBFeiJbA==", - "requires": { - "@hapi/joi": "^16.1.4", - "buffer-alloc": "^1.1.0", - "buffer-from": "^1.0.0", - "generate-object-property": "^1.0.0", - "minimist": "^1.2.0", - "ndjson": "^1.4.0" - } - }, - "csv-stringify": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-4.3.1.tgz", - "integrity": "sha512-VRjPYIUzex5kfbsOY7LaJcNE2qMWGQQAanb3/Vv85WbOgA+dAfDNfwntRvv335icJgGYrnTX403WxJxRVpLDFA==", - "requires": { - "lodash.get": "~4.4.2" - } - }, - "currency-symbol-map": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/currency-symbol-map/-/currency-symbol-map-2.2.0.tgz", - "integrity": "sha1-KzwYcv8aws5ZXYJz5Y4f/wJyrqI=" - }, - "d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "decimal.js": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", - "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==" - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" - }, - "decompress": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", - "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", - "requires": { - "decompress-tar": "^4.0.0", - "decompress-tarbz2": "^4.0.0", - "decompress-targz": "^4.0.0", - "decompress-unzip": "^4.0.1", - "graceful-fs": "^4.1.10", - "make-dir": "^1.0.0", - "pify": "^2.3.0", - "strip-dirs": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "requires": { - "mimic-response": "^1.0.0" - } - }, - "decompress-tar": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz", - "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", - "requires": { - "file-type": "^5.2.0", - "is-stream": "^1.1.0", - "tar-stream": "^1.5.2" - }, - "dependencies": { - "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", - "requires": { - "readable-stream": "^2.3.5", - "safe-buffer": "^5.1.1" - } - }, - "tar-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", - "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", - "requires": { - "bl": "^1.0.0", - "buffer-alloc": "^1.2.0", - "end-of-stream": "^1.0.0", - "fs-constants": "^1.0.0", - "readable-stream": "^2.3.0", - "to-buffer": "^1.1.1", - "xtend": "^4.0.0" - } - } - } - }, - "decompress-tarbz2": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", - "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", - "requires": { - "decompress-tar": "^4.1.0", - "file-type": "^6.1.0", - "is-stream": "^1.1.0", - "seek-bzip": "^1.0.5", - "unbzip2-stream": "^1.0.9" - }, - "dependencies": { - "file-type": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", - "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" - } - } - }, - "decompress-targz": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", - "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", - "requires": { - "decompress-tar": "^4.1.1", - "file-type": "^5.2.0", - "is-stream": "^1.1.0" - } - }, - "decompress-unzip": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", - "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", - "requires": { - "file-type": "^3.8.0", - "get-stream": "^2.2.0", - "pify": "^2.3.0", - "yauzl": "^2.4.2" - }, - "dependencies": { - "file-type": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" - }, - "get-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", - "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", - "requires": { - "object-assign": "^4.0.1", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "requires": { - "type-detect": "^4.0.0" - } - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "^1.0.2" - }, - "dependencies": { - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" - } - } - }, - "defer-to-connect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz", - "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==" - }, - "deferred-leveldown": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz", - "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==", - "requires": { - "abstract-leveldown": "~2.6.0" - } - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "requires": { - "object-keys": "^1.0.12" - }, - "dependencies": { - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - } - } - }, - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "optional": true - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" - }, - "deprecate": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/deprecate/-/deprecate-1.0.0.tgz", - "integrity": "sha1-ZhSQ7SQokWpsiIPYg05WRvTkpKg=" - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" - }, - "detect-file": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz", - "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=", - "requires": { - "fs-exists-sync": "^0.1.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "requires": { - "repeating": "^2.0.0" - } - }, - "detect-installed": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-installed/-/detect-installed-2.0.4.tgz", - "integrity": "sha1-oIUEZefD68/5eda2U1rTRLgN18U=", - "requires": { - "get-installed-path": "^2.0.3" - }, - "dependencies": { - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "get-installed-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/get-installed-path/-/get-installed-path-2.1.1.tgz", - "integrity": "sha512-Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA==", - "requires": { - "global-modules": "1.0.0" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - } - } - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "optional": true - }, - "detect-node": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", - "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=" - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" - }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-walk": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", - "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=" - }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "requires": { - "is-obj": "^1.0.0" - } - }, - "dotdir-regex": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dotdir-regex/-/dotdir-regex-0.1.0.tgz", - "integrity": "sha1-1F30yIY75vVZPXFpFDgXZ+k4wLY=" - }, - "drbg.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", - "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", - "requires": { - "browserify-aes": "^1.0.6", - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4" - } - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" - }, - "electron-to-chromium": { - "version": "1.3.296", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz", - "integrity": "sha512-s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ==" - }, - "elliptic": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", - "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" - }, - "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "requires": { - "iconv-lite": "~0.4.13" - } - }, - "encoding-down": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", - "integrity": "sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw==", - "requires": { - "abstract-leveldown": "^5.0.0", - "inherits": "^2.0.3", - "level-codec": "^9.0.0", - "level-errors": "^2.0.0", - "xtend": "^4.0.1" - }, - "dependencies": { - "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", - "requires": { - "xtend": "~4.0.0" - } - }, - "level-codec": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.1.tgz", - "integrity": "sha512-ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q==" - }, - "level-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz", - "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==", - "requires": { - "errno": "~0.1.1" - } - } - } - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "requires": { - "once": "^1.4.0" - } - }, - "ends-with": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz", - "integrity": "sha1-L52pjVelDP2kVxzkM5AAUA9Oa4o=" - }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-abstract": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz", - "integrity": "sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==", - "requires": { - "es-to-primitive": "^1.2.0", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.0", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-inspect": "^1.6.0", - "object-keys": "^1.1.1", - "string.prototype.trimleft": "^2.1.0", - "string.prototype.trimright": "^2.1.0" - }, - "dependencies": { - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - } - } - }, - "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "es5-ext": { - "version": "0.10.51", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz", - "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==", - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "^1.0.0" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz", - "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==", - "requires": { - "d": "^1.0.1", - "es5-ext": "^0.10.51" - } - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, - "escape-latex": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz", - "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==" - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.2.0" - }, - "dependencies": { - "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "eslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", - "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", - "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.9.1", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^4.0.3", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^5.0.1", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^6.2.2", - "js-yaml": "^3.13.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.11", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" - }, - "import-fresh": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", - "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - }, - "dependencies": { - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" - } - } - }, - "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==" - }, - "espree": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", - "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", - "requires": { - "acorn": "^6.0.7", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" - }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "requires": { - "estraverse": "^4.0.0" - }, - "dependencies": { - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" - } - } - }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "requires": { - "estraverse": "^4.1.0" - }, - "dependencies": { - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" - } - } - }, - "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" - }, - "eth-block-tracker": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-4.4.3.tgz", - "integrity": "sha512-A8tG4Z4iNg4mw5tP1Vung9N9IjgMNqpiMoJ/FouSFwNCGHv2X0mmOYwtQOJzki6XN7r7Tyo01S29p7b224I4jw==", - "requires": { - "@babel/plugin-transform-runtime": "^7.5.5", - "@babel/runtime": "^7.5.5", - "eth-query": "^2.1.0", - "json-rpc-random-id": "^1.0.1", - "pify": "^3.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "eth-ens-namehash": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz", - "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=", - "requires": { - "idna-uts46-hx": "^2.3.1", - "js-sha3": "^0.5.7" - }, - "dependencies": { - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - } - } - }, - "eth-gas-reporter": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/eth-gas-reporter/-/eth-gas-reporter-0.1.12.tgz", - "integrity": "sha512-Ao5uiXSA5Ep5fi/YvGCsFJMelMKj0fMJkAvWYzPVe1h3Mg9Z7X3Rs51ovG9izFZH7wSqnqydiC6SKDhZWpxK2g==", - "dev": true, - "requires": { - "abi-decoder": "^1.0.8", - "cli-table3": "^0.5.0", - "colors": "^1.1.2", - "lodash": "^4.17.4", - "mocha": "^4.1.0", - "req-cwd": "^2.0.0", - "request": "^2.83.0", - "request-promise-native": "^1.0.5", - "sha1": "^1.1.1", - "shelljs": "^0.7.8", - "solidity-parser-antlr": "^0.2.10", - "sync-request": "^6.0.0" - }, - "dependencies": { - "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", - "dev": true - }, - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "diff": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", - "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", - "dev": true - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "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" - } - }, - "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "mocha": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz", - "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==", - "dev": true, - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.3.1", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - } - }, - "solidity-parser-antlr": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/solidity-parser-antlr/-/solidity-parser-antlr-0.2.15.tgz", - "integrity": "sha512-EzRI8/TR/ljTXkZAyAjb0w4G20wH2XM7pcNf87ifdV825AbUv7DkY7HmiZCTj6NeKtIx8Y1s0NZWPbj+JTp8Zw==", - "dev": true - }, - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", - "dev": true, - "requires": { - "has-flag": "^2.0.0" - } - } - } - }, - "eth-json-rpc-errors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/eth-json-rpc-errors/-/eth-json-rpc-errors-1.1.1.tgz", - "integrity": "sha512-WT5shJ5KfNqHi9jOZD+ID8I1kuYWNrigtZat7GOQkvwo99f8SzAVaEcWhJUv656WiZOAg3P1RiJQANtUmDmbIg==", - "requires": { - "fast-safe-stringify": "^2.0.6" - } - }, - "eth-json-rpc-filters": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-filters/-/eth-json-rpc-filters-4.1.0.tgz", - "integrity": "sha512-r/Zk0Tvx3BNYOCPCSEXxe2BeZJpKlA+E+76kYo8g95cHGXRP4uXKDnoTkFaRc/mamabmRhfyCoOjhDDx8iA3eA==", - "requires": { - "await-semaphore": "^0.1.3", - "eth-json-rpc-middleware": "^4.1.4", - "eth-query": "^2.1.2", - "json-rpc-engine": "^5.1.3", - "lodash.flatmap": "^4.5.0", - "safe-event-emitter": "^1.0.1" - } - }, - "eth-json-rpc-infura": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-4.0.2.tgz", - "integrity": "sha512-dvgOrci9lZqpjpp0hoC3Zfedhg3aIpLFVDH0TdlKxRlkhR75hTrKTwxghDrQwE0bn3eKrC8RsN1m/JdnIWltpw==", - "requires": { - "cross-fetch": "^2.1.1", - "eth-json-rpc-errors": "^1.0.1", - "eth-json-rpc-middleware": "^4.1.4", - "json-rpc-engine": "^5.1.3" - } - }, - "eth-json-rpc-middleware": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-4.3.0.tgz", - "integrity": "sha512-Acr+FaIHB0oIV0nWrCvepQghgA3FzYFvnMDXdTUeHQvAX/G6ioMbw1exGJs+6HirRjJ+MmkZqaArphx+PTrRNQ==", - "requires": { - "btoa": "^1.2.1", - "clone": "^2.1.1", - "eth-json-rpc-errors": "^1.0.1", - "eth-query": "^2.1.2", - "eth-sig-util": "^1.4.2", - "ethereumjs-block": "^1.6.0", - "ethereumjs-tx": "^1.3.7", - "ethereumjs-util": "^5.1.2", - "ethereumjs-vm": "^2.6.0", - "fetch-ponyfill": "^4.0.0", - "json-rpc-engine": "^5.1.3", - "json-stable-stringify": "^1.0.1", - "pify": "^3.0.0", - "safe-event-emitter": "^1.0.1" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz", - "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - } - } - }, - "eth-lib": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", - "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "xhr-request-promise": "^0.1.2" - } - }, - "eth-query": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/eth-query/-/eth-query-2.1.2.tgz", - "integrity": "sha1-1nQdkAAQa1FRDHLbktY2VFam2l4=", - "requires": { - "json-rpc-random-id": "^1.0.0", - "xtend": "^4.0.1" - } - }, - "eth-sig-util": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz", - "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=", - "requires": { - "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git", - "ethereumjs-util": "^5.1.1" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "eth-tx-summary": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/eth-tx-summary/-/eth-tx-summary-3.2.4.tgz", - "integrity": "sha512-NtlDnaVZah146Rm8HMRUNMgIwG/ED4jiqk0TME9zFheMl1jOp6jL1m0NKGjJwehXQ6ZKCPr16MTr+qspKpEXNg==", - "requires": { - "async": "^2.1.2", - "clone": "^2.0.0", - "concat-stream": "^1.5.1", - "end-of-stream": "^1.1.0", - "eth-query": "^2.0.2", - "ethereumjs-block": "^1.4.1", - "ethereumjs-tx": "^1.1.1", - "ethereumjs-util": "^5.0.1", - "ethereumjs-vm": "^2.6.0", - "through2": "^2.0.3" - } - }, - "ethashjs": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ethashjs/-/ethashjs-0.0.7.tgz", - "integrity": "sha1-ML/kGWcmaQoMWdO4Jy5w1NDDS64=", - "requires": { - "async": "^1.4.2", - "buffer-xor": "^1.0.3", - "ethereumjs-util": "^4.0.1", - "miller-rabin": "^4.0.0" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "ethereumjs-util": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz", - "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", - "requires": { - "bn.js": "^4.8.0", - "create-hash": "^1.1.2", - "keccakjs": "^0.2.0", - "rlp": "^2.0.0", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereum-bloom-filters": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.6.tgz", - "integrity": "sha512-dE9CGNzgOOsdh7msZirvv8qjHtnHpvBlKe2647kM8v+yeF71IRso55jpojemvHV+jMjr48irPWxMRaHuOWzAFA==", - "requires": { - "js-sha3": "^0.8.0" - }, - "dependencies": { - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - } - } - }, - "ethereum-common": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz", - "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==" - }, - "ethereum-types": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/ethereum-types/-/ethereum-types-2.1.6.tgz", - "integrity": "sha512-xaN5TxLvkdFCGjGfUQ5wV00GHzDHStozP1j+K/YdmUeQXVGiD15cogYPhBVWG3pQJM/aBjtYrpMrjywvKkNC4A==", - "requires": { - "@types/node": "*", - "bignumber.js": "~8.0.2" - }, - "dependencies": { - "bignumber.js": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.0.2.tgz", - "integrity": "sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw==" - } - } - }, - "ethereumjs-abi": { - "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1cfbb13862f90f0b391d8a699544d5fe4dfb8c7b", - "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", - "requires": { - "bn.js": "^4.11.8", - "ethereumjs-util": "^6.0.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-account": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz", - "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==", - "requires": { - "ethereumjs-util": "^5.0.0", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-block": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz", - "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==", - "requires": { - "async": "^2.0.1", - "ethereum-common": "0.2.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-blockchain": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ethereumjs-blockchain/-/ethereumjs-blockchain-3.4.0.tgz", - "integrity": "sha512-wxPSmt6EQjhbywkFbftKcb0qRFIZWocHMuDa8/AB4eWL/UPYalNcDyLaxYbrDytmhHid3Uu8G/tA3C/TxZBuOQ==", - "requires": { - "async": "^2.6.1", - "ethashjs": "~0.0.7", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "~6.0.0", - "flow-stoplight": "^1.0.0", - "level-mem": "^3.0.1", - "lru-cache": "^5.1.1", - "safe-buffer": "^5.1.2", - "semaphore": "^1.1.0" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.0.0.tgz", - "integrity": "sha512-E3yKUyl0Fs95nvTFQZe/ZSNcofhDzUsDlA5y2uoRmf1+Ec7gpGhNCsgKkZBRh7Br5op8mJcYF/jFbmjj909+nQ==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "requires": { - "yallist": "^3.0.2" - } - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - } - } - }, - "ethereumjs-common": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.3.2.tgz", - "integrity": "sha512-GkltYRIqBLzaZLmF/K3E+g9lZ4O4FL+TtpisAlD3N+UVlR+mrtoG+TvxavqVa6PwOY4nKIEMe5pl6MrTio3Lww==" - }, - "ethereumjs-tx": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz", - "integrity": "sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==", - "requires": { - "ethereum-common": "^0.0.18", - "ethereumjs-util": "^5.0.0" - }, - "dependencies": { - "ethereum-common": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz", - "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=" - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz", - "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-wallet": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.3.tgz", - "integrity": "sha512-qiXPiZOsStem+Dj/CQHbn5qex+FVkuPmGH7SvSnA9F3tdRDt8dLMyvIj3+U05QzVZNPYh4HXEdnzoYI4dZkr9w==", - "requires": { - "aes-js": "^3.1.1", - "bs58check": "^2.1.2", - "ethereumjs-util": "^6.0.0", - "hdkey": "^1.1.0", - "randombytes": "^2.0.6", - "safe-buffer": "^5.1.2", - "scrypt.js": "^0.3.0", - "utf8": "^3.0.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethers": { - "version": "4.0.38", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.38.tgz", - "integrity": "sha512-l7l7RIfk2/rIFgRRVLFY3H06S9dhXXPUdMlYm6SCelB6oG+ABmoRig7xSVOLcHLayBfSwssjAAYLKxf1jWhbuQ==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.4", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==" - }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - } - } - }, - "ethjs-abi": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.1.8.tgz", - "integrity": "sha1-zSiFg+1ijN+tr4re+juh28vKbBg=", - "requires": { - "bn.js": "4.11.6", - "js-sha3": "0.5.5", - "number-to-bn": "1.7.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - }, - "js-sha3": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", - "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" - } - } - }, - "ethjs-unit": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", - "integrity": "sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk=", - "requires": { - "bn.js": "4.11.6", - "number-to-bn": "1.7.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - } - } - }, - "ethjs-util": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz", - "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==", - "requires": { - "is-hex-prefixed": "1.0.0", - "strip-hex-prefix": "1.0.0" - } - }, - "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==" - }, - "events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", - "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==" - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "requires": { - "fill-range": "^2.1.0" - }, - "dependencies": { - "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", - "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "requires": { - "kind-of": "^3.0.2" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "optional": true - }, - "expand-tilde": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", - "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", - "requires": { - "os-homedir": "^1.0.1" - } - }, - "export-files": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/export-files/-/export-files-2.1.1.tgz", - "integrity": "sha1-u/ZFdAU6CeTrmOX0NQHVcrLDzn8=", - "requires": { - "lazy-cache": "^1.0.3" - }, - "dependencies": { - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" - } - } - }, - "express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "requires": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "requires": { - "is-extglob": "^1.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fake-merkle-patricia-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fake-merkle-patricia-tree/-/fake-merkle-patricia-tree-1.0.1.tgz", - "integrity": "sha1-S4w6z7Ugr635hgsfFM2M40As3dM=", - "requires": { - "checkpoint-store": "^1.1.0" - } - }, - "fast-async": { - "version": "6.3.8", - "resolved": "https://registry.npmjs.org/fast-async/-/fast-async-6.3.8.tgz", - "integrity": "sha512-TjlooyqrYm/gOXjD2UHNwfrWkvTbzU105Nk4bvcRTeRoL+wIeK6rqbqDg3CN9z5p37cE2iXhP6SxQFz8OVIaUg==", - "requires": { - "nodent-compiler": "^3.2.10", - "nodent-runtime": ">=3.2.1" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" - }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==" - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" - }, - "fast-safe-stringify": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", - "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" - }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "requires": { - "pend": "~1.2.0" - } - }, - "fetch-ponyfill": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz", - "integrity": "sha1-rjzl9zLGReq4fkroeTQUcJsjmJM=", - "requires": { - "node-fetch": "~1.7.1" - }, - "dependencies": { - "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - } - } - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", - "requires": { - "flat-cache": "^2.0.1" - } - }, - "file-type": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" - }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" - }, - "fill-keys": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", - "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", - "requires": { - "is-object": "~1.0.1", - "merge-descriptors": "~1.0.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - } - }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - }, - "dependencies": { - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } - } - }, - "find-replace": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz", - "integrity": "sha1-uI5zZNLZyVlVnziMZmcNYTBEH6A=", - "requires": { - "array-back": "^1.0.4", - "test-value": "^2.1.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "findup-sync": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-1.0.0.tgz", - "integrity": "sha1-b35LV7buOkA3tEFOrt6j9Y9x4Ow=", - "requires": { - "detect-file": "^0.1.0", - "is-glob": "^2.0.1", - "micromatch": "^2.3.7", - "resolve-dir": "^0.1.0" - }, - "dependencies": { - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - } - } - } - }, - "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", - "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" - }, - "dependencies": { - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "requires": { - "glob": "^7.1.3" - } - } - } - }, - "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==" - }, - "flow-stoplight": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flow-stoplight/-/flow-stoplight-1.0.0.tgz", - "integrity": "sha1-SiksW8/4s5+mzAyxqFPYbyfu/3s=" - }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } - } - }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "requires": { - "is-callable": "^1.1.3" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "requires": { - "for-in": "^1.0.1" - } - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" - }, - "fraction.js": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz", - "integrity": "sha512-8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA==" - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" - }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" - }, - "fs-exists-sync": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", - "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=" - }, - "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs-minipass": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", - "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", - "requires": { - "minipass": "^2.6.0" - } - }, - "fs-promise": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-2.0.3.tgz", - "integrity": "sha1-9k5PhUvPaJqovdy6JokW2z20aFQ=", - "requires": { - "any-promise": "^1.3.0", - "fs-extra": "^2.0.0", - "mz": "^2.6.0", - "thenify-all": "^1.6.0" - }, - "dependencies": { - "fs-extra": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", - "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0" - } - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - } - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.1.tgz", - "integrity": "sha512-4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw==", - "optional": true - }, - "fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" - }, - "futoin-hkdf": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/futoin-hkdf/-/futoin-hkdf-1.2.1.tgz", - "integrity": "sha512-3VpqjhVhR/UCEs87YsUAvY59oimbAehXzJPBmYEMJZfOnPYoV8B92f1spBcuNlWsGIX+MWavCZI/Kw/w4b79IA==" - }, - "ganache-core": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/ganache-core/-/ganache-core-2.8.0.tgz", - "integrity": "sha512-hfXqZGJx700jJqwDHNXrU2BnPYuETn1ekm36oRHuXY3oOuJLFs5C+cFdUFaBlgUxcau1dOgZUUwKqTAy0gTA9Q==", - "requires": { - "abstract-leveldown": "3.0.0", - "async": "2.6.2", - "bip39": "2.5.0", - "cachedown": "1.0.0", - "clone": "2.1.2", - "debug": "3.2.6", - "encoding-down": "5.0.4", - "eth-sig-util": "2.3.0", - "ethereumjs-abi": "0.6.7", - "ethereumjs-account": "3.0.0", - "ethereumjs-block": "2.2.0", - "ethereumjs-tx": "1.3.7", - "ethereumjs-util": "6.1.0", - "ethereumjs-vm": "3.0.0", - "ethereumjs-wallet": "0.6.3", - "heap": "0.2.6", - "level-sublevel": "6.6.4", - "levelup": "3.1.1", - "lodash": "4.17.14", - "merkle-patricia-tree": "2.3.2", - "seedrandom": "3.0.1", - "source-map-support": "0.5.12", - "tmp": "0.1.0", - "web3": "1.2.1", - "web3-provider-engine": "14.2.1", - "websocket": "1.0.29" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", - "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", - "requires": { - "@babel/highlight": "^7.0.0" - } - }, - "@babel/generator": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", - "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", - "requires": { - "@babel/types": "^7.5.5", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "@babel/helper-function-name": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", - "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", - "requires": { - "@babel/helper-get-function-arity": "^7.0.0", - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/highlight": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", - "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", - "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==" - }, - "@babel/runtime": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz", - "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==", - "requires": { - "regenerator-runtime": "^0.13.2" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", - "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==" - } - } - }, - "@babel/template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", - "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" - } - }, - "@babel/traverse": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", - "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.5.5", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.5.5", - "@babel/types": "^7.5.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" - } - } - }, - "@babel/types": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", - "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" - } - } - }, - "@samverschueren/stream-to-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", - "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==", - "requires": { - "any-observable": "^0.3.0" - } - }, - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "optional": true - }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "optional": true, - "requires": { - "defer-to-connect": "^1.0.1" - } - }, - "@types/bn.js": { - "version": "4.11.5", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.5.tgz", - "integrity": "sha512-AEAZcIZga0JgVMHNtl1CprA/hXX7/wPt79AgR4XqaDt7jyj3QWYw6LPoOiznPtugDmlubUnAahMs2PFxGcQrng==", - "requires": { - "@types/node": "*" - } - }, - "@types/node": { - "version": "10.14.15", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.15.tgz", - "integrity": "sha512-CBR5avlLcu0YCILJiDIXeU2pTw7UK/NIxfC63m7d7CVamho1qDEzXKkOtEauQRPMy6MI8mLozth+JJkas7HY6g==" - }, - "@types/underscore": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.2.tgz", - "integrity": "sha512-KgOKTAD+9X+qvZnB5S1+onqKc4E+PZ+T6CM/NA5ohRPLHJXb+yCJMVf8pWOnvuBuKFNUAJW8N97IA6lba6mZGg==" - }, - "@types/web3": { - "version": "1.0.19", - "resolved": "https://registry.npmjs.org/@types/web3/-/web3-1.0.19.tgz", - "integrity": "sha512-fhZ9DyvDYDwHZUp5/STa9XW2re0E8GxoioYJ4pEUZ13YHpApSagixj7IAdoYH5uAK+UalGq6Ml8LYzmgRA/q+A==", - "requires": { - "@types/bn.js": "*", - "@types/underscore": "*" - } - }, - "@webassemblyjs/ast": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz", - "integrity": "sha512-49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA==", - "requires": { - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "debug": "^3.1.0", - "mamacro": "^0.0.3" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz", - "integrity": "sha512-vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA==" - }, - "@webassemblyjs/helper-api-error": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz", - "integrity": "sha512-dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg==" - }, - "@webassemblyjs/helper-buffer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz", - "integrity": "sha512-v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA==", - "requires": { - "debug": "^3.1.0" - } - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz", - "integrity": "sha512-yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ==", - "requires": { - "@webassemblyjs/wast-printer": "1.5.13" - } - }, - "@webassemblyjs/helper-fsm": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz", - "integrity": "sha512-hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg==" - }, - "@webassemblyjs/helper-module-context": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz", - "integrity": "sha512-zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ==", - "requires": { - "debug": "^3.1.0", - "mamacro": "^0.0.3" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz", - "integrity": "sha512-0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw==" - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz", - "integrity": "sha512-IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "debug": "^3.1.0" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz", - "integrity": "sha512-TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg==", - "requires": { - "ieee754": "^1.1.11" - } - }, - "@webassemblyjs/leb128": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz", - "integrity": "sha512-0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg==", - "requires": { - "long": "4.0.0" - }, - "dependencies": { - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - } - } - }, - "@webassemblyjs/utf8": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz", - "integrity": "sha512-Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng==" - }, - "@webassemblyjs/wasm-edit": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz", - "integrity": "sha512-X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/helper-wasm-section": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "@webassemblyjs/wast-printer": "1.5.13", - "debug": "^3.1.0" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz", - "integrity": "sha512-yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz", - "integrity": "sha512-IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "debug": "^3.1.0" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz", - "integrity": "sha512-XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" - } - }, - "@webassemblyjs/wast-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz", - "integrity": "sha512-Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/floating-point-hex-parser": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-code-frame": "1.5.13", - "@webassemblyjs/helper-fsm": "1.5.13", - "long": "^3.2.0", - "mamacro": "^0.0.3" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz", - "integrity": "sha512-QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "long": "^3.2.0" - } - }, - "abstract-leveldown": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz", - "integrity": "sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ==", - "requires": { - "xtend": "~4.0.0" - } - }, - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "optional": true, - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==" - }, - "acorn-dynamic-import": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", - "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", - "requires": { - "acorn": "^5.0.0" - }, - "dependencies": { - "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" - } - } - }, - "acorn-jsx": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz", - "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==" - }, - "aes-js": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz", - "integrity": "sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==", - "optional": true - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-errors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==" - }, - "ajv-keywords": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", - "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==" - }, - "ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "requires": { - "ansi-wrap": "^0.1.0" - } - }, - "ansi-escapes": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", - "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", - "requires": { - "type-fest": "^0.5.2" - } - }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" - }, - "any-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz", - "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==" - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", - "optional": true - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - } - }, - "append-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz", - "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=", - "requires": { - "buffer-equal": "^1.0.0" - } - }, - "append-transform": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", - "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", - "requires": { - "default-require-extensions": "^2.0.0" - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "arr-filter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz", - "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", - "requires": { - "make-iterator": "^1.0.0" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "arr-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz", - "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", - "requires": { - "make-iterator": "^1.0.0" - } - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "optional": true - }, - "array-initial": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", - "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", - "requires": { - "array-slice": "^1.0.0", - "is-number": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" - } - } - }, - "array-last": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz", - "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", - "requires": { - "is-number": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" - } - } - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" - }, - "array-sort": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz", - "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==", - "requires": { - "default-compare": "^1.0.0", - "get-value": "^2.0.6", - "kind-of": "^5.0.2" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - } - }, - "assert-match": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/assert-match/-/assert-match-1.1.1.tgz", - "integrity": "sha512-c0QY2kpYVrH/jis6cCq9Mnt4/bIdGALDh1N8HY9ZARZedsMs5LSbgywxkjd5A1uNVLN0L8evANxBPxKiabVoZw==", - "requires": { - "assert": "^1.4.1", - "babel-runtime": "^6.23.0", - "es-to-primitive": "^1.1.1", - "lodash.merge": "^4.6.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" - }, - "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==" - }, - "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "requires": { - "lodash": "^4.17.11" - } - }, - "async-done": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz", - "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.2", - "process-nextick-args": "^2.0.0", - "stream-exhaust": "^1.0.1" - } - }, - "async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" - }, - "async-eventemitter": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz", - "integrity": "sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==", - "requires": { - "async": "^2.4.0" - } - }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" - }, - "async-settle": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", - "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", - "requires": { - "async-done": "^1.2.2" - } - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-define-map": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", - "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-optimise-call-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-replace-supers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=" - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=" - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=" - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoping": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", - "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", - "requires": { - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-plugin-transform-es2015-classes": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-computed-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-for-of": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-modules-amd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.2", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", - "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", - "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-systemjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-umd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-object-super": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-template-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-regenerator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", - "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", - "requires": { - "regenerator-transform": "^0.10.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-preset-env": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", - "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", - "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-to-generator": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.23.0", - "babel-plugin-transform-es2015-classes": "^6.23.0", - "babel-plugin-transform-es2015-computed-properties": "^6.22.0", - "babel-plugin-transform-es2015-destructuring": "^6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-function-name": "^6.22.0", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-umd": "^6.23.0", - "babel-plugin-transform-es2015-object-super": "^6.22.0", - "babel-plugin-transform-es2015-parameters": "^6.23.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", - "babel-plugin-transform-exponentiation-operator": "^6.22.0", - "babel-plugin-transform-regenerator": "^6.22.0", - "browserslist": "^3.2.6", - "invariant": "^2.2.2", - "semver": "^5.3.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "requires": { - "source-map": "^0.5.6" - } - } - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babelify": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz", - "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=", - "requires": { - "babel-core": "^6.0.14", - "object-assign": "^4.0.0" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" - }, - "bach": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz", - "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", - "requires": { - "arr-filter": "^1.1.1", - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "array-each": "^1.0.0", - "array-initial": "^1.0.0", - "array-last": "^1.1.1", - "async-done": "^1.2.2", - "async-settle": "^1.0.0", - "now-and-later": "^2.0.0" - } - }, - "backoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz", - "integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=", - "requires": { - "precond": "0.2" - } - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "base-x": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.6.tgz", - "integrity": "sha512-4PaF8u2+AlViJxRVjurkLTxpp7CaFRD/jo5rPT9ONnKxyhQ8f59yzamEvq7EkriG56yn5On4ONyaG75HLqr46w==", - "optional": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "requires": { - "tweetnacl": "^0.14.3" - }, - "dependencies": { - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - } - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" - }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" - }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "requires": { - "file-uri-to-path": "1.0.0" - } - }, - "bip39": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/bip39/-/bip39-2.5.0.tgz", - "integrity": "sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA==", - "requires": { - "create-hash": "^1.1.0", - "pbkdf2": "^3.0.9", - "randombytes": "^2.0.1", - "safe-buffer": "^5.0.1", - "unorm": "^1.3.3" - } - }, - "bip66": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", - "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", - "optional": true, - "requires": { - "readable-stream": "^2.3.5", - "safe-buffer": "^5.1.1" - } - }, - "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" - }, - "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "optional": true, - "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "optional": true - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==" - }, - "browserfs": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/browserfs/-/browserfs-1.4.3.tgz", - "integrity": "sha512-tz8HClVrzTJshcyIu8frE15cjqjcBIu15Bezxsvl/i+6f59iNCN3kznlWjz0FEb3DlnDx3gW5szxeT6D1x0s0w==", - "requires": { - "async": "^2.1.4", - "pako": "^1.0.4" - } - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sha3": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/browserify-sha3/-/browserify-sha3-0.0.4.tgz", - "integrity": "sha1-CGxHuMgjFsnUcCLCYYWVRXbdjiY=", - "requires": { - "js-sha3": "^0.6.1", - "safe-buffer": "^5.1.1" - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "requires": { - "pako": "~1.0.5" - } - }, - "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" - } - }, - "bs58": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz", - "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=", - "optional": true, - "requires": { - "base-x": "^3.0.2" - } - }, - "bs58check": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz", - "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==", - "optional": true, - "requires": { - "bs58": "^4.0.0", - "create-hash": "^1.1.0", - "safe-buffer": "^5.1.2" - } - }, - "buffer": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.3.0.tgz", - "integrity": "sha512-XykNc84nIOC32vZ9euOKbmGAP69JUkXDtBQfLq88c8/6J/gZi/t14A+l/p/9EM2TcT5xNC1MKPCrvO3LVUpVPw==", - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4" - } - }, - "buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "optional": true, - "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "optional": true - }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", - "optional": true - }, - "buffer-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", - "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=" - }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", - "optional": true - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" - }, - "buffer-to-arraybuffer": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", - "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=", - "optional": true - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" - }, - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "optional": true - }, - "bytewise": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz", - "integrity": "sha1-HRPL/3F65xWAlKqIGzXQgbOHJT4=", - "requires": { - "bytewise-core": "^1.2.2", - "typewise": "^1.0.3" - } - }, - "bytewise-core": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz", - "integrity": "sha1-P7QQx+kVWOsasiqCg0V3qmvWHUI=", - "requires": { - "typewise-core": "^1.2" - } - }, - "cacache": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", - "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "requires": { - "yallist": "^3.0.2" - } - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - } - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "optional": true, - "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "optional": true, - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "optional": true - } - } - }, - "cachedown": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cachedown/-/cachedown-1.0.0.tgz", - "integrity": "sha1-1D8DbkUQaWsxJG19sx6/D3rDLRU=", - "requires": { - "abstract-leveldown": "^2.4.1", - "lru-cache": "^3.2.0" - }, - "dependencies": { - "abstract-leveldown": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz", - "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==", - "requires": { - "xtend": "~4.0.0" - } - } - } - }, - "caching-transform": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz", - "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==", - "requires": { - "hasha": "^3.0.0", - "make-dir": "^2.0.0", - "package-hash": "^3.0.0", - "write-file-atomic": "^2.4.2" - }, - "dependencies": { - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } - } - }, - "caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "requires": { - "callsites": "^2.0.0" - }, - "dependencies": { - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" - } - } - }, - "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "requires": { - "callsites": "^0.2.0" - } - }, - "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=" - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" - }, - "caniuse-lite": { - "version": "1.0.30000989", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz", - "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==" - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "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" - } - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" - }, - "checkpoint-store": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/checkpoint-store/-/checkpoint-store-1.1.0.tgz", - "integrity": "sha1-BOTLUWuRQziTWB5tRgGnjpVS6gY=", - "requires": { - "functional-red-black-tree": "^1.0.1" - } - }, - "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - }, - "dependencies": { - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } - } - }, - "chownr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", - "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==" - }, - "chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "requires": { - "tslib": "^1.9.0" - } - }, - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==" - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-truncate": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz", - "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", - "requires": { - "slice-ansi": "0.0.4", - "string-width": "^1.0.1" - }, - "dependencies": { - "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=" - } - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" - }, - "clone-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", - "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=" - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "optional": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "clone-stats": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", - "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=" - }, - "cloneable-readable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", - "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", - "requires": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "coinstring": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/coinstring/-/coinstring-2.3.0.tgz", - "integrity": "sha1-zbYzY6lhUCQEolr7gsLibV/2J6Q=", - "optional": true, - "requires": { - "bs58": "^2.0.1", - "create-hash": "^1.1.1" - }, - "dependencies": { - "bs58": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-2.0.1.tgz", - "integrity": "sha1-VZCNWPGYKrogCPob7Y+RmYopv40=", - "optional": true - } - } - }, - "collection-map": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", - "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", - "requires": { - "arr-map": "^2.0.2", - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "command-exists": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz", - "integrity": "sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==" - }, - "commander": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", - "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", - "requires": { - "graceful-readlink": ">= 1.0.0" - } - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" - }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "requires": { - "date-now": "^0.1.4" - } - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" - }, - "contains-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", - "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=" - }, - "content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "optional": true, - "requires": { - "safe-buffer": "5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "optional": true - } - } - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "optional": true - }, - "convert-source-map": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", - "requires": { - "safe-buffer": "~5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", - "optional": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "optional": true - }, - "cookiejar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", - "optional": true - }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - } - }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" - }, - "copy-props": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", - "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", - "requires": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" - } - }, - "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "optional": true, - "requires": { - "object-assign": "^4", - "vary": "^1" - } - }, - "cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - }, - "dependencies": { - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - } - } - }, - "coveralls": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.6.tgz", - "integrity": "sha512-Pgh4v3gCI4T/9VijVrm8Ym5v0OgjvGLKj3zTUwkvsCiwqae/p6VLzpsFNjQS2i6ewV7ef+DjFJ5TSKxYt/mCrA==", - "requires": { - "growl": "~> 1.10.0", - "js-yaml": "^3.13.1", - "lcov-parse": "^0.0.10", - "log-driver": "^1.2.7", - "minimist": "^1.2.0", - "request": "^2.86.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, - "cp-file": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", - "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==", - "requires": { - "graceful-fs": "^4.1.2", - "make-dir": "^2.0.0", - "nested-error-stacks": "^2.0.0", - "pify": "^4.0.1", - "safe-buffer": "^5.0.1" - }, - "dependencies": { - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } - } - }, - "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "cross-env": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", - "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", - "requires": { - "cross-spawn": "^6.0.5", - "is-windows": "^1.0.0" - } - }, - "cross-fetch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.3.tgz", - "integrity": "sha512-PrWWNH3yL2NYIb/7WF/5vFG3DCQiXDOVf8k3ijatbrtnwNuhMWLC7YF7uqf53tbTFDzHIUD8oITw4Bxt8ST3Nw==", - "requires": { - "node-fetch": "2.1.2", - "whatwg-fetch": "2.0.4" - } - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, - "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=" - }, - "d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=" - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" - }, - "decompress": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", - "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", - "optional": true, - "requires": { - "decompress-tar": "^4.0.0", - "decompress-tarbz2": "^4.0.0", - "decompress-targz": "^4.0.0", - "decompress-unzip": "^4.0.1", - "graceful-fs": "^4.1.10", - "make-dir": "^1.0.0", - "pify": "^2.3.0", - "strip-dirs": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "optional": true - } - } - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "optional": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "decompress-tar": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz", - "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", - "optional": true, - "requires": { - "file-type": "^5.2.0", - "is-stream": "^1.1.0", - "tar-stream": "^1.5.2" - } - }, - "decompress-tarbz2": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", - "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", - "optional": true, - "requires": { - "decompress-tar": "^4.1.0", - "file-type": "^6.1.0", - "is-stream": "^1.1.0", - "seek-bzip": "^1.0.5", - "unbzip2-stream": "^1.0.9" - }, - "dependencies": { - "file-type": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", - "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", - "optional": true - } - } - }, - "decompress-targz": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", - "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", - "optional": true, - "requires": { - "decompress-tar": "^4.1.1", - "file-type": "^5.2.0", - "is-stream": "^1.1.0" - } - }, - "decompress-unzip": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", - "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", - "optional": true, - "requires": { - "file-type": "^3.8.0", - "get-stream": "^2.2.0", - "pify": "^2.3.0", - "yauzl": "^2.4.2" - }, - "dependencies": { - "file-type": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", - "optional": true - }, - "get-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", - "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", - "optional": true, - "requires": { - "object-assign": "^4.0.1", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "optional": true - } - } - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=" - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" - }, - "default-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", - "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", - "requires": { - "kind-of": "^5.0.2" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "default-require-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", - "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", - "requires": { - "strip-bom": "^3.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - } - } - }, - "default-resolution": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz", - "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=" - }, - "defer-to-connect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz", - "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==", - "optional": true - }, - "deferred-leveldown": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz", - "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==", - "requires": { - "abstract-leveldown": "~2.6.0" - }, - "dependencies": { - "abstract-leveldown": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz", - "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==", - "requires": { - "xtend": "~4.0.0" - } - } - } - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "requires": { - "object-keys": "^1.0.12" - }, - "dependencies": { - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - } - } - }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" - }, - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "requires": { - "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "optional": true - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "optional": true - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "requires": { - "repeating": "^2.0.0" - } - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" - }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-walk": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", - "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=" - }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" - }, - "drbg.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", - "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", - "requires": { - "browserify-aes": "^1.0.6", - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4" - } - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "optional": true - }, - "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "each-props": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz", - "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", - "requires": { - "is-plain-object": "^2.0.1", - "object.defaults": "^1.1.0" - } - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "optional": true - }, - "electron-to-chromium": { - "version": "1.3.237", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.237.tgz", - "integrity": "sha512-SPAFjDr/7iiVK2kgTluwxela6eaWjjFkS9rO/iYpB/KGXgccUom5YC7OIf19c8m8GGptWxLU0Em8xM64A/N7Fg==" - }, - "elegant-spinner": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz", - "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=" - }, - "elliptic": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", - "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "optional": true - }, - "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "requires": { - "iconv-lite": "~0.4.13" - } - }, - "encoding-down": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", - "integrity": "sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw==", - "requires": { - "abstract-leveldown": "^5.0.0", - "inherits": "^2.0.3", - "level-codec": "^9.0.0", - "level-errors": "^2.0.0", - "xtend": "^4.0.1" - }, - "dependencies": { - "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", - "requires": { - "xtend": "~4.0.0" - } - } - } - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "requires": { - "once": "^1.4.0" - } - }, - "enhanced-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", - "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", - "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "tapable": "^1.0.0" - } - }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-abstract": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", - "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", - "requires": { - "es-to-primitive": "^1.2.0", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-keys": "^1.0.12" - }, - "dependencies": { - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - } - } - }, - "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "es5-ext": { - "version": "0.10.50", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz", - "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==", - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "^1.0.0" - } - }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "es6-weak-map": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", - "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", - "requires": { - "d": "1", - "es5-ext": "^0.10.46", - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.1" - } - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "optional": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "eslint": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.7.0.tgz", - "integrity": "sha512-zYCeFQahsxffGl87U2aJ7DPyH8CbWgxBC213Y8+TCanhUTf2gEvfq3EKpHmEcozTLyPmGe9LZdMAwC/CpJBM5A==", - "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.5.3", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^2.1.0", - "eslint-scope": "^4.0.0", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^4.0.0", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.6", - "imurmurhash": "^0.1.4", - "inquirer": "^6.1.0", - "is-resolvable": "^1.1.0", - "js-yaml": "^3.12.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.5", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "require-uncached": "^1.0.3", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^5.0.2", - "text-table": "^0.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "eslint-config-standard": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz", - "integrity": "sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==" - }, - "eslint-import-resolver-node": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz", - "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==", - "requires": { - "debug": "^2.6.9", - "resolve": "^1.5.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "eslint-module-utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz", - "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==", - "requires": { - "debug": "^2.6.8", - "pkg-dir": "^2.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "eslint-plugin-es": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz", - "integrity": "sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw==", - "requires": { - "eslint-utils": "^1.3.0", - "regexpp": "^2.0.1" - } - }, - "eslint-plugin-import": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz", - "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==", - "requires": { - "contains-path": "^0.1.0", - "debug": "^2.6.8", - "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.1", - "eslint-module-utils": "^2.2.0", - "has": "^1.0.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.3", - "read-pkg-up": "^2.0.0", - "resolve": "^1.6.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "doctrine": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", - "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "requires": { - "pify": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - } - } - }, - "eslint-plugin-node": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz", - "integrity": "sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==", - "requires": { - "eslint-plugin-es": "^1.3.1", - "eslint-utils": "^1.3.1", - "ignore": "^4.0.2", - "minimatch": "^3.0.4", - "resolve": "^1.8.1", - "semver": "^5.5.0" - } - }, - "eslint-plugin-promise": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz", - "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==" - }, - "eslint-plugin-standard": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz", - "integrity": "sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA==" - }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz", - "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==", - "requires": { - "eslint-visitor-keys": "^1.0.0" - } - }, - "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==" - }, - "espree": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz", - "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==", - "requires": { - "acorn": "^6.0.2", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "requires": { - "estraverse": "^4.0.0" - } - }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "requires": { - "estraverse": "^4.1.0" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "optional": true - }, - "eth-block-tracker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-3.0.1.tgz", - "integrity": "sha512-WUVxWLuhMmsfenfZvFO5sbl1qFY2IqUlw/FPVmjjdElpqLsZtSG+wPe9Dz7W/sB6e80HgFKknOmKk2eNlznHug==", - "requires": { - "eth-query": "^2.1.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.3", - "ethjs-util": "^0.1.3", - "json-rpc-engine": "^3.6.0", - "pify": "^2.3.0", - "tape": "^4.6.3" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "eth-ens-namehash": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz", - "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=", - "optional": true, - "requires": { - "idna-uts46-hx": "^2.3.1", - "js-sha3": "^0.5.7" - }, - "dependencies": { - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=", - "optional": true - } - } - }, - "eth-json-rpc-infura": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.0.tgz", - "integrity": "sha512-FLcpdxPRVBCUc7yoE+wHGvyYg2lATedP+/q7PsKvaSzQpJbgTG4ZjLnyrLanxDr6M1k/dSNa6V5QnILwjUKJcw==", - "requires": { - "cross-fetch": "^2.1.1", - "eth-json-rpc-middleware": "^1.5.0", - "json-rpc-engine": "^3.4.0", - "json-rpc-error": "^2.0.0", - "tape": "^4.8.0" - } - }, - "eth-json-rpc-middleware": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.6.0.tgz", - "integrity": "sha512-tDVCTlrUvdqHKqivYMjtFZsdD7TtpNLBCfKAcOpaVs7orBMS/A8HWro6dIzNtTZIR05FAbJ3bioFOnZpuCew9Q==", - "requires": { - "async": "^2.5.0", - "eth-query": "^2.1.2", - "eth-tx-summary": "^3.1.2", - "ethereumjs-block": "^1.6.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.2", - "ethereumjs-vm": "^2.1.0", - "fetch-ponyfill": "^4.0.0", - "json-rpc-engine": "^3.6.0", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "tape": "^4.6.3" - }, - "dependencies": { - "ethereum-common": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz", - "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==" - }, - "ethereumjs-account": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz", - "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==", - "requires": { - "ethereumjs-util": "^5.0.0", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1" - } - }, - "ethereumjs-block": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz", - "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==", - "requires": { - "async": "^2.0.1", - "ethereum-common": "0.2.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - } - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz", - "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - } - } - }, - "eth-lib": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.27.tgz", - "integrity": "sha512-B8czsfkJYzn2UIEMwjc7Mbj+Cy72V+/OXH/tb44LV8jhrjizQJJ325xMOMyk3+ETa6r6oi0jsUY14+om8mQMWA==", - "optional": true, - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "keccakjs": "^0.2.1", - "nano-json-stream-parser": "^0.1.2", - "servify": "^0.1.12", - "ws": "^3.0.0", - "xhr-request-promise": "^0.1.2" - } - }, - "eth-query": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/eth-query/-/eth-query-2.1.2.tgz", - "integrity": "sha1-1nQdkAAQa1FRDHLbktY2VFam2l4=", - "requires": { - "json-rpc-random-id": "^1.0.0", - "xtend": "^4.0.1" - } - }, - "eth-sig-util": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.3.0.tgz", - "integrity": "sha512-ugD1AvaggvKaZDgnS19W5qOfepjGc7qHrt7TrAaL54gJw9SHvgIXJ3r2xOMW30RWJZNP+1GlTOy5oye7yXA4xA==", - "requires": { - "buffer": "^5.2.1", - "elliptic": "^6.4.0", - "ethereumjs-abi": "0.6.5", - "ethereumjs-util": "^5.1.1", - "tweetnacl": "^1.0.0", - "tweetnacl-util": "^0.15.0" - }, - "dependencies": { - "ethereumjs-abi": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz", - "integrity": "sha1-WmN+8Wq0NHP6cqKa2QhxQFs/UkE=", - "requires": { - "bn.js": "^4.10.0", - "ethereumjs-util": "^4.3.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz", - "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", - "requires": { - "bn.js": "^4.8.0", - "create-hash": "^1.1.2", - "keccakjs": "^0.2.0", - "rlp": "^2.0.0", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "eth-tx-summary": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/eth-tx-summary/-/eth-tx-summary-3.2.4.tgz", - "integrity": "sha512-NtlDnaVZah146Rm8HMRUNMgIwG/ED4jiqk0TME9zFheMl1jOp6jL1m0NKGjJwehXQ6ZKCPr16MTr+qspKpEXNg==", - "requires": { - "async": "^2.1.2", - "clone": "^2.0.0", - "concat-stream": "^1.5.1", - "end-of-stream": "^1.1.0", - "eth-query": "^2.0.2", - "ethereumjs-block": "^1.4.1", - "ethereumjs-tx": "^1.1.1", - "ethereumjs-util": "^5.0.1", - "ethereumjs-vm": "^2.6.0", - "through2": "^2.0.3" - }, - "dependencies": { - "ethereum-common": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz", - "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==" - }, - "ethereumjs-account": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz", - "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==", - "requires": { - "ethereumjs-util": "^5.0.0", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1" - } - }, - "ethereumjs-block": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz", - "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==", - "requires": { - "async": "^2.0.1", - "ethereum-common": "0.2.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - } - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz", - "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - } - } - }, - "ethashjs": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ethashjs/-/ethashjs-0.0.7.tgz", - "integrity": "sha1-ML/kGWcmaQoMWdO4Jy5w1NDDS64=", - "requires": { - "async": "^1.4.2", - "buffer-xor": "^1.0.3", - "ethereumjs-util": "^4.0.1", - "miller-rabin": "^4.0.0" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "ethereumjs-util": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz", - "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", - "requires": { - "bn.js": "^4.8.0", - "create-hash": "^1.1.2", - "keccakjs": "^0.2.0", - "rlp": "^2.0.0", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereum-common": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz", - "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=" - }, - "ethereumjs-abi": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.7.tgz", - "integrity": "sha512-EMLOA8ICO5yAaXDhjVEfYjsJIXYutY8ufTE93eEKwsVtp2usQreKwsDTJ9zvam3omYqNuffr8IONIqb2uUslGQ==", - "requires": { - "bn.js": "^4.11.8", - "ethereumjs-util": "^6.0.0" - } - }, - "ethereumjs-account": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-3.0.0.tgz", - "integrity": "sha512-WP6BdscjiiPkQfF9PVfMcwx/rDvfZTjFKY0Uwc09zSQr9JfIVH87dYIJu0gNhBhpmovV4yq295fdllS925fnBA==", - "requires": { - "ethereumjs-util": "^6.0.0", - "rlp": "^2.2.1", - "safe-buffer": "^5.1.1" - } - }, - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-blockchain": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ethereumjs-blockchain/-/ethereumjs-blockchain-3.4.0.tgz", - "integrity": "sha512-wxPSmt6EQjhbywkFbftKcb0qRFIZWocHMuDa8/AB4eWL/UPYalNcDyLaxYbrDytmhHid3Uu8G/tA3C/TxZBuOQ==", - "requires": { - "async": "^2.6.1", - "ethashjs": "~0.0.7", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "~6.0.0", - "flow-stoplight": "^1.0.0", - "level-mem": "^3.0.1", - "lru-cache": "^5.1.1", - "safe-buffer": "^5.1.2", - "semaphore": "^1.1.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.0.0.tgz", - "integrity": "sha512-E3yKUyl0Fs95nvTFQZe/ZSNcofhDzUsDlA5y2uoRmf1+Ec7gpGhNCsgKkZBRh7Br5op8mJcYF/jFbmjj909+nQ==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "requires": { - "yallist": "^3.0.2" - } - } - } - }, - "ethereumjs-common": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.3.1.tgz", - "integrity": "sha512-kexqNgM2q29RKoZPPjehPREeqbr/vhYfT9Ho8FVeH3f7USjBuYp1iZ1qjqklk8FSMvEKPpMJFYSOunikw30Prw==" - }, - "ethereumjs-tx": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz", - "integrity": "sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==", - "requires": { - "ethereum-common": "^0.0.18", - "ethereumjs-util": "^5.0.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-3.0.0.tgz", - "integrity": "sha512-lNu+G/RWPRCrQM5s24MqgU75PEGiAhL4Ombw0ew6m08d+amsxf/vGAb98yDNdQqqHKV6JbwO/tCGfdqXGI6Cug==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-blockchain": "^3.4.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-account": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz", - "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==", - "requires": { - "ethereumjs-util": "^5.0.0", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - } - } - }, - "ethereumjs-wallet": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.3.tgz", - "integrity": "sha512-qiXPiZOsStem+Dj/CQHbn5qex+FVkuPmGH7SvSnA9F3tdRDt8dLMyvIj3+U05QzVZNPYh4HXEdnzoYI4dZkr9w==", - "optional": true, - "requires": { - "aes-js": "^3.1.1", - "bs58check": "^2.1.2", - "ethereumjs-util": "^6.0.0", - "hdkey": "^1.1.0", - "randombytes": "^2.0.6", - "safe-buffer": "^5.1.2", - "scrypt.js": "^0.3.0", - "utf8": "^3.0.0", - "uuid": "^3.3.2" - } - }, - "ethers": { - "version": "4.0.26", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.26.tgz", - "integrity": "sha512-3hK4S8eAGhuWZ/feip5z17MswjGgjb4lEPJqWO/O0dNqToYLSHhvu6gGQPs8d9f+XfpEB2EYexfF0qjhWiZjUA==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.4", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - }, - "dependencies": { - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - }, - "scrypt-js": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", - "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==" - }, - "setimmediate": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", - "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=" - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - } - } - }, - "ethjs-unit": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", - "integrity": "sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk=", - "optional": true, - "requires": { - "bn.js": "4.11.6", - "number-to-bn": "1.7.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "optional": true - } - } - }, - "ethjs-util": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz", - "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==", - "requires": { - "is-hex-prefixed": "1.0.0", - "strip-hex-prefix": "1.0.0" - } - }, - "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", - "optional": true - }, - "events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", - "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==" - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "optional": true, - "requires": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "optional": true - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "optional": true - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "dependencies": { - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fake-merkle-patricia-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fake-merkle-patricia-tree/-/fake-merkle-patricia-tree-1.0.1.tgz", - "integrity": "sha1-S4w6z7Ugr635hgsfFM2M40As3dM=", - "requires": { - "checkpoint-store": "^1.1.0" - } - }, - "fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" - }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "optional": true, - "requires": { - "pend": "~1.2.0" - } - }, - "fetch-ponyfill": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz", - "integrity": "sha1-rjzl9zLGReq4fkroeTQUcJsjmJM=", - "requires": { - "node-fetch": "~1.7.1" - }, - "dependencies": { - "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - } - } - }, - "figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==" - }, - "figures": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz", - "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==", - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", - "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" - } - }, - "file-type": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", - "optional": true - }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" - }, - "filesize": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", - "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==" - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "optional": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "optional": true - } - } - }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - }, - "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "requires": { - "find-up": "^3.0.0" - } - } - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "findup-sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", - "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - } - }, - "fined": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", - "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - } - }, - "flagged-respawn": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", - "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==" - }, - "flat-cache": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", - "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", - "requires": { - "circular-json": "^0.3.1", - "graceful-fs": "^4.1.2", - "rimraf": "~2.6.2", - "write": "^0.2.1" - } - }, - "flow-stoplight": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flow-stoplight/-/flow-stoplight-1.0.0.tgz", - "integrity": "sha1-SiksW8/4s5+mzAyxqFPYbyfu/3s=" - }, - "flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - } - }, - "fn-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", - "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=" - }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "requires": { - "is-callable": "^1.1.3" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "requires": { - "for-in": "^1.0.1" - } - }, - "foreground-child": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", - "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", - "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - } - } - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "optional": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "requires": { - "map-cache": "^0.2.2" - } - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "optional": true - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "optional": true - }, - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "optional": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs-minipass": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", - "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs-mkdirp-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", - "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", - "requires": { - "graceful-fs": "^4.1.11", - "through2": "^2.0.3" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", - "optional": true, - "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "debug": { - "version": "4.1.1", - "bundled": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.3", - "bundled": true, - "optional": true, - "requires": { - "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" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "optional": true - }, - "minipass": { - "version": "2.3.5", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.2.1", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.1.1", - "bundled": true, - "optional": true - }, - "needle": { - "version": "2.3.0", - "bundled": true, - "optional": true, - "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.12.0", - "bundled": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.6", - "bundled": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.1", - "bundled": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.3", - "bundled": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "optional": true - }, - "semver": { - "version": "5.7.0", - "bundled": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "tar": { - "version": "4.4.8", - "bundled": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "yallist": { - "version": "3.0.3", - "bundled": true, - "optional": true - } - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" - }, - "g-status": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/g-status/-/g-status-2.0.2.tgz", - "integrity": "sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==", - "requires": { - "arrify": "^1.0.1", - "matcher": "^1.0.0", - "simple-git": "^1.85.0" - } - }, - "generic-pool": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.0.4.tgz", - "integrity": "sha1-+XGN7agvoSXtXEPjQcmiFadm2aM=" - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "get-own-enumerable-property-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", - "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==" - }, - "get-stdin": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", - "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==" - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "requires": { - "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" - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "glob-stream": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", - "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", - "requires": { - "extend": "^3.0.0", - "glob": "^7.1.1", - "glob-parent": "^3.1.0", - "is-negated-glob": "^1.0.0", - "ordered-read-streams": "^1.0.0", - "pumpify": "^1.3.5", - "readable-stream": "^2.1.5", - "remove-trailing-separator": "^1.0.1", - "to-absolute-glob": "^2.0.0", - "unique-stream": "^2.0.2" - } - }, - "glob-watcher": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz", - "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==", - "requires": { - "anymatch": "^2.0.0", - "async-done": "^1.2.0", - "chokidar": "^2.0.0", - "is-negated-glob": "^1.0.0", - "just-debounce": "^1.0.0", - "object.defaults": "^1.1.0" - } - }, - "global": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", - "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", - "requires": { - "min-document": "^2.19.0", - "process": "~0.5.1" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-modules-path": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.1.tgz", - "integrity": "sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==" - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "glogg": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", - "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", - "requires": { - "sparkles": "^1.0.0" - } - }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "optional": true, - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - } - }, - "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==" - }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==" - }, - "gulp": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", - "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==", - "requires": { - "glob-watcher": "^5.0.3", - "gulp-cli": "^2.2.0", - "undertaker": "^1.2.1", - "vinyl-fs": "^3.0.0" - }, - "dependencies": { - "gulp-cli": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz", - "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==", - "requires": { - "ansi-colors": "^1.0.1", - "archy": "^1.0.0", - "array-sort": "^1.0.0", - "color-support": "^1.1.3", - "concat-stream": "^1.6.0", - "copy-props": "^2.0.1", - "fancy-log": "^1.3.2", - "gulplog": "^1.0.0", - "interpret": "^1.1.0", - "isobject": "^3.0.1", - "liftoff": "^3.1.0", - "matchdep": "^2.0.0", - "mute-stdout": "^1.0.0", - "pretty-hrtime": "^1.0.0", - "replace-homedir": "^1.0.0", - "semver-greatest-satisfied-range": "^1.1.0", - "v8flags": "^3.0.1", - "yargs": "^7.1.0" - } - } - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "requires": { - "glogg": "^1.0.0" - } - }, - "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "has-symbol-support-x": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", - "optional": true - }, - "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" - }, - "has-to-string-tag-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", - "optional": true, - "requires": { - "has-symbol-support-x": "^1.4.1" - } - }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "hasha": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz", - "integrity": "sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=", - "requires": { - "is-stream": "^1.0.1" - } - }, - "hdkey": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/hdkey/-/hdkey-1.1.1.tgz", - "integrity": "sha512-DvHZ5OuavsfWs5yfVJZestsnc3wzPvLWNk6c2nRUfo6X+OtxypGt20vDDf7Ba+MJzjL3KS1og2nw2eBbLCOUTA==", - "optional": true, - "requires": { - "coinstring": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" - }, - "heap": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz", - "integrity": "sha1-CH4fELBGky/IWU3Z5tN4r8nR5aw=" - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hosted-git-info": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz", - "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==" - }, - "http-cache-semantics": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz", - "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==", - "optional": true - }, - "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "optional": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "optional": true - } - } - }, - "http-https": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz", - "integrity": "sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs=", - "optional": true - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" - }, - "humanize": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz", - "integrity": "sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ=" - }, - "husky": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz", - "integrity": "sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==", - "requires": { - "cosmiconfig": "^5.0.7", - "execa": "^1.0.0", - "find-up": "^3.0.0", - "get-stdin": "^6.0.0", - "is-ci": "^2.0.0", - "pkg-dir": "^3.0.0", - "please-upgrade-node": "^3.1.1", - "read-pkg": "^4.0.1", - "run-node": "^1.0.0", - "slash": "^2.0.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "requires": { - "find-up": "^3.0.0" - } - }, - "read-pkg": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", - "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", - "requires": { - "normalize-package-data": "^2.3.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0" - } - }, - "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==" - } - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "idna-uts46-hx": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz", - "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==", - "optional": true, - "requires": { - "punycode": "2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=", - "optional": true - } - } - }, - "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" - }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==" - }, - "immediate": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz", - "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=" - }, - "import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - }, - "dependencies": { - "caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "requires": { - "caller-callsite": "^2.0.0" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" - } - } - }, - "import-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz", - "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", - "requires": { - "pkg-dir": "^2.0.0", - "resolve-cwd": "^2.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" - }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=" - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" - }, - "inquirer": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz", - "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==", - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^2.4.2", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^4.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "is-fullwidth-code-point": { - "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==" - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" - }, - "string-width": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", - "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^5.2.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "interpret": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", - "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==" - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "requires": { - "loose-envify": "^1.0.0" - } - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" - }, - "ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", - "optional": true - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" - }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "requires": { - "ci-info": "^2.0.0" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-fn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fn/-/is-fn-1.0.0.tgz", - "integrity": "sha1-lUPV3nvPWwiiLsiiC65uKG1RDYw=" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-function": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz", - "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=" - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-hex-prefixed": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", - "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=" - }, - "is-natural-number": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", - "optional": true - }, - "is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=" - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" - }, - "is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", - "optional": true - }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", - "requires": { - "symbol-observable": "^1.1.0" - } - }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=" - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "requires": { - "is-path-inside": "^1.0.0" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "requires": { - "path-is-inside": "^1.0.1" - } - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "optional": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "requires": { - "isobject": "^3.0.1" - } - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" - }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "requires": { - "has": "^1.0.1" - } - }, - "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==" - }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", - "optional": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "requires": { - "has-symbols": "^1.0.0" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" - }, - "is-valid-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", - "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=" - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, - "istanbul-lib-coverage": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", - "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==" - }, - "istanbul-lib-hook": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", - "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", - "requires": { - "append-transform": "^1.0.0" - } - }, - "istanbul-lib-instrument": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", - "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", - "requires": { - "@babel/generator": "^7.4.0", - "@babel/parser": "^7.4.3", - "@babel/template": "^7.4.0", - "@babel/traverse": "^7.4.3", - "@babel/types": "^7.4.0", - "istanbul-lib-coverage": "^2.0.5", - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, - "istanbul-lib-report": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", - "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", - "requires": { - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "supports-color": "^6.1.0" - }, - "dependencies": { - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", - "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "rimraf": "^2.6.3", - "source-map": "^0.6.1" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } - } - }, - "istanbul-reports": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz", - "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", - "requires": { - "handlebars": "^4.1.2" - } - }, - "isurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", - "optional": true, - "requires": { - "has-to-string-tag-x": "^1.2.0", - "is-object": "^1.0.1" - } - }, - "js-scrypt": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/js-scrypt/-/js-scrypt-0.2.0.tgz", - "integrity": "sha1-emK3AbRhbnCtDN5URiequ5nX/jk=", - "requires": { - "generic-pool": "~2.0.4" - } - }, - "js-sha3": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.6.1.tgz", - "integrity": "sha1-W4n3enR3Z5h39YxKB1JAk0sflcA=" - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" - }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" - }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" - }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "optional": true - }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" - }, - "json-rpc-engine": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz", - "integrity": "sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA==", - "requires": { - "async": "^2.0.1", - "babel-preset-env": "^1.7.0", - "babelify": "^7.3.0", - "json-rpc-error": "^2.0.0", - "promise-to-callback": "^1.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "json-rpc-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/json-rpc-error/-/json-rpc-error-2.0.0.tgz", - "integrity": "sha1-p6+cICg4tekFxyUOVH8a/3cligI=", - "requires": { - "inherits": "^2.0.1" - } - }, - "json-rpc-random-id": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-rpc-random-id/-/json-rpc-random-id-1.0.1.tgz", - "integrity": "sha1-uknZat7RRE27jaPSA3SKy7zeyMg=" - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "requires": { - "jsonify": "~0.0.0" - } - }, - "json-stable-stringify-without-jsonify": { - "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=" - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "optional": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "just-debounce": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", - "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=" - }, - "keccak": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz", - "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==", - "requires": { - "bindings": "^1.2.1", - "inherits": "^2.0.3", - "nan": "^2.2.1", - "safe-buffer": "^5.1.0" - } - }, - "keccakjs": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/keccakjs/-/keccakjs-0.2.3.tgz", - "integrity": "sha512-BjLkNDcfaZ6l8HBG9tH0tpmDv3sS2mA7FNQxFHpCdzP3Gb2MVruXBSuoM66SnVxKJpAr5dKGdkHD+bDokt8fTg==", - "requires": { - "browserify-sha3": "^0.0.4", - "sha3": "^1.2.2" - } - }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "optional": true, - "requires": { - "json-buffer": "3.0.0" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "klaw": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", - "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", - "requires": { - "graceful-fs": "^4.1.9" - } - }, - "last-run": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz", - "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", - "requires": { - "default-resolution": "^2.0.0", - "es6-weak-map": "^2.0.1" - } - }, - "lazystream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", - "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", - "requires": { - "readable-stream": "^2.0.5" - } - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "requires": { - "invert-kv": "^1.0.0" - } - }, - "lcov-parse": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz", - "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=" - }, - "lead": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", - "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=", - "requires": { - "flush-write-stream": "^1.0.2" - } - }, - "level-codec": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.1.tgz", - "integrity": "sha512-ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q==" - }, - "level-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz", - "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==", - "requires": { - "errno": "~0.1.1" - } - }, - "level-iterator-stream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz", - "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=", - "requires": { - "inherits": "^2.0.1", - "level-errors": "^1.0.3", - "readable-stream": "^1.0.33", - "xtend": "^4.0.0" - }, - "dependencies": { - "level-errors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz", - "integrity": "sha512-Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==", - "requires": { - "errno": "~0.1.1" - } - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - } - } - }, - "level-mem": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/level-mem/-/level-mem-3.0.1.tgz", - "integrity": "sha512-LbtfK9+3Ug1UmvvhR2DqLqXiPW1OJ5jEh0a3m9ZgAipiwpSxGj/qaVVy54RG5vAQN1nCuXqjvprCuKSCxcJHBg==", - "requires": { - "level-packager": "~4.0.0", - "memdown": "~3.0.0" - }, - "dependencies": { - "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", - "requires": { - "xtend": "~4.0.0" - } - }, - "memdown": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/memdown/-/memdown-3.0.0.tgz", - "integrity": "sha512-tbV02LfZMWLcHcq4tw++NuqMO+FZX8tNJEiD2aNRm48ZZusVg5N8NART+dmBkepJVye986oixErf7jfXboMGMA==", - "requires": { - "abstract-leveldown": "~5.0.0", - "functional-red-black-tree": "~1.0.1", - "immediate": "~3.2.3", - "inherits": "~2.0.1", - "ltgt": "~2.2.0", - "safe-buffer": "~5.1.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "level-packager": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-4.0.1.tgz", - "integrity": "sha512-svCRKfYLn9/4CoFfi+d8krOtrp6RoX8+xm0Na5cgXMqSyRru0AnDYdLl+YI8u1FyS6gGZ94ILLZDE5dh2but3Q==", - "requires": { - "encoding-down": "~5.0.0", - "levelup": "^3.0.0" - } - }, - "level-post": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/level-post/-/level-post-1.0.7.tgz", - "integrity": "sha512-PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew==", - "requires": { - "ltgt": "^2.1.2" - } - }, - "level-sublevel": { - "version": "6.6.4", - "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.4.tgz", - "integrity": "sha512-pcCrTUOiO48+Kp6F1+UAzF/OtWqLcQVTVF39HLdZ3RO8XBoXt+XVPKZO1vVr1aUoxHZA9OtD2e1v7G+3S5KFDA==", - "requires": { - "bytewise": "~1.1.0", - "level-codec": "^9.0.0", - "level-errors": "^2.0.0", - "level-iterator-stream": "^2.0.3", - "ltgt": "~2.1.1", - "pull-defer": "^0.2.2", - "pull-level": "^2.0.3", - "pull-stream": "^3.6.8", - "typewiselite": "~1.0.0", - "xtend": "~4.0.0" - }, - "dependencies": { - "level-iterator-stream": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz", - "integrity": "sha512-I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig==", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.5", - "xtend": "^4.0.0" - } - }, - "ltgt": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz", - "integrity": "sha1-EIUaBtmWS5cReEQcI8nlJpjuzjQ=" - } - } - }, - "level-ws": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-0.0.0.tgz", - "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=", - "requires": { - "readable-stream": "~1.0.15", - "xtend": "~2.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "requires": { - "object-keys": "~0.4.0" - } - } - } - }, - "levelup": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/levelup/-/levelup-3.1.1.tgz", - "integrity": "sha512-9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg==", - "requires": { - "deferred-leveldown": "~4.0.0", - "level-errors": "~2.0.0", - "level-iterator-stream": "~3.0.0", - "xtend": "~4.0.0" - }, - "dependencies": { - "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", - "requires": { - "xtend": "~4.0.0" - } - }, - "deferred-leveldown": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", - "integrity": "sha512-5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww==", - "requires": { - "abstract-leveldown": "~5.0.0", - "inherits": "^2.0.3" - } - }, - "level-iterator-stream": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-3.0.1.tgz", - "integrity": "sha512-nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g==", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "xtend": "^4.0.0" - } - } - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "liftoff": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz", - "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==", - "requires": { - "extend": "^3.0.0", - "findup-sync": "^3.0.0", - "fined": "^1.0.1", - "flagged-respawn": "^1.0.0", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.0", - "rechoir": "^0.6.2", - "resolve": "^1.1.7" - } - }, - "lint-staged": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-8.2.1.tgz", - "integrity": "sha512-n0tDGR/rTCgQNwXnUf/eWIpPNddGWxC32ANTNYsj2k02iZb7Cz5ox2tytwBu+2r0zDXMEMKw7Y9OD/qsav561A==", - "requires": { - "chalk": "^2.3.1", - "commander": "^2.14.1", - "cosmiconfig": "^5.2.0", - "debug": "^3.1.0", - "dedent": "^0.7.0", - "del": "^3.0.0", - "execa": "^1.0.0", - "g-status": "^2.0.2", - "is-glob": "^4.0.0", - "is-windows": "^1.0.2", - "listr": "^0.14.2", - "listr-update-renderer": "^0.5.0", - "lodash": "^4.17.11", - "log-symbols": "^2.2.0", - "micromatch": "^3.1.8", - "npm-which": "^3.0.1", - "p-map": "^1.1.1", - "path-is-inside": "^1.0.2", - "pify": "^3.0.0", - "please-upgrade-node": "^3.0.2", - "staged-git-files": "1.1.2", - "string-argv": "^0.0.2", - "stringify-object": "^3.2.2", - "yup": "^0.27.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "listr": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz", - "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==", - "requires": { - "@samverschueren/stream-to-observable": "^0.3.0", - "is-observable": "^1.1.0", - "is-promise": "^2.1.0", - "is-stream": "^1.1.0", - "listr-silent-renderer": "^1.1.1", - "listr-update-renderer": "^0.5.0", - "listr-verbose-renderer": "^0.5.0", - "p-map": "^2.0.0", - "rxjs": "^6.3.3" - }, - "dependencies": { - "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" - } - } - }, - "listr-silent-renderer": { - "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=" - }, - "listr-update-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz", - "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==", - "requires": { - "chalk": "^1.1.3", - "cli-truncate": "^0.2.1", - "elegant-spinner": "^1.0.1", - "figures": "^1.7.0", - "indent-string": "^3.0.0", - "log-symbols": "^1.0.2", - "log-update": "^2.3.0", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", - "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" - } - }, - "log-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", - "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", - "requires": { - "chalk": "^1.0.0" - } - } - } - }, - "listr-verbose-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz", - "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==", - "requires": { - "chalk": "^2.4.1", - "cli-cursor": "^2.1.0", - "date-fns": "^1.27.2", - "figures": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "loader-runner": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", - "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==" - }, - "loader-utils": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", - "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^2.0.0", - "json5": "^1.0.1" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - } - } - }, - "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" - }, - "lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "log-driver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", - "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" - }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "requires": { - "chalk": "^2.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "log-update": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz", - "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=", - "requires": { - "ansi-escapes": "^3.0.0", - "cli-cursor": "^2.0.0", - "wrap-ansi": "^3.0.1" - }, - "dependencies": { - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "is-fullwidth-code-point": { - "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=" - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "wrap-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", - "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0" - } - } - } - }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - }, - "looper": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz", - "integrity": "sha1-Zs0Md0rz1P7axTeU90LbVtqPCew=" - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "optional": true - }, - "lru-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", - "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=", - "requires": { - "pseudomap": "^1.0.1" - } - }, - "ltgt": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz", - "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=" - }, - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "requires": { - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } - } - }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "requires": { - "kind-of": "^6.0.2" - } - }, - "mamacro": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", - "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==" - }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "requires": { - "p-defer": "^1.0.0" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" - }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "requires": { - "object-visit": "^1.0.0" - } - }, - "matchdep": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz", - "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=", - "requires": { - "findup-sync": "^2.0.0", - "micromatch": "^3.0.4", - "resolve": "^1.4.0", - "stack-trace": "0.0.10" - }, - "dependencies": { - "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - } - }, - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "matcher": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz", - "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", - "requires": { - "escape-string-regexp": "^1.0.4" - } - }, - "md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "optional": true - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "requires": { - "mimic-fn": "^1.0.0" - }, - "dependencies": { - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - } - } - }, - "memdown": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz", - "integrity": "sha1-tOThkhdGZP+65BNhqlAPMRnv4hU=", - "requires": { - "abstract-leveldown": "~2.7.1", - "functional-red-black-tree": "^1.0.1", - "immediate": "^3.2.3", - "inherits": "~2.0.1", - "ltgt": "~2.2.0", - "safe-buffer": "~5.1.1" - }, - "dependencies": { - "abstract-leveldown": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz", - "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==", - "requires": { - "xtend": "~4.0.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - }, - "memorystream": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", - "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=" - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "optional": true - }, - "merge-source-map": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "requires": { - "source-map": "^0.6.1" - } - }, - "merkle-patricia-tree": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz", - "integrity": "sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==", - "requires": { - "async": "^1.4.2", - "ethereumjs-util": "^5.0.0", - "level-ws": "0.0.0", - "levelup": "^1.2.1", - "memdown": "^1.0.0", - "readable-stream": "^2.0.0", - "rlp": "^2.0.0", - "semaphore": ">=1.0.1" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "level-codec": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz", - "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==" - }, - "level-errors": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz", - "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==", - "requires": { - "errno": "~0.1.1" - } - }, - "levelup": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz", - "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==", - "requires": { - "deferred-leveldown": "~1.2.1", - "level-codec": "~7.0.0", - "level-errors": "~1.0.3", - "level-iterator-stream": "~1.3.0", - "prr": "~1.0.1", - "semver": "~5.4.1", - "xtend": "~4.0.0" - } - }, - "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" - } - } - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "optional": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "optional": true - }, - "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" - }, - "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "requires": { - "mime-db": "1.40.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "optional": true - }, - "min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "requires": { - "dom-walk": "^0.1.0" - } - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - }, - "minipass": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - } - }, - "mkdirp-promise": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz", - "integrity": "sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=", - "optional": true, - "requires": { - "mkdirp": "*" - } - }, - "mocha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", - "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", - "requires": { - "browser-stdout": "1.3.1", - "commander": "2.15.1", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.5", - "he": "1.1.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "supports-color": "5.4.0" - }, - "dependencies": { - "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "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" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "mocha-lcov-reporter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/mocha-lcov-reporter/-/mocha-lcov-reporter-1.3.0.tgz", - "integrity": "sha1-Rpve9PivyaEWBW8HnfYYLQr7A4Q=" - }, - "mock-fs": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.10.1.tgz", - "integrity": "sha512-w22rOL5ZYu6HbUehB5deurghGM0hS/xBVyHMGKOuQctkk93J9z9VEOhDsiWrXOprVNQpP9uzGKdl8v9mFspKuw==", - "optional": true - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "mute-stdout": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz", - "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==" - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" - }, - "nan": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==" - }, - "nano-json-stream-parser": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz", - "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=", - "optional": true - }, - "nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" - }, - "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "optional": true - }, - "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" - }, - "nested-error-stacks": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz", - "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==" - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" - }, - "node-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", - "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=" - }, - "node-libs-browser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", - "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.1", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "^1.0.1" - }, - "dependencies": { - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - }, - "string_decoder": { - "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==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "util": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", - "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "requires": { - "inherits": "2.0.3" - } - } - } - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "normalize-url": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz", - "integrity": "sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==", - "optional": true - }, - "now-and-later": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", - "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", - "requires": { - "once": "^1.3.2" - } - }, - "npm-path": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", - "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==", - "requires": { - "which": "^1.2.10" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "requires": { - "path-key": "^2.0.0" - } - }, - "npm-which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz", - "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=", - "requires": { - "commander": "^2.9.0", - "npm-path": "^2.0.2", - "which": "^1.2.10" - }, - "dependencies": { - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" - } - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "number-to-bn": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", - "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=", - "optional": true, - "requires": { - "bn.js": "4.11.6", - "strip-hex-prefix": "1.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "optional": true - } - } - }, - "nyc": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-14.1.1.tgz", - "integrity": "sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==", - "requires": { - "archy": "^1.0.0", - "caching-transform": "^3.0.2", - "convert-source-map": "^1.6.0", - "cp-file": "^6.2.0", - "find-cache-dir": "^2.1.0", - "find-up": "^3.0.0", - "foreground-child": "^1.5.6", - "glob": "^7.1.3", - "istanbul-lib-coverage": "^2.0.5", - "istanbul-lib-hook": "^2.0.7", - "istanbul-lib-instrument": "^3.3.0", - "istanbul-lib-report": "^2.0.8", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^2.2.4", - "js-yaml": "^3.13.1", - "make-dir": "^2.1.0", - "merge-source-map": "^1.1.0", - "resolve-from": "^4.0.0", - "rimraf": "^2.6.3", - "signal-exit": "^3.0.2", - "spawn-wrap": "^1.4.2", - "test-exclude": "^5.2.3", - "uuid": "^3.3.2", - "yargs": "^13.2.2", - "yargs-parser": "^13.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, - "is-fullwidth-code-point": { - "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=" - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - }, - "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "object-inspect": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", - "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==" - }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" - }, - "object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "requires": { - "isobject": "^3.0.0" - } - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - }, - "dependencies": { - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - } - } - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "requires": { - "isobject": "^3.0.1" - } - }, - "object.reduce": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz", - "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "oboe": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.4.tgz", - "integrity": "sha1-IMiM2wwVNxuwQRklfU/dNLCqSfY=", - "optional": true, - "requires": { - "http-https": "^1.0.0" - } - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "optional": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" - } - } - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - } - }, - "ordered-read-streams": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", - "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", - "requires": { - "readable-stream": "^2.0.1" - } - }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "requires": { - "lcid": "^1.0.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "p-cancelable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", - "optional": true - }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" - }, - "p-is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==" - }, - "p-timeout": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", - "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", - "optional": true, - "requires": { - "p-finally": "^1.0.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" - }, - "package-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz", - "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==", - "requires": { - "graceful-fs": "^4.1.15", - "hasha": "^3.0.0", - "lodash.flattendeep": "^4.4.0", - "release-zalgo": "^1.0.0" - } - }, - "pako": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", - "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==" - }, - "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", - "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - } - }, - "parse-asn1": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", - "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", - "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-headers": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.2.tgz", - "integrity": "sha512-/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg==", - "requires": { - "for-each": "^0.3.3", - "string.prototype.trim": "^1.1.2" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "requires": { - "error-ex": "^1.2.0" - } - }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "optional": true - }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" - }, - "path-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", - "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==" - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" - }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "optional": true - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "pbkdf2": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", - "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "optional": true - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" - }, - "pify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.0.tgz", - "integrity": "sha512-zrSP/KDf9DH3K3VePONoCstgPiYJy9z0SCatZuTpOc7YdnWIqwkWdXOuwlr4uDc7em8QZRsFWsT/685x5InjYg==" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "requires": { - "pinkie": "^2.0.0" - } - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "requires": { - "find-up": "^2.1.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - } - } - }, - "please-upgrade-node": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", - "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", - "requires": { - "semver-compare": "^1.0.0" - } - }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==" - }, - "portfinder": { - "version": "1.0.21", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz", - "integrity": "sha512-ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA==", - "requires": { - "async": "^1.5.2", - "debug": "^2.2.0", - "mkdirp": "0.5.x" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" - }, - "precond": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz", - "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw=" - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "optional": true - }, - "prettier": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz", - "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==" - }, - "pretty-hrtime": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" - }, - "process": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", - "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" - }, - "promise-to-callback": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/promise-to-callback/-/promise-to-callback-1.0.0.tgz", - "integrity": "sha1-XSp0kBC/tn2WNZj805YHRqaP7vc=", - "requires": { - "is-fn": "^1.0.0", - "set-immediate-shim": "^1.0.1" - } - }, - "property-expr": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-1.5.1.tgz", - "integrity": "sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==" - }, - "proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", - "optional": true, - "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, - "psl": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", - "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==" - }, - "public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "pull-cat": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz", - "integrity": "sha1-tkLdElXaN2pwa220+pYvX9t0wxs=" - }, - "pull-defer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/pull-defer/-/pull-defer-0.2.3.tgz", - "integrity": "sha512-/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA==" - }, - "pull-level": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pull-level/-/pull-level-2.0.4.tgz", - "integrity": "sha512-fW6pljDeUThpq5KXwKbRG3X7Ogk3vc75d5OQU/TvXXui65ykm+Bn+fiktg+MOx2jJ85cd+sheufPL+rw9QSVZg==", - "requires": { - "level-post": "^1.0.7", - "pull-cat": "^1.1.9", - "pull-live": "^1.0.1", - "pull-pushable": "^2.0.0", - "pull-stream": "^3.4.0", - "pull-window": "^2.1.4", - "stream-to-pull-stream": "^1.7.1" - } - }, - "pull-live": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz", - "integrity": "sha1-pOzuAeMwFV6RJLu89HYfIbOPUfU=", - "requires": { - "pull-cat": "^1.1.9", - "pull-stream": "^3.4.0" - } - }, - "pull-pushable": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz", - "integrity": "sha1-Xy867UethpGfAbEqLpnW8b13ZYE=" - }, - "pull-stream": { - "version": "3.6.14", - "resolved": "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz", - "integrity": "sha512-KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew==" - }, - "pull-window": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz", - "integrity": "sha1-/DuG/uvRkgx64pdpHiP3BfiFUvA=", - "requires": { - "looper": "^2.0.0" - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - }, - "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "optional": true - }, - "query-string": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", - "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", - "optional": true, - "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - } - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, - "randomhex": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/randomhex/-/randomhex-0.1.5.tgz", - "integrity": "sha1-us7vmCMpCRQA8qKRLGzQLxCU9YU=", - "optional": true - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "optional": true - }, - "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "optional": true, - "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } - }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "requires": { - "resolve": "^1.1.6" - } - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==" - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - }, - "regenerator-transform": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", - "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", - "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" - } - }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } - }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==" - }, - "regexpu-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "requires": { - "jsesc": "~0.5.0" - } - }, - "release-zalgo": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", - "requires": { - "es6-error": "^4.0.1" - } - }, - "remove-bom-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", - "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", - "requires": { - "is-buffer": "^1.1.5", - "is-utf8": "^0.2.1" - } - }, - "remove-bom-stream": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz", - "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=", - "requires": { - "remove-bom-buffer": "^3.0.0", - "safe-buffer": "^5.1.0", - "through2": "^2.0.3" - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" - }, - "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "requires": { - "is-finite": "^1.0.0" - } - }, - "replace-ext": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", - "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" - }, - "replace-homedir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz", - "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=", - "requires": { - "homedir-polyfill": "^1.0.1", - "is-absolute": "^1.0.0", - "remove-trailing-separator": "^1.1.0" - } - }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" - } - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, - "require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", - "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" - } - }, - "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", - "requires": { - "path-parse": "^1.0.6" - } - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "requires": { - "resolve-from": "^3.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" - } - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=" - }, - "resolve-options": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", - "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=", - "requires": { - "value-or-function": "^3.0.0" - } - }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" - }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "optional": true, - "requires": { - "lowercase-keys": "^1.0.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "resumer": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", - "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", - "requires": { - "through": "~2.3.4" - } - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" - }, - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "requires": { - "glob": "^7.1.3" - } - }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, - "rlp": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.3.tgz", - "integrity": "sha512-l6YVrI7+d2vpW6D6rS05x2Xrmq8oW7v3pieZOJKBEdjuTF4Kz/iwk55Zyh1Zaz+KOB2kC8+2jZlp2u9L4tTzCQ==", - "requires": { - "bn.js": "^4.11.1", - "safe-buffer": "^5.1.1" - } - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "requires": { - "is-promise": "^2.1.0" - } - }, - "run-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz", - "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==" - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "requires": { - "aproba": "^1.1.1" - } - }, - "rustbn.js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz", - "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==" - }, - "rxjs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", - "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", - "requires": { - "tslib": "^1.9.0" - } - }, - "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" - }, - "safe-event-emitter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-event-emitter/-/safe-event-emitter-1.0.1.tgz", - "integrity": "sha512-e1wFe99A91XYYxoQbcq2ZJUWurxEyP8vfz7A7vuUe1s95q8r5ebraVaA1BukYJcpM6V16ugWoD9vngi8Ccu5fg==", - "requires": { - "events": "^3.0.0" - } - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "requires": { - "ret": "~0.1.10" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "scrypt": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/scrypt/-/scrypt-6.0.3.tgz", - "integrity": "sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0=", - "optional": true, - "requires": { - "nan": "^2.0.8" - } - }, - "scrypt-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", - "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=", - "optional": true - }, - "scrypt.js": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/scrypt.js/-/scrypt.js-0.3.0.tgz", - "integrity": "sha512-42LTc1nyFsyv/o0gcHtDztrn+aqpkaCNt5Qh7ATBZfhEZU7IC/0oT/qbBH+uRNoAPvs2fwiOId68FDEoSRA8/A==", - "optional": true, - "requires": { - "scrypt": "^6.0.2", - "scryptsy": "^1.2.1" - } - }, - "scryptsy": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-1.2.1.tgz", - "integrity": "sha1-oyJfpLJST4AnAHYeKFW987LZIWM=", - "optional": true, - "requires": { - "pbkdf2": "^3.0.3" - } - }, - "secp256k1": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.7.1.tgz", - "integrity": "sha512-1cf8sbnRreXrQFdH6qsg2H71Xw91fCCS9Yp021GnUNJzWJS/py96fS4lHbnTnouLp08Xj6jBoBB6V78Tdbdu5g==", - "requires": { - "bindings": "^1.5.0", - "bip66": "^1.1.5", - "bn.js": "^4.11.8", - "create-hash": "^1.2.0", - "drbg.js": "^1.0.1", - "elliptic": "^6.4.1", - "nan": "^2.14.0", - "safe-buffer": "^5.1.2" - }, - "dependencies": { - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" - } - } - }, - "seedrandom": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.1.tgz", - "integrity": "sha512-1/02Y/rUeU1CJBAGLebiC5Lbo5FnB22gQbIFFYTLkwvp1xdABZJH1sn4ZT1MzXmPpzv+Rf/Lu2NcsLJiK4rcDg==" - }, - "seek-bzip": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", - "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", - "optional": true, - "requires": { - "commander": "~2.8.1" - } - }, - "semaphore": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz", - "integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==" - }, - "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" - }, - "semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=" - }, - "semver-greatest-satisfied-range": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz", - "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=", - "requires": { - "sver-compat": "^1.5.0" - } - }, - "send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "optional": true, - "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "optional": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "optional": true - } - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "optional": true - } - } - }, - "serialize-javascript": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz", - "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==" - }, - "serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "optional": true, - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" - } - }, - "servify": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/servify/-/servify-0.1.12.tgz", - "integrity": "sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==", - "optional": true, - "requires": { - "body-parser": "^1.16.0", - "cors": "^2.8.1", - "express": "^4.14.0", - "request": "^2.79.0", - "xhr": "^2.3.3" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" - }, - "set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" - }, - "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", - "optional": true - }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "sha3": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.3.tgz", - "integrity": "sha512-sOWDZi8cDBRkLfWOw18wvJyNblXDHzwMGnRWut8zNNeIeLnmMRO17bjpLc7OzMuj1ASUgx2IyohzUCAl+Kx5vA==", - "requires": { - "nan": "2.13.2" - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" - }, - "simple-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", - "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=", - "optional": true - }, - "simple-get": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz", - "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==", - "optional": true, - "requires": { - "decompress-response": "^3.3.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "simple-git": { - "version": "1.124.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.124.0.tgz", - "integrity": "sha512-ks9mBoO4ODQy/xGLC8Cc+YDvj/hho/IKgPhi6h5LI/sA+YUdHc3v0DEoHzM29VmulubpGCxMJUSFmyXNsjNMEA==", - "requires": { - "debug": "^4.0.1" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" - }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "is-fullwidth-code-point": { - "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=" - } - } - }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "requires": { - "kind-of": "^3.2.0" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "solc": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.10.tgz", - "integrity": "sha512-Stdrh/MDkopsXYPRzPehTNYuV80Grr2CnQMuFvWj+EeRVbe3piGHxW47KebWn1sGdmK8FLaMfUehccqJP0KovQ==", - "requires": { - "command-exists": "^1.2.8", - "fs-extra": "^0.30.0", - "keccak": "^1.0.2", - "memorystream": "^0.3.1", - "require-from-string": "^2.0.0", - "semver": "^5.5.0", - "tmp": "0.0.33", - "yargs": "^11.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - }, - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" - }, - "is-fullwidth-code-point": { - "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=" - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - }, - "yargs": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", - "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - } - }, - "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", - "requires": { - "camelcase": "^4.1.0" - } - } - } - }, - "source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "source-map-support": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", - "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" - }, - "sparkles": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", - "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==" - }, - "spawn-wrap": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", - "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==", - "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" - } - }, - "spdx-correct": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", - "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" - }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "dependencies": { - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - } - } - }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "requires": { - "figgy-pudding": "^3.5.1" - } - }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" - }, - "staged-git-files": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-1.1.2.tgz", - "integrity": "sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==" - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "optional": true - }, - "stream-browserify": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", - "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - } - }, - "stream-each": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", - "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", - "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } - }, - "stream-exhaust": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", - "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==" - }, - "stream-http": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", - "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - } - }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" - }, - "stream-to-pull-stream": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz", - "integrity": "sha512-6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg==", - "requires": { - "looper": "^3.0.0", - "pull-stream": "^3.2.3" - }, - "dependencies": { - "looper": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz", - "integrity": "sha1-LvpUw7HLq6m5Su4uWRSwvlf7t0k=" - } - } - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", - "optional": true - }, - "string-argv": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz", - "integrity": "sha1-2sMECGkMIfPDYwo/86BYd73L1zY=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string.prototype.trim": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz", - "integrity": "sha512-9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==", - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.13.0", - "function-bind": "^1.1.1" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, - "stringify-object": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", - "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", - "requires": { - "get-own-enumerable-property-symbols": "^3.0.0", - "is-obj": "^1.0.1", - "is-regexp": "^1.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-dirs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", - "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", - "optional": true, - "requires": { - "is-natural-number": "^4.0.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" - }, - "strip-hex-prefix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", - "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", - "requires": { - "is-hex-prefixed": "1.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - }, - "sver-compat": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", - "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", - "requires": { - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" - } - }, - "swarm-js": { - "version": "0.1.39", - "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.39.tgz", - "integrity": "sha512-QLMqL2rzF6n5s50BptyD6Oi0R1aWlJC5Y17SRIVXRj6OR1DRIPM7nepvrxxkjA1zNzFz6mUOMjfeqeDaWB7OOg==", - "optional": true, - "requires": { - "bluebird": "^3.5.0", - "buffer": "^5.0.5", - "decompress": "^4.0.0", - "eth-lib": "^0.1.26", - "fs-extra": "^4.0.2", - "got": "^7.1.0", - "mime-types": "^2.1.16", - "mkdirp-promise": "^5.0.1", - "mock-fs": "^4.1.0", - "setimmediate": "^1.0.5", - "tar": "^4.0.2", - "xhr-request-promise": "^0.1.2" - }, - "dependencies": { - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "optional": true - }, - "got": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", - "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", - "optional": true, - "requires": { - "decompress-response": "^3.2.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-plain-obj": "^1.1.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^1.1.1", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "url-parse-lax": "^1.0.0", - "url-to-options": "^1.0.1" - } - }, - "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", - "optional": true - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", - "optional": true - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "optional": true, - "requires": { - "prepend-http": "^1.0.1" - } - } - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, - "synchronous-promise": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.9.tgz", - "integrity": "sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==" - }, - "table": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.5.tgz", - "integrity": "sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==", - "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "is-fullwidth-code-point": { - "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=" - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "tapable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" - }, - "tape": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/tape/-/tape-4.11.0.tgz", - "integrity": "sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==", - "requires": { - "deep-equal": "~1.0.1", - "defined": "~1.0.0", - "for-each": "~0.3.3", - "function-bind": "~1.1.1", - "glob": "~7.1.4", - "has": "~1.0.3", - "inherits": "~2.0.4", - "minimist": "~1.2.0", - "object-inspect": "~1.6.0", - "resolve": "~1.11.1", - "resumer": "~0.0.0", - "string.prototype.trim": "~1.1.2", - "through": "~2.3.8" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "resolve": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", - "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", - "requires": { - "path-parse": "^1.0.6" - } - }, - "string.prototype.trim": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", - "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=", - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.0", - "function-bind": "^1.0.2" - } - } - } - }, - "tar": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", - "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.5", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - } - }, - "tar-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", - "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", - "optional": true, - "requires": { - "bl": "^1.0.0", - "buffer-alloc": "^1.2.0", - "end-of-stream": "^1.0.0", - "fs-constants": "^1.0.0", - "readable-stream": "^2.3.0", - "to-buffer": "^1.1.1", - "xtend": "^4.0.0" - } - }, - "temp": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", - "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=", - "requires": { - "os-tmpdir": "^1.0.0", - "rimraf": "~2.2.6" - }, - "dependencies": { - "rimraf": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", - "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=" - } - } - }, - "terser": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.4.tgz", - "integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==", - "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" - }, - "dependencies": { - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" - } - } - }, - "terser-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==", - "requires": { - "cacache": "^11.3.2", - "find-cache-dir": "^2.0.0", - "is-wsl": "^1.1.0", - "loader-utils": "^1.2.3", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", - "source-map": "^0.6.1", - "terser": "^4.0.0", - "webpack-sources": "^1.3.0", - "worker-farm": "^1.7.0" - } - }, - "test-exclude": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", - "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==", - "requires": { - "glob": "^7.1.3", - "minimatch": "^3.0.4", - "read-pkg-up": "^4.0.0", - "require-main-filename": "^2.0.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - } - }, - "read-pkg-up": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", - "requires": { - "find-up": "^3.0.0", - "read-pkg": "^3.0.0" - } - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - } - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "through2-filter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", - "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", - "requires": { - "through2": "~2.0.0", - "xtend": "~4.0.0" - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" - }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", - "optional": true - }, - "timers-browserify": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", - "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", - "requires": { - "setimmediate": "^1.0.4" - } - }, - "tmp": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", - "requires": { - "rimraf": "^2.6.3" - } - }, - "to-absolute-glob": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", - "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", - "requires": { - "is-absolute": "^1.0.0", - "is-negated-glob": "^1.0.0" - } - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" - }, - "to-buffer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", - "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", - "optional": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" - }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", - "optional": true - }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "to-through": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", - "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", - "requires": { - "through2": "^2.0.3" - } - }, - "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "optional": true - }, - "toposort": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", - "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=" - }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } - } - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" - }, - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz", - "integrity": "sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A==" - }, - "tweetnacl-util": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.0.tgz", - "integrity": "sha1-RXbBzuXi1j0gf+5S8boCgZSAvHU=" - }, - "type": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/type/-/type-1.0.3.tgz", - "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==" - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "type-fest": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", - "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==" - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "optional": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } - }, - "typewise": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz", - "integrity": "sha1-EGeTZUCvl5N8xdz5kiSG6fooRlE=", - "requires": { - "typewise-core": "^1.2.0" - } - }, - "typewise-core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz", - "integrity": "sha1-l+uRgFx/VdL5QXSPpQ0xXZke8ZU=" - }, - "typewiselite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz", - "integrity": "sha1-yIgvobsQksBgBal/NO9chQjjZk4=" - }, - "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", - "optional": true, - "requires": { - "commander": "~2.20.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", - "optional": true - } - } - }, - "uglifyjs-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==", - "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.5", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "uglify-es": "^3.3.4", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" - }, - "dependencies": { - "cacache": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", - "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", - "requires": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^5.2.4", - "unique-filename": "^1.1.0", - "y18n": "^4.0.0" - } - }, - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==" - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" - } - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "mississippi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", - "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^2.0.1", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" - } - }, - "ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", - "requires": { - "safe-buffer": "^5.1.1" - } - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - } - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - } - } - }, - "ultron": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", - "optional": true - }, - "unbzip2-stream": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", - "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", - "optional": true, - "requires": { - "buffer": "^5.2.1", - "through": "^2.3.8" - } - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, - "underscore": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", - "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==", - "optional": true - }, - "undertaker": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz", - "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==", - "requires": { - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "bach": "^1.0.0", - "collection-map": "^1.0.0", - "es6-weak-map": "^2.0.1", - "last-run": "^1.1.0", - "object.defaults": "^1.0.0", - "object.reduce": "^1.0.0", - "undertaker-registry": "^1.0.0" - } - }, - "undertaker-registry": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=" - }, - "union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - } - }, - "unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "requires": { - "unique-slug": "^2.0.0" - } - }, - "unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "unique-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz", - "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==", - "requires": { - "json-stable-stringify-without-jsonify": "^1.0.1", - "through2-filter": "^3.0.0" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "optional": true - }, - "unorm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz", - "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==" - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "optional": true - }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - } - } - }, - "upath": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==" - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "requires": { - "punycode": "^2.1.0" - } - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - } - } - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "optional": true, - "requires": { - "prepend-http": "^2.0.0" - } - }, - "url-set-query": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", - "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=", - "optional": true - }, - "url-to-options": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", - "optional": true - }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" - }, - "utf8": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", - "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", - "optional": true - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "requires": { - "inherits": "2.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "optional": true - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" - }, - "v8-compile-cache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", - "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==" - }, - "v8flags": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", - "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "value-or-function": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", - "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "optional": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "vinyl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", - "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", - "requires": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" - } - }, - "vinyl-fs": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", - "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==", - "requires": { - "fs-mkdirp-stream": "^1.0.0", - "glob-stream": "^6.1.0", - "graceful-fs": "^4.0.0", - "is-valid-glob": "^1.0.0", - "lazystream": "^1.0.0", - "lead": "^1.0.0", - "object.assign": "^4.0.4", - "pumpify": "^1.3.5", - "readable-stream": "^2.3.3", - "remove-bom-buffer": "^3.0.0", - "remove-bom-stream": "^1.2.0", - "resolve-options": "^1.1.0", - "through2": "^2.0.0", - "to-through": "^2.0.0", - "value-or-function": "^3.0.0", - "vinyl": "^2.0.0", - "vinyl-sourcemap": "^1.1.0" - } - }, - "vinyl-sourcemap": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", - "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", - "requires": { - "append-buffer": "^1.0.2", - "convert-source-map": "^1.5.0", - "graceful-fs": "^4.1.6", - "normalize-path": "^2.1.1", - "now-and-later": "^2.0.0", - "remove-bom-buffer": "^3.0.0", - "vinyl": "^2.0.0" - } - }, - "vm-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", - "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==" - }, - "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", - "requires": { - "chokidar": "^2.0.2", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" - } - }, - "web3": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", - "integrity": "sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw==", - "optional": true, - "requires": { - "web3-bzz": "1.2.1", - "web3-core": "1.2.1", - "web3-eth": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-shh": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-bzz": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.1.tgz", - "integrity": "sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw==", - "optional": true, - "requires": { - "got": "9.6.0", - "swarm-js": "0.1.39", - "underscore": "1.9.1" - } - }, - "web3-core": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.1.tgz", - "integrity": "sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg==", - "optional": true, - "requires": { - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-requestmanager": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-core-helpers": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz", - "integrity": "sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw==", - "optional": true, - "requires": { - "underscore": "1.9.1", - "web3-eth-iban": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-core-method": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.1.tgz", - "integrity": "sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ==", - "optional": true, - "requires": { - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-core-promievent": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz", - "integrity": "sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw==", - "optional": true, - "requires": { - "any-promise": "1.3.0", - "eventemitter3": "3.1.2" - } - }, - "web3-core-requestmanager": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz", - "integrity": "sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg==", - "optional": true, - "requires": { - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "web3-providers-http": "1.2.1", - "web3-providers-ipc": "1.2.1", - "web3-providers-ws": "1.2.1" - } - }, - "web3-core-subscriptions": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz", - "integrity": "sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g==", - "optional": true, - "requires": { - "eventemitter3": "3.1.2", - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1" - } - }, - "web3-eth": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.1.tgz", - "integrity": "sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA==", - "optional": true, - "requires": { - "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-eth-accounts": "1.2.1", - "web3-eth-contract": "1.2.1", - "web3-eth-ens": "1.2.1", - "web3-eth-iban": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-eth-abi": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz", - "integrity": "sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g==", - "optional": true, - "requires": { - "ethers": "4.0.0-beta.3", - "underscore": "1.9.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=", - "optional": true - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "optional": true, - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "ethers": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", - "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", - "optional": true, - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.3", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "optional": true, - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=", - "optional": true - }, - "setimmediate": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", - "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=", - "optional": true - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=", - "optional": true - } - } - }, - "web3-eth-accounts": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz", - "integrity": "sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ==", - "optional": true, - "requires": { - "any-promise": "1.3.0", - "crypto-browserify": "3.12.0", - "eth-lib": "0.2.7", - "scryptsy": "2.1.0", - "semver": "6.2.0", - "underscore": "1.9.1", - "uuid": "3.3.2", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "eth-lib": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", - "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", - "optional": true, - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "xhr-request-promise": "^0.1.2" - } - }, - "scryptsy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz", - "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==", - "optional": true - }, - "semver": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", - "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", - "optional": true - } - } - }, - "web3-eth-contract": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.1.tgz", - "integrity": "sha512-kYFESbQ3boC9bl2rYVghj7O8UKMiuKaiMkxvRH5cEDHil8V7MGEGZNH0slSdoyeftZVlaWSMqkRP/chfnKND0g==", - "optional": true, - "requires": { - "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-eth-ens": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz", - "integrity": "sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q==", - "optional": true, - "requires": { - "eth-ens-namehash": "2.0.8", - "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-eth-contract": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-eth-iban": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz", - "integrity": "sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ==", - "optional": true, - "requires": { - "bn.js": "4.11.8", - "web3-utils": "1.2.1" - } - }, - "web3-eth-personal": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz", - "integrity": "sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg==", - "optional": true, - "requires": { - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-net": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-net": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.1.tgz", - "integrity": "sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw==", - "optional": true, - "requires": { - "web3-core": "1.2.1", - "web3-core-method": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-provider-engine": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-14.2.1.tgz", - "integrity": "sha512-iSv31h2qXkr9vrL6UZDm4leZMc32SjWJFGOp/D92JXfcEboCqraZyuExDkpxKw8ziTufXieNM7LSXNHzszYdJw==", - "requires": { - "async": "^2.5.0", - "backoff": "^2.5.0", - "clone": "^2.0.0", - "cross-fetch": "^2.1.0", - "eth-block-tracker": "^3.0.0", - "eth-json-rpc-infura": "^3.1.0", - "eth-sig-util": "^1.4.2", - "ethereumjs-block": "^1.2.2", - "ethereumjs-tx": "^1.2.0", - "ethereumjs-util": "^5.1.5", - "ethereumjs-vm": "^2.3.4", - "json-rpc-error": "^2.0.0", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "readable-stream": "^2.2.9", - "request": "^2.85.0", - "semaphore": "^1.0.3", - "ws": "^5.1.1", - "xhr": "^2.2.0", - "xtend": "^4.0.1" - }, - "dependencies": { - "eth-sig-util": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz", - "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=", - "requires": { - "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git", - "ethereumjs-util": "^5.1.1" - } - }, - "ethereum-common": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz", - "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==" - }, - "ethereumjs-abi": { - "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1cfbb13862f90f0b391d8a699544d5fe4dfb8c7b", - "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", - "requires": { - "bn.js": "^4.11.8", - "ethereumjs-util": "^6.0.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-account": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz", - "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==", - "requires": { - "ethereumjs-util": "^5.0.0", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1" - } - }, - "ethereumjs-block": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz", - "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==", - "requires": { - "async": "^2.0.1", - "ethereum-common": "0.2.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - } - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz", - "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ws": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", - "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", - "requires": { - "async-limiter": "~1.0.0" - } - } - } - }, - "web3-providers-http": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.1.tgz", - "integrity": "sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ==", - "optional": true, - "requires": { - "web3-core-helpers": "1.2.1", - "xhr2-cookies": "1.1.0" - } - }, - "web3-providers-ipc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz", - "integrity": "sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA==", - "optional": true, - "requires": { - "oboe": "2.1.4", - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1" - } - }, - "web3-providers-ws": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz", - "integrity": "sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA==", - "optional": true, - "requires": { - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "optional": true - }, - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "optional": true - }, - "websocket": { - "version": "github:web3-js/WebSocket-Node#b134a75541b5db59668df81c03e926cd5f325077", - "from": "github:web3-js/WebSocket-Node#polyfill/globalThis", - "optional": true, - "requires": { - "debug": "^2.2.0", - "es5-ext": "^0.10.50", - "nan": "^2.14.0", - "typedarray-to-buffer": "^3.1.5", - "yaeti": "^0.0.6" - } - } - } - }, - "web3-shh": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.1.tgz", - "integrity": "sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA==", - "optional": true, - "requires": { - "web3-core": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-net": "1.2.1" - } - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "optional": true, - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - }, - "dependencies": { - "eth-lib": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", - "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", - "optional": true, - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "xhr-request-promise": "^0.1.2" - } - } - } - }, - "webpack": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.17.1.tgz", - "integrity": "sha512-vdPYogljzWPhFKDj3Gcp01Vqgu7K3IQlybc3XIdKSQHelK1C3eIQuysEUR7MxKJmdandZlQB/9BG2Jb1leJHaw==", - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/wasm-edit": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "acorn": "^5.6.2", - "acorn-dynamic-import": "^3.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", - "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", - "schema-utils": "^0.4.4", - "tapable": "^1.0.0", - "uglifyjs-webpack-plugin": "^1.2.4", - "watchpack": "^1.5.0", - "webpack-sources": "^1.0.1" - }, - "dependencies": { - "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" - }, - "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "webpack-bundle-size-analyzer": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-size-analyzer/-/webpack-bundle-size-analyzer-2.7.0.tgz", - "integrity": "sha1-LsBTn9V/hxYIOJizi4kv6UyIxrw=", - "requires": { - "commander": "^2.7.1", - "filesize": "^3.1.2", - "humanize": "0.0.9" - } - }, - "webpack-cli": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.0.tgz", - "integrity": "sha512-p5NeKDtYwjZozUWq6kGNs9w+Gtw/CPvyuXjXn2HMdz8Tie+krjEg8oAtonvIyITZdvpF7XG9xDHwscLr2c+ugQ==", - "requires": { - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.0.0", - "global-modules-path": "^2.1.0", - "import-local": "^1.0.0", - "inquirer": "^6.0.0", - "interpret": "^1.1.0", - "loader-utils": "^1.1.0", - "supports-color": "^5.4.0", - "v8-compile-cache": "^2.0.0", - "yargs": "^12.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" - }, - "is-fullwidth-code-point": { - "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=" - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "requires": { - "invert-kv": "^2.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - } - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } - }, - "websocket": { - "version": "1.0.29", - "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.29.tgz", - "integrity": "sha512-WhU8jKXC8sTh6ocLSqpZRlOKMNYGwUvjA5+XcIgIk/G3JCaDfkZUr0zA19sVSxJ0TEvm0i5IBzr54RZC4vzW7g==", - "requires": { - "debug": "^2.2.0", - "gulp": "^4.0.2", - "nan": "^2.11.0", - "typedarray-to-buffer": "^3.1.5", - "yaeti": "^0.0.6" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "whatwg-fetch": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", - "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, - "worker-farm": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", - "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", - "requires": { - "errno": "~0.1.7" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", - "requires": { - "mkdirp": "^0.5.1" - } - }, - "write-file-atomic": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", - "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } - }, - "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "optional": true, - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "optional": true - } - } - }, - "xhr": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz", - "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==", - "requires": { - "global": "~4.3.0", - "is-function": "^1.0.1", - "parse-headers": "^2.0.0", - "xtend": "^4.0.0" - } - }, - "xhr-request": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/xhr-request/-/xhr-request-1.1.0.tgz", - "integrity": "sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==", - "optional": true, - "requires": { - "buffer-to-arraybuffer": "^0.0.5", - "object-assign": "^4.1.1", - "query-string": "^5.0.1", - "simple-get": "^2.7.0", - "timed-out": "^4.0.1", - "url-set-query": "^1.0.0", - "xhr": "^2.0.4" - } - }, - "xhr-request-promise": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/xhr-request-promise/-/xhr-request-promise-0.1.2.tgz", - "integrity": "sha1-NDxE0e53JrhkgGloLQ+EDIO0Jh0=", - "optional": true, - "requires": { - "xhr-request": "^1.0.1" - } - }, - "xhr2-cookies": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", - "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=", - "optional": true, - "requires": { - "cookiejar": "^2.1.1" - } - }, - "xmlhttprequest": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", - "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yaeti": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" - }, - "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" - } - }, - "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "requires": { - "camelcase": "^3.0.0" - } - }, - "yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "optional": true, - "requires": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "yup": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz", - "integrity": "sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==", - "requires": { - "@babel/runtime": "^7.0.0", - "fn-name": "~2.0.1", - "lodash": "^4.17.11", - "property-expr": "^1.5.0", - "synchronous-promise": "^2.0.6", - "toposort": "^2.0.2" - } - } - } - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "generate-object-property": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", - "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", - "requires": { - "is-property": "^1.0.0" - } - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=" - }, - "get-installed-path": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/get-installed-path/-/get-installed-path-4.0.8.tgz", - "integrity": "sha512-PmANK1xElIHlHH2tXfOoTnSDUjX1X3GvKK6ZyLbUnSCCn1pADwu67eVWttuPzJWrXDDT2MfO6uAaKILOFfitmA==", - "requires": { - "global-modules": "1.0.0" - }, - "dependencies": { - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - } - } - }, - "get-port": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", - "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", - "dev": true - }, - "get-proxy": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz", - "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=", - "requires": { - "rc": "^1.1.2" - } - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" - }, - "get-value": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-1.3.1.tgz", - "integrity": "sha1-isfvTyA4I5KyZGVI+bmtLcbIlkI=", - "requires": { - "arr-flatten": "^1.0.1", - "is-extendable": "^0.1.1", - "lazy-cache": "^0.2.4", - "noncharacters": "^1.1.0" - }, - "dependencies": { - "lazy-cache": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=" - } - } - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", - "optional": true - }, - "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "requires": { - "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" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - }, - "dependencies": { - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "requires": { - "is-glob": "^2.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, - "glob-fs": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/glob-fs/-/glob-fs-0.1.7.tgz", - "integrity": "sha512-f0U3u9xK8MEYtKDCnZXvZrZAy4uNp+KSA4xfaKI/NxbE6HXhqUBQ485Uwd6jQa/Q6z1yKi804WT9y53RrwuMxQ==", - "requires": { - "async": "^1.3.0", - "bluebird": "^2.9.33", - "component-emitter": "^1.2.0", - "ends-with": "^0.2.0", - "export-files": "^2.0.1", - "extend-shallow": "^2.0.0", - "get-value": "^1.1.5", - "glob-fs-dotfiles": "^0.1.6", - "glob-fs-gitignore": "^0.1.5", - "glob-parent": "^1.2.0", - "graceful-fs": "^4.1.2", - "is-dotdir": "^0.1.0", - "is-dotfile": "^1.0.1", - "is-glob": "^2.0.0", - "is-windows": "^0.1.0", - "kind-of": "^2.0.0", - "lazy-cache": "^0.1.0", - "micromatch": "github:jonschlinkert/micromatch#2.2.0", - "mixin-object": "^2.0.0", - "object-visit": "^0.1.0", - "object.omit": "^1.1.0", - "parse-filepath": "^0.6.1", - "relative": "^3.0.1", - "set-value": "^0.2.0", - "starts-with": "^1.0.2", - "through2": "^2.0.0" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "glob-parent": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-1.3.0.tgz", - "integrity": "sha1-lx7dgW7V21hwW1gHlkemTQrveWg=", - "requires": { - "is-glob": "^2.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, - "glob-fs-dotfiles": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/glob-fs-dotfiles/-/glob-fs-dotfiles-0.1.6.tgz", - "integrity": "sha1-tPF7c8GIQYq6R80gbPWnImtKiUk=" - }, - "glob-fs-gitignore": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/glob-fs-gitignore/-/glob-fs-gitignore-0.1.6.tgz", - "integrity": "sha1-iF5vQS+FnMWXVhVIKdvVVybN6ZI=", - "requires": { - "findup-sync": "^1.0.0", - "micromatch": "^2.3.11", - "parse-gitignore": "^0.2.0" - }, - "dependencies": { - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - } - } - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "global": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", - "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", - "requires": { - "min-document": "^2.19.0", - "process": "~0.5.1" - } - }, - "global-modules": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", - "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", - "requires": { - "global-prefix": "^0.1.4", - "is-windows": "^0.2.0" - }, - "dependencies": { - "is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=" - } - } - }, - "global-prefix": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", - "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", - "requires": { - "homedir-polyfill": "^1.0.0", - "ini": "^1.3.4", - "is-windows": "^0.2.0", - "which": "^1.2.12" - }, - "dependencies": { - "is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=" - } - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" - }, - "google-libphonenumber": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/google-libphonenumber/-/google-libphonenumber-3.2.6.tgz", - "integrity": "sha512-6QCQAaKJlSd/1dUqvdQf7zzfb3uiZHsG8yhCfOdCVRfMuPZ/VDIEB47y5SYwjPQJPs7ebfW5jj6PeobB9JJ4JA==" - }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - }, - "dependencies": { - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } - } - } - }, - "graceful-fs": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", - "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" - }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" - }, - "graphql": { - "version": "14.5.8", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.5.8.tgz", - "integrity": "sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==", - "requires": { - "iterall": "^1.2.2" - } - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==" - }, - "handlebars": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz", - "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==", - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - } - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "has-symbol-support-x": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" - }, - "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" - }, - "has-to-string-tag-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", - "requires": { - "has-symbol-support-x": "^1.4.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "optional": true - }, - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "hdkey": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/hdkey/-/hdkey-1.1.1.tgz", - "integrity": "sha512-DvHZ5OuavsfWs5yfVJZestsnc3wzPvLWNk6c2nRUfo6X+OtxypGt20vDDf7Ba+MJzjL3KS1og2nw2eBbLCOUTA==", - "requires": { - "coinstring": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hosted-git-info": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", - "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==" - }, - "http-basic": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz", - "integrity": "sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==", - "dev": true, - "requires": { - "caseless": "^0.12.0", - "concat-stream": "^1.6.2", - "http-response-object": "^3.0.1", - "parse-cache-control": "^1.0.1" - } - }, - "http-cache-semantics": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz", - "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==" - }, - "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - } - } - }, - "http-https": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz", - "integrity": "sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs=" - }, - "http-response-object": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz", - "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==", - "dev": true, - "requires": { - "@types/node": "^10.0.3" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==", - "dev": true - } - } - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "humanize-duration": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.21.0.tgz", - "integrity": "sha512-7BLsrQZ2nMGeakmGDUl1pDne6/7iAdvwf1RtDLCOPHNFIHjkOVW7lcu7xHkIM9HhZAlSSO5crhC1dHvtl4dIQw==" - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "idna-uts46-hx": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz", - "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==", - "requires": { - "punycode": "2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" - } - } - }, - "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" - }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==" - }, - "immediate": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz", - "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=" - }, - "import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" - }, - "inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", - "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - } - } - }, - "interpret": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", - "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", - "dev": true - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "requires": { - "loose-envify": "^1.0.0" - } - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" - }, - "ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" - }, - "is-absolute": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", - "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", - "requires": { - "is-relative": "^0.2.1", - "is-windows": "^0.2.0" - }, - "dependencies": { - "is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=" - } - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" - }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" - }, - "is-dotdir": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-dotdir/-/is-dotdir-0.1.0.tgz", - "integrity": "sha1-2h5UZPWfw6g8HYIrWs4JG0X+azE=", - "requires": { - "dotdir-regex": "^0.1.0" - } - }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "requires": { - "is-primitive": "^2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-fn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fn/-/is-fn-1.0.0.tgz", - "integrity": "sha1-lUPV3nvPWwiiLsiiC65uKG1RDYw=" - }, - "is-fullwidth-code-point": { - "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=" - }, - "is-function": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz", - "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=" - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-hex-prefixed": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", - "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=" - }, - "is-natural-number": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" - }, - "is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" - }, - "is-property": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", - "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=" - }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "requires": { - "has": "^1.0.1" - } - }, - "is-relative": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", - "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", - "requires": { - "is-unc-path": "^0.1.1" - } - }, - "is-retry-allowed": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", - "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "requires": { - "has-symbols": "^1.0.0" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "is-unc-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", - "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", - "requires": { - "unc-path-regex": "^0.1.0" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" - }, - "is-windows": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz", - "integrity": "sha1-vjEHFUMc+rzMVKs5USEPoLbQGr4=" - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "requires": { - "isarray": "1.0.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - } - } - }, - "isomorphic-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", - "requires": { - "node-fetch": "^1.0.1", - "whatwg-fetch": ">=0.10.0" - }, - "dependencies": { - "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - } - } - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, - "istanbul": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "requires": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.8.x", - "esprima": "2.7.x", - "glob": "^5.0.15", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=" - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, - "isurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", - "requires": { - "has-to-string-tag-x": "^1.2.0", - "is-object": "^1.0.1" - } - }, - "iterall": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", - "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==" - }, - "j6": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/j6/-/j6-1.0.2.tgz", - "integrity": "sha1-SAiKyxxm9hC68uULQCjQky817Yk=", - "requires": { - "algebrite": "^0.2.23", - "jStat": "^1.5.2", - "lodash": "^4.16.4", - "numeric": "^1.2.6" - } - }, - "jStat": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/jStat/-/jStat-1.8.5.tgz", - "integrity": "sha512-9lxw5LvhhQz3D3XQM3BRB6p2PomZnmocu3OoQf5mOtn4xSVLgdCPFPN+MmoRQBkNFnHenbfQEhzKNg9nPWrfYQ==" - }, - "javascript-natural-sort": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", - "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=" - }, - "js-sha3": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.7.0.tgz", - "integrity": "sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA==" - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" - }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - } - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" - }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" - }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" - }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" - }, - "json-rpc-engine": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.1.4.tgz", - "integrity": "sha512-nBFWYJ1mvlZL7gqq0M9230SxedL9CbSYO1WgrFi/C1Zo+ZrHUZWLRbr7fUdlLt9TC0G+sf/aEUeuJjR2lHsMvA==", - "requires": { - "async": "^2.0.1", - "eth-json-rpc-errors": "^1.1.0", - "promise-to-callback": "^1.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "json-rpc-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/json-rpc-error/-/json-rpc-error-2.0.0.tgz", - "integrity": "sha1-p6+cICg4tekFxyUOVH8a/3cligI=", - "requires": { - "inherits": "^2.0.1" - } - }, - "json-rpc-random-id": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-rpc-random-id/-/json-rpc-random-id-1.0.1.tgz", - "integrity": "sha1-uknZat7RRE27jaPSA3SKy7zeyMg=" - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "requires": { - "jsonify": "~0.0.0" - } - }, - "json-stable-stringify-without-jsonify": { - "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=" - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" - }, - "jsonschema": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.4.tgz", - "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw==" - }, - "jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", - "requires": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^5.6.0" - }, - "dependencies": { - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "requires": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, - "keccak": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz", - "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==", - "requires": { - "bindings": "^1.2.1", - "inherits": "^2.0.3", - "nan": "^2.2.1", - "safe-buffer": "^5.1.0" - } - }, - "keccak256": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/keccak256/-/keccak256-1.0.0.tgz", - "integrity": "sha512-8qv2vJdQk+Aa2tFXo8zYodm+6DgXqUOqvNJhj1p1V2pxQJT1oNKxNF+zWfhtKXNLZdLvyxjB/dvd9GwcvTHSQQ==", - "requires": { - "bn.js": "^4.11.8", - "keccak": "^1.4.0" - } - }, - "keccakjs": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/keccakjs/-/keccakjs-0.2.3.tgz", - "integrity": "sha512-BjLkNDcfaZ6l8HBG9tH0tpmDv3sS2mA7FNQxFHpCdzP3Gb2MVruXBSuoM66SnVxKJpAr5dKGdkHD+bDokt8fTg==", - "requires": { - "browserify-sha3": "^0.0.4", - "sha3": "^1.2.2" - } - }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "requires": { - "json-buffer": "3.0.0" - } - }, - "kind-of": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", - "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", - "requires": { - "is-buffer": "^1.0.2" - } - }, - "klaw": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", - "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", - "requires": { - "graceful-fs": "^4.1.9" - } - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==" - }, - "lazy-cache": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.1.0.tgz", - "integrity": "sha1-1s1FAlHUFbcBA3ZfYxMKAEmgN5U=", - "requires": { - "ansi-yellow": "^0.1.1" - } - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "requires": { - "invert-kv": "^1.0.0" - } - }, - "level-codec": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz", - "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==" - }, - "level-errors": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz", - "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==", - "requires": { - "errno": "~0.1.1" - } - }, - "level-iterator-stream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz", - "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=", - "requires": { - "inherits": "^2.0.1", - "level-errors": "^1.0.3", - "readable-stream": "^1.0.33", - "xtend": "^4.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - } - } - }, - "level-mem": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/level-mem/-/level-mem-3.0.1.tgz", - "integrity": "sha512-LbtfK9+3Ug1UmvvhR2DqLqXiPW1OJ5jEh0a3m9ZgAipiwpSxGj/qaVVy54RG5vAQN1nCuXqjvprCuKSCxcJHBg==", - "requires": { - "level-packager": "~4.0.0", - "memdown": "~3.0.0" - }, - "dependencies": { - "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", - "requires": { - "xtend": "~4.0.0" - } - }, - "memdown": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/memdown/-/memdown-3.0.0.tgz", - "integrity": "sha512-tbV02LfZMWLcHcq4tw++NuqMO+FZX8tNJEiD2aNRm48ZZusVg5N8NART+dmBkepJVye986oixErf7jfXboMGMA==", - "requires": { - "abstract-leveldown": "~5.0.0", - "functional-red-black-tree": "~1.0.1", - "immediate": "~3.2.3", - "inherits": "~2.0.1", - "ltgt": "~2.2.0", - "safe-buffer": "~5.1.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "level-packager": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-4.0.1.tgz", - "integrity": "sha512-svCRKfYLn9/4CoFfi+d8krOtrp6RoX8+xm0Na5cgXMqSyRru0AnDYdLl+YI8u1FyS6gGZ94ILLZDE5dh2but3Q==", - "requires": { - "encoding-down": "~5.0.0", - "levelup": "^3.0.0" - }, - "dependencies": { - "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", - "requires": { - "xtend": "~4.0.0" - } - }, - "deferred-leveldown": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", - "integrity": "sha512-5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww==", - "requires": { - "abstract-leveldown": "~5.0.0", - "inherits": "^2.0.3" - } - }, - "level-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz", - "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==", - "requires": { - "errno": "~0.1.1" - } - }, - "level-iterator-stream": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-3.0.1.tgz", - "integrity": "sha512-nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g==", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "xtend": "^4.0.0" - } - }, - "levelup": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/levelup/-/levelup-3.1.1.tgz", - "integrity": "sha512-9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg==", - "requires": { - "deferred-leveldown": "~4.0.0", - "level-errors": "~2.0.0", - "level-iterator-stream": "~3.0.0", - "xtend": "~4.0.0" - } - } - } - }, - "level-ws": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-0.0.0.tgz", - "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=", - "requires": { - "readable-stream": "~1.0.15", - "xtend": "~2.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "requires": { - "object-keys": "~0.4.0" - } - } - } - }, - "levelup": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz", - "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==", - "requires": { - "deferred-leveldown": "~1.2.1", - "level-codec": "~7.0.0", - "level-errors": "~1.0.3", - "level-iterator-stream": "~1.3.0", - "prr": "~1.0.1", - "semver": "~5.4.1", - "xtend": "~4.0.0" - }, - "dependencies": { - "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" - } - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" - }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" - }, - "lodash.flatmap": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz", - "integrity": "sha1-74y/QI9uSCaGYzRTBcaswLd4cC4=" - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" - }, - "lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" - }, - "lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" - }, - "lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" - }, - "lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" - }, - "lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" - }, - "lodash.values": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz", - "integrity": "sha1-o6bCsOvsxcLLocF+bmIP6BtT00c=" - }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "requires": { - "chalk": "^2.0.1" - } - }, - "loglevel": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz", - "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==" - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "ltgt": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz", - "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=" - }, - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "requires": { - "pify": "^3.0.0" - } - }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, - "requires": { - "p-defer": "^1.0.0" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" - }, - "math-random": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz", - "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==" - }, - "mathjs": { - "version": "5.10.3", - "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz", - "integrity": "sha512-ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==", - "requires": { - "complex.js": "2.0.11", - "decimal.js": "10.2.0", - "escape-latex": "1.2.0", - "fraction.js": "4.0.12", - "javascript-natural-sort": "0.7.1", - "seed-random": "2.2.0", - "tiny-emitter": "2.1.0", - "typed-function": "1.1.0" - } - }, - "md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "memdown": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz", - "integrity": "sha1-tOThkhdGZP+65BNhqlAPMRnv4hU=", - "requires": { - "abstract-leveldown": "~2.7.1", - "functional-red-black-tree": "^1.0.1", - "immediate": "^3.2.3", - "inherits": "~2.0.1", - "ltgt": "~2.2.0", - "safe-buffer": "~5.1.1" - }, - "dependencies": { - "abstract-leveldown": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz", - "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==", - "requires": { - "xtend": "~4.0.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "memorystream": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", - "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=" - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" - }, - "merkle-patricia-tree": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz", - "integrity": "sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==", - "requires": { - "async": "^1.4.2", - "ethereumjs-util": "^5.0.0", - "level-ws": "0.0.0", - "levelup": "^1.2.1", - "memdown": "^1.0.0", - "readable-stream": "^2.0.0", - "rlp": "^2.0.0", - "semaphore": ">=1.0.1" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" - }, - "micromatch": { - "version": "github:jonschlinkert/micromatch#5017fd78202e04c684cc31d3c2fb1f469ea222ff", - "from": "github:jonschlinkert/micromatch#2.2.0", - "requires": { - "arr-diff": "^1.0.1", - "array-unique": "^0.2.1", - "braces": "^1.8.0", - "expand-brackets": "^0.1.1", - "extglob": "^0.3.0", - "filename-regex": "^2.0.0", - "is-glob": "^1.1.3", - "kind-of": "^1.1.0", - "object.omit": "^1.1.0", - "parse-glob": "^3.0.1", - "regex-cache": "^0.4.2" - }, - "dependencies": { - "arr-diff": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", - "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", - "requires": { - "arr-flatten": "^1.0.1", - "array-slice": "^0.2.3" - } - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "is-glob": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-1.1.3.tgz", - "integrity": "sha1-tMZLgwPTkRRJKkYNNkzPsNPAoEU=" - }, - "kind-of": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", - "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=" - } - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" - }, - "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" - }, - "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "requires": { - "mime-db": "1.40.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" - }, - "min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "requires": { - "dom-walk": "^0.1.0" - } - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "minipass": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", - "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - }, - "dependencies": { - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - } - } - }, - "minizlib": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", - "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", - "requires": { - "minipass": "^2.9.0" - } - }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=" - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - } - } - }, - "mkdirp-promise": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz", - "integrity": "sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=", - "requires": { - "mkdirp": "*" - } - }, - "mocha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", - "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", - "requires": { - "browser-stdout": "1.3.1", - "commander": "2.15.1", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.5", - "he": "1.1.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "supports-color": "5.4.0" - }, - "dependencies": { - "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "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" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "mock-fs": { - "version": "4.10.2", - "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.10.2.tgz", - "integrity": "sha512-ewPQ83O4U8/Gd8I15WoB6vgTTmq5khxBskUWCRvswUqjCfOOTREmxllztQOm+PXMWUxATry+VBWXQJloAyxtbQ==" - }, - "module-not-found-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", - "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=" - }, - "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" - }, - "mout": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/mout/-/mout-0.11.1.tgz", - "integrity": "sha1-ujYR318OWx/7/QEWa48C0fX6K5k=" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "multi-progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/multi-progress/-/multi-progress-2.0.0.tgz", - "integrity": "sha1-Kcy0LPJIdLHGOE8DEnzl3/eyLyw=", - "requires": { - "progress": "^1.1.8" - }, - "dependencies": { - "progress": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", - "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=" - } - } - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" - }, - "mythxjs": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/mythxjs/-/mythxjs-1.3.6.tgz", - "integrity": "sha512-3KRSysOq3qM0cfZUDDtOPhFKeLJKX4bAoXrDIrI71OX245qTL2q5El8Ke5/JT0L+kDZVGlCT8pAS9Q+sjd5NGQ==", - "requires": { - "axios": "^0.19.0", - "jsonwebtoken": "^8.5.1" - } - }, - "mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "requires": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" - }, - "nano-json-stream-parser": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz", - "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=" - }, - "napi-build-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.1.tgz", - "integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==", - "optional": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" - }, - "ndjson": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz", - "integrity": "sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg=", - "requires": { - "json-stringify-safe": "^5.0.1", - "minimist": "^1.2.0", - "split2": "^2.1.0", - "through2": "^2.0.3" - } - }, - "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" - }, - "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" - }, - "node-abi": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.12.0.tgz", - "integrity": "sha512-VhPBXCIcvmo/5K8HPmnWJyyhvgKxnHTUMXR/XwGHV68+wrgkzST4UmQrY/XszSWA5dtnXpNp528zkcyJ/pzVcw==", - "optional": true, - "requires": { - "semver": "^5.4.1" - } - }, - "node-fetch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", - "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" - }, - "node-hid": { - "version": "0.7.9", - "resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.9.tgz", - "integrity": "sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA==", - "optional": true, - "requires": { - "bindings": "^1.5.0", - "nan": "^2.13.2", - "prebuild-install": "^5.3.0" - } - }, - "nodemailer": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.7.0.tgz", - "integrity": "sha512-IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw==", - "dev": true - }, - "nodent-compiler": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/nodent-compiler/-/nodent-compiler-3.2.11.tgz", - "integrity": "sha512-rfDrGWdgIJYomPUzR8nXiWNuIhJ7cVodPeZP3Ho65LEycuaX2uVNZ0ytpcfrmUKzdFeLRtye9+pHe8OynPZuPQ==", - "requires": { - "acorn": ">= 2.5.2 <= 5.7.3", - "acorn-es7-plugin": "^1.1.7", - "nodent-transform": "^3.2.9", - "source-map": "^0.5.7" - }, - "dependencies": { - "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "nodent-runtime": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/nodent-runtime/-/nodent-runtime-3.2.1.tgz", - "integrity": "sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==" - }, - "nodent-transform": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/nodent-transform/-/nodent-transform-3.2.9.tgz", - "integrity": "sha512-4a5FH4WLi+daH/CGD5o/JWRR8W5tlCkd3nrDSkxbOzscJTyTUITltvOJeQjg3HJ1YgEuNyiPhQbvbtRjkQBByQ==" - }, - "noncharacters": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/noncharacters/-/noncharacters-1.1.0.tgz", - "integrity": "sha1-rzPfMP1Q7TxTzSAiWPJa2pC1QNI=" - }, - "noop-logger": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", - "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=", - "optional": true - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "requires": { - "abbrev": "1" - } - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "requires": { - "path-key": "^2.0.0" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "number-to-bn": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", - "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=", - "requires": { - "bn.js": "4.11.6", - "strip-hex-prefix": "1.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - } - } - }, - "numeric": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/numeric/-/numeric-1.2.6.tgz", - "integrity": "sha1-dlsCvvl5iPz4gNTrPza4D6MTNao=" - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "object-inspect": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", - "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==" - }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" - }, - "object-visit": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-0.1.0.tgz", - "integrity": "sha1-sbtnSfIo7nbgxC84UdKKFNIzziY=", - "requires": { - "isobject": "^1.0.0" - }, - "dependencies": { - "isobject": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz", - "integrity": "sha1-8Pm4zpLdVA+gdAiC44NaLgIux4o=" - } - } - }, - "object.omit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-1.1.0.tgz", - "integrity": "sha1-nRfqFneOUFfeundSxvVfFJaCnpQ=", - "requires": { - "for-own": "^0.1.3", - "isobject": "^1.0.0" - }, - "dependencies": { - "isobject": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz", - "integrity": "sha1-8Pm4zpLdVA+gdAiC44NaLgIux4o=" - } - } - }, - "oboe": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.4.tgz", - "integrity": "sha1-IMiM2wwVNxuwQRklfU/dNLCqSfY=", - "requires": { - "http-https": "^1.0.0" - } - }, - "omni-fetch": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/omni-fetch/-/omni-fetch-0.2.3.tgz", - "integrity": "sha512-PezYE0Vhm5+/TffAWNjuHz8cuUKgPBgC601EBW/jUyXrCsJPlgtd/CekUvyT+TgKZupl9FQuPhwALrYsUuEbgA==", - "requires": { - "@types/isomorphic-fetch": "0.0.31", - "@types/node": "^6.0.52", - "caw": "^1.2.0" - }, - "dependencies": { - "@types/node": { - "version": "6.14.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.14.8.tgz", - "integrity": "sha512-ZVswkI0zxOcADy2b4T9Lj3N+OYyHwCyzMtmkRIi1P94vF/GOLpDPB76P1uBXX/QM6e5wICriSz2XBPSBdxIN5g==" - } - } - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "requires": { - "ee-first": "1.1.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "openzeppelin-solidity": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/openzeppelin-solidity/-/openzeppelin-solidity-2.2.0.tgz", - "integrity": "sha512-HfQq0xyT+EPs/lTWEd5Odu4T7CYdYe+qwf54EH28FQZthp4Bs6IWvOlOumTdS2dvpwZoTXURAopHn2LN1pwAGQ==" - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" - } - } - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - } - }, - "ora": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz", - "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==", - "requires": { - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-spinners": "^2.0.0", - "log-symbols": "^2.2.0", - "strip-ansi": "^5.2.0", - "wcwidth": "^1.0.1" - } - }, - "original-require": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/original-require/-/original-require-1.0.1.tgz", - "integrity": "sha1-DxMEcVhM0zURxew4yNWSE/msXiA=" - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "requires": { - "lcid": "^1.0.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "p-cancelable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" - }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" - }, - "p-is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", - "dev": true - }, - "p-limit": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", - "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-timeout": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", - "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", - "requires": { - "p-finally": "^1.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "requires": { - "callsites": "^3.0.0" - }, - "dependencies": { - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" - } - } - }, - "parse-asn1": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", - "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", - "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, - "parse-cache-control": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz", - "integrity": "sha1-juqz5U+laSD+Fro493+iGqzC104=", - "dev": true - }, - "parse-filepath": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-0.6.3.tgz", - "integrity": "sha1-OOF6c+Xk5ndrrpUG/DzLFLw6K4A=", - "requires": { - "is-absolute": "^0.2.2", - "map-cache": "^0.2.0" - } - }, - "parse-gitignore": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-0.2.0.tgz", - "integrity": "sha1-mHBtCfD5PuhjSLch/+4GBrwJPXQ=", - "requires": { - "ends-with": "^0.2.0", - "is-glob": "^2.0.0", - "starts-with": "^1.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, - "parse-headers": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.2.tgz", - "integrity": "sha512-/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg==", - "requires": { - "for-each": "^0.3.3", - "string.prototype.trim": "^1.1.2" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "requires": { - "error-ex": "^1.2.0" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" - }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=" - }, - "pbkdf2": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", - "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" - }, - "picomatch": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==" - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "requires": { - "pinkie": "^2.0.0" - } - }, - "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "requires": { - "find-up": "^3.0.0" - } - }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==" - }, - "pop-iterate": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz", - "integrity": "sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M=" - }, - "popper.js": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.3.tgz", - "integrity": "sha1-FDj5jQRqz3tNeM1QK/QYrGTU8JU=" - }, - "prebuild-install": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.2.tgz", - "integrity": "sha512-INDfXzTPnhT+WYQemqnAXlP7SvfiFMopMozSgXCZ+RDLb279gKfIuLk4o7PgEawLp3WrMgIYGBpkxpraROHsSA==", - "optional": true, - "requires": { - "detect-libc": "^1.0.3", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "napi-build-utils": "^1.0.1", - "node-abi": "^2.7.0", - "noop-logger": "^0.1.1", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^3.0.3", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0", - "which-pm-runs": "^1.0.0" - }, - "dependencies": { - "decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", - "optional": true, - "requires": { - "mimic-response": "^2.0.0" - } - }, - "mimic-response": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz", - "integrity": "sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==", - "optional": true - }, - "simple-get": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", - "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", - "optional": true, - "requires": { - "decompress-response": "^4.2.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - } - } - }, - "precond": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz", - "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw=" - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" - }, - "prettier": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz", - "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==" - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" - }, - "process": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", - "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" - }, - "promise": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz", - "integrity": "sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==", - "dev": true, - "requires": { - "asap": "~2.0.6" - } - }, - "promise-to-callback": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/promise-to-callback/-/promise-to-callback-1.0.0.tgz", - "integrity": "sha1-XSp0kBC/tn2WNZj805YHRqaP7vc=", - "requires": { - "is-fn": "^1.0.0", - "set-immediate-shim": "^1.0.1" - } - }, - "prompts": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz", - "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==", - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.3" - } - }, - "proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", - "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" - } - }, - "proxyquire": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", - "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==", - "requires": { - "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.1", - "resolve": "^1.11.1" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, - "psl": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz", - "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==" - }, - "public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "q": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/q/-/q-2.0.3.tgz", - "integrity": "sha1-dbjbAlWhpa+C9Yw/Oqoe/sfQ0TQ=", - "requires": { - "asap": "^2.0.0", - "pop-iterate": "^1.0.1", - "weak-map": "^1.0.5" - } - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" - }, - "query-string": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", - "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", - "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - } - }, - "randomatic": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", - "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", - "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } - } - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, - "randomhex": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/randomhex/-/randomhex-0.1.5.tgz", - "integrity": "sha1-us7vmCMpCRQA8qKRLGzQLxCU9YU=" - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" - }, - "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "requires": { - "pinkie-promise": "^2.0.0" - } - } - } - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "readdirp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", - "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", - "requires": { - "picomatch": "^2.0.4" - } - }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "requires": { - "resolve": "^1.1.6" - } - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==" - }, - "regenerator-runtime": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", - "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==" - }, - "regenerator-transform": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", - "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", - "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" - } - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "requires": { - "is-equal-shallow": "^0.1.3" - } - }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==" - }, - "regexpu-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "requires": { - "jsesc": "~0.5.0" - } - }, - "relative": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/relative/-/relative-3.0.2.tgz", - "integrity": "sha1-Dc2OxUpdNaPBXhBFA9ZTdbWlNn8=", - "requires": { - "isobject": "^2.0.0" - } - }, - "remix-lib": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/remix-lib/-/remix-lib-0.4.14.tgz", - "integrity": "sha512-FFKIniTrE9oyRKDzZlDnFFtLKy2qbQhA7KUBtHvC6qDY1CuJnbJp0HGIh9JbeDlNMfB84TiUHbZDHJoox1Fnsg==", - "requires": { - "async": "^2.1.2", - "ethereumjs-block": "^1.6.0", - "ethereumjs-tx": "^1.3.3", - "ethereumjs-util": "^5.1.2", - "ethereumjs-vm": "3.0.0", - "ethers": "^4.0.27", - "events": "^3.0.0", - "fast-async": "^6.1.2", - "solc": "^0.5.0", - "web3": "0.20.6" - }, - "dependencies": { - "bignumber.js": { - "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git" - }, - "ethereumjs-vm": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-3.0.0.tgz", - "integrity": "sha512-lNu+G/RWPRCrQM5s24MqgU75PEGiAhL4Ombw0ew6m08d+amsxf/vGAb98yDNdQqqHKV6JbwO/tCGfdqXGI6Cug==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-blockchain": "^3.4.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "solc": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.12.tgz", - "integrity": "sha512-OX/AGZT04tuUsagoVXSZBiBZYJReA02hdwZOfRkB03/eeYP9Dl3pr+M+au+1MhssgiuWBlFPN7sRXFiqwkAW2g==", - "requires": { - "command-exists": "^1.2.8", - "fs-extra": "^0.30.0", - "js-sha3": "0.8.0", - "memorystream": "^0.3.1", - "require-from-string": "^2.0.0", - "semver": "^5.5.0", - "tmp": "0.0.33", - "yargs": "^13.2.0" - } - }, - "utf8": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" - }, - "web3": { - "version": "0.20.6", - "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", - "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", - "requires": { - "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", - "crypto-js": "^3.1.4", - "utf8": "^2.1.1", - "xhr2": "*", - "xmlhttprequest": "*" - } - }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - } - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" - }, - "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "requires": { - "is-finite": "^1.0.0" - } - }, - "req-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/req-cwd/-/req-cwd-2.0.0.tgz", - "integrity": "sha1-1AgrTURZgDZkD7c93qAe1T20nrw=", - "dev": true, - "requires": { - "req-from": "^2.0.0" - } - }, - "req-from": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/req-from/-/req-from-2.0.0.tgz", - "integrity": "sha1-10GI5H+TeW9Kpx327jWuaJ8+DnA=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } - }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - } - }, - "request-promise": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.4.tgz", - "integrity": "sha512-8wgMrvE546PzbR5WbYxUQogUnUDfM0S7QIFZMID+J73vdFARkFy+HElj4T+MWYhpXwlLp0EQ8Zoj8xUA0he4Vg==", - "requires": { - "bluebird": "^3.5.0", - "request-promise-core": "1.1.2", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - }, - "dependencies": { - "bluebird": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz", - "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==" - } - } - }, - "request-promise-core": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz", - "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==", - "requires": { - "lodash": "^4.17.11" - } - }, - "request-promise-native": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz", - "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==", - "dev": true, - "requires": { - "request-promise-core": "1.1.2", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-from-string": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=" - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, - "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", - "requires": { - "path-parse": "^1.0.6" - } - }, - "resolve-dir": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", - "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", - "requires": { - "expand-tilde": "^1.2.2", - "global-modules": "^0.2.3" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" - }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "requires": { - "lowercase-keys": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "resumer": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", - "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", - "requires": { - "through": "~2.3.4" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, - "rlp": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.3.tgz", - "integrity": "sha512-l6YVrI7+d2vpW6D6rS05x2Xrmq8oW7v3pieZOJKBEdjuTF4Kz/iwk55Zyh1Zaz+KOB2kC8+2jZlp2u9L4tTzCQ==", - "requires": { - "bn.js": "^4.11.1", - "safe-buffer": "^5.1.1" - } - }, - "rootpath": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/rootpath/-/rootpath-0.1.2.tgz", - "integrity": "sha1-Wzeah9ypBum5HWkKWZQ5vvJn6ms=" - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "requires": { - "is-promise": "^2.1.0" - } - }, - "rustbn.js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz", - "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==" - }, - "rxjs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz", - "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==", - "requires": { - "tslib": "^1.9.0" - } - }, - "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" - }, - "safe-event-emitter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-event-emitter/-/safe-event-emitter-1.0.1.tgz", - "integrity": "sha512-e1wFe99A91XYYxoQbcq2ZJUWurxEyP8vfz7A7vuUe1s95q8r5ebraVaA1BukYJcpM6V16ugWoD9vngi8Ccu5fg==", - "requires": { - "events": "^3.0.0" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "scmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/scmp/-/scmp-2.0.0.tgz", - "integrity": "sha1-JHEQ7yLM+JexOj8KvdtSeCOTzWo=" - }, - "scrypt": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/scrypt/-/scrypt-6.0.3.tgz", - "integrity": "sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0=", - "requires": { - "nan": "^2.0.8" - } - }, - "scrypt-js": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", - "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==" - }, - "scrypt.js": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/scrypt.js/-/scrypt.js-0.3.0.tgz", - "integrity": "sha512-42LTc1nyFsyv/o0gcHtDztrn+aqpkaCNt5Qh7ATBZfhEZU7IC/0oT/qbBH+uRNoAPvs2fwiOId68FDEoSRA8/A==", - "requires": { - "scrypt": "^6.0.2", - "scryptsy": "^1.2.1" - } - }, - "scryptsy": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-1.2.1.tgz", - "integrity": "sha1-oyJfpLJST4AnAHYeKFW987LZIWM=", - "requires": { - "pbkdf2": "^3.0.3" - } - }, - "secp256k1": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.7.1.tgz", - "integrity": "sha512-1cf8sbnRreXrQFdH6qsg2H71Xw91fCCS9Yp021GnUNJzWJS/py96fS4lHbnTnouLp08Xj6jBoBB6V78Tdbdu5g==", - "requires": { - "bindings": "^1.5.0", - "bip66": "^1.1.5", - "bn.js": "^4.11.8", - "create-hash": "^1.2.0", - "drbg.js": "^1.0.1", - "elliptic": "^6.4.1", - "nan": "^2.14.0", - "safe-buffer": "^5.1.2" - }, - "dependencies": { - "elliptic": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", - "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - } - } - }, - "seed-random": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz", - "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ=" - }, - "seek-bzip": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", - "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", - "requires": { - "commander": "~2.8.1" - }, - "dependencies": { - "commander": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", - "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", - "requires": { - "graceful-readlink": ">= 1.0.0" - } - } - } - }, - "semaphore": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz", - "integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==" - }, - "semaphore-async-await": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz", - "integrity": "sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo=" - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, - "dependencies": { - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" - } - } - }, - "serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" - } - }, - "servify": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/servify/-/servify-0.1.12.tgz", - "integrity": "sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==", - "requires": { - "body-parser": "^1.16.0", - "cors": "^2.8.1", - "express": "^4.14.0", - "request": "^2.79.0", - "xhr": "^2.3.3" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" - }, - "set-value": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.2.0.tgz", - "integrity": "sha1-c7CmglwVjGoWqCu9yVd1vyqCX6s=", - "requires": { - "isobject": "^1.0.0", - "noncharacters": "^1.1.0" - }, - "dependencies": { - "isobject": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz", - "integrity": "sha1-8Pm4zpLdVA+gdAiC44NaLgIux4o=" - } - } - }, - "setimmediate": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", - "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=" - }, - "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" - }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "sha1": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz", - "integrity": "sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg=", - "dev": true, - "requires": { - "charenc": ">= 0.0.1", - "crypt": ">= 0.0.1" - } - }, - "sha3": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.3.tgz", - "integrity": "sha512-sOWDZi8cDBRkLfWOw18wvJyNblXDHzwMGnRWut8zNNeIeLnmMRO17bjpLc7OzMuj1ASUgx2IyohzUCAl+Kx5vA==", - "requires": { - "nan": "2.13.2" - }, - "dependencies": { - "nan": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==" - } - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" - }, - "shelljs": { - "version": "0.7.8", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", - "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", - "dev": true, - "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - } - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" - }, - "simple-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", - "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" - }, - "simple-get": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz", - "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==", - "requires": { - "decompress-response": "^3.3.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "sisteransi": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz", - "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==" - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" - }, - "sleep": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/sleep/-/sleep-6.1.0.tgz", - "integrity": "sha512-Z1x4JjJxsru75Tqn8F4tnOFeEu3HjtITTsumYUiuz54sGKdISgLCek9AUlXlVVrkhltRFhNUsJDJE76SFHTDIQ==", - "requires": { - "nan": "^2.13.2" - } - }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - } - }, - "solc": { - "version": "0.4.26", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.26.tgz", - "integrity": "sha512-o+c6FpkiHd+HPjmjEVpQgH7fqZ14tJpXhho+/bQXlXbliLIS/xjXb42Vxh+qQY1WCSTMQ0+a5vR9vi0MfhU6mA==", - "requires": { - "fs-extra": "^0.30.0", - "memorystream": "^0.3.1", - "require-from-string": "^1.1.0", - "semver": "^5.3.0", - "yargs": "^4.7.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yargs": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", - "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", - "requires": { - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "lodash.assign": "^4.0.3", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.1", - "which-module": "^1.0.0", - "window-size": "^0.2.0", - "y18n": "^3.2.1", - "yargs-parser": "^2.4.1" - } - }, - "yargs-parser": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", - "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", - "requires": { - "camelcase": "^3.0.0", - "lodash.assign": "^4.0.6" - } - } - } - }, - "solhint": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/solhint/-/solhint-2.3.0.tgz", - "integrity": "sha512-2yiELLp+MsDtuOTrjc14lgsYmlMchp++SicvqCBu01VXsi9Mk2uynhyN3nBfbGzYq1YfmOEBpUqJfFYXVAR/Ig==", - "requires": { - "ajv": "^6.6.1", - "antlr4": "4.7.1", - "chalk": "^2.4.2", - "commander": "2.18.0", - "cosmiconfig": "^5.0.7", - "eslint": "^5.6.0", - "fast-diff": "^1.1.2", - "glob": "^7.1.3", - "ignore": "^4.0.6", - "js-yaml": "^3.12.0", - "lodash": "^4.17.11", - "prettier": "^1.14.3", - "semver": "^6.3.0" - }, - "dependencies": { - "commander": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz", - "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==" - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, - "solidity-bytes-utils": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/solidity-bytes-utils/-/solidity-bytes-utils-0.0.7.tgz", - "integrity": "sha512-NdzNDmzpd45MiEmYS5MVW1O0ovjneyXpPV5iWt05juA77KFQqO2axQOdkMGvKtA69nxobKQU9BakopeT48bWRQ==", - "requires": { - "truffle-hdwallet-provider": "0.0.3" - } - }, - "solidity-parser-antlr": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/solidity-parser-antlr/-/solidity-parser-antlr-0.4.11.tgz", - "integrity": "sha512-4jtxasNGmyC0midtjH/lTFPZYvTTUMy6agYcF+HoMnzW8+cqo3piFrINb4ZCzpPW+7tTVFCGa5ubP34zOzeuMg==" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "spdx-correct": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", - "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" - }, - "split2": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", - "requires": { - "through2": "^2.0.2" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, - "starts-with": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/starts-with/-/starts-with-1.0.2.tgz", - "integrity": "sha1-Fnk6cp2J1M89T7LtovkIrjV/GW8=" - }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" - }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "string.prototype.trim": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz", - "integrity": "sha512-9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==", - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.13.0", - "function-bind": "^1.1.1" - } - }, - "string.prototype.trimleft": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz", - "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==", - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, - "string.prototype.trimright": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz", - "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==", - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-dirs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", - "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", - "requires": { - "is-natural-number": "^4.0.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" - }, - "strip-hex-prefix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", - "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", - "requires": { - "is-hex-prefixed": "1.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - }, - "swarm-js": { - "version": "0.1.39", - "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.39.tgz", - "integrity": "sha512-QLMqL2rzF6n5s50BptyD6Oi0R1aWlJC5Y17SRIVXRj6OR1DRIPM7nepvrxxkjA1zNzFz6mUOMjfeqeDaWB7OOg==", - "requires": { - "bluebird": "^3.5.0", - "buffer": "^5.0.5", - "decompress": "^4.0.0", - "eth-lib": "^0.1.26", - "fs-extra": "^4.0.2", - "got": "^7.1.0", - "mime-types": "^2.1.16", - "mkdirp-promise": "^5.0.1", - "mock-fs": "^4.1.0", - "setimmediate": "^1.0.5", - "tar": "^4.0.2", - "xhr-request-promise": "^0.1.2" - }, - "dependencies": { - "bluebird": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz", - "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==" - }, - "eth-lib": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.27.tgz", - "integrity": "sha512-B8czsfkJYzn2UIEMwjc7Mbj+Cy72V+/OXH/tb44LV8jhrjizQJJ325xMOMyk3+ETa6r6oi0jsUY14+om8mQMWA==", - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "keccakjs": "^0.2.1", - "nano-json-stream-parser": "^0.1.2", - "servify": "^0.1.12", - "ws": "^3.0.0", - "xhr-request-promise": "^0.1.2" - } - }, - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "got": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", - "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", - "requires": { - "decompress-response": "^3.2.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-plain-obj": "^1.1.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^1.1.1", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "url-parse-lax": "^1.0.0", - "url-to-options": "^1.0.1" - } - }, - "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "requires": { - "prepend-http": "^1.0.1" - } - }, - "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - } - } - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, - "sync-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-6.1.0.tgz", - "integrity": "sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==", - "dev": true, - "requires": { - "http-response-object": "^3.0.1", - "sync-rpc": "^1.2.1", - "then-request": "^6.0.0" - } - }, - "sync-rpc": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz", - "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==", - "dev": true, - "requires": { - "get-port": "^3.1.0" - } - }, - "table": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", - "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", - "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" - } - }, - "tape": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/tape/-/tape-4.11.0.tgz", - "integrity": "sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==", - "requires": { - "deep-equal": "~1.0.1", - "defined": "~1.0.0", - "for-each": "~0.3.3", - "function-bind": "~1.1.1", - "glob": "~7.1.4", - "has": "~1.0.3", - "inherits": "~2.0.4", - "minimist": "~1.2.0", - "object-inspect": "~1.6.0", - "resolve": "~1.11.1", - "resumer": "~0.0.0", - "string.prototype.trim": "~1.1.2", - "through": "~2.3.8" - }, - "dependencies": { - "resolve": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", - "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", - "requires": { - "path-parse": "^1.0.6" - } - }, - "string.prototype.trim": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", - "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=", - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.0", - "function-bind": "^1.0.2" - } - } - } - }, - "tar": { - "version": "4.4.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", - "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - }, - "dependencies": { - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - } - } - }, - "tar-fs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", - "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", - "optional": true, - "requires": { - "chownr": "^1.1.1", - "mkdirp": "^0.5.1", - "pump": "^3.0.0", - "tar-stream": "^2.0.0" - } - }, - "tar-stream": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", - "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", - "optional": true, - "requires": { - "bl": "^3.0.0", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", - "optional": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "string_decoder": { - "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==", - "optional": true, - "requires": { - "safe-buffer": "~5.2.0" - } - } - } - }, - "tar.gz": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/tar.gz/-/tar.gz-1.0.7.tgz", - "integrity": "sha512-uhGatJvds/3diZrETqMj4RxBR779LKlIE74SsMcn5JProZsfs9j0QBwWO1RW+IWNJxS2x8Zzra1+AW6OQHWphg==", - "requires": { - "bluebird": "^2.9.34", - "commander": "^2.8.1", - "fstream": "^1.0.8", - "mout": "^0.11.0", - "tar": "^2.1.1" - }, - "dependencies": { - "tar": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", - "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", - "requires": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" - } - } - } - }, - "test-value": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz", - "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=", - "requires": { - "array-back": "^1.0.3", - "typical": "^2.6.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" - }, - "then-request": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/then-request/-/then-request-6.0.2.tgz", - "integrity": "sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==", - "dev": true, - "requires": { - "@types/concat-stream": "^1.6.0", - "@types/form-data": "0.0.33", - "@types/node": "^8.0.0", - "@types/qs": "^6.2.31", - "caseless": "~0.12.0", - "concat-stream": "^1.6.0", - "form-data": "^2.2.0", - "http-basic": "^8.1.1", - "http-response-object": "^3.0.1", - "promise": "^8.0.0", - "qs": "^6.4.0" - }, - "dependencies": { - "@types/node": { - "version": "8.10.56", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.56.tgz", - "integrity": "sha512-5yWs9hy3UWdandOgvmmPCNJ3jI5/o8syatQWOmiAO/9/PptOQ+0O2ANKHltFhE4MGCt/QiVkoxQFUbeha9Yf4w==", - "dev": true - } - } - }, - "thenify": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", - "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", - "requires": { - "any-promise": "^1.0.0" - } - }, - "thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", - "requires": { - "thenify": ">= 3.1.0 < 4" - } - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" - }, - "tiny-async-pool": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.0.4.tgz", - "integrity": "sha512-4gdLvReS3WwmPCxZjj38Go673xhEXlK77fVFA2x+dE2Bf9QzDkVQb3rdO1iJt337ybhir42m4zM2GHJjiuFwoA==", - "requires": { - "semver": "^5.5.0", - "yaassertion": "^1.0.0" - } - }, - "tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "to-buffer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", - "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" - }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" - }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } - } - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" - }, - "truffle": { - "version": "5.0.20", - "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.0.20.tgz", - "integrity": "sha512-Vr2+UnfoFXPf0shry1CawBrQYGveht4K+vfPx63JwVI71vqpeybPqFHiiuqmcnZ3ch+aQgaelNNQU4rsAKgTJg==", - "requires": { - "app-module-path": "^2.2.0", - "mocha": "^4.1.0", - "original-require": "1.0.1" - }, - "dependencies": { - "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=" - }, - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "diff": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", - "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==" - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "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" - } - }, - "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==" - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" - }, - "mocha": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz", - "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==", - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.3.1", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - } - }, - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", - "requires": { - "has-flag": "^2.0.0" - } - } - } - }, - "truffle-artifactor": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/truffle-artifactor/-/truffle-artifactor-3.0.9.tgz", - "integrity": "sha512-EutPyqWya2B5Gc7nOJf6DkDKyYIsjIwMA0gHvasZ5Fb9LYaI3mEB/FS3yNHQTtuPRL7nedI39+D4zu/yyDZyHw==", - "requires": { - "async": "2.6.1", - "debug": "^3.1.0", - "fs-extra": "6.0.1", - "lodash": "^4.17.12", - "truffle-contract": "^3.0.8", - "truffle-contract-schema": "^2.0.3", - "truffle-expect": "^0.0.4" - }, - "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "requires": { - "lodash": "^4.17.10" - } - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "fs-extra": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", - "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, - "truffle-blockchain-utils": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.5.tgz", - "integrity": "sha1-pOXAZNrdafeCoTfz0nbSEJXaekc=" - }, - "truffle-compile": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/truffle-compile/-/truffle-compile-4.2.3.tgz", - "integrity": "sha512-t3s8+I+R7PyyX8BqVaYeN1K2zzbXLY1exSoo/HwHkf05rsfoOjACplyDMdXBtKtWtQX+UtIhy5SPQvwU/dj3/Q==", - "requires": { - "@truffle/error": "^0.0.6", - "@truffle/expect": "^0.0.10", - "colors": "^1.1.2", - "debug": "^4.1.0", - "fs-extra": "^8.0.1", - "ora": "^3.0.0", - "original-require": "^1.0.1", - "request": "^2.85.0", - "request-promise": "^4.2.2", - "require-from-string": "^2.0.2", - "semver": "^5.6.0", - "solc": "^0.5.0", - "truffle-config": "^1.1.20", - "truffle-contract-sources": "^0.1.5" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "solc": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.12.tgz", - "integrity": "sha512-OX/AGZT04tuUsagoVXSZBiBZYJReA02hdwZOfRkB03/eeYP9Dl3pr+M+au+1MhssgiuWBlFPN7sRXFiqwkAW2g==", - "requires": { - "command-exists": "^1.2.8", - "fs-extra": "^0.30.0", - "js-sha3": "0.8.0", - "memorystream": "^0.3.1", - "require-from-string": "^2.0.0", - "semver": "^5.5.0", - "tmp": "0.0.33", - "yargs": "^13.2.0" - }, - "dependencies": { - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - } - } - }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - } - } - }, - "truffle-compile-vyper": { - "version": "1.0.27", - "resolved": "https://registry.npmjs.org/truffle-compile-vyper/-/truffle-compile-vyper-1.0.27.tgz", - "integrity": "sha512-Gpmn+DSRNJhViKOAO0oPtPIeMc6PzGejlW5rPXcCUWCWxNV+3KDlsCxdSn7vxT9Aqy/dRW5cg5XnwZjR4z1x7A==", - "requires": { - "async": "2.6.1", - "colors": "^1.1.2", - "eslint": "^5.5.0", - "minimatch": "^3.0.4", - "truffle-compile": "^4.2.3" - }, - "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "requires": { - "lodash": "^4.17.10" - } - } - } - }, - "truffle-config": { - "version": "1.1.20", - "resolved": "https://registry.npmjs.org/truffle-config/-/truffle-config-1.1.20.tgz", - "integrity": "sha512-Pam/e593+T4AY3oVgpQlOAnnFJGa+hYuhnn90DPOcTvoD7Fp1oBpnZ0sAy9bGT3YnUuB/ae7q9Phm/tYM5ffpw==", - "requires": { - "@truffle/error": "^0.0.6", - "configstore": "^4.0.0", - "find-up": "^2.1.0", - "lodash": "^4.17.13", - "original-require": "1.0.1", - "truffle-provider": "^0.1.16" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" - } - } - }, - "truffle-contract": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-3.0.8.tgz", - "integrity": "sha512-uhXb/G4dORU4RjFlwZZbFT0n5BS8akify+MaRsnWWs4SA/bo6x4/bQs1xtdO3b5Cl9nXiOX88wdQzRj3xtPVUg==", - "requires": { - "ethjs-abi": "0.1.8", - "truffle-blockchain-utils": "^0.0.5", - "truffle-contract-schema": "^2.0.3", - "truffle-error": "^0.0.3", - "web3": "0.20.6" - }, - "dependencies": { - "bignumber.js": { - "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git" - }, - "utf8": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" - }, - "web3": { - "version": "0.20.6", - "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", - "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", - "requires": { - "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", - "crypto-js": "^3.1.4", - "utf8": "^2.1.1", - "xhr2": "*", - "xmlhttprequest": "*" - } - } - } - }, - "truffle-contract-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/truffle-contract-schema/-/truffle-contract-schema-2.0.3.tgz", - "integrity": "sha512-eI5cFifbB3zpcO4RsXSnjN9JMSlJ4M50GQPdrfbrIXRTXHsyQ433SkgFjIATUwfq++TXWkCRfKMjN8eA7YQ3+Q==", - "requires": { - "ajv": "^5.1.1", - "crypto-js": "^3.1.9-1", - "debug": "^3.1.0" - }, - "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "crypto-js": { - "version": "3.1.9-1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", - "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, - "truffle-contract-sources": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/truffle-contract-sources/-/truffle-contract-sources-0.1.5.tgz", - "integrity": "sha512-skhZ8s3sLM4PyRFqn8zbBWG2z1P5zX7ndQPYokr2aiez8o44x5hmUoPeiXgKlMYIyR1Y1zOyNpaVEZyBY1+4Cw==", - "requires": { - "debug": "^4.1.0", - "glob": "^7.1.2" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, - "truffle-error": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/truffle-error/-/truffle-error-0.0.3.tgz", - "integrity": "sha1-S/VSQuFN7uHHGUkycJGC3v8sl8o=" - }, - "truffle-expect": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/truffle-expect/-/truffle-expect-0.0.4.tgz", - "integrity": "sha1-1bJ63qTFUvQ7cNwAh3I2t7aMdcg=" - }, - "truffle-external-compile": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/truffle-external-compile/-/truffle-external-compile-1.0.16.tgz", - "integrity": "sha512-2zplUk5TLUZu8qRXT6hZ08Gm9LF9GolILhXdp087U+nnOlT2BvpwmBU/q2G+NmciJ37prToDFKr1GiGWkc5YYA==", - "requires": { - "@truffle/contract-schema": "^3.0.14", - "@truffle/expect": "^0.0.10", - "debug": "^4.1.0", - "glob": "^7.1.2", - "web3-utils": "1.2.1" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "truffle-hdwallet-provider": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/truffle-hdwallet-provider/-/truffle-hdwallet-provider-0.0.3.tgz", - "integrity": "sha1-Dh3gIQS3PTh14c9wkzBbTqii2EM=", - "requires": { - "bip39": "^2.2.0", - "ethereumjs-wallet": "^0.6.0", - "web3": "^0.18.2", - "web3-provider-engine": "^8.4.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz", - "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "utf8": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" - }, - "web3": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/web3/-/web3-0.18.4.tgz", - "integrity": "sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0=", - "requires": { - "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", - "crypto-js": "^3.1.4", - "utf8": "^2.1.1", - "xhr2": "*", - "xmlhttprequest": "*" - } - }, - "web3-provider-engine": { - "version": "8.6.1", - "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-8.6.1.tgz", - "integrity": "sha1-TYbhnjDKr5ffNRUR7A9gE25bMOs=", - "requires": { - "async": "^2.1.2", - "clone": "^2.0.0", - "ethereumjs-block": "^1.2.2", - "ethereumjs-tx": "^1.2.0", - "ethereumjs-util": "^5.0.1", - "ethereumjs-vm": "^2.0.2", - "isomorphic-fetch": "^2.2.0", - "request": "^2.67.0", - "semaphore": "^1.0.3", - "solc": "^0.4.2", - "tape": "^4.4.0", - "web3": "^0.16.0", - "xhr": "^2.2.0", - "xtend": "^4.0.1" - }, - "dependencies": { - "bignumber.js": { - "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", - "from": "git+https://github.com/debris/bignumber.js.git#master" - }, - "web3": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz", - "integrity": "sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk=", - "requires": { - "bignumber.js": "git+https://github.com/debris/bignumber.js.git#master", - "crypto-js": "^3.1.4", - "utf8": "^2.1.1", - "xmlhttprequest": "*" - } - } - } - } - } - }, - "truffle-interface-adapter": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/truffle-interface-adapter/-/truffle-interface-adapter-0.2.5.tgz", - "integrity": "sha512-EL39OpP8FcZ99ne1Rno3jImfb92Nectd4iVsZzoEUCBfbwHe7sr0k+i45guoruSoP8nMUE81Mov2s8I5pi6d9Q==", - "requires": { - "bn.js": "^4.11.8", - "ethers": "^4.0.32", - "lodash": "^4.17.13", - "web3": "1.2.1" - }, - "dependencies": { - "web3": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", - "integrity": "sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw==", - "requires": { - "web3-bzz": "1.2.1", - "web3-core": "1.2.1", - "web3-eth": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-shh": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "truffle-provider": { - "version": "0.1.16", - "resolved": "https://registry.npmjs.org/truffle-provider/-/truffle-provider-0.1.16.tgz", - "integrity": "sha512-3d5WqSKIzZcpgW44mdfF97s+Tgh2a/3Ly6vHJirBV9OZDUtiAzP6WVnlRNvmlDJXFCDqt6Yb9qQWoXFHbYoR6w==", - "requires": { - "@truffle/error": "^0.0.6", - "truffle-interface-adapter": "^0.2.5", - "web3": "1.2.1" - }, - "dependencies": { - "web3": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", - "integrity": "sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw==", - "requires": { - "web3-bzz": "1.2.1", - "web3-core": "1.2.1", - "web3-eth": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-shh": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "truffle-provisioner": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/truffle-provisioner/-/truffle-provisioner-0.1.5.tgz", - "integrity": "sha512-XSzD4Tj1T16E8qwoIHnQ9sOuvoemP1yqxX9Jg0VvvoLTdl8X17uau6dN08JgNR09hJroTrXPbkAi5Y8IfKhVMw==" - }, - "truffle-resolver": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/truffle-resolver/-/truffle-resolver-4.0.6.tgz", - "integrity": "sha512-RPlUdAwXGN+qR0bVw3BrdS1RA+cjLxDKi8bBcZwBQy3TNWI+00cZToc2o8RTwaDolbGIAIlRz95q+oLQvp0AhQ==", - "requires": { - "async": "2.6.1", - "truffle-contract": "^3.0.8", - "truffle-expect": "^0.0.4", - "truffle-provisioner": "^0.1.1" - }, - "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "requires": { - "lodash": "^4.17.10" - } - } - } - }, - "truffle-security": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/truffle-security/-/truffle-security-1.6.1.tgz", - "integrity": "sha512-FMeQD19437PRJ3i/wK8lKes3ssPTlXon70/XbekcehJlrtFSk8N0WWb8f0cW32508na7wYhc8dGCWtl0ECmKnQ==", - "requires": { - "armlet": "^2.7.0", - "configstore": "^4.0.0", - "debug": "^4.1.1", - "find-cache-dir": "^2.1.0", - "inquirer": "^6.2.2", - "js-yaml": "^3.13.1", - "lodash": "^4.17.11", - "mkdirp": "^0.5.1", - "mocha": "^5.2.0", - "multi-progress": "^2.0.0", - "mythxjs": "^1.3.5", - "proxyquire": "^2.1.0", - "remix-lib": ">=0.4.1", - "sleep": "6.1.0", - "solc": "^0.5.8", - "tiny-async-pool": "^1.0.4", - "truffle-artifactor": "^4.0.13", - "truffle-compile-vyper": "^1.0.13", - "truffle-config": "^1.1.10", - "truffle-contract": "^4.0.31", - "truffle-contract-sources": "^0.1.3", - "truffle-error": "0.0.5", - "truffle-expect": "0.0.7", - "truffle-external-compile": "^1.0.8", - "truffle-resolver": "^5.0.13" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==" - }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "requires": { - "lodash": "^4.17.10" - } - }, - "bignumber.js": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz", - "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==" - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "scrypt-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", - "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" - }, - "solc": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.12.tgz", - "integrity": "sha512-OX/AGZT04tuUsagoVXSZBiBZYJReA02hdwZOfRkB03/eeYP9Dl3pr+M+au+1MhssgiuWBlFPN7sRXFiqwkAW2g==", - "requires": { - "command-exists": "^1.2.8", - "fs-extra": "^0.30.0", - "js-sha3": "0.8.0", - "memorystream": "^0.3.1", - "require-from-string": "^2.0.0", - "semver": "^5.5.0", - "tmp": "0.0.33", - "yargs": "^13.2.0" - } - }, - "truffle-artifactor": { - "version": "4.0.30", - "resolved": "https://registry.npmjs.org/truffle-artifactor/-/truffle-artifactor-4.0.30.tgz", - "integrity": "sha512-3ZriLaKQ1UZ7Fhf70PUAWq0/0461oiYOLheabdQrNiggwzAwt1URMoLLByqDGmCmVBimbf/RHA4VYGd62343aA==", - "requires": { - "@truffle/contract-schema": "^3.0.14", - "fs-extra": "6.0.1", - "lodash": "^4.17.13" - }, - "dependencies": { - "fs-extra": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", - "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "requires": { - "graceful-fs": "^4.1.6" - } - } - } - }, - "truffle-contract": { - "version": "4.0.31", - "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-4.0.31.tgz", - "integrity": "sha512-u3q+p1wiX5C2GpnluGx/d2iaJk7bcWshk2/TohiJyA2iQiTfkS7M4n9D9tY3JqpXR8PmD/TrA69RylO0RhITFA==", - "requires": { - "@truffle/blockchain-utils": "^0.0.11", - "@truffle/contract-schema": "^3.0.14", - "@truffle/error": "^0.0.6", - "bignumber.js": "^7.2.1", - "ethers": "^4.0.0-beta.1", - "truffle-interface-adapter": "^0.2.5", - "web3": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "truffle-error": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/truffle-error/-/truffle-error-0.0.5.tgz", - "integrity": "sha512-JpzPLMPSCE0vaZ3vH5NO5u42GpMj/Y1SRBkQ6b69PSw3xMSH1umApN32cEcg1nnh8q5FNYc5FnKu0m4tiBffyQ==" - }, - "truffle-expect": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/truffle-expect/-/truffle-expect-0.0.7.tgz", - "integrity": "sha512-qnasS3kXZ9EcqvRkpJ1Q7xSLTU1WxSWf487pudsGcDMsmcQ2YUMizmyV0BdhMVPUhcnXkNDaITHtMch1hGVyPA==" - }, - "truffle-resolver": { - "version": "5.0.16", - "resolved": "https://registry.npmjs.org/truffle-resolver/-/truffle-resolver-5.0.16.tgz", - "integrity": "sha512-ek8y6KSGLvqDZhTXzDlwFaUtwSCBtDZ4k624xNAj/RZIyqodGs1a9MBTQZ6BzpQ6uc4yC9ZlSzdClhNHugYwqg==", - "requires": { - "@truffle/expect": "^0.0.10", - "async": "2.6.1", - "detect-installed": "^2.0.4", - "get-installed-path": "^4.0.8", - "truffle-provisioner": "^0.1.5" - } - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - }, - "web3": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", - "integrity": "sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw==", - "requires": { - "web3-bzz": "1.2.1", - "web3-core": "1.2.1", - "web3-eth": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-shh": "1.2.1", - "web3-utils": "1.2.1" - } - }, - "web3-eth-abi": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz", - "integrity": "sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g==", - "requires": { - "ethers": "4.0.0-beta.3", - "underscore": "1.9.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "ethers": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", - "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.3", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - } - } - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - } - } - }, - "truffle-typings": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/truffle-typings/-/truffle-typings-1.0.8.tgz", - "integrity": "sha512-75yFYNt0ws1TTehrGxhOqH3tutvBCAs+RG2SrhVIqQvU72kLAb4ercl32dES8yKbXBVHjzv3OXNg5gsbak+3Dg==", - "dev": true, - "requires": { - "@types/chai": "^4.1.4", - "@types/mocha": "^5.2.5", - "@types/web3": "^1.0.18" - } - }, - "ts-essentials": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-1.0.4.tgz", - "integrity": "sha512-q3N1xS4vZpRouhYHDPwO0bDW3EZ6SK9CrrDHxi/D6BPReSjpVgWIOpLS2o0gSBZm+7q/wyKp6RVM1AeeW7uyfQ==" - }, - "ts-generator": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/ts-generator/-/ts-generator-0.0.8.tgz", - "integrity": "sha512-Gi+aZCELpVL7Mqb+GuMgM+n8JZ/arZZib1iD/R9Ok8JDjOCOCrqS9b1lr72ku7J45WeDCFZxyJoRsiQvhokCnw==", - "requires": { - "@types/mkdirp": "^0.5.2", - "@types/prettier": "^1.13.2", - "@types/resolve": "^0.0.8", - "chalk": "^2.4.1", - "glob": "^7.1.2", - "mkdirp": "^0.5.1", - "prettier": "^1.14.2", - "resolve": "^1.8.1", - "ts-essentials": "^1.0.0" - } - }, - "ts-invariant": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz", - "integrity": "sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==", - "requires": { - "tslib": "^1.9.3" - } - }, - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - }, - "twilio": { - "version": "3.36.0", - "resolved": "https://registry.npmjs.org/twilio/-/twilio-3.36.0.tgz", - "integrity": "sha512-rj042yEMNjE+Ze3XL2SMvxJOLik8EEMu+nkEc7sbf8c/9cdsJfdKienl9eEWHjsT2H5xn3zqZHDNvZLypA2Nxg==", - "requires": { - "@types/express": "^4.17.1", - "deprecate": "1.0.0", - "jsonwebtoken": "^8.5.1", - "lodash": "^4.17.15", - "moment": "^2.24.0", - "q": "2.0.x", - "request": "^2.88.0", - "rootpath": "0.1.2", - "scmp": "2.0.0", - "xmlbuilder": "9.0.1" - } - }, - "type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==" - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "typechain": { - "version": "git+https://github.com/celo-org/TypeChain.git#832e628fab8f7d9946d46047afe73958d527c262", - "from": "git+https://github.com/celo-org/TypeChain.git#832e628", - "requires": { - "command-line-args": "^4.0.7", - "debug": "^3.0.1", - "fs-extra": "^7.0.0", - "ts-generator": "^0.0.8" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, - "typed-function": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz", - "integrity": "sha512-TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA==" - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } - }, - "typical": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz", - "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=" - }, - "u2f-api": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/u2f-api/-/u2f-api-0.2.7.tgz", - "integrity": "sha512-fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg==" - }, - "uglify-js": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.4.tgz", - "integrity": "sha512-9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA==", - "optional": true, - "requires": { - "commander": "~2.20.3", - "source-map": "~0.6.1" - } - }, - "ultron": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" - }, - "unbzip2-stream": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", - "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", - "requires": { - "buffer": "^5.2.1", - "through": "^2.3.8" - } - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, - "underscore": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", - "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==" - }, - "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", - "requires": { - "crypto-random-string": "^1.0.0" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" - }, - "unorm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz", - "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==" - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "requires": { - "punycode": "^2.1.0" - } - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "requires": { - "prepend-http": "^2.0.0" - } - }, - "url-set-query": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", - "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=" - }, - "url-to-options": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" - }, - "usb": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/usb/-/usb-1.6.0.tgz", - "integrity": "sha512-52DyWlCk9K+iw3LnvY95WXSnpHjxJoI++aGkV8HiMNPc4zmvDQlYvWAzrkbJ2JH3oUcx26XfU5sZcG4RAcVkMg==", - "optional": true, - "requires": { - "bindings": "^1.4.0", - "nan": "2.13.2", - "prebuild-install": "^5.2.4" - }, - "dependencies": { - "nan": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", - "optional": true - } - } - }, - "utf8": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", - "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" - }, - "uuid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", - "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" - }, - "valid-url": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz", - "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA=" - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "requires": { - "defaults": "^1.0.3" - } - }, - "weak-map": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", - "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=" - }, - "web3": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.37.tgz", - "integrity": "sha512-8XLgUspdzicC/xHG82TLrcF/Fxzj2XYNJ1KTYnepOI77bj5rvpsxxwHYBWQ6/JOjk0HkZqoBfnXWgcIHCDhZhQ==", - "requires": { - "web3-bzz": "1.0.0-beta.37", - "web3-core": "1.0.0-beta.37", - "web3-eth": "1.0.0-beta.37", - "web3-eth-personal": "1.0.0-beta.37", - "web3-net": "1.0.0-beta.37", - "web3-shh": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==" - }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "bluebird": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz", - "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==" - }, - "eth-lib": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.27.tgz", - "integrity": "sha512-B8czsfkJYzn2UIEMwjc7Mbj+Cy72V+/OXH/tb44LV8jhrjizQJJ325xMOMyk3+ETa6r6oi0jsUY14+om8mQMWA==", - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "keccakjs": "^0.2.1", - "nano-json-stream-parser": "^0.1.2", - "servify": "^0.1.12", - "ws": "^3.0.0", - "xhr-request-promise": "^0.1.2" - } - }, - "ethers": { - "version": "4.0.0-beta.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.1.tgz", - "integrity": "sha512-SoYhktEbLxf+fiux5SfCEwdzWENMvgIbMZD90I62s4GZD9nEjgEWy8ZboI3hck193Vs0bDoTohDISx84f2H2tw==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.3", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - }, - "dependencies": { - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "setimmediate": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", - "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=" - } - } - }, - "eventemitter3": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz", - "integrity": "sha1-R3hr2qCHyvext15zq8XH1UAVjNA=" - }, - "fs-extra": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", - "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0" - } - }, - "got": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", - "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", - "requires": { - "decompress-response": "^3.2.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-plain-obj": "^1.1.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^1.1.1", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "url-parse-lax": "^1.0.0", - "url-to-options": "^1.0.1" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "oboe": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.3.tgz", - "integrity": "sha1-K0hl29Rr6BIlcT9Om/5Lz09oCk8=", - "requires": { - "http-https": "^1.0.0" - } - }, - "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" - }, - "scrypt-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", - "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" - }, - "scrypt.js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/scrypt.js/-/scrypt.js-0.2.0.tgz", - "integrity": "sha1-r40UZbcemZARC+38WTuUeeA6ito=", - "requires": { - "scrypt": "^6.0.2", - "scryptsy": "^1.2.1" - } - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" - }, - "swarm-js": { - "version": "0.1.37", - "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.37.tgz", - "integrity": "sha512-G8gi5fcXP/2upwiuOShJ258sIufBVztekgobr3cVgYXObZwJ5AXLqZn52AI+/ffft29pJexF9WNdUxjlkVehoQ==", - "requires": { - "bluebird": "^3.5.0", - "buffer": "^5.0.5", - "decompress": "^4.0.0", - "eth-lib": "^0.1.26", - "fs-extra": "^2.1.2", - "fs-promise": "^2.0.0", - "got": "^7.1.0", - "mime-types": "^2.1.16", - "mkdirp-promise": "^5.0.1", - "mock-fs": "^4.1.0", - "setimmediate": "^1.0.5", - "tar.gz": "^1.0.5", - "xhr-request-promise": "^0.1.2" - } - }, - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "requires": { - "prepend-http": "^1.0.1" - } - }, - "utf8": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz", - "integrity": "sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g=" - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - }, - "web3-bzz": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.0.0-beta.37.tgz", - "integrity": "sha512-E+dho49Nsm/QpQvYWOF35YDsQrMvLB19AApENxhlQsu6HpWQt534DQul0t3Y/aAh8rlKD6Kanxt8LhHDG3vejQ==", - "requires": { - "got": "7.1.0", - "swarm-js": "0.1.37", - "underscore": "1.8.3" - } - }, - "web3-core": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.0.0-beta.37.tgz", - "integrity": "sha512-cIwEqCj7OJyefQNauI0HOgW4sSaOQ98V99H2/HEIlnCZylsDzfw7gtQUdwnRFiIyIxjbWy3iWsjwDPoXNPZBYg==", - "requires": { - "web3-core-helpers": "1.0.0-beta.37", - "web3-core-method": "1.0.0-beta.37", - "web3-core-requestmanager": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-core-helpers": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.37.tgz", - "integrity": "sha512-efaLOzN28RMnbugnyelgLwPWWaSwElQzcAJ/x3PZu+uPloM/lE5x0YuBKvIh7/PoSMlHqtRWj1B8CpuQOUQ5Ew==", - "requires": { - "underscore": "1.8.3", - "web3-eth-iban": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-core-method": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.0.0-beta.37.tgz", - "integrity": "sha512-pKWFUeqnVmzx3VrZg+CseSdrl/Yrk2ioid/HzolNXZE6zdoITZL0uRjnsbqXGEzgRRd1Oe/pFndpTlRsnxXloA==", - "requires": { - "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.37", - "web3-core-promievent": "1.0.0-beta.37", - "web3-core-subscriptions": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-core-promievent": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.37.tgz", - "integrity": "sha512-GTF2r1lP8nJBeA5Gxq5yZpJy9l8Fb9CXGZPfF8jHvaRdQHtm2Z+NDhqYmF833lcdkokRSyfPcXlz1mlWeClFpg==", - "requires": { - "any-promise": "1.3.0", - "eventemitter3": "1.1.1" - } - }, - "web3-core-requestmanager": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.37.tgz", - "integrity": "sha512-66VUqye5BGp1Zz1r8psCxdNH+GtTjaFwroum2Osx+wbC5oRjAiXkkadiitf6wRb+edodjEMPn49u7B6WGNuewQ==", - "requires": { - "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.37", - "web3-providers-http": "1.0.0-beta.37", - "web3-providers-ipc": "1.0.0-beta.37", - "web3-providers-ws": "1.0.0-beta.37" - } - }, - "web3-core-subscriptions": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.37.tgz", - "integrity": "sha512-FdXl8so9kwkRRWziuCSpFsAuAdg9KvpXa1fQlT16uoGcYYfxwFO/nkwyBGQzkZt7emShI2IRugcazyPCZDwkOA==", - "requires": { - "eventemitter3": "1.1.1", - "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.37" - } - }, - "web3-eth": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.0.0-beta.37.tgz", - "integrity": "sha512-Eb3aGtkz3G9q+Z9DKgSQNbn/u8RtcZQQ0R4sW9hy5KK47GoT6vab5c6DiD3QWzI0BzitHzR5Ji+3VHf/hPUGgw==", - "requires": { - "underscore": "1.8.3", - "web3-core": "1.0.0-beta.37", - "web3-core-helpers": "1.0.0-beta.37", - "web3-core-method": "1.0.0-beta.37", - "web3-core-subscriptions": "1.0.0-beta.37", - "web3-eth-abi": "1.0.0-beta.37", - "web3-eth-accounts": "1.0.0-beta.37", - "web3-eth-contract": "1.0.0-beta.37", - "web3-eth-ens": "1.0.0-beta.37", - "web3-eth-iban": "1.0.0-beta.37", - "web3-eth-personal": "1.0.0-beta.37", - "web3-net": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-eth-abi": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.37.tgz", - "integrity": "sha512-g9DKZGM2OqwKp/tX3W/yihcj7mQCtJ6CXyZXEIZfuDyRBED/iSEIFfieDOd+yo16sokLMig6FG7ADhhu+19hdA==", - "requires": { - "ethers": "4.0.0-beta.1", - "underscore": "1.8.3", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-eth-accounts": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.37.tgz", - "integrity": "sha512-uvbHL62/zwo4GDmwKdqH9c/EgYd8QVnAfpVw8D3epSISpgbONNY7Hr4MRMSd/CqAP12l2Ls9JVQGLhhC83bW6g==", - "requires": { - "any-promise": "1.3.0", - "crypto-browserify": "3.12.0", - "eth-lib": "0.2.7", - "scrypt.js": "0.2.0", - "underscore": "1.8.3", - "uuid": "2.0.1", - "web3-core": "1.0.0-beta.37", - "web3-core-helpers": "1.0.0-beta.37", - "web3-core-method": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - }, - "dependencies": { - "eth-lib": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", - "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", - "requires": { - "bn.js": "^4.11.6", - "elliptic": "^6.4.0", - "xhr-request-promise": "^0.1.2" - } - } - } - }, - "web3-eth-contract": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.37.tgz", - "integrity": "sha512-h1B3A8Z/C7BlnTCHkrWbXZQTViDxfR12lKMeTkT8Sqj5phFmxrBlPE4ORy4lf1Dk5b23mZYE0r/IRACx4ThCrQ==", - "requires": { - "underscore": "1.8.3", - "web3-core": "1.0.0-beta.37", - "web3-core-helpers": "1.0.0-beta.37", - "web3-core-method": "1.0.0-beta.37", - "web3-core-promievent": "1.0.0-beta.37", - "web3-core-subscriptions": "1.0.0-beta.37", - "web3-eth-abi": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-eth-ens": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.37.tgz", - "integrity": "sha512-dR3UkrVzdRrJhfP57xBPx0CMiVnCcYFvh+u2XMkGydrhHgupSUkjqGr89xry/j1T0BkuN9mikpbyhdCVMXqMbg==", - "requires": { - "eth-ens-namehash": "2.0.8", - "underscore": "1.8.3", - "web3-core": "1.0.0-beta.37", - "web3-core-helpers": "1.0.0-beta.37", - "web3-core-promievent": "1.0.0-beta.37", - "web3-eth-abi": "1.0.0-beta.37", - "web3-eth-contract": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-eth-iban": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.37.tgz", - "integrity": "sha512-WQRniGJFxH/XCbd7miO6+jnUG+6bvuzfeufPIiOtCbeIC1ypp1kSqER8YVBDrTyinU1xnf1U5v0KBZ2yiWBJxQ==", - "requires": { - "bn.js": "4.11.6", - "web3-utils": "1.0.0-beta.37" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - } - } - }, - "web3-eth-personal": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.37.tgz", - "integrity": "sha512-B4dZpGbD+nGnn48i6nJBqrQ+HB7oDmd+Q3wGRKOsHSK5HRWO/KwYeA7wgwamMAElkut50lIsT9EJl4Apfk3G5Q==", - "requires": { - "web3-core": "1.0.0-beta.37", - "web3-core-helpers": "1.0.0-beta.37", - "web3-core-method": "1.0.0-beta.37", - "web3-net": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-net": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.0.0-beta.37.tgz", - "integrity": "sha512-xG/uBtMdDa1UMXw9KjDUgf3fXA/fDEJUYUS0TDn+U9PMgngA+UVECHNNvQTrVVDxEky38V3sahwIDiopNsQdsw==", - "requires": { - "web3-core": "1.0.0-beta.37", - "web3-core-method": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" - } - }, - "web3-providers-http": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.0.0-beta.37.tgz", - "integrity": "sha512-FM/1YDB1jtZuTo78habFj7S9tNHoqt0UipdyoQV29b8LkGKZV9Vs3is8L24hzuj1j/tbwkcAH+ewIseHwu0DTg==", - "requires": { - "web3-core-helpers": "1.0.0-beta.37", - "xhr2-cookies": "1.1.0" - } - }, - "web3-providers-ipc": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.37.tgz", - "integrity": "sha512-NdRPRxYMIU0C3u18NI8u4bwbhI9pCg5nRgDGYcmSAx5uOBxiYcQy+hb0WkJRRhBoyIXJmy+s26FoH8904+UnPg==", - "requires": { - "oboe": "2.1.3", - "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.37" - } - }, - "web3-providers-ws": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.37.tgz", - "integrity": "sha512-8p6ZLv+1JYa5Vs8oBn33Nn3VGFBbF+wVfO+b78RJS1Qf1uIOzjFVDk3XwYDD7rlz9G5BKpxhaQw+6EGQ7L02aw==", - "requires": { - "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.37", - "websocket": "https://github.com/frozeman/WebSocket-Node.git#browserifyCompatible" - } - }, - "web3-shh": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.0.0-beta.37.tgz", - "integrity": "sha512-h5STG/xqZNQWtCLYOu7NiMqwqPea8SfkKQUPUFxXKIPVCFVKpHuQEwW1qcPQRJMLhlQIv17xuoUe1A+RzDNbrw==", - "requires": { - "web3-core": "1.0.0-beta.37", - "web3-core-method": "1.0.0-beta.37", - "web3-core-subscriptions": "1.0.0-beta.37", - "web3-net": "1.0.0-beta.37" - } - }, - "web3-utils": { - "version": "1.0.0-beta.37", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.37.tgz", - "integrity": "sha512-kA1fyhO8nKgU21wi30oJQ/ssvu+9srMdjOTKbHYbQe4ATPcr5YNwwrxG3Bcpbu1bEwRUVKHCkqi+wTvcAWBdlQ==", - "requires": { - "bn.js": "4.11.6", - "eth-lib": "0.1.27", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.8.3", - "utf8": "2.1.1" - }, - "dependencies": { - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - } - } - }, - "websocket": { - "version": "https://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", - "from": "https://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", - "requires": { - "debug": "^2.2.0", - "nan": "^2.3.3", - "typedarray-to-buffer": "^3.1.2", - "yaeti": "^0.0.6" - } - }, - "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - } - } - }, - "web3-bzz": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.1.tgz", - "integrity": "sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw==", - "requires": { - "got": "9.6.0", - "swarm-js": "0.1.39", - "underscore": "1.9.1" - } - }, - "web3-core": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.1.tgz", - "integrity": "sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg==", - "requires": { - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-requestmanager": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-core-helpers": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz", - "integrity": "sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw==", - "requires": { - "underscore": "1.9.1", - "web3-eth-iban": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-core-method": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.1.tgz", - "integrity": "sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ==", - "requires": { - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-core-promievent": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz", - "integrity": "sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw==", - "requires": { - "any-promise": "1.3.0", - "eventemitter3": "3.1.2" - } - }, - "web3-core-requestmanager": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz", - "integrity": "sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg==", - "requires": { - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "web3-providers-http": "1.2.1", - "web3-providers-ipc": "1.2.1", - "web3-providers-ws": "1.2.1" - } - }, - "web3-core-subscriptions": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz", - "integrity": "sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g==", - "requires": { - "eventemitter3": "3.1.2", - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1" - } - }, - "web3-eth": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.1.tgz", - "integrity": "sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA==", - "requires": { - "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-eth-accounts": "1.2.1", - "web3-eth-contract": "1.2.1", - "web3-eth-ens": "1.2.1", - "web3-eth-iban": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==" - }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "ethers": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", - "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.3", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - }, - "scrypt-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", - "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - }, - "web3-eth-abi": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz", - "integrity": "sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g==", - "requires": { - "ethers": "4.0.0-beta.3", - "underscore": "1.9.1", - "web3-utils": "1.2.1" - } - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-eth-abi": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz", - "integrity": "sha512-Yn/ZMgoOLxhTVxIYtPJ0eS6pnAnkTAaJgUJh1JhZS4ekzgswMfEYXOwpMaD5eiqPJLpuxmZFnXnBZlnQ1JMXsw==", - "requires": { - "ethers": "4.0.0-beta.3", - "underscore": "1.9.1", - "web3-utils": "1.2.2" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==" - }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "ethers": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", - "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.3", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - }, - "scrypt-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", - "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - } - } - }, - "web3-eth-accounts": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz", - "integrity": "sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ==", - "requires": { - "any-promise": "1.3.0", - "crypto-browserify": "3.12.0", - "eth-lib": "0.2.7", - "scryptsy": "2.1.0", - "semver": "6.2.0", - "underscore": "1.9.1", - "uuid": "3.3.2", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "scryptsy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz", - "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==" - }, - "semver": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", - "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==" - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-eth-contract": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.1.tgz", - "integrity": "sha512-kYFESbQ3boC9bl2rYVghj7O8UKMiuKaiMkxvRH5cEDHil8V7MGEGZNH0slSdoyeftZVlaWSMqkRP/chfnKND0g==", - "requires": { - "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==" - }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "ethers": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", - "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.3", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - }, - "scrypt-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", - "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - }, - "web3-eth-abi": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz", - "integrity": "sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g==", - "requires": { - "ethers": "4.0.0-beta.3", - "underscore": "1.9.1", - "web3-utils": "1.2.1" - } - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-eth-ens": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz", - "integrity": "sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q==", - "requires": { - "eth-ens-namehash": "2.0.8", - "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-eth-contract": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "@types/node": { - "version": "10.17.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.0.tgz", - "integrity": "sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==" - }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "ethers": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", - "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", - "requires": { - "@types/node": "^10.3.2", - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.3.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.3", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - }, - "scrypt-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", - "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" - }, - "uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=" - }, - "web3-eth-abi": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz", - "integrity": "sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g==", - "requires": { - "ethers": "4.0.0-beta.3", - "underscore": "1.9.1", - "web3-utils": "1.2.1" - } - }, - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-eth-iban": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz", - "integrity": "sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ==", - "requires": { - "bn.js": "4.11.8", - "web3-utils": "1.2.1" - }, - "dependencies": { - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-eth-personal": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz", - "integrity": "sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg==", - "requires": { - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-net": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-net": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.1.tgz", - "integrity": "sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw==", - "requires": { - "web3-core": "1.2.1", - "web3-core-method": "1.2.1", - "web3-utils": "1.2.1" - }, - "dependencies": { - "web3-utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", - "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - } - } - }, - "web3-provider-engine": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-15.0.3.tgz", - "integrity": "sha512-E2/j0iEA1JJVijV84bPpiFKZPA6jFkcCKJtzDCl/CUn8CeqtkGykpjP55pnQtzxszzmpGgSZlThMEFUzBU7X2g==", - "requires": { - "async": "^2.5.0", - "backoff": "^2.5.0", - "clone": "^2.0.0", - "cross-fetch": "^2.1.0", - "eth-block-tracker": "^4.4.2", - "eth-json-rpc-errors": "^1.0.1", - "eth-json-rpc-filters": "^4.1.0", - "eth-json-rpc-infura": "^4.0.1", - "eth-json-rpc-middleware": "^4.1.5", - "eth-sig-util": "^1.4.2", - "ethereumjs-block": "^1.2.2", - "ethereumjs-tx": "^1.2.0", - "ethereumjs-util": "^5.1.5", - "ethereumjs-vm": "^2.3.4", - "json-stable-stringify": "^1.0.1", - "promise-to-callback": "^1.0.0", - "readable-stream": "^2.2.9", - "request": "^2.85.0", - "semaphore": "^1.0.3", - "ws": "^5.1.1", - "xhr": "^2.2.0", - "xtend": "^4.0.1" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "ethereumjs-vm": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz", - "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==", - "requires": { - "async": "^2.1.2", - "async-eventemitter": "^0.2.2", - "ethereumjs-account": "^2.0.3", - "ethereumjs-block": "~2.2.0", - "ethereumjs-common": "^1.1.0", - "ethereumjs-util": "^6.0.0", - "fake-merkle-patricia-tree": "^1.0.1", - "functional-red-black-tree": "^1.0.1", - "merkle-patricia-tree": "^2.3.2", - "rustbn.js": "~0.2.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "ethereumjs-block": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz", - "integrity": "sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw==", - "requires": { - "async": "^2.0.1", - "ethereumjs-common": "^1.1.0", - "ethereumjs-tx": "^1.2.2", - "ethereumjs-util": "^5.0.0", - "merkle-patricia-tree": "^2.1.2" - }, - "dependencies": { - "ethereumjs-util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", - "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "^0.1.3", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - }, - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } - } - } - } - }, - "web3-providers-http": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.1.tgz", - "integrity": "sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ==", - "requires": { - "web3-core-helpers": "1.2.1", - "xhr2-cookies": "1.1.0" - } - }, - "web3-providers-ipc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz", - "integrity": "sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA==", - "requires": { - "oboe": "2.1.4", - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1" - } - }, - "web3-providers-ws": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz", - "integrity": "sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA==", - "requires": { - "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" - } - }, - "web3-shh": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.1.tgz", - "integrity": "sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA==", - "requires": { - "web3-core": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-net": "1.2.1" - } - }, - "web3-utils": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", - "integrity": "sha512-joF+s3243TY5cL7Z7y4h1JsJpUCf/kmFmj+eJar7Y2yNIGVcW961VyrAms75tjUysSuHaUQ3eQXjBEUJueT52A==", - "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", - "ethereum-bloom-filters": "^1.0.6", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randombytes": "^2.1.0", - "underscore": "1.9.1", - "utf8": "3.0.0" - } - }, - "websocket": { - "version": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e", - "from": "github:web3-js/WebSocket-Node#polyfill/globalThis", - "requires": { - "debug": "^2.2.0", - "es5-ext": "^0.10.50", - "nan": "^2.14.0", - "typedarray-to-buffer": "^3.1.5", - "yaeti": "^0.0.6" - } - }, - "whatwg-fetch": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", - "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "which-pm-runs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", - "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=", - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "optional": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "optional": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "optional": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "window-size": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", - "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", - "requires": { - "mkdirp": "^0.5.1" - } - }, - "write-file-atomic": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", - "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } - }, - "ws": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", - "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", - "requires": { - "async-limiter": "~1.0.0" - } - }, - "xdg-basedir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", - "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" - }, - "xhr": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz", - "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==", - "requires": { - "global": "~4.3.0", - "is-function": "^1.0.1", - "parse-headers": "^2.0.0", - "xtend": "^4.0.0" - } - }, - "xhr-request": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/xhr-request/-/xhr-request-1.1.0.tgz", - "integrity": "sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==", - "requires": { - "buffer-to-arraybuffer": "^0.0.5", - "object-assign": "^4.1.1", - "query-string": "^5.0.1", - "simple-get": "^2.7.0", - "timed-out": "^4.0.1", - "url-set-query": "^1.0.0", - "xhr": "^2.0.4" - } - }, - "xhr-request-promise": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/xhr-request-promise/-/xhr-request-promise-0.1.2.tgz", - "integrity": "sha1-NDxE0e53JrhkgGloLQ+EDIO0Jh0=", - "requires": { - "xhr-request": "^1.0.1" - } - }, - "xhr2": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.0.tgz", - "integrity": "sha512-BDtiD0i2iKPK/S8OAZfpk6tyzEDnKKSjxWHcMBVmh+LuqJ8A32qXTyOx+TVOg2dKvq6zGBq2sgKPkEeRs1qTRA==" - }, - "xhr2-cookies": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", - "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=", - "requires": { - "cookiejar": "^2.1.1" - } - }, - "xmlbuilder": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.1.tgz", - "integrity": "sha1-kc1wiXdVNj66V8Et3uq0o0GmH2U=" - }, - "xmlhttprequest": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", - "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, - "yaassertion": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/yaassertion/-/yaassertion-1.0.2.tgz", - "integrity": "sha512-sBoJBg5vTr3lOpRX0yFD+tz7wv/l2UPMFthag4HGTMPrypBRKerjjS8jiEnNMjcAEtPXjbHiKE0UwRR1W1GXBg==" - }, - "yaeti": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - }, - "yargs": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz", - "integrity": "sha512-ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - }, - "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "requires": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "zen-observable": { - "version": "0.8.14", - "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.14.tgz", - "integrity": "sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==" - }, - "zen-observable-ts": { - "version": "0.8.20", - "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz", - "integrity": "sha512-2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==", - "requires": { - "tslib": "^1.9.3", - "zen-observable": "^0.8.0" - } - } - } -} diff --git a/packages/protocol/package.json b/packages/protocol/package.json index d1a7a275d7c..dbb46b86cae 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -54,14 +54,15 @@ "@celo/base": "2.2.1-dev", "@celo/bls12377js": "0.1.1", "@celo/connect": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", "@celo/cryptographic-utils": "2.2.1-dev", + "@celo/utils": "2.2.1-dev", + "@ethereumjs/vm": "npm:@soloseng/ethereumjs-vm@6.2.3", "@openzeppelin/upgrades": "^2.8.0", - "@truffle/artifactor": "4.0.171", - "@truffle/contract": "4.6.3", - "@truffle/resolver": "9.0.18", - "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", + "@truffle/artifactor": "4.0.180", + "@truffle/contract": "4.6.10", + "@truffle/resolver": "9.0.27", "bignumber.js": "9.1.0", + "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", "chai": "^4.3.6", "chai-subset": "^1.6.0", "csv-parser": "^2.0.0", @@ -69,10 +70,9 @@ "elliptic": "^6.5.4", "ethereumjs-abi": "^0.6.8", "ethereumjs-util": "^5.2.0", - "ethereumjs-vm": "^4.2.0", "ethereumjs-wallet": "^0.6.3", "fs-extra": "^5.0.0", - "ganache": "^7.4.4", + "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", "glob-fs": "^0.1.7", "graphql": "^14.1.1", "j6": "^1.0.2", @@ -83,7 +83,7 @@ "prompts": "^2.0.1", "solhint": "^2.3.1", "solidity-bytes-utils": "0.0.7", - "truffle": "5.6.1", + "truffle": "5.7.3", "truffle-security": "^1.7.3", "twilio": "^3.57.0", "weak-map": "^1.0.5", diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 55989ac2ff4..eabe08733ee 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -43,13 +43,13 @@ "web3": "1.3.6" }, "devDependencies": { - "@celo/phone-utils": "2.2.1-dev", "@celo/dev-utils": "0.0.1-dev", "@celo/flake-tracker": "0.0.1-dev", + "@celo/phone-utils": "2.2.1-dev", "@celo/protocol": "1.0.0", "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", - "ganache": "^7.4.4", + "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", "jest": "^26.6.3", "ts-node": "8.3.0", "typedoc": "^0.19.2", diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json index e175fa8371d..277d40e9972 100644 --- a/packages/sdk/identity/package.json +++ b/packages/sdk/identity/package.json @@ -26,9 +26,9 @@ }, "dependencies": { "@celo/base": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", "@celo/contractkit": "2.2.1-dev", "@celo/phone-number-privacy-common": "1.0.39", + "@celo/utils": "2.2.1-dev", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", @@ -40,11 +40,11 @@ }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "@celo/wallet-local": "2.2.1-dev", "@celo/flake-tracker": "0.0.1-dev", + "@celo/wallet-local": "2.2.1-dev", "@types/elliptic": "^6.4.12", "fetch-mock": "9.10.4", - "ganache": "^7.4.4" + "ganache": "npm:@soloseng/ganache@7.7.5-beta.3" }, "engines": { "node": ">=12.9.0" diff --git a/yarn.lock b/yarn.lock index 476d187caf4..e2c1792c774 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1290,40 +1290,6 @@ semver "^7.3.5" web3 "1.3.6" -"@celo/ganache-core@git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b", ganache-core@^2.6.0, "ganache-core@git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b": - version "2.10.3" - resolved "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" - dependencies: - "@celo/utils" "1.5.1" - abstract-leveldown "3.0.0" - async "2.6.2" - bip39 "2.5.0" - cachedown "1.0.0" - clone "2.1.2" - debug "3.2.6" - encoding-down "5.0.4" - eth-sig-util "2.3.0" - ethereumjs-abi "0.6.7" - ethereumjs-account "3.0.0" - ethereumjs-block "2.2.2" - ethereumjs-common "1.5.0" - ethereumjs-tx "2.1.2" - ethereumjs-util "6.2.0" - ethereumjs-vm "git+https://github.com/celo-org/celo-monorepo.git#ethereumjs-vm-v4.1.3-celo3-gitpkg" - heap "0.2.6" - level-sublevel "6.6.4" - levelup "3.1.1" - lodash "4.17.14" - merkle-patricia-tree "2.3.2" - seedrandom "3.0.1" - source-map-support "0.5.12" - tmp "0.1.0" - web3-provider-engine "14.2.1" - websocket "1.0.29" - optionalDependencies: - ethereumjs-wallet "0.6.4" - web3 "1.2.4" - "@celo/identity@2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@celo/identity/-/identity-2.2.0.tgz#a218faa2d53d5e4941c4da24a0ec2c65dd8eadc8" @@ -1432,6 +1398,42 @@ eth-lib "^0.2.8" ethereumjs-util "^5.2.0" +"@chainsafe/as-sha256@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.3.1.tgz#3639df0e1435cab03f4d9870cc3ac079e57a6fc9" + integrity sha512-hldFFYuf49ed7DAakWVXSJODuq3pzJEguD8tQ7h+sGkM18vja+OFoJI9krnGmgzyuZC2ETX0NOIcCTy31v2Mtg== + +"@chainsafe/persistent-merkle-tree@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.4.2.tgz#4c9ee80cc57cd3be7208d98c40014ad38f36f7ff" + integrity sha512-lLO3ihKPngXLTus/L7WHKaw9PnNJWizlOF1H9NNzHP6Xvh82vzg9F2bzkXhYIFshMZ2gTCEz8tq6STe7r5NDfQ== + dependencies: + "@chainsafe/as-sha256" "^0.3.1" + +"@chainsafe/persistent-merkle-tree@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.5.0.tgz#2b4a62c9489a5739dedd197250d8d2f5427e9f63" + integrity sha512-l0V1b5clxA3iwQLXP40zYjyZYospQLZXzBVIhhr9kDg/1qHZfzzHw0jj4VPBijfYCArZDlPkRi1wZaV2POKeuw== + dependencies: + "@chainsafe/as-sha256" "^0.3.1" + +"@chainsafe/ssz@^0.10.0": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.10.1.tgz#c05ec168a3c7de1e6b72eac170afbe497ffca329" + integrity sha512-IdDOblRmH/aYqSJknAjTuT2Y2FEctofyXvmFzbJZkQ/XgYWyFELI3IFR3P2T2VNxeAgl6QOqcVbe+cGRL7Mxpw== + dependencies: + "@chainsafe/as-sha256" "^0.3.1" + "@chainsafe/persistent-merkle-tree" "^0.5.0" + +"@chainsafe/ssz@^0.9.2": + version "0.9.4" + resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.9.4.tgz#696a8db46d6975b600f8309ad3a12f7c0e310497" + integrity sha512-77Qtg2N1ayqs4Bg/wvnWfg5Bta7iy7IRh8XqXh7oNMeP2HBbBwx8m6yTpA8p0EHItWPEBkgZd5S5/LSlp3GXuQ== + dependencies: + "@chainsafe/as-sha256" "^0.3.1" + "@chainsafe/persistent-merkle-tree" "^0.4.2" + case "^1.6.3" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1504,6 +1506,66 @@ resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA== +"@ethereumjs/block@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-4.0.1.tgz#bc865daa901c3165c43b1bad2c6db544d4e9b3dd" + integrity sha512-cYkJaogUL5V3iZOSm7WgSP8Fvm9R/jN/dotRQZpj5SJ3fP6GF00xtmYpQGE10SnK/Lo+iyXwZ2K7M1zn/0wnXw== + dependencies: + "@ethereumjs/common" "^3.0.1" + "@ethereumjs/rlp" "^4.0.0" + "@ethereumjs/trie" "^5.0.1" + "@ethereumjs/tx" "^4.0.1" + "@ethereumjs/util" "^8.0.0" + ethereum-cryptography "^1.1.2" + ethers "^5.7.1" + +"@ethereumjs/block@^4.0.1", "@ethereumjs/block@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-4.2.0.tgz#08c0f98b30b13069291749414bf47172f2eaa121" + integrity sha512-IBGJaJN8wt1LGBXFouF6TGLz7Q5QTJR3dudP+Mf2LMNxpH1I6A/N5dSzMIRtULke5UI5V/dnWlobF9XFVx37Pw== + dependencies: + "@ethereumjs/common" "^3.1.0" + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/trie" "^5.0.3" + "@ethereumjs/tx" "^4.1.0" + "@ethereumjs/util" "^8.0.4" + ethereum-cryptography "^1.1.2" + ethers "^5.7.1" + +"@ethereumjs/blockchain@6.0.2": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@ethereumjs/blockchain/-/blockchain-6.0.2.tgz#51f7b573dccc976077a699f08882276e54ab1fd8" + integrity sha512-32zKVQ8iOb7oOwKqGsLvdAzGaTQP6FepW6ssTycJOZ2r0NAHcN8+dsk77mv48yZkuQ4kt0D/73bj8lApiO5Uew== + dependencies: + "@ethereumjs/block" "^4.0.1" + "@ethereumjs/common" "^3.0.1" + "@ethereumjs/ethash" "^2.0.1" + "@ethereumjs/rlp" "^4.0.0" + "@ethereumjs/trie" "^5.0.1" + "@ethereumjs/util" "^8.0.2" + abstract-level "^1.0.3" + debug "^4.3.3" + ethereum-cryptography "^1.1.2" + level "^8.0.0" + lru-cache "^5.1.1" + memory-level "^1.0.0" + +"@ethereumjs/common@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.5.0.tgz#ec61551b31bef7a69d1dc634d8932468866a4268" + integrity sha512-DEHjW6e38o+JmB/NO3GZBpW4lpaiBpkFgXF6jLcJ6gETBYpEyaA5nTimsWBUJR3Vmtm/didUEbNjajskugZORg== + dependencies: + crc-32 "^1.2.0" + ethereumjs-util "^7.1.1" + +"@ethereumjs/common@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.0.1.tgz#c2dbd444d96e4014c7f7befd0529b5c1a02f590b" + integrity sha512-AHsJB7ydfb7TFCT7ORGY0tRiKkAylWZd/Qt6Lmc3Oycs66bMeE1JuYHbc0U6qsAZKZMFsUmL/UJDT/w7Z0cytw== + dependencies: + "@ethereumjs/util" "^8.0.0" + crc-32 "^1.2.0" + "@ethereumjs/common@^2.5.0", "@ethereumjs/common@^2.6.4": version "2.6.5" resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.5.tgz#0a75a22a046272579d91919cb12d84f2756e8d30" @@ -1512,6 +1574,102 @@ crc-32 "^1.2.0" ethereumjs-util "^7.1.5" +"@ethereumjs/common@^3.0.1", "@ethereumjs/common@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.1.0.tgz#33eca566d19a7555d905edeeef36a2cc55afc355" + integrity sha512-LyfDb6i4AJ9sSuFY+sz1HQwjSZkIrEuYjrqUO2d3ESzvc8pQwKkrqk19dlNxIMNP3Q5SJ+fqeLOun7R4HJYKdQ== + dependencies: + "@ethereumjs/util" "^8.0.4" + crc-32 "^1.2.0" + +"@ethereumjs/ethash@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-2.0.3.tgz#a903b422f0c41105cb47e9630d1234a9c934b669" + integrity sha512-CPNP7gD6XAmBRlh70iBVOmfiP7CZcb4q1z5r9pzFWW0dzoXRUJKV7WqlCJXF9mNvpuQEAPJzYjBEE8NqOg/Spg== + dependencies: + "@ethereumjs/block" "^4.2.0" + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/util" "^8.0.4" + abstract-level "^1.0.3" + bigint-crypto-utils "^3.0.23" + ethereum-cryptography "^1.1.2" + +"@ethereumjs/evm@npm:@soloseng/ethereumjs-evm@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-evm/-/ethereumjs-evm-1.2.4.tgz#7f6ac5bc9362f49c7d3ccaf2902887078e460da1" + integrity sha512-PtKPDqV6dMfKtDCV8WBys9jJAnmyX3+dBtTKGPsCcSHrEOzcdrTyQjUXo82vXDSLtyhjKYsgSu35FyRHAqop3g== + dependencies: + "@ethereumjs/common" "3.0.1" + "@ethereumjs/util" "8.0.2" + "@ethersproject/providers" "^5.7.1" + debug "^4.3.3" + ethereum-cryptography "^1.1.2" + mcl-wasm "^0.7.1" + rustbn.js "~0.2.0" + +"@ethereumjs/rlp@4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.0.tgz#66719891bd727251a7f233f9ca80212d1994f8c8" + integrity sha512-LM4jS5n33bJN60fM5EC8VeyhUgga6/DjCPBV2vWjnfVtobqtOiNC4SQ1MRFqyBSmJGGdB533JZWewyvlcdJtkQ== + +"@ethereumjs/rlp@^4.0.0", "@ethereumjs/rlp@^4.0.0-beta.2", "@ethereumjs/rlp@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.1.tgz#626fabfd9081baab3d0a3074b0c7ecaf674aaa41" + integrity sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw== + +"@ethereumjs/statemanager@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/statemanager/-/statemanager-1.0.1.tgz#1ded98f3c139af1f9b4b3feb8ea7272aaeb7348f" + integrity sha512-Ao9NPuoh7ijH+mexgCZdANSKF80Fd6DuzTgXUwag+uGhUclErjjJ7m2b4YCaUVwLkhgHPOTa8r2E4sPC/DltkQ== + dependencies: + "@ethereumjs/common" "^3.0.1" + "@ethereumjs/rlp" "^4.0.0" + debug "^4.3.3" + ethereum-cryptography "^1.1.2" + ethers "^5.7.1" + js-sdsl "^4.1.4" + +"@ethereumjs/trie@5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.1.tgz#3cb5730450839c8a540ec48e16a7825a1d0897e5" + integrity sha512-MA8uXR2pa+r8+wBvlyeZoUewwbUZe4Iy4zKi38THP6/flYvIIY+bTVjf/EA3jMhH68j6nJH5SFu5wi5SBdS/2A== + dependencies: + "@ethereumjs/rlp" "^4.0.0" + "@ethereumjs/util" "^8.0.0" + "@types/readable-stream" "^2.3.13" + ethereum-cryptography "^1.1.2" + readable-stream "^3.6.0" + +"@ethereumjs/trie@^5.0.1", "@ethereumjs/trie@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.3.tgz#050c844c80cf0669506de747ec3907b082d01c83" + integrity sha512-E32kjPP1+Li151VaPWzkZJColdR/bO8V/D4JoX8RqPN5rDvZEtbjDi69UUGyJqIIsa9ZxwGeeqcDCNJmxiMTCQ== + dependencies: + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/util" "^8.0.4" + "@types/readable-stream" "^2.3.13" + ethereum-cryptography "^1.1.2" + readable-stream "^3.6.0" + +"@ethereumjs/tx@3.3.2": + version "3.3.2" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.2.tgz#348d4624bf248aaab6c44fec2ae67265efe3db00" + integrity sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog== + dependencies: + "@ethereumjs/common" "^2.5.0" + ethereumjs-util "^7.1.2" + +"@ethereumjs/tx@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.0.1.tgz#bb8333e883952b61c40dbc7a3335d99cc5f1c2e4" + integrity sha512-JFq66cjjwnWOdKuDNNq0Hr1j04A546ymUo/8xnPa7wAm3s+RyGVt8VbaNF71/GJqN4tuY62gxvTfZ+B62foyPw== + dependencies: + "@ethereumjs/common" "^3.0.1" + "@ethereumjs/rlp" "^4.0.0" + "@ethereumjs/util" "^8.0.0" + ethereum-cryptography "^1.1.2" + ethers "^5.7.1" + "@ethereumjs/tx@^3.3.2": version "3.5.2" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.5.2.tgz#197b9b6299582ad84f9527ca961466fce2296c1c" @@ -1520,6 +1678,55 @@ "@ethereumjs/common" "^2.6.4" ethereumjs-util "^7.1.5" +"@ethereumjs/tx@^4.0.1", "@ethereumjs/tx@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.1.0.tgz#02357c4f307b988abe7870126241c140c7ecc375" + integrity sha512-3/PawJxcmI0LR8SCqN/3OTz76Q4Mhto8TCvcTpIAPx/l9V68C/NBjYdJOn2WshzxRvvm6jBTphUaZc2B70W5Jw== + dependencies: + "@chainsafe/ssz" "^0.9.2" + "@ethereumjs/common" "^3.1.0" + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/util" "^8.0.4" + "@ethersproject/providers" "^5.7.2" + ethereum-cryptography "^1.1.2" + +"@ethereumjs/util@8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.0.2.tgz#b7348fc7253649b0f00685a94546c6eee1fad819" + integrity sha512-b1Fcxmq+ckCdoLPhVIBkTcH8szigMapPuEmD8EDakvtI5Na5rzmX1sBW73YQqaPc7iUxGCAzZP1LrFQ7aEMugA== + dependencies: + "@ethereumjs/rlp" "^4.0.0-beta.2" + async "^3.2.4" + ethereum-cryptography "^1.1.2" + +"@ethereumjs/util@^8.0.0", "@ethereumjs/util@^8.0.2", "@ethereumjs/util@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.0.4.tgz#a5bdf0009e2e23f2c821369f718f8a404f59def4" + integrity sha512-tX2k9fG6eWBq5qby3VT1KgQT8iqnmwMYeDPJ/oyVdOcYKTiCBdkSBNtCWLh0vp3bIWUOjNRyPdwsYu73CyFCNA== + dependencies: + "@chainsafe/ssz" "^0.10.0" + "@ethereumjs/rlp" "^4.0.1" + ethereum-cryptography "^1.1.2" + +"@ethereumjs/vm@npm:@soloseng/ethereumjs-vm@6.2.3": + version "6.2.3" + resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-vm/-/ethereumjs-vm-6.2.3.tgz#1f1dbd055698c35b2d993aab8a907ff7d3390167" + integrity sha512-+IP8/oqC3JCRIYwEIefGwJdxTPPTzjS9tUavQ9z39uvJEUf56+HIM4mk5wi++2bL6OP4u6pDZMFGnwA/Dh8VjA== + dependencies: + "@ethereumjs/block" "4.0.1" + "@ethereumjs/blockchain" "6.0.2" + "@ethereumjs/common" "3.0.1" + "@ethereumjs/evm" "npm:@soloseng/ethereumjs-evm@1.2.4" + "@ethereumjs/rlp" "4.0.0" + "@ethereumjs/statemanager" "1.0.1" + "@ethereumjs/trie" "5.0.1" + "@ethereumjs/tx" "4.0.1" + "@ethereumjs/util" "8.0.2" + debug "^4.3.3" + ethereum-cryptography "^1.1.2" + mcl-wasm "^0.7.1" + rustbn.js "~0.2.0" + "@ethersproject/abi@5.0.7": version "5.0.7" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" @@ -1711,6 +1918,13 @@ dependencies: "@ethersproject/logger" "^5.7.0" +"@ethersproject/networks@5.7.1": + version "5.7.1" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" + integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== + dependencies: + "@ethersproject/logger" "^5.7.0" + "@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz#d2267d0a1f6e123f3771007338c47cccd83d3102" @@ -1752,6 +1966,32 @@ bech32 "1.1.4" ws "7.4.6" +"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2": + version "5.7.2" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" + integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/base64" "^5.7.0" + "@ethersproject/basex" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/networks" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/random" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/web" "^5.7.0" + bech32 "1.1.4" + ws "7.4.6" + "@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" @@ -1866,6 +2106,17 @@ "@ethersproject/properties" "^5.7.0" "@ethersproject/strings" "^5.7.0" +"@ethersproject/web@5.7.1": + version "5.7.1" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae" + integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w== + dependencies: + "@ethersproject/base64" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.7.0.tgz#8fb2c07185d68c3e09eb3bfd6e779ba2774627f5" @@ -2177,6 +2428,25 @@ resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.4.0.tgz#becce788818d3f47f0ac1a74c3c061ac1dcf4f6d" integrity sha512-8cUA/mg0S+BxIZ72TdZRsXKBP5n5uRcE3k29TZhZw6oIiHBt9JA7CTb/4pE1uKtE/q5NeTY2tBDcagoZ+1zjXQ== +"@ganache/console.log@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@ganache/console.log/-/console.log-0.2.0.tgz#32ea0df806ed735d61bd0537d7b7fc350e511479" + integrity sha512-+SNBUZzrbe4DE4F0jdl9SU8w3ek5k4cUE73ttUFweo8FaKEDQsMbFjZ3ZU0LM6QM/zCMqE7euSq0s/IlsYxf7A== + dependencies: + "@ganache/utils" "0.3.0" + ethereumjs-util "7.1.5" + +"@ganache/utils@0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@ganache/utils/-/utils-0.3.0.tgz#f95d7a4746d4e062febf3ce59f65f6ca1336be8a" + integrity sha512-cxoG8KQxkYPl71BPdKZihjVKqN2AE7WLXjU65BVOQ5jEYrUH3CWSxA9v7CCUJj4e0HoXFpVFIZ+1HRkiBKKiKg== + dependencies: + emittery "0.10.0" + keccak "3.0.1" + seedrandom "3.0.5" + optionalDependencies: + "@trufflesuite/bigint-buffer" "1.1.9" + "@gar/promisify@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" @@ -4070,11 +4340,21 @@ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183" integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA== +"@noble/hashes@1.2.0", "@noble/hashes@~1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.2.0.tgz#a3150eeb09cc7ab207ebf6d7b9ad311a9bdbed12" + integrity sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ== + "@noble/secp256k1@1.6.3", "@noble/secp256k1@~1.6.0": version "1.6.3" resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.6.3.tgz#7eed12d9f4404b416999d0c87686836c4c5c9b94" integrity sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ== +"@noble/secp256k1@1.7.1", "@noble/secp256k1@~1.7.0": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c" + integrity sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -5015,6 +5295,15 @@ "@noble/secp256k1" "~1.6.0" "@scure/base" "~1.1.0" +"@scure/bip32@1.1.5": + version "1.1.5" + resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.1.5.tgz#d2ccae16dcc2e75bc1d75f5ef3c66a338d1ba300" + integrity sha512-XyNh1rB0SkEqd3tXcXMi+Xe1fvg+kUIcoRIEujP1Jgv7DqW2r9lg3Ah0NkFaCs9sTkQAQA8kw7xiRXzENi9Rtw== + dependencies: + "@noble/hashes" "~1.2.0" + "@noble/secp256k1" "~1.7.0" + "@scure/base" "~1.1.0" + "@scure/bip39@1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.0.tgz#92f11d095bae025f166bef3defcc5bf4945d419a" @@ -5023,6 +5312,14 @@ "@noble/hashes" "~1.1.1" "@scure/base" "~1.1.0" +"@scure/bip39@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.1.tgz#b54557b2e86214319405db819c4b6a370cf340c5" + integrity sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg== + dependencies: + "@noble/hashes" "~1.2.0" + "@scure/base" "~1.1.0" + "@sinclair/typebox@^0.24.1": version "0.24.38" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.38.tgz#7f68d9c5775c4c2cec0524b3b990263dd009c968" @@ -5145,21 +5442,21 @@ fast-check "3.1.1" web3-utils "1.7.4" -"@truffle/abi-utils@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.3.tgz#4484489b160ad35aa0716427c73de10ebed40146" - integrity sha512-/KpaaPi0daffnwLhFulMtwdQ7YfZZtj24J34kZJi7OQw9x0dSNSskGFTU5SEv9d3fOfHNYqCevsqtv1zek0+zg== +"@truffle/abi-utils@^0.3.8": + version "0.3.8" + resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.8.tgz#23cafa152673dfff8d0d22f08f44b8c0f9719a52" + integrity sha512-RevMtlEuQw9cE2VWzQuvLDSYPCVSZQQUOsaK8ArcwxXct6ugiJCDC7tNouhHzP1Y4ccdZtG2y/XPHQJdzgYdZQ== dependencies: change-case "3.0.2" fast-check "3.1.1" - web3-utils "1.7.4" + web3-utils "1.8.2" -"@truffle/artifactor@4.0.171": - version "4.0.171" - resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.171.tgz#59446b53b33ec001a3cbf89a6b37123efb7fd4fd" - integrity sha512-Iwf7Pvu0jVTxicn96PLYgU26HT3kU+whul+q21/Z0BjtCl+mzV0pGlHON28X2xPnbYW/c6pcSpJJlNcm+uNmYg== +"@truffle/artifactor@4.0.180": + version "4.0.180" + resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.180.tgz#5dded58d923d5c2e6442d09d4d3d3d9b10646c05" + integrity sha512-XWY1w5KMYsYQ9XN+QbR5W95HXLKumxdi3so70SRUkmmEx9+vTlvhzJ/aeyCtuOzRO6WjdZ6pOaUxMNcW5BqQDg== dependencies: - "@truffle/contract-schema" "^3.4.10" + "@truffle/contract-schema" "^3.4.11" fs-extra "^9.1.0" lodash "^4.17.21" @@ -5177,20 +5474,25 @@ resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.4.tgz#1365b88c3d2922a066d947e93748f09b0fac2e93" integrity sha512-HegAo5A8UX9vE8dtceBRgCY207gOb9wj54c8mNOOWHcFpkyJz7kZYGo44As6Imh10/0hD2j7vHQ56Jf+uszJ3A== -"@truffle/code-utils@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@truffle/code-utils/-/code-utils-3.0.0.tgz#47812cdaa6ede006d4f224c3f4d21d165a271e0a" - integrity sha512-MHUrOAZYlbmVp+9W2Mmw6vaLteWolkn6AF5iiKUr/j42Bon6CU5gNnc1gvdVoNdO/xsrqKqyoloYNgtZLgMldg== +"@truffle/blockchain-utils@^0.1.6": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.6.tgz#7ea0a16b8135e5aeb688bf3bd014fa8f6ba45adb" + integrity sha512-SldoNRIFSm3+HMBnSc2jFsu5TWDkCN4X6vL3wrd0t6DIeF7nD6EoPPjxwbFSoqCnkkRxMuZeL6sUx7UMJS/wSA== + +"@truffle/code-utils@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@truffle/code-utils/-/code-utils-3.0.2.tgz#603b0662a1fc27d24a92aaf66417559a3f3e3915" + integrity sha512-Q4FyYIX9G4GyMa8RJDk19kvgiyGZ1CGEx2RmVcXoCDZqEyiHLzqjvCRp+/fuBz2fv7szO6d+60LO1gLCGS1drQ== dependencies: cbor "^5.2.0" -"@truffle/codec@^0.14.3": - version "0.14.3" - resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.3.tgz#2b37f7763390391b488c927b12f2310fe7cdb129" - integrity sha512-8lwWQXkbrmewwiDSekZPUiweysGKXOpFSNhtWCi1CS6gtla3bNK8/xE1nUi3ALsuKw2745kzzLZpwKsipGtGKg== +"@truffle/codec@^0.14.15": + version "0.14.15" + resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.15.tgz#79d253c05c09a036ccba86a2a909519ebf14309a" + integrity sha512-cooWy8blmvYQQRBKgzWJnDUS6mZE9cvnmpVN15jU6TseAQkBtmfYfCH12QCKEWMq2+R4yQICP54WNCYg78g72g== dependencies: - "@truffle/abi-utils" "^0.3.0" - "@truffle/compile-common" "^0.8.0" + "@truffle/abi-utils" "^0.3.8" + "@truffle/compile-common" "^0.9.3" big.js "^6.0.3" bn.js "^5.1.3" cbor "^5.2.0" @@ -5198,15 +5500,15 @@ lodash "^4.17.21" semver "7.3.7" utf8 "^3.0.0" - web3-utils "1.7.4" + web3-utils "1.8.2" -"@truffle/codec@^0.14.6": - version "0.14.6" - resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.6.tgz#28b491fdac3a502e369672be5072ff2fca1d6544" - integrity sha512-0jPT2MCVTk+1OzkWj0h1Twyh7nP5VBdfqrFK6XjPJZggqmm0bLWexoRPeTrVlByjaKq7uih6bH8MnnoED1MMxQ== +"@truffle/codec@^0.14.3": + version "0.14.3" + resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.3.tgz#2b37f7763390391b488c927b12f2310fe7cdb129" + integrity sha512-8lwWQXkbrmewwiDSekZPUiweysGKXOpFSNhtWCi1CS6gtla3bNK8/xE1nUi3ALsuKw2745kzzLZpwKsipGtGKg== dependencies: - "@truffle/abi-utils" "^0.3.3" - "@truffle/compile-common" "^0.8.1" + "@truffle/abi-utils" "^0.3.0" + "@truffle/compile-common" "^0.8.0" big.js "^6.0.3" bn.js "^5.1.3" cbor "^5.2.0" @@ -5234,12 +5536,12 @@ "@truffle/error" "^0.1.1" colors "1.4.0" -"@truffle/compile-common@^0.8.1": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.8.1.tgz#a3fe500edb880a3104324c9885bbd27b6ce05c54" - integrity sha512-7mzzG9Cfrn+fDT5Sqi7B6pccvIIV5w/GM8/56YgnjysbDzy5aZ6mv0fe37ZbcznEVQ35NJjBy+lEr/ozOGXwQA== +"@truffle/compile-common@^0.9.3": + version "0.9.3" + resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.9.3.tgz#d8e78195992669430d21e2b3c63c5a4bc72d8e10" + integrity sha512-9S86H5DRC0zEj164KeClP/6jVt1M/nRd7St89h6QbuIU0JjpqSz1SXpkvqhbFoV9hhW+4ZGh0NysjrdPlk7gFw== dependencies: - "@truffle/error" "^0.1.1" + "@truffle/error" "^0.2.0" colors "1.4.0" "@truffle/compile-solidity@^4.3.22": @@ -5263,18 +5565,17 @@ semver "^5.6.0" solc "^0.6.0" -"@truffle/compile-solidity@^6.0.45": - version "6.0.45" - resolved "https://registry.yarnpkg.com/@truffle/compile-solidity/-/compile-solidity-6.0.45.tgz#4e5413dfeb9ed9e1658511e5c40e6efeaff15f5a" - integrity sha512-bXQKyPqciQ7FJKKMInZ+wtpUW4PPK7ytmHtaGVJ6WRhLpQpOi12ncFTNyiKKvAu0yxWAF51wJi4yeZ9EfW/jWw== +"@truffle/compile-solidity@^6.0.54": + version "6.0.61" + resolved "https://registry.yarnpkg.com/@truffle/compile-solidity/-/compile-solidity-6.0.61.tgz#415f484f0a12aa434ae5fc09a049c239caa5fa57" + integrity sha512-0XZZ9OeeGtp2b+4Q2yHb7VaZ1Haf3rYHQdVChmvxLYKbq+8S/8zPCFs/4fcfi2lI2v/FayvNBYljXh8cZYHLJw== dependencies: - "@truffle/compile-common" "^0.8.1" - "@truffle/config" "^1.3.39" + "@truffle/compile-common" "^0.9.3" + "@truffle/config" "^1.3.52" "@truffle/contract-sources" "^0.2.0" - "@truffle/expect" "^0.1.3" - "@truffle/profiler" "^0.1.31" - "@truffle/spinners" "^0.2.2" - axios "0.27.2" + "@truffle/expect" "^0.1.5" + "@truffle/profiler" "^0.1.44" + axios "1.2.4" axios-retry "^3.1.9" debug "^4.3.1" fs-extra "^9.1.0" @@ -5284,7 +5585,7 @@ original-require "^1.0.1" require-from-string "^2.0.2" semver "7.3.7" - solc "0.8.17" + solc "0.8.18" "@truffle/compile-vyper@^1.0.33": version "1.0.71" @@ -5309,15 +5610,16 @@ lodash "^4.17.21" original-require "^1.0.1" -"@truffle/config@^1.3.39": - version "1.3.39" - resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.39.tgz#069faa1cf8faa549451c5ec78a6b6b8d226b4a4d" - integrity sha512-A8WrDswTKOc7ES8QDx2EjUDH6l/oKX9vtsnLAydINvEy7ciN3Q4v4hsEMYp9hRbhVByPiKZ7sOaA0QI2ssnRog== +"@truffle/config@^1.3.52": + version "1.3.52" + resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.52.tgz#8de19ccc9e3146f743e880ffbfeb4980caf21b16" + integrity sha512-yH4ektrDfcKieJUPjxLq6MIht8mx9eFFv312irUCqzuRD8WtqZp90eB2Wx0CwAKfJ4+4maNCD6vyFShMrdcO8Q== dependencies: - "@truffle/error" "^0.1.1" - "@truffle/events" "^0.1.15" - "@truffle/provider" "^0.2.61" + "@truffle/error" "^0.2.0" + "@truffle/events" "^0.1.22" + "@truffle/provider" "^0.3.5" conf "^10.1.2" + debug "^4.3.1" find-up "^2.1.0" lodash "^4.17.21" original-require "^1.0.1" @@ -5330,7 +5632,7 @@ ajv "^6.10.0" debug "^4.3.1" -"@truffle/contract-schema@^3.3.1", "@truffle/contract-schema@^3.4.10": +"@truffle/contract-schema@^3.3.1": version "3.4.10" resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.10.tgz#c11a814c13ad55a5e454fb35ddfa291ae0d24ace" integrity sha512-BhRNRoRvlj2th6E5RNS0BnS0ZxQe01JJz8I7MjkGqdeXSvrn6qDCAnbmvhNgUv0l5h8w5+gBOQhAJhILf1shdQ== @@ -5338,6 +5640,14 @@ ajv "^6.10.0" debug "^4.3.1" +"@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.12": + version "3.4.12" + resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.12.tgz#038518c7a6af81d8ce3df16e8b0d114062d04d0c" + integrity sha512-XpMMps/bqHwiRuCyLiEEGWEAvGGzGj4u1X1+lzxrtIsrwbQhSZcdgEbXl9vGxOOJWOup3HXRCIsjlao27kS4OA== + dependencies: + ajv "^6.10.0" + debug "^4.3.1" + "@truffle/contract-sources@^0.1.6", "@truffle/contract-sources@^0.1.8": version "0.1.12" resolved "https://registry.yarnpkg.com/@truffle/contract-sources/-/contract-sources-0.1.12.tgz#7a3dfec1bcf6f3632c0f54e522fb6f12b0bdf34b" @@ -5354,25 +5664,25 @@ debug "^4.3.1" glob "^7.1.6" -"@truffle/contract@4.6.3", "@truffle/contract@^4.6.3": - version "4.6.3" - resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.6.3.tgz#5ba7c032d2666f6a16bad7bcc680bd6e767e4811" - integrity sha512-boiCnXxYUr+9Iy8hiJN8b6pZfTlwnBCTKjqs8dqrLbA3QTlqTmsxkMMLZrqdIY+WuAU3yT6ah/EWGqf1rMvbqQ== +"@truffle/contract@4.6.10": + version "4.6.10" + resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.6.10.tgz#94b2c59273cd142021a6d2fe4de7ac30f572e184" + integrity sha512-69IZSXeQKRP3EutILqe+vLY5A5gUpeXUiZhm/Fy/qHHkP238vMjtOkTZGkY6bonYqmgk+vDY7KSYSYKzDNPdCA== dependencies: "@ensdomains/ensjs" "^2.1.0" - "@truffle/blockchain-utils" "^0.1.4" - "@truffle/contract-schema" "^3.4.10" - "@truffle/debug-utils" "^6.0.36" + "@truffle/blockchain-utils" "^0.1.6" + "@truffle/contract-schema" "^3.4.11" + "@truffle/debug-utils" "^6.0.42" "@truffle/error" "^0.1.1" - "@truffle/interface-adapter" "^0.5.23" + "@truffle/interface-adapter" "^0.5.26" bignumber.js "^7.2.1" debug "^4.3.1" ethers "^4.0.32" - web3 "1.7.4" - web3-core-helpers "1.7.4" - web3-core-promievent "1.7.4" - web3-eth-abi "1.7.4" - web3-utils "1.7.4" + web3 "1.8.1" + web3-core-helpers "1.8.1" + web3-core-promievent "1.8.1" + web3-eth-abi "1.8.1" + web3-utils "1.8.1" "@truffle/contract@^4.0.37", "@truffle/contract@^4.2.3": version "4.5.23" @@ -5394,14 +5704,34 @@ web3-eth-abi "1.7.4" web3-utils "1.7.4" -"@truffle/dashboard-message-bus-client@^0.1.6": - version "0.1.6" - resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-client/-/dashboard-message-bus-client-0.1.6.tgz#1956c1582fd2c1a923343d12d8543db92eba6baf" - integrity sha512-qIf5e+/xfZfXiiOkfWKtRjwbkstpjQpCkbndKSKhZcnz3QLkDIvfgSU6K9d+j4AyNCq4oN38gWoLDa3PVqZo8Q== +"@truffle/contract@^4.6.10": + version "4.6.15" + resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.6.15.tgz#2a2e0cb146534cd10d24a57e224e60f0bbade18f" + integrity sha512-3V+50z94XRh+I3axz6Zrot1wlMhRiG2O9XjR20LwR5YBnzHV7YFfOs8x6pluXVLQyxcVJBISJyqxvGxpkecrZg== dependencies: - "@truffle/dashboard-message-bus-common" "^0.1.4" - "@truffle/promise-tracker" "^0.1.3" - axios "0.27.2" + "@ensdomains/ensjs" "^2.1.0" + "@truffle/blockchain-utils" "^0.1.6" + "@truffle/contract-schema" "^3.4.12" + "@truffle/debug-utils" "^6.0.46" + "@truffle/error" "^0.2.0" + "@truffle/interface-adapter" "^0.5.29" + bignumber.js "^7.2.1" + debug "^4.3.1" + ethers "^4.0.32" + web3 "1.8.2" + web3-core-helpers "1.8.2" + web3-core-promievent "1.8.2" + web3-eth-abi "1.8.2" + web3-utils "1.8.2" + +"@truffle/dashboard-message-bus-client@^0.1.10": + version "0.1.10" + resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-client/-/dashboard-message-bus-client-0.1.10.tgz#bd1cef19956f06716d55a327b8ea6f983e41f0b0" + integrity sha512-r9GpdR96T8xzk2Z3Qq5lowixT6hQwDZ9F3D3oNjOv2AOwBrC7dGkt1Ra1FQRsABn4K7LUVvnjjn6rALlsatAdw== + dependencies: + "@truffle/dashboard-message-bus-common" "^0.1.5" + "@truffle/promise-tracker" "^0.1.5" + axios "1.2.4" debug "^4.3.1" delay "^5.0.0" isomorphic-ws "^4.0.1" @@ -5409,13 +5739,13 @@ tiny-typed-emitter "^2.1.0" ws "^7.2.0" -"@truffle/dashboard-message-bus-client@^0.1.7": - version "0.1.7" - resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-client/-/dashboard-message-bus-client-0.1.7.tgz#62e71123eb2cc1e4dce0b1664a9455b3207c77da" - integrity sha512-7F62gQl5K1MIwVk5+dO9FeHD4zblty0jfTjKBMsdDZEd4yazzS2n2QOzxnPsjxvthX1oPPLRxK+VrN9c/3+VTw== +"@truffle/dashboard-message-bus-client@^0.1.6": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-client/-/dashboard-message-bus-client-0.1.6.tgz#1956c1582fd2c1a923343d12d8543db92eba6baf" + integrity sha512-qIf5e+/xfZfXiiOkfWKtRjwbkstpjQpCkbndKSKhZcnz3QLkDIvfgSU6K9d+j4AyNCq4oN38gWoLDa3PVqZo8Q== dependencies: "@truffle/dashboard-message-bus-common" "^0.1.4" - "@truffle/promise-tracker" "^0.1.4" + "@truffle/promise-tracker" "^0.1.3" axios "0.27.2" debug "^4.3.1" delay "^5.0.0" @@ -5429,25 +5759,30 @@ resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-common/-/dashboard-message-bus-common-0.1.4.tgz#f5b5326eb4774d5d209c310c135309f4b3f42bea" integrity sha512-R+16jYcr/mxhz5pI+0GAJI14XUvYySLTB650kWubMBrVf4vi4QaIOdAOrx4KxAIA6e/5Nq9j0le59Y2c+xAHYg== -"@truffle/db-loader@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@truffle/db-loader/-/db-loader-0.2.1.tgz#e3fce4abda6bd0fda0a8b47d3614239af11a1d7d" - integrity sha512-qmOYvwfNIgot+tIqZqOwnU6EhYdHgpph+aF/lyepZEKW0U/tPDubkmD/p4E1nZ1Db/yG5XEzTuLCM9nH4aNnZg== +"@truffle/dashboard-message-bus-common@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-common/-/dashboard-message-bus-common-0.1.5.tgz#180c8c421b2836b7bd109944e7956f427236d8ab" + integrity sha512-F4RfXi7ymNA3HFOlaujRJxAb3I8ciErCRQq+MZVaqjSPF9LSw23IizZsGpLaY43K2bGoBSxyNQRZWxsUEBujPQ== + +"@truffle/db-loader@^0.2.12": + version "0.2.17" + resolved "https://registry.yarnpkg.com/@truffle/db-loader/-/db-loader-0.2.17.tgz#85b9c4b4e63b3ad1249a75bddbe6da5a1a967427" + integrity sha512-oVDZ3vlYopbUwkHl9sYpF3T//P2diJMwDWYWK3oSg7uEpLm4uroAK8MyrOpLW5XAsIUn+Z4BLS3JGMwQd8aI2Q== optionalDependencies: - "@truffle/db" "^2.0.1" + "@truffle/db" "^2.0.17" -"@truffle/db@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@truffle/db/-/db-2.0.1.tgz#929e4ee58694673caa674ffc2f1f9d405d43c7a4" - integrity sha512-jjBpwpIqAjVNnN/KjefT2xBN2YzxCmxcd4qFhb/iueSrQyZfPQaJRM8hASoQepzV5dDH8iU5gVU7gYX0jQtOBw== +"@truffle/db@^2.0.12", "@truffle/db@^2.0.17": + version "2.0.17" + resolved "https://registry.yarnpkg.com/@truffle/db/-/db-2.0.17.tgz#358f490f58050c0a67e47211ef2b920e10e7bea6" + integrity sha512-7vO595WwvE2Tjp6p4rFmr4Q4d5qJFM4fhAsUBHzfVpWlz0szBsSnzn2RK5/NSS4Rqqp8HLBcfuRShuYFqajx0w== dependencies: "@graphql-tools/delegate" "^8.4.3" "@graphql-tools/schema" "^8.3.1" - "@truffle/abi-utils" "^0.3.3" - "@truffle/code-utils" "^3.0.0" - "@truffle/config" "^1.3.39" + "@truffle/abi-utils" "^0.3.8" + "@truffle/code-utils" "^3.0.2" + "@truffle/config" "^1.3.52" abstract-leveldown "^7.2.0" - apollo-server "^3.6.3" + apollo-server "^3.11.0" debug "^4.3.1" fs-extra "^9.1.0" graphql "^15.3.0" @@ -5459,7 +5794,7 @@ pouchdb-adapter-memory "^7.1.1" pouchdb-debug "^7.1.1" pouchdb-find "^7.0.0" - web3-utils "1.7.4" + web3-utils "1.8.2" "@truffle/debug-utils@^6.0.33": version "6.0.33" @@ -5473,26 +5808,26 @@ debug "^4.3.1" highlightjs-solidity "^2.0.5" -"@truffle/debug-utils@^6.0.36": - version "6.0.36" - resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.36.tgz#557e41b0006d36e231b4620bbf0b1e3830d28854" - integrity sha512-oxqVAJOXLUsSpGK3ez0JLTgPoVUhGrvdkYKIfYVkED10lhCgh0HlJ/AbRkUPUV7KR9SKXK5BCDsTJlVbdqtMXA== +"@truffle/debug-utils@^6.0.42", "@truffle/debug-utils@^6.0.46": + version "6.0.46" + resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.46.tgz#1fba4d76bb737a90ca510e24d30e381e2aaefd1b" + integrity sha512-MWko3c1M0NI8IT0yNh8Dh2xoDgR2R1apP8hc/9VsR/4Q7P6OE/578WRpZnvo2HWXYBiJ2PrWBDtMYBHntImrrA== dependencies: - "@truffle/codec" "^0.14.6" + "@truffle/codec" "^0.14.15" "@trufflesuite/chromafi" "^3.0.0" bn.js "^5.1.3" chalk "^2.4.2" debug "^4.3.1" - highlightjs-solidity "^2.0.5" + highlightjs-solidity "^2.0.6" -"@truffle/debugger@^11.0.12": - version "11.0.12" - resolved "https://registry.yarnpkg.com/@truffle/debugger/-/debugger-11.0.12.tgz#629e547b79dae754235ad93ef4c6b0eb6b4135f6" - integrity sha512-coEiRJGdrLJ+TfNPxENvv8mUyRs6sVoPVtyQO8pyOZf6+8sEH/21GhEXx6mxUxWuOhhA0dLYVY9XBqOtx1df/Q== +"@truffle/debugger@^11.0.23": + version "11.0.28" + resolved "https://registry.yarnpkg.com/@truffle/debugger/-/debugger-11.0.28.tgz#7f393a66f2cd6255779958bd23aedfb386194c88" + integrity sha512-0AN7GjwXTDHGzdx9H3+5JTRtSsCy0T4C+QoJ/iOUpT5palzxIykMEB064afu9TUo/jLtLNOR29pQSmmTKW6d7w== dependencies: - "@truffle/abi-utils" "^0.3.3" - "@truffle/codec" "^0.14.6" - "@truffle/source-map-utils" "^1.3.97" + "@truffle/abi-utils" "^0.3.8" + "@truffle/codec" "^0.14.15" + "@truffle/source-map-utils" "^1.3.107" bn.js "^5.1.3" debug "^4.3.1" json-pointer "^0.6.1" @@ -5502,8 +5837,8 @@ redux-saga "1.0.0" reselect-tree "^1.3.7" semver "7.3.7" - web3 "1.7.4" - web3-eth-abi "1.7.4" + web3 "1.8.2" + web3-eth-abi "1.8.2" "@truffle/error@0.0.7": version "0.0.7" @@ -5520,6 +5855,11 @@ resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.1.1.tgz#e52026ac8ca7180d83443dca73c03e07ace2a301" integrity sha512-sE7c9IHIGdbK4YayH4BC8i8qMjoAOeg6nUXUDZZp8wlU21/EMpaG+CLx+KqcIPyR+GSWIW3Dm0PXkr2nlggFDA== +"@truffle/error@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.2.0.tgz#65de6f03f5c041f883cc87677eecf8231428f1ab" + integrity sha512-Fe0/z4WWb7IP2gBnv3l6zqP87Y0kSMs7oiSLakKJq17q3GUunrHSdioKuNspdggxkXIBhEQLhi8C+LJdwmHKWQ== + "@truffle/events@^0.1.14": version "0.1.14" resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.14.tgz#6a3f1026dc1739bfac18b7f8351935b9f2756045" @@ -5531,16 +5871,16 @@ emittery "^0.4.1" web3-utils "1.7.4" -"@truffle/events@^0.1.15": - version "0.1.15" - resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.15.tgz#d2dbcb2494804d9cbc80d7ab3a1624bfd86239a2" - integrity sha512-GP0WFayhgzFT1vu9LAYJOzbOnEV7PWdkzrMrjYPv5biQQLcchCNNuIyuarflFZZ/08wpEjvy2F4FHj/RJXRdkQ== +"@truffle/events@^0.1.22": + version "0.1.22" + resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.22.tgz#007617de4d20093e8c257a63ddc1193a21a9c5b8" + integrity sha512-WBEfaQ5zagS3J1M66J8wQ8N1As/EnBjLQsRlCCFs3/KbmeWhsoalVZ5Effhe0Vxd+e+k7lvwbloQBdS6roc+wg== dependencies: - "@truffle/dashboard-message-bus-client" "^0.1.7" - "@truffle/spinners" "^0.2.2" + "@truffle/dashboard-message-bus-client" "^0.1.10" + "@truffle/spinners" "^0.2.3" debug "^4.3.1" emittery "^0.4.1" - web3-utils "1.7.4" + web3-utils "1.8.2" "@truffle/expect@0.0.12": version "0.0.12" @@ -5557,10 +5897,10 @@ resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.15.tgz#293b773680d3e088b8c102480df55907234db533" integrity sha512-hrIbDRsaEoIkapvY2unw8W5b5qfkz3A3ayxUVxfdPlnevdDUVmvfqfYJrJOSdtbIucwDIhU74VaBPKyiqoTJOw== -"@truffle/expect@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.1.3.tgz#53f0626fee400e43485292879bbc90973ee5c54a" - integrity sha512-+pQW2Kh+T6Pf1WIv1O8jqKr3Vsagy8lpNbtUXa6eiSkvvb0E+3cMn9K4hXG7APzj7G2f6bSBoVYPxamXGRGvDQ== +"@truffle/expect@^0.1.4", "@truffle/expect@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.1.5.tgz#9b6d3d8e2f3765d8975506d50cd70a47e71161f7" + integrity sha512-CkrR2BbT2ORwy1l39few03JlXysthXQIjWPk8vC2uA8orcUpMv7PWC4AoVbTvE2OgcnbClpYekGFyaQ9iToyAg== "@truffle/external-compile@^1.0.19": version "1.0.36" @@ -5582,22 +5922,22 @@ ethers "^4.0.32" web3 "1.7.4" -"@truffle/interface-adapter@^0.5.23": - version "0.5.23" - resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.23.tgz#a4103270e3c73746089b9e5807aaa1359f4725bb" - integrity sha512-nU8kChKgcUP+tELId1PMgHnmd2KcBdBer59TxfVqAZXRmt6blm2tpBbGYtKzTIdZlf6kMqVbZXdB6u1CJDqfxg== +"@truffle/interface-adapter@^0.5.26", "@truffle/interface-adapter@^0.5.29": + version "0.5.29" + resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.29.tgz#e75e5b5dd120e699774bbea6465c6d1d7c75056e" + integrity sha512-6UlJ+f87z7y/dWk9UfbIU+4e80iRsp8h03LEiE5B+PvZbr6cuMjLJUBtBBQZMo3+xrIcS/2u3p5hOxW8OJm8tw== dependencies: bn.js "^5.1.3" ethers "^4.0.32" - web3 "1.7.4" + web3 "1.8.2" -"@truffle/profiler@^0.1.31": - version "0.1.31" - resolved "https://registry.yarnpkg.com/@truffle/profiler/-/profiler-0.1.31.tgz#b94a7899a5ba199bbe9439bcf090fb5d696dd066" - integrity sha512-5giNwNVKnOBIPTklaE/2R+L9VICkW/SW+vk+7j5qXBkXuhfEl+m5W6L5fDY88r+RraGgzBlBU7J1HtzMf/36Bg== +"@truffle/profiler@^0.1.44": + version "0.1.44" + resolved "https://registry.yarnpkg.com/@truffle/profiler/-/profiler-0.1.44.tgz#07ccf3f4e934416987848acd27eb5ff25f2e1492" + integrity sha512-rmhfO072o9FNSMmRWOHCLxmA0dYyg5pJVc8MmmCwlP5JnNPxuLAQJQqchAYc3N+oMrG8vK6dPL0aRQ1g/nbK8g== dependencies: "@truffle/contract-sources" "^0.2.0" - "@truffle/expect" "^0.1.3" + "@truffle/expect" "^0.1.5" debug "^4.3.1" "@truffle/promise-tracker@^0.1.3": @@ -5605,10 +5945,10 @@ resolved "https://registry.yarnpkg.com/@truffle/promise-tracker/-/promise-tracker-0.1.3.tgz#8a971a5f22ea6922b3578a49b05be481d2d2a3fa" integrity sha512-1Z5qEfu0KSS+774xe9aPPlLMvzCJNdEeTofne2HkEPLBb53Lb28ZZoMYrwE8eJRjMKMG+y75IYpX7SKcSgj+OQ== -"@truffle/promise-tracker@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@truffle/promise-tracker/-/promise-tracker-0.1.4.tgz#6f9d019b048a78b6d024bf2967e24dfa8c3a164d" - integrity sha512-JqsZZXWXUnrF+zsU2jf12BXyVYAHQj0iJck7EyTsdy9Wdx1aSsqX9Cnc6U274Xk0xNXziV+NestyuoF3kHTWiw== +"@truffle/promise-tracker@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@truffle/promise-tracker/-/promise-tracker-0.1.5.tgz#df68df14d45a32bda6237ab85169d1808e4b3928" + integrity sha512-wZx8eeu/6rcwwkmRF0Y832/NSQR9A9u6pyhTozv+j77jklnd/KZvu2JlACaAjP30eL5SOtSrSOzAMcSh/trJjg== "@truffle/provider@^0.2.59": version "0.2.59" @@ -5620,15 +5960,15 @@ debug "^4.3.1" web3 "1.7.4" -"@truffle/provider@^0.2.61": - version "0.2.61" - resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.2.61.tgz#c20b891d77eca3c8907fa096f8f23bac7a180e8b" - integrity sha512-/aa4Xy+ag4zohfPWytA+u5QDDDvSdml6p/+zo5eN1nkmJ7hF6noxBlBHG+rEC3Pl+NNNQrbGZMzvlpfsOrNhMw== +"@truffle/provider@^0.3.5": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.3.5.tgz#8be196e7f38a14d4db3b70ef796ac23b29680473" + integrity sha512-Df55yLshSnEEFrbGKqKrAbW5hzlbZOZ1EC5hucBmoYLeN1Ar1D3InSUbEg9rA29ip2LsmmJZ5QGmQQ4oYaAPfQ== dependencies: - "@truffle/error" "^0.1.1" - "@truffle/interface-adapter" "^0.5.23" + "@truffle/error" "^0.2.0" + "@truffle/interface-adapter" "^0.5.29" debug "^4.3.1" - web3 "1.7.4" + web3 "1.8.2" "@truffle/provisioner@^0.2.0": version "0.2.60" @@ -5637,30 +5977,31 @@ dependencies: "@truffle/config" "^1.3.37" -"@truffle/provisioner@^0.2.62": - version "0.2.62" - resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.62.tgz#2aa4141c27382f34b09558e0167b2ba75d249b06" - integrity sha512-rdPXVuSEfha/u0zATCFyCESIRM/Pxvgd3JjkWDhfadIw2N9DSsq8Q0kIetjBjqkkzBoIY0uefLINfEyfqxczzQ== +"@truffle/provisioner@^0.2.70": + version "0.2.75" + resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.75.tgz#ace362a97bee52d5d291eab01c55cfd3eb29ee90" + integrity sha512-tLjjFj/A1xb6uqm4lMYI7/UGttc7KvX7XdmsR9HcGGilph5a5OohdRpf00MFXqlv9VgQUOalap13Hl3UvsrRuQ== dependencies: - "@truffle/config" "^1.3.39" + "@truffle/config" "^1.3.52" -"@truffle/resolver@9.0.18": - version "9.0.18" - resolved "https://registry.yarnpkg.com/@truffle/resolver/-/resolver-9.0.18.tgz#d048fbb8c62b1fcb34b44350392afd60613e55e6" - integrity sha512-N6ZklGljKZwl4VElovmiE15MVR2SkoFjLbyH2/w5pG5d83/18GdUyotmuLjv6FJ+3MLsWzxboMr4Evw4LRlKog== +"@truffle/resolver@9.0.27": + version "9.0.27" + resolved "https://registry.yarnpkg.com/@truffle/resolver/-/resolver-9.0.27.tgz#7c0eaa1cb30ada2951cde44f537baa53fce4c49c" + integrity sha512-sNYMXqyEEtKAp2zkT+NQJ5pTXa41aEUF3HuLi2Sqt+bBKT8RjQoqM7PwNO0DzoLIwmRba8mpLoNMq87ALb8N5Q== dependencies: - "@truffle/compile-solidity" "^6.0.45" - "@truffle/contract" "^4.6.3" + "@ganache/console.log" "0.2.0" + "@truffle/compile-solidity" "^6.0.54" + "@truffle/contract" "^4.6.10" "@truffle/contract-sources" "^0.2.0" - "@truffle/expect" "^0.1.3" - "@truffle/provisioner" "^0.2.62" + "@truffle/expect" "^0.1.4" + "@truffle/provisioner" "^0.2.70" abi-to-sol "^0.6.6" debug "^4.3.1" detect-installed "^2.0.4" fs-extra "^9.1.0" get-installed-path "^4.0.8" glob "^7.1.6" - web3-utils "1.7.4" + web3-utils "1.8.1" "@truffle/resolver@^5.0.18": version "5.1.12" @@ -5677,17 +6018,17 @@ source-map-support "^0.5.16" supports-color "^7.1.0" -"@truffle/source-map-utils@^1.3.97": - version "1.3.97" - resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.97.tgz#be2c3e073ab3a17f534a9c7ee4a418215222cf26" - integrity sha512-tSRBBr0+C9VgZJeHOaI3Ptk4x1fUQx4GbgbB8E6yoqOLdfE00pNINaQjUwSAuLyDevyw0U7AdBOY/6mrvRj2iQ== +"@truffle/source-map-utils@^1.3.107": + version "1.3.107" + resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.107.tgz#b5460cf3e37cabb2fa96d4439c181a6c0f356b9e" + integrity sha512-R82cl+I2rpIvJciomfqAq4w5niywymgFIHqbhl0v6srrtn3roksrtIq5R/dXJSaMv4o0C5E6sxZ1IMy3E3+ahw== dependencies: - "@truffle/code-utils" "^3.0.0" - "@truffle/codec" "^0.14.6" + "@truffle/code-utils" "^3.0.2" + "@truffle/codec" "^0.14.15" debug "^4.3.1" json-pointer "^0.6.1" node-interval-tree "^1.3.3" - web3-utils "1.7.4" + web3-utils "1.8.2" "@truffle/spinners@^0.2.2": version "0.2.2" @@ -5696,6 +6037,13 @@ dependencies: "@trufflesuite/spinnies" "^0.1.1" +"@truffle/spinners@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@truffle/spinners/-/spinners-0.2.3.tgz#5689d06ef16855a9f6b70dc0cd40188de54450ec" + integrity sha512-YnaQ+oBRQ1I1+/P18i8oSW4orUYi6vwpZQxauEZ5X0L8atjKq+RWdiNaza6J6L+KOLunXM4+pWxnNzuUmxlJZw== + dependencies: + "@trufflesuite/spinnies" "^0.1.1" + "@trufflesuite/bigint-buffer@1.1.10": version "1.1.10" resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.10.tgz#a1d9ca22d3cad1a138b78baaf15543637a3e1692" @@ -5703,6 +6051,13 @@ dependencies: node-gyp-build "4.4.0" +"@trufflesuite/bigint-buffer@1.1.9": + version "1.1.9" + resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.9.tgz#e2604d76e1e4747b74376d68f1312f9944d0d75d" + integrity sha512-bdM5cEGCOhDSwminryHJbRmXc1x7dPKg6Pqns3qyTwFlxsqUgxE29lsERS3PlIW1HTjoIGMUqsk1zQQwST1Yxw== + dependencies: + node-gyp-build "4.3.0" + "@trufflesuite/chromafi@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@trufflesuite/chromafi/-/chromafi-3.0.0.tgz#f6956408c1af6a38a6ed1657783ce59504a1eb8b" @@ -6434,6 +6789,14 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/readable-stream@^2.3.13": + version "2.3.15" + resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.15.tgz#3d79c9ceb1b6a57d5f6e6976f489b9b5384321ae" + integrity sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ== + dependencies: + "@types/node" "*" + safe-buffer "~5.1.1" + "@types/readable-stream@^2.3.5": version "2.3.14" resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.14.tgz#1282cdc03a1fc9ed52982aa8f0553d7c251070b9" @@ -6664,11 +7027,6 @@ dependencies: "@types/yargs-parser" "*" -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - "@web3-js/scrypt-shim@^0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@web3-js/scrypt-shim/-/scrypt-shim-0.1.0.tgz#0bf7529ab6788311d3e07586f7d89107c3bea2cc" @@ -6917,6 +7275,19 @@ absolute-path@^0.0.0: resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" integrity sha512-HQiug4c+/s3WOvEnDRxXVmNtSG5s2gJM9r19BTcqjp7BWcE48PB+Y2G6jE65kqI0LpsQeMZygt/b60Gi4KxGyA== +abstract-level@1.0.3, abstract-level@^1.0.0, abstract-level@^1.0.2, abstract-level@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/abstract-level/-/abstract-level-1.0.3.tgz#78a67d3d84da55ee15201486ab44c09560070741" + integrity sha512-t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA== + dependencies: + buffer "^6.0.3" + catering "^2.1.0" + is-buffer "^2.0.5" + level-supports "^4.0.0" + level-transcoder "^1.0.1" + module-error "^1.0.1" + queue-microtask "^1.2.3" + abstract-leveldown@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz#5cb89f958a44f526779d740d1440e743e0c30a57" @@ -6924,6 +7295,18 @@ abstract-leveldown@3.0.0: dependencies: xtend "~4.0.0" +abstract-leveldown@7.2.0, abstract-leveldown@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz#08d19d4e26fb5be426f7a57004851b39e1795a2e" + integrity sha512-DnhQwcFEaYsvYDnACLZhMmCWd3rkOeEvglpa4q5i/5Jlm3UIsWaxVzuXvDLFCSCWRO3yy2/+V/G7FusFgejnfQ== + dependencies: + buffer "^6.0.3" + catering "^2.0.0" + is-buffer "^2.0.5" + level-concat-iterator "^3.0.0" + level-supports "^2.0.1" + queue-microtask "^1.2.3" + abstract-leveldown@^2.4.1, abstract-leveldown@~2.7.1: version "2.7.2" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz#87a44d7ebebc341d59665204834c8b7e0932cc93" @@ -6949,18 +7332,6 @@ abstract-leveldown@^6.2.1: level-supports "~1.0.0" xtend "~4.0.0" -abstract-leveldown@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz#08d19d4e26fb5be426f7a57004851b39e1795a2e" - integrity sha512-DnhQwcFEaYsvYDnACLZhMmCWd3rkOeEvglpa4q5i/5Jlm3UIsWaxVzuXvDLFCSCWRO3yy2/+V/G7FusFgejnfQ== - dependencies: - buffer "^6.0.3" - catering "^2.0.0" - is-buffer "^2.0.5" - level-concat-iterator "^3.0.0" - level-supports "^2.0.1" - queue-microtask "^1.2.3" - abstract-leveldown@~2.6.0: version "2.6.3" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz#1c5e8c6a5ef965ae8c35dfb3a8770c476b82c4b8" @@ -7324,10 +7695,10 @@ apollo-reporting-protobuf@^3.3.1, apollo-reporting-protobuf@^3.3.3: dependencies: "@apollo/protobufjs" "1.2.6" -apollo-server-core@^3.10.3: - version "3.10.3" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.10.3.tgz#64db45703785e9e79e7c5dadb6df2f7ee6fcbecc" - integrity sha512-PiTirlcaszgnJGzSsGui9XWh0KAh0BUW+GvRKN6O0H0qOSXSLmoqqyL83J+u+HaUZGyyiE0+VOkyCcuF+kKbEw== +apollo-server-core@^3.11.1: + version "3.11.1" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.11.1.tgz#89d83aeaa71a59f760ebfa35bb0cbd31e15474ca" + integrity sha512-t/eCKrRFK1lYZlc5pHD99iG7Np7CEm3SmbDiONA7fckR3EaB/pdsEdIkIwQ5QBBpT5JLp/nwvrZRVwhaWmaRvw== dependencies: "@apollo/utils.keyvaluecache" "^1.0.1" "@apollo/utils.logger" "^1.0.0" @@ -7341,13 +7712,14 @@ apollo-server-core@^3.10.3: apollo-reporting-protobuf "^3.3.3" apollo-server-env "^4.2.1" apollo-server-errors "^3.3.1" - apollo-server-plugin-base "^3.6.3" - apollo-server-types "^3.6.3" + apollo-server-plugin-base "^3.7.1" + apollo-server-types "^3.7.1" async-retry "^1.2.1" fast-json-stable-stringify "^2.1.0" graphql-tag "^2.11.0" loglevel "^1.6.8" lru-cache "^6.0.0" + node-abort-controller "^3.0.1" sha.js "^2.4.11" uuid "^9.0.0" whatwg-mimetype "^3.0.0" @@ -7364,10 +7736,10 @@ apollo-server-errors@^3.3.1: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== -apollo-server-express@^3.10.3: - version "3.10.3" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.10.3.tgz#946b857c7d8516235a757e853966dd1189f247e1" - integrity sha512-Z8m0r10mX8KlGS3noYeRPcWxWR2hX6NHJicjuwZ62PeTZlrDJF5cwGmXqbUg/sCTPx7Ny//ZEASBTwFFp8DOeQ== +apollo-server-express@^3.11.1: + version "3.11.1" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.11.1.tgz#f46d2f2f8db3d99ede6c0c144fea02f24b73cb78" + integrity sha512-x9ngcpXbBlt4naCXTwNtBFb/mOd9OU0wtFXvJkObHF26NsRazu3DxDfEuekA6V1NFOocD+A9jmVMQeQWug5MgA== dependencies: "@types/accepts" "^1.3.5" "@types/body-parser" "1.19.2" @@ -7375,37 +7747,37 @@ apollo-server-express@^3.10.3: "@types/express" "4.17.14" "@types/express-serve-static-core" "4.17.31" accepts "^1.3.5" - apollo-server-core "^3.10.3" - apollo-server-types "^3.6.3" + apollo-server-core "^3.11.1" + apollo-server-types "^3.7.1" body-parser "^1.19.0" cors "^2.8.5" parseurl "^1.3.3" -apollo-server-plugin-base@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.3.tgz#7eaf24af19641ddccf37307f294aba6877bf4c86" - integrity sha512-/Q0Zx8N8La97faKV0siGHDzfZ56ygN6ovtUpPbr+1GIbNmUzkte3lWW2YV08HmxiRmC2i2OGN80exNJEvbKvNA== +apollo-server-plugin-base@^3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.1.tgz#aa78ef49bd114e35906ca9cf7493fed2664cbde8" + integrity sha512-g3vJStmQtQvjGI289UkLMfThmOEOddpVgHLHT2bNj0sCD/bbisj4xKbBHETqaURokteqSWyyd4RDTUe0wAUDNQ== dependencies: - apollo-server-types "^3.6.3" + apollo-server-types "^3.7.1" -apollo-server-types@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.6.3.tgz#7818cab914c865dafa53ea263ca6cb1854b4f05a" - integrity sha512-+7caNTLdevpWI2dGKSa7CWdyudO3NBuJ3HzcrYxjBei6Bth9YdRUNzPSFmBjlm2baHF0GsrMwLpjO+HStJzm3A== +apollo-server-types@^3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.7.1.tgz#87adfcb52ec0893999a9cfafd5474bfda7ab0798" + integrity sha512-aE9RDVplmkaOj/OduNmGa+0a1B5RIWI0o3zC1zLvBTVWMKTpo0ifVf11TyMkLCY+T7cnZqVqwyShziOyC3FyUw== dependencies: "@apollo/utils.keyvaluecache" "^1.0.1" "@apollo/utils.logger" "^1.0.0" apollo-reporting-protobuf "^3.3.3" apollo-server-env "^4.2.1" -apollo-server@^3.6.3: - version "3.10.3" - resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-3.10.3.tgz#1da948f6494d30fb6dcb37b636c140489ea0bf39" - integrity sha512-qWaCVKmMpUmDPiug93kWbqVPt9/T9RwFsPP6cZ4MUF/0X931WrWPpYzyETPUhnVgdPzWbdVcvbXjgyKYc4NB2g== +apollo-server@^3.11.0: + version "3.11.1" + resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-3.11.1.tgz#831646081323aadf2cb53cdc3401786e41d44d81" + integrity sha512-3RZ/veWGbi0zXy2YVaPkYIAavpbHyEVui91DNYvz6UFS0fZmhJwG7f1VmGheeRiqiV8nFa8GuBejI1niTeAYzA== dependencies: "@types/express" "4.17.14" - apollo-server-core "^3.10.3" - apollo-server-express "^3.10.3" + apollo-server-core "^3.11.1" + apollo-server-express "^3.11.1" express "^4.17.1" app-module-path@^2.2.0: @@ -7823,7 +8195,7 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== -async-eventemitter@^0.2.2: +async-eventemitter@0.2.4, async-eventemitter@^0.2.2: version "0.2.4" resolved "https://registry.yarnpkg.com/async-eventemitter/-/async-eventemitter-0.2.4.tgz#f5e7c8ca7d3e46aab9ec40a292baf686a0bafaca" integrity sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw== @@ -7875,7 +8247,7 @@ async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1, async@^2.6 dependencies: lodash "^4.17.14" -async@^3.2.2, async@^3.2.3: +async@^3.2.2, async@^3.2.3, async@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== @@ -7952,6 +8324,15 @@ axios@0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" +axios@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.4.tgz#6555dd955d2efa9b8f4cb4cb0b3371b7b243537a" + integrity sha512-lIQuCfBJvZB/Bv7+RWUqEJqNShGOVpk9v7P0ZWx5Ip0qY6u7JBAU6dzQPMLasU9vHL2uD8av/1FDJXj7n6c39w== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axios@^0.18.0: version "0.18.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" @@ -8793,6 +9174,18 @@ bigi@^1.1.0, bigi@^1.4.2: resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825" integrity sha512-ddkU+dFIuEIW8lE7ZwdIAf2UPoM90eaprg5m3YXAVVTmKlqV/9BX4A2M8BOK2yOq6/VgZFVhK6QAxJebhlbhzw== +bigint-crypto-utils@^3.0.23: + version "3.1.8" + resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.1.8.tgz#e2e0f40cf45488f9d7f0e32ff84152aa73819d5d" + integrity sha512-+VMV9Laq8pXLBKKKK49nOoq9bfR3j7NNQAtbA617a4nw9bVLo8rsqkKMBgM2AJWlNX9fEIyYaYX+d0laqYV4tw== + dependencies: + bigint-mod-arith "^3.1.0" + +bigint-mod-arith@^3.1.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bigint-mod-arith/-/bigint-mod-arith-3.1.2.tgz#658e416bc593a463d97b59766226d0a3021a76b1" + integrity sha512-nx8J8bBeiRR+NlsROFH9jHswW5HO8mgfOSqW0AmjicMMvaONDa8AO+5ViKDUUNytBPWiwfvZP4/Bj4Y3lUfvgQ== + bignumber.js@*, bignumber.js@9.1.0, bignumber.js@^9.0.0, bignumber.js@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62" @@ -9157,6 +9550,16 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== +browser-level@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/browser-level/-/browser-level-1.0.1.tgz#36e8c3183d0fe1c405239792faaab5f315871011" + integrity sha512-XECYKJ+Dbzw0lbydyQuJzwNXtOpbMSq737qxJN11sIRTErOMShvDpbzTlgju7orJKvx4epULolZAuJGLzCmWRQ== + dependencies: + abstract-level "^1.0.2" + catering "^2.1.1" + module-error "^1.0.2" + run-parallel-limit "^1.1.0" + browser-process-hrtime@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" @@ -9716,12 +10119,17 @@ cardinal@^2.1.1: ansicolors "~0.3.2" redeyed "~2.1.0" +case@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" + integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== + caseless@^0.12.0, caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== -catering@^2.0.0, catering@^2.1.0: +catering@^2.0.0, catering@^2.1.0, catering@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/catering/-/catering-2.1.1.tgz#66acba06ed5ee28d5286133982a927de9a04b510" integrity sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w== @@ -10072,6 +10480,17 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +classic-level@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/classic-level/-/classic-level-1.2.0.tgz#2d52bdec8e7a27f534e67fdeb890abef3e643c27" + integrity sha512-qw5B31ANxSluWz9xBzklRWTUAJ1SXIdaVKTVS7HcTGKOAmExx65Wo5BUICW+YGORe2FOUaDghoI9ZDxj82QcFg== + dependencies: + abstract-level "^1.0.2" + catering "^2.1.0" + module-error "^1.0.1" + napi-macros "~2.0.0" + node-gyp-build "^4.3.0" + clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -11325,7 +11744,7 @@ debug@3.2.6: dependencies: ms "^2.1.1" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -11339,13 +11758,6 @@ debug@4.3.1: dependencies: ms "2.1.2" -debug@4.3.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -12924,6 +13336,16 @@ ethereum-cryptography@^1.0.3: "@scure/bip32" "1.1.0" "@scure/bip39" "1.1.0" +ethereum-cryptography@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz#5ccfa183e85fdaf9f9b299a79430c044268c9b3a" + integrity sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw== + dependencies: + "@noble/hashes" "1.2.0" + "@noble/secp256k1" "1.7.1" + "@scure/bip32" "1.1.5" + "@scure/bip39" "1.1.1" + ethereum-types@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-2.1.6.tgz#57d9d515fad86ab987c0f6962c4203be37da8579" @@ -13050,6 +13472,17 @@ ethereumjs-util@6.2.0: rlp "^2.2.3" secp256k1 "^3.0.1" +ethereumjs-util@7.1.5, ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: + version "7.1.5" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" + integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== + dependencies: + "@types/bn.js" "^5.1.0" + bn.js "^5.1.2" + create-hash "^1.1.2" + ethereum-cryptography "^0.1.3" + rlp "^2.2.4" + ethereumjs-util@^4.3.0: version "4.5.1" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.1.tgz#f4bf9b3b515a484e3cc8781d61d9d980f7c83bd0" @@ -13087,17 +13520,6 @@ ethereumjs-util@^6.0.0, ethereumjs-util@^6.1.0, ethereumjs-util@^6.2.0: ethjs-util "0.1.6" rlp "^2.2.3" -ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: - version "7.1.5" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" - integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== - dependencies: - "@types/bn.js" "^5.1.0" - bn.js "^5.1.2" - create-hash "^1.1.2" - ethereum-cryptography "^0.1.3" - rlp "^2.2.4" - ethereumjs-vm@4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-4.1.3.tgz#dc8eb45f47d775da9f0b2437d5e20896fdf66f37" @@ -13136,27 +13558,6 @@ ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4, ethereumjs-vm@ rustbn.js "~0.2.0" safe-buffer "^5.1.1" -ethereumjs-vm@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-4.2.0.tgz#e885e861424e373dbc556278f7259ff3fca5edab" - integrity sha512-X6qqZbsY33p5FTuZqCnQ4+lo957iUJMM6Mpa6bL4UW0dxM6WmDSHuI4j/zOp1E2TDKImBGCJA9QPfc08PaNubA== - dependencies: - async "^2.1.2" - async-eventemitter "^0.2.2" - core-js-pure "^3.0.1" - ethereumjs-account "^3.0.0" - ethereumjs-block "^2.2.2" - ethereumjs-blockchain "^4.0.3" - ethereumjs-common "^1.5.0" - ethereumjs-tx "^2.1.2" - ethereumjs-util "^6.2.0" - fake-merkle-patricia-tree "^1.0.1" - functional-red-black-tree "^1.0.1" - merkle-patricia-tree "^2.3.2" - rustbn.js "~0.2.0" - safe-buffer "^5.1.1" - util.promisify "^1.0.0" - "ethereumjs-vm@git+https://github.com/celo-org/celo-monorepo.git#ethereumjs-vm-v4.1.3-celo3-gitpkg": version "4.1.3-celo3" resolved "git+https://github.com/celo-org/celo-monorepo.git#886e684bcfd05c8299cfdba0c3f8411e1d5cf8c6" @@ -13288,6 +13689,42 @@ ethers@^5.0.13: "@ethersproject/web" "5.7.0" "@ethersproject/wordlists" "5.7.0" +ethers@^5.7.1: + version "5.7.2" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" + integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== + dependencies: + "@ethersproject/abi" "5.7.0" + "@ethersproject/abstract-provider" "5.7.0" + "@ethersproject/abstract-signer" "5.7.0" + "@ethersproject/address" "5.7.0" + "@ethersproject/base64" "5.7.0" + "@ethersproject/basex" "5.7.0" + "@ethersproject/bignumber" "5.7.0" + "@ethersproject/bytes" "5.7.0" + "@ethersproject/constants" "5.7.0" + "@ethersproject/contracts" "5.7.0" + "@ethersproject/hash" "5.7.0" + "@ethersproject/hdnode" "5.7.0" + "@ethersproject/json-wallets" "5.7.0" + "@ethersproject/keccak256" "5.7.0" + "@ethersproject/logger" "5.7.0" + "@ethersproject/networks" "5.7.1" + "@ethersproject/pbkdf2" "5.7.0" + "@ethersproject/properties" "5.7.0" + "@ethersproject/providers" "5.7.2" + "@ethersproject/random" "5.7.0" + "@ethersproject/rlp" "5.7.0" + "@ethersproject/sha2" "5.7.0" + "@ethersproject/signing-key" "5.7.0" + "@ethersproject/solidity" "5.7.0" + "@ethersproject/strings" "5.7.0" + "@ethersproject/transactions" "5.7.0" + "@ethersproject/units" "5.7.0" + "@ethersproject/wallet" "5.7.0" + "@ethersproject/web" "5.7.1" + "@ethersproject/wordlists" "5.7.0" + ethjs-unit@0.1.6, ethjs-unit@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -14405,7 +14842,7 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" -follow-redirects@^1.12.1: +follow-redirects@^1.12.1, follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -14744,15 +15181,52 @@ funpermaproxy@^1.0.1: resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== -ganache@7.4.4, ganache@^7.4.4: - version "7.4.4" - resolved "https://registry.yarnpkg.com/ganache/-/ganache-7.4.4.tgz#af1bb7e85cde010c8d05186ab952a69df970dfa2" - integrity sha512-wC5XZB7ttHXc4rYfAq8+ieOZZajlsTdWsWievtQNjiuxcrIkqPqSwAZK6IP5mbooe/HSp3bDGJhXW5EHVd2G9w== +ganache-core@^2.6.0: + version "2.10.3" + resolved "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" + dependencies: + "@celo/utils" "1.5.1" + abstract-leveldown "3.0.0" + async "2.6.2" + bip39 "2.5.0" + cachedown "1.0.0" + clone "2.1.2" + debug "3.2.6" + encoding-down "5.0.4" + eth-sig-util "2.3.0" + ethereumjs-abi "0.6.7" + ethereumjs-account "3.0.0" + ethereumjs-block "2.2.2" + ethereumjs-common "1.5.0" + ethereumjs-tx "2.1.2" + ethereumjs-util "6.2.0" + ethereumjs-vm "git+https://github.com/celo-org/celo-monorepo.git#ethereumjs-vm-v4.1.3-celo3-gitpkg" + heap "0.2.6" + level-sublevel "6.6.4" + levelup "3.1.1" + lodash "4.17.14" + merkle-patricia-tree "2.3.2" + seedrandom "3.0.1" + source-map-support "0.5.12" + tmp "0.1.0" + web3-provider-engine "14.2.1" + websocket "1.0.29" + optionalDependencies: + ethereumjs-wallet "0.6.4" + web3 "1.2.4" + +ganache@7.7.3, "ganache@npm:@soloseng/ganache@7.7.5-beta.3": + version "7.7.5-beta.3" + resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.7.5-beta.3.tgz#078e3c685c0b97a5b8d11c8c9892e082d2d76a9a" + integrity sha512-IwopVN98CdRDRNPFTUe38DZgPWswfmdspNNh/ZmM9G1nSc+v50KUK5UFGIjPxZMCZs8mnHGL0kKK4JQq/Ivz/w== dependencies: "@trufflesuite/bigint-buffer" "1.1.10" "@types/bn.js" "^5.1.0" "@types/lru-cache" "5.1.1" "@types/seedrandom" "3.0.1" + abstract-level "1.0.3" + abstract-leveldown "7.2.0" + async-eventemitter "0.2.4" emittery "0.10.0" keccak "3.0.2" leveldown "6.1.0" @@ -16143,6 +16617,11 @@ highlightjs-solidity@^2.0.5: resolved "https://registry.yarnpkg.com/highlightjs-solidity/-/highlightjs-solidity-2.0.5.tgz#48b945f41886fa49af9f06023e6e87fffc243745" integrity sha512-ReXxQSGQkODMUgHcWzVSnfDCDrL2HshOYgw3OlIYmfHeRzUPkfJTUIp95pK4CmbiNG2eMTOmNLpfCz9Zq7Cwmg== +highlightjs-solidity@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/highlightjs-solidity/-/highlightjs-solidity-2.0.6.tgz#e7a702a2b05e0a97f185e6ba39fd4846ad23a990" + integrity sha512-DySXWfQghjm2l6a/flF+cteroJqD4gI8GSdL4PtvxZSsAHie8m3yVe2JFoRg03ROKT6hp2Lc/BxXkqerNmtQYg== + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -18612,6 +19091,11 @@ js-beautify@^1.8.8: glob "^8.0.3" nopt "^6.0.0" +js-sdsl@^4.1.4: + version "4.3.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" + integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== + js-sha3@0.5.7, js-sha3@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" @@ -19036,6 +19520,14 @@ keccak256@^1.0.0: buffer "^6.0.3" keccak "^3.0.2" +keccak@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" + integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + keccak@3.0.2, keccak@^3.0.0, keccak@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" @@ -19415,6 +19907,11 @@ level-supports@^2.0.1: resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-2.1.0.tgz#9af908d853597ecd592293b2fad124375be79c5f" integrity sha512-E486g1NCjW5cF78KGPrMDRBYzPuueMZ6VBXHT6gC7A8UYWGiM14fGgp+s/L1oFfDWSPV/+SFkYCmZ0SiESkRKA== +level-supports@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-4.0.1.tgz#431546f9d81f10ff0fea0e74533a0e875c08c66a" + integrity sha512-PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA== + level-supports@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-1.0.1.tgz#2f530a596834c7301622521988e2c36bb77d122d" @@ -19422,6 +19919,14 @@ level-supports@~1.0.0: dependencies: xtend "^4.0.2" +level-transcoder@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/level-transcoder/-/level-transcoder-1.0.1.tgz#f8cef5990c4f1283d4c86d949e73631b0bc8ba9c" + integrity sha512-t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w== + dependencies: + buffer "^6.0.3" + module-error "^1.0.1" + level-write-stream@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/level-write-stream/-/level-write-stream-1.0.0.tgz#3f7fbb679a55137c0feb303dee766e12ee13c1dc" @@ -19455,6 +19960,14 @@ level@6.0.1: level-packager "^5.1.0" leveldown "^5.4.0" +level@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/level/-/level-8.0.0.tgz#41b4c515dabe28212a3e881b61c161ffead14394" + integrity sha512-ypf0jjAk2BWI33yzEaaotpq7fkOPALKAgDBxggO6Q9HGX2MRXn0wbP1Jn/tJv1gtL867+YOjOB49WaUF3UoJNQ== + dependencies: + browser-level "^1.0.1" + classic-level "^1.2.0" + leveldown@5.6.0, leveldown@^5.4.0: version "5.6.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" @@ -20233,6 +20746,11 @@ mathjs@^5.0.4: tiny-emitter "2.1.0" typed-function "1.1.0" +mcl-wasm@^0.7.1: + version "0.7.9" + resolved "https://registry.yarnpkg.com/mcl-wasm/-/mcl-wasm-0.7.9.tgz#c1588ce90042a8700c3b60e40efb339fc07ab87f" + integrity sha512-iJIUcQWA88IJB/5L15GnJVnSQJmf/YaxxV6zRavv83HILHaJQb6y0iFyDMdDO0gN8X37tdxmAOrH/P8B6RB8sQ== + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -20329,6 +20847,15 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" +memory-level@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/memory-level/-/memory-level-1.0.0.tgz#7323c3fd368f9af2f71c3cd76ba403a17ac41692" + integrity sha512-UXzwewuWeHBz5krr7EvehKcmLFNoXxGcvuYhC41tRnkrTbJohtS7kVn9akmgirtRygg+f7Yjsfi8Uu5SGSQ4Og== + dependencies: + abstract-level "^1.0.0" + functional-red-black-tree "^1.0.1" + module-error "^1.0.1" + memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" @@ -20819,12 +21346,12 @@ minimatch@3.0.5: dependencies: brace-expansion "^1.1.7" -minimatch@4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4" - integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g== +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== dependencies: - brace-expansion "^1.1.7" + brace-expansion "^2.0.1" minimatch@^5.0.1, minimatch@^5.1.0: version "5.1.0" @@ -21015,6 +21542,33 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkd dependencies: minimist "^1.2.6" +mocha@10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a" + integrity sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg== + dependencies: + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + nanoid "3.3.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + mocha@8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.0.1.tgz#fe01f0530362df271aa8f99510447bc38b88d8ed" @@ -21046,36 +21600,6 @@ mocha@8.0.1: yargs-parser "13.1.2" yargs-unparser "1.6.0" -mocha@9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9" - integrity sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.3" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - growl "1.10.5" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "4.2.1" - ms "2.1.3" - nanoid "3.3.1" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - which "2.0.2" - workerpool "6.2.0" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - mocha@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" @@ -21170,6 +21694,11 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== +module-error@^1.0.1, module-error@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/module-error/-/module-error-1.0.2.tgz#8d1a48897ca883f47a45816d4fb3e3c6ba404d86" + integrity sha512-0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA== + module-not-found-error@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0" @@ -21403,10 +21932,10 @@ nano-json-stream-parser@^0.1.2: resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" integrity sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew== -nanoid@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" - integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== +nanoid@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" + integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== nanomatch@^1.2.9: version "1.2.13" @@ -21624,6 +22153,11 @@ node-forge@^1.3.1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== +node-gyp-build@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" + integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== + node-gyp-build@4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4" @@ -24007,7 +24541,7 @@ proxy-agent@^5.0.0: proxy-from-env "^1.0.0" socks-proxy-agent "^5.0.0" -proxy-from-env@^1.0.0: +proxy-from-env@^1.0.0, proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -25249,6 +25783,13 @@ run-node@^1.0.0: resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== +run-parallel-limit@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz#be80e936f5768623a38a963262d6bef8ff11e7ba" + integrity sha512-jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw== + dependencies: + queue-microtask "^1.2.2" + run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -25471,6 +26012,11 @@ seedrandom@3.0.1: resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.1.tgz#eb3dde015bcf55df05a233514e5df44ef9dce083" integrity sha512-1/02Y/rUeU1CJBAGLebiC5Lbo5FnB22gQbIFFYTLkwvp1xdABZJH1sn4ZT1MzXmPpzv+Rf/Lu2NcsLJiK4rcDg== +seedrandom@3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" + integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg== + seek-bzip@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" @@ -26013,10 +26559,10 @@ solc@0.5.8: tmp "0.0.33" yargs "^11.0.0" -solc@0.8.17: - version "0.8.17" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.17.tgz#c748fec6a64bf029ec406aa9b37e75938d1115ae" - integrity sha512-Dtidk2XtTTmkB3IKdyeg6wLYopJnBVxdoykN8oP8VY3PQjN16BScYoUJTXFm2OP7P0hXNAqWiJNmmfuELtLf8g== +solc@0.8.18: + version "0.8.18" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.18.tgz#a05ce8918540eda5f10aa91f0f52f239b9645dad" + integrity sha512-wVAa2Y3BYd64Aby5LsgS3g6YC2NvZ3bJ+A8TAIAukfVuQb3AjyGrLZpyxQk5YLn14G35uZtSnIgHEpab9klOLQ== dependencies: command-exists "^1.2.8" commander "^8.1.0" @@ -27635,19 +28181,19 @@ truffle-typings@^1.0.6: "@types/mocha" "^5.2.5" "@types/web3" "^1.0.18" -truffle@5.6.1: - version "5.6.1" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.6.1.tgz#6791f0fc4b6e15afb5c0e440b6cdf83d6d399ef4" - integrity sha512-hu3Kbz5G6AmBrxOZB8XxY3d7LngwXSwwZ/kkdNfyKSFhdaYaWS3POLeRqbZSR0x61n17wRwzV5nKKxsEqnFDhg== +truffle@5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.7.3.tgz#89d75168cb3b77cf896b5252de21966c7ed2d222" + integrity sha512-NnffU0XMI9fEIEVcsYjcOL3ntneGdao+x0ZyJYdPe22fm8v1IlkyRYXtRLGSyJqFl0E76pUb5AbsRs12N8on1Q== dependencies: - "@truffle/db-loader" "^0.2.1" - "@truffle/debugger" "^11.0.12" + "@truffle/db-loader" "^0.2.12" + "@truffle/debugger" "^11.0.23" app-module-path "^2.2.0" - ganache "7.4.4" - mocha "9.2.2" + ganache "7.7.3" + mocha "10.1.0" original-require "^1.0.1" optionalDependencies: - "@truffle/db" "^2.0.1" + "@truffle/db" "^2.0.12" truncate-utf8-bytes@^1.0.0: version "1.0.2" @@ -28670,6 +29216,17 @@ util@^0.12.0, util@^0.12.4: safe-buffer "^5.1.2" which-typed-array "^1.1.2" +util@^0.12.5: + version "0.12.5" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" + integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== + dependencies: + inherits "^2.0.3" + is-arguments "^1.0.4" + is-generator-function "^1.0.7" + is-typed-array "^1.1.3" + which-typed-array "^1.1.2" + utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -29032,6 +29589,24 @@ web3-bzz@1.7.5: got "12.1.0" swarm-js "^0.1.40" +web3-bzz@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.8.1.tgz#81397be5ce262d03d82b92e9d8acc11f8a609ea1" + integrity sha512-dJJHS84nvpoxv6ijTMkdUSlRr5beCXNtx4UZcrFLHBva8dT63QEtKdLyDt2AyMJJdVzTCk78uir/6XtVWrdS6w== + dependencies: + "@types/node" "^12.12.6" + got "12.1.0" + swarm-js "^0.1.40" + +web3-bzz@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.8.2.tgz#67ea1c775874056250eece551ded22905ed08784" + integrity sha512-1EEnxjPnFnvNWw3XeeKuTR8PBxYd0+XWzvaLK7OJC/Go9O8llLGxrxICbKV+8cgIE0sDRBxiYx02X+6OhoAQ9w== + dependencies: + "@types/node" "^12.12.6" + got "12.1.0" + swarm-js "^0.1.40" + web3-core-helpers@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.55.tgz#832b8499889f9f514b1d174f00172fd3683d63de" @@ -29086,6 +29661,22 @@ web3-core-helpers@1.7.5: web3-eth-iban "1.7.5" web3-utils "1.7.5" +web3-core-helpers@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.8.1.tgz#7904747b23fd0afa4f2c86ed98ea9418ccad7672" + integrity sha512-ClzNO6T1S1gifC+BThw0+GTfcsjLEY8T1qUp6Ly2+w4PntAdNtKahxWKApWJ0l9idqot/fFIDXwO3Euu7I0Xqw== + dependencies: + web3-eth-iban "1.8.1" + web3-utils "1.8.1" + +web3-core-helpers@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.8.2.tgz#82066560f8085e6c7b93bcc8e88b441289ea9f9f" + integrity sha512-6B1eLlq9JFrfealZBomd1fmlq1o4A09vrCVQSa51ANoib/jllT3atZrRDr0zt1rfI7TSZTZBXdN/aTdeN99DWw== + dependencies: + web3-eth-iban "1.8.2" + web3-utils "1.8.2" + web3-core-method@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.55.tgz#0af994295ac2dd64ccd53305b7df8da76e11da49" @@ -29156,6 +29747,28 @@ web3-core-method@1.7.5: web3-core-subscriptions "1.7.5" web3-utils "1.7.5" +web3-core-method@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.8.1.tgz#0fc5a433a9fc784c447522f141c0a8e0163c7790" + integrity sha512-oYGRodktfs86NrnFwaWTbv2S38JnpPslFwSSARwFv4W9cjbGUW3LDeA5MKD/dRY+ssZ5OaekeMsUCLoGhX68yA== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.8.1" + web3-core-promievent "1.8.1" + web3-core-subscriptions "1.8.1" + web3-utils "1.8.1" + +web3-core-method@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.8.2.tgz#ba5ec68084e903f0516415010477618be017eac2" + integrity sha512-1qnr5mw5wVyULzLOrk4B+ryO3gfGjGd/fx8NR+J2xCGLf1e6OSjxT9vbfuQ3fErk/NjSTWWreieYWLMhaogcRA== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.8.2" + web3-core-promievent "1.8.2" + web3-core-subscriptions "1.8.2" + web3-utils "1.8.2" + web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -29193,6 +29806,20 @@ web3-core-promievent@1.7.5: dependencies: eventemitter3 "4.0.4" +web3-core-promievent@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.8.1.tgz#f334c8b2ceac6c2228f06d2a515f6d103157f036" + integrity sha512-9mxqHlgB0MrZI4oUIRFkuoJMNj3E7btjrMv3sMer/Z9rYR1PfoSc1aAokw4rxKIcAh+ylVtd/acaB2HKB7aRPg== + dependencies: + eventemitter3 "4.0.4" + +web3-core-promievent@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.8.2.tgz#e670d6b4453632e6ecfd9ad82da44f77ac1585c9" + integrity sha512-nvkJWDVgoOSsolJldN33tKW6bKKRJX3MCPDYMwP5SUFOA/mCzDEoI88N0JFofDTXkh1k7gOqp1pvwi9heuaxGg== + dependencies: + eventemitter3 "4.0.4" + web3-core-requestmanager@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" @@ -29249,6 +29876,28 @@ web3-core-requestmanager@1.7.5: web3-providers-ipc "1.7.5" web3-providers-ws "1.7.5" +web3-core-requestmanager@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.8.1.tgz#272ffa55b7b568ecbc8e4a257ca080355c31c60e" + integrity sha512-x+VC2YPPwZ1khvqA6TA69LvfFCOZXsoUVOxmTx/vIN22PrY9KzKhxcE7pBSiGhmab1jtmRYXUbcQSVpAXqL8cw== + dependencies: + util "^0.12.0" + web3-core-helpers "1.8.1" + web3-providers-http "1.8.1" + web3-providers-ipc "1.8.1" + web3-providers-ws "1.8.1" + +web3-core-requestmanager@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.8.2.tgz#dda95e83ca4808949612a41e54ecea557f78ef26" + integrity sha512-p1d090RYs5Mu7DK1yyc3GCBVZB/03rBtFhYFoS2EruGzOWs/5Q0grgtpwS/DScdRAm8wB8mYEBhY/RKJWF6B2g== + dependencies: + util "^0.12.5" + web3-core-helpers "1.8.2" + web3-providers-http "1.8.2" + web3-providers-ipc "1.8.2" + web3-providers-ws "1.8.2" + web3-core-subscriptions@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.55.tgz#105902c13db53466fc17d07a981ad3d41c700f76" @@ -29301,6 +29950,22 @@ web3-core-subscriptions@1.7.5: eventemitter3 "4.0.4" web3-core-helpers "1.7.5" +web3-core-subscriptions@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.8.1.tgz#f5ae1380e92746eadfab6475b8a70ef5a1be6bbf" + integrity sha512-bmCMq5OeA3E2vZUh8Js1HcJbhwtsE+yeMqGC4oIZB3XsL5SLqyKLB/pU+qUYqQ9o4GdcrFTDPhPg1bgvf7p1Pw== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.8.1" + +web3-core-subscriptions@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.8.2.tgz#0c8bd49439d83c6f0a03c70f00b24a915a70a5ed" + integrity sha512-vXQogHDmAIQcKpXvGiMddBUeP9lnKgYF64+yQJhPNE5PnWr1sAibXuIPV7mIPihpFr/n/DORRj6Wh1pUv9zaTw== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.8.2" + web3-core@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.55.tgz#26b9abbf1bc1837c9cc90f06ecbc4ed714f89b53" @@ -29378,6 +30043,32 @@ web3-core@1.7.5: web3-core-requestmanager "1.7.5" web3-utils "1.7.5" +web3-core@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.1.tgz#050b1c408d1f9b7ae539e90f7f7d1b7a7d10578b" + integrity sha512-LbRZlJH2N6nS3n3Eo9Y++25IvzMY7WvYnp4NM/Ajhh97dAdglYs6rToQ2DbL2RLvTYmTew4O/y9WmOk4nq9COw== + dependencies: + "@types/bn.js" "^5.1.0" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-core-requestmanager "1.8.1" + web3-utils "1.8.1" + +web3-core@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.2.tgz#333e93d7872b1a36efe758ed8b89a7acbdd962c2" + integrity sha512-DJTVEAYcNqxkqruJE+Rxp3CIv0y5AZMwPHQmOkz/cz+MM75SIzMTc0AUdXzGyTS8xMF8h3YWMQGgGEy8SBf1PQ== + dependencies: + "@types/bn.js" "^5.1.0" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.8.2" + web3-core-method "1.8.2" + web3-core-requestmanager "1.8.2" + web3-utils "1.8.2" + web3-eth-abi@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" @@ -29421,6 +30112,22 @@ web3-eth-abi@1.7.5, web3-eth-abi@^1.0.0-beta.24: "@ethersproject/abi" "^5.6.3" web3-utils "1.7.5" +web3-eth-abi@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.8.1.tgz#47455d6513217c4b0866fea6f97b1c4afa0b6535" + integrity sha512-0mZvCRTIG0UhDhJwNQJgJxu4b4DyIpuMA0GTfqxqeuqzX4Q/ZvmoNurw0ExTfXaGPP82UUmmdkRi6FdZOx+C6w== + dependencies: + "@ethersproject/abi" "^5.6.3" + web3-utils "1.8.1" + +web3-eth-abi@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.8.2.tgz#16e1e9be40e2527404f041a4745111211488f31a" + integrity sha512-Om9g3kaRNjqiNPAgKwGT16y+ZwtBzRe4ZJFGjLiSs6v5I7TPNF+rRMWuKnR6jq0azQZDj6rblvKFMA49/k48Og== + dependencies: + "@ethersproject/abi" "^5.6.3" + web3-utils "1.8.2" + web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -29508,6 +30215,39 @@ web3-eth-accounts@1.7.5: web3-core-method "1.7.5" web3-utils "1.7.5" +web3-eth-accounts@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.8.1.tgz#1ce7387721f118aeb0376291e4d8bbe2ac323406" + integrity sha512-mgzxSYgN54/NsOFBO1Fq1KkXp1S5KlBvI/DlgvajU72rupoFMq6Cu6Yp9GUaZ/w2ij9PzEJuFJk174XwtfMCmg== + dependencies: + "@ethereumjs/common" "2.5.0" + "@ethereumjs/tx" "3.3.2" + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-util "^7.0.10" + scrypt-js "^3.0.1" + uuid "^9.0.0" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-utils "1.8.1" + +web3-eth-accounts@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.8.2.tgz#b894f5d5158fcae429da42de75d96520d0712971" + integrity sha512-c367Ij63VCz9YdyjiHHWLFtN85l6QghgwMQH2B1eM/p9Y5lTlTX7t/Eg/8+f1yoIStXbk2w/PYM2lk+IkbqdLA== + dependencies: + "@ethereumjs/common" "2.5.0" + "@ethereumjs/tx" "3.3.2" + eth-lib "0.2.8" + ethereumjs-util "^7.1.5" + scrypt-js "^3.0.1" + uuid "^9.0.0" + web3-core "1.8.2" + web3-core-helpers "1.8.2" + web3-core-method "1.8.2" + web3-utils "1.8.2" + web3-eth-admin@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-eth-admin/-/web3-eth-admin-1.0.0-beta.55.tgz#dcbcc5be4e3a008ce367c2ac83432b9a711f39e9" @@ -29594,6 +30334,34 @@ web3-eth-contract@1.7.5: web3-eth-abi "1.7.5" web3-utils "1.7.5" +web3-eth-contract@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.8.1.tgz#bdf3e33bbcb79a1b6144dffd6a0deefd2e459272" + integrity sha512-1wphnl+/xwCE2io44JKnN+ti3oa47BKRiVzvWd42icwRbcpFfRxH9QH+aQX3u8VZIISNH7dAkTWpGIIJgGFTmg== + dependencies: + "@types/bn.js" "^5.1.0" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-core-promievent "1.8.1" + web3-core-subscriptions "1.8.1" + web3-eth-abi "1.8.1" + web3-utils "1.8.1" + +web3-eth-contract@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.8.2.tgz#5388b7130923d2b790c09a420391a81312a867fb" + integrity sha512-ID5A25tHTSBNwOPjiXSVzxruz006ULRIDbzWTYIFTp7NJ7vXu/kynKK2ag/ObuTqBpMbobP8nXcA9b5EDkIdQA== + dependencies: + "@types/bn.js" "^5.1.0" + web3-core "1.8.2" + web3-core-helpers "1.8.2" + web3-core-method "1.8.2" + web3-core-promievent "1.8.2" + web3-core-subscriptions "1.8.2" + web3-eth-abi "1.8.2" + web3-utils "1.8.2" + web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -29665,6 +30433,34 @@ web3-eth-ens@1.7.5: web3-eth-contract "1.7.5" web3-utils "1.7.5" +web3-eth-ens@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.8.1.tgz#e78a9651fea8282abe8565b001819e2d645e5929" + integrity sha512-FT8xTI9uN8RxeBQa/W8pLa2aoFh4+EE34w7W2271LICKzla1dtLyb6XSdn48vsUcPmhWsTVk9mO9RTU0l4LGQQ== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-promievent "1.8.1" + web3-eth-abi "1.8.1" + web3-eth-contract "1.8.1" + web3-utils "1.8.1" + +web3-eth-ens@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.8.2.tgz#0a086ad4d919102e28b9fd3036df246add9df22a" + integrity sha512-PWph7C/CnqdWuu1+SH4U4zdrK4t2HNt0I4XzPYFdv9ugE8EuojselioPQXsVGvjql+Nt3jDLvQvggPqlMbvwRw== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.8.2" + web3-core-helpers "1.8.2" + web3-core-promievent "1.8.2" + web3-eth-abi "1.8.2" + web3-eth-contract "1.8.2" + web3-utils "1.8.2" + web3-eth-iban@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.55.tgz#15146a69de21addc99e7dbfb2920555b1e729637" @@ -29714,6 +30510,22 @@ web3-eth-iban@1.7.5: bn.js "^5.2.1" web3-utils "1.7.5" +web3-eth-iban@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.8.1.tgz#c6484e5d68ca644aa78431301e7acd5df24598d1" + integrity sha512-DomoQBfvIdtM08RyMGkMVBOH0vpOIxSSQ+jukWk/EkMLGMWJtXw/K2c2uHAeq3L/VPWNB7zXV2DUEGV/lNE2Dg== + dependencies: + bn.js "^5.2.1" + web3-utils "1.8.1" + +web3-eth-iban@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.8.2.tgz#5cb3022234b13986f086353b53f0379a881feeaf" + integrity sha512-h3vNblDWkWMuYx93Q27TAJz6lhzpP93EiC3+45D6xoz983p6si773vntoQ+H+5aZhwglBtoiBzdh7PSSOnP/xQ== + dependencies: + bn.js "^5.2.1" + web3-utils "1.8.2" + web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -29774,6 +30586,30 @@ web3-eth-personal@1.7.5: web3-net "1.7.5" web3-utils "1.7.5" +web3-eth-personal@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.8.1.tgz#00b5ff1898b62044d25ed5fddd8486168d4827cf" + integrity sha512-myIYMvj7SDIoV9vE5BkVdon3pya1WinaXItugoii2VoTcQNPOtBxmYVH+XS5ErzCJlnxzphpQrkywyY64bbbCA== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-net "1.8.1" + web3-utils "1.8.1" + +web3-eth-personal@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.8.2.tgz#3526c1ebaa4e7bf3a0a8ec77e34f067cc9a750b2" + integrity sha512-Vg4HfwCr7doiUF/RC+Jz0wT4+cYaXcOWMAW2AHIjHX6Z7Xwa8nrURIeQgeEE62qcEHAzajyAdB1u6bJyTfuCXw== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.8.2" + web3-core-helpers "1.8.2" + web3-core-method "1.8.2" + web3-net "1.8.2" + web3-utils "1.8.2" + web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -29867,6 +30703,42 @@ web3-eth@1.7.5: web3-net "1.7.5" web3-utils "1.7.5" +web3-eth@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.8.1.tgz#395f6cd56edaac5dbb23e8cec9886c3fd32c430e" + integrity sha512-LgyzbhFqiFRd8M8sBXoFN4ztzOnkeckl3H/9lH5ek7AdoRMhBg7tYpYRP3E5qkhd/q+yiZmcUgy1AF6NHrC1wg== + dependencies: + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-core-subscriptions "1.8.1" + web3-eth-abi "1.8.1" + web3-eth-accounts "1.8.1" + web3-eth-contract "1.8.1" + web3-eth-ens "1.8.1" + web3-eth-iban "1.8.1" + web3-eth-personal "1.8.1" + web3-net "1.8.1" + web3-utils "1.8.1" + +web3-eth@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.8.2.tgz#8562287ae1803c30eb54dc7d832092e5739ce06a" + integrity sha512-JoTiWWc4F4TInpbvDUGb0WgDYJsFhuIjJlinc5ByjWD88Gvh+GKLsRjjFdbqe5YtwIGT4NymwoC5LQd1K6u/QQ== + dependencies: + web3-core "1.8.2" + web3-core-helpers "1.8.2" + web3-core-method "1.8.2" + web3-core-subscriptions "1.8.2" + web3-eth-abi "1.8.2" + web3-eth-accounts "1.8.2" + web3-eth-contract "1.8.2" + web3-eth-ens "1.8.2" + web3-eth-iban "1.8.2" + web3-eth-personal "1.8.2" + web3-net "1.8.2" + web3-utils "1.8.2" + web3-net@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.55.tgz#daf24323df16a890a0bac6c6eda48b6e8c7e96ef" @@ -29925,6 +30797,24 @@ web3-net@1.7.5: web3-core-method "1.7.5" web3-utils "1.7.5" +web3-net@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.8.1.tgz#2bed4d4b93166724129ec33d0e5dea98880285f4" + integrity sha512-LyEJAwogdFo0UAXZqoSJGFjopdt+kLw0P00FSZn2yszbgcoI7EwC+nXiOsEe12xz4LqpYLOtbR7+gxgiTVjjHQ== + dependencies: + web3-core "1.8.1" + web3-core-method "1.8.1" + web3-utils "1.8.1" + +web3-net@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.8.2.tgz#97e1e0015fabc4cda31017813e98d0b5468dd04f" + integrity sha512-1itkDMGmbgb83Dg9nporFes9/fxsU7smJ3oRXlFkg4ZHn8YJyP1MSQFPJWWwSc+GrcCFt4O5IrUTvEkHqE3xag== + dependencies: + web3-core "1.8.2" + web3-core-method "1.8.2" + web3-utils "1.8.2" + web3-provider-engine@14.0.6: version "14.0.6" resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz#cbdd66fe20c0136a3a495cbe40d18b6c4160d5f0" @@ -30068,6 +30958,26 @@ web3-providers-http@1.7.5: es6-promise "^4.2.8" web3-core-helpers "1.7.5" +web3-providers-http@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.8.1.tgz#8aa89c11a9272f11ddb74b871273c92225faa28d" + integrity sha512-1Zyts4O9W/UNEPkp+jyL19Jc3D15S4yp8xuLTjVhcUEAlHo24NDWEKxtZGUuHk4HrKL2gp8OlsDbJ7MM+ESDgg== + dependencies: + abortcontroller-polyfill "^1.7.3" + cross-fetch "^3.1.4" + es6-promise "^4.2.8" + web3-core-helpers "1.8.1" + +web3-providers-http@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.8.2.tgz#fbda3a3bbc8db004af36e91bec35f80273b37885" + integrity sha512-2xY94IIEQd16+b+vIBF4IC1p7GVaz9q4EUFscvMUjtEq4ru4Atdzjs9GP+jmcoo49p70II0UV3bqQcz0TQfVyQ== + dependencies: + abortcontroller-polyfill "^1.7.3" + cross-fetch "^3.1.4" + es6-promise "^4.2.8" + web3-core-helpers "1.8.2" + web3-providers-ipc@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" @@ -30111,6 +31021,22 @@ web3-providers-ipc@1.7.5: oboe "2.1.5" web3-core-helpers "1.7.5" +web3-providers-ipc@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.8.1.tgz#6128a3a3a824d06bf0efcfe86325401f8691a5ca" + integrity sha512-nw/W5nclvi+P2z2dYkLWReKLnocStflWqFl+qjtv0xn3MrUTyXMzSF0+61i77+16xFsTgzo4wS/NWIOVkR0EFA== + dependencies: + oboe "2.1.5" + web3-core-helpers "1.8.1" + +web3-providers-ipc@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.8.2.tgz#e52a7250f40c83b99a2482ec5b4cf2728377ae5c" + integrity sha512-p6fqKVGFg+WiXGHWnB1hu43PbvPkDHTz4RgoEzbXugv5rtv5zfYLqm8Ba6lrJOS5ks9kGKR21a0y3NzE3u7V4w== + dependencies: + oboe "2.1.5" + web3-core-helpers "1.8.2" + web3-providers-ws@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" @@ -30157,6 +31083,24 @@ web3-providers-ws@1.7.5: web3-core-helpers "1.7.5" websocket "^1.0.32" +web3-providers-ws@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.8.1.tgz#5e5370e07eb8c615ed298ebc8602b283c7b7d649" + integrity sha512-TNefIDAMpdx57+YdWpYZ/xdofS0P+FfKaDYXhn24ie/tH9G+AB+UBSOKnjN0KSadcRSCMBwGPRiEmNHPavZdsA== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.8.1" + websocket "^1.0.32" + +web3-providers-ws@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.8.2.tgz#56a2b701387011aca9154ca4bc06ea4b5f27e4ef" + integrity sha512-3s/4K+wHgbiN+Zrp9YjMq2eqAF6QGABw7wFftPdx+m5hWImV27/MoIx57c6HffNRqZXmCHnfWWFCNHHsi7wXnA== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.8.2" + websocket "^1.0.32" + web3-providers@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-providers/-/web3-providers-1.0.0-beta.55.tgz#639503517741b69baaa82f1f940630df6a25992b" @@ -30224,6 +31168,26 @@ web3-shh@1.7.5: web3-core-subscriptions "1.7.5" web3-net "1.7.5" +web3-shh@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.8.1.tgz#028a95cf9d3a36020380938b9a127610efbb9be7" + integrity sha512-sqHgarnfcY2Qt3PYS4R6YveHrDy7hmL09yeLLHHCI+RKirmjLVqV0rc5LJWUtlbYI+kDoa5gbgde489M9ZAC0g== + dependencies: + web3-core "1.8.1" + web3-core-method "1.8.1" + web3-core-subscriptions "1.8.1" + web3-net "1.8.1" + +web3-shh@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.8.2.tgz#217a417f0d6e243dd4d441848ffc2bd164cea8a0" + integrity sha512-uZ+3MAoNcaJsXXNCDnizKJ5viBNeHOFYsCbFhV755Uu52FswzTOw6DtE7yK9nYXMtIhiSgi7nwl1RYzP8pystw== + dependencies: + web3-core "1.8.2" + web3-core-method "1.8.2" + web3-core-subscriptions "1.8.2" + web3-net "1.8.2" + web3-utils@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.55.tgz#beb40926b7c04208b752d36a9bc959d27a04b308" @@ -30321,6 +31285,32 @@ web3-utils@1.7.5, web3-utils@^1.0.0-beta.31: randombytes "^2.1.0" utf8 "3.0.0" +web3-utils@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.1.tgz#f2f7ca7eb65e6feb9f3d61056d0de6bbd57125ff" + integrity sha512-LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ== + dependencies: + bn.js "^5.2.1" + ethereum-bloom-filters "^1.0.6" + ethereumjs-util "^7.1.0" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + utf8 "3.0.0" + +web3-utils@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.2.tgz#c32dec5e9b955acbab220eefd7715bc540b75cc9" + integrity sha512-v7j6xhfLQfY7xQDrUP0BKbaNrmZ2/+egbqP9q3KYmOiPpnvAfol+32slgL0WX/5n8VPvKCK5EZ1HGrAVICSToA== + dependencies: + bn.js "^5.2.1" + ethereum-bloom-filters "^1.0.6" + ethereumjs-util "^7.1.0" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + utf8 "3.0.0" + web3@*, web3@^1.2.4: version "1.7.5" resolved "https://registry.yarnpkg.com/web3/-/web3-1.7.5.tgz#4e185d2058195b5775109b3f27cdea65a34a036e" @@ -30388,6 +31378,32 @@ web3@1.7.4: web3-shh "1.7.4" web3-utils "1.7.4" +web3@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.8.1.tgz#8ea67215ef5f3a6f6d3381800b527242ea22885a" + integrity sha512-tAqFsQhGv340C9OgRJIuoScN7f7wa1tUvsnnDUMt9YE6J4gcm7TV2Uwv+KERnzvV+xgdeuULYpsioRRNKrUvoQ== + dependencies: + web3-bzz "1.8.1" + web3-core "1.8.1" + web3-eth "1.8.1" + web3-eth-personal "1.8.1" + web3-net "1.8.1" + web3-shh "1.8.1" + web3-utils "1.8.1" + +web3@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.8.2.tgz#95a4e5398fd0f01325264bf8e5e8cdc69a7afe86" + integrity sha512-92h0GdEHW9wqDICQQKyG4foZBYi0OQkyg4CRml2F7XBl/NG+fu9o6J19kzfFXzSBoA4DnJXbyRgj/RHZv5LRiw== + dependencies: + web3-bzz "1.8.2" + web3-core "1.8.2" + web3-eth "1.8.2" + web3-eth-personal "1.8.2" + web3-net "1.8.2" + web3-shh "1.8.2" + web3-utils "1.8.2" + web3@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019" @@ -30762,10 +31778,10 @@ workerpool@6.0.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58" integrity sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA== -workerpool@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" - integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== +workerpool@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" + integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== wrap-ansi@^2.0.0: version "2.1.0" From 4925a778fb5d8a7281a60b1dede7b1e515f2c286 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 25 Feb 2023 15:05:26 -0500 Subject: [PATCH 003/184] fix build errors --- packages/protocol/lib/compatibility/ast-version.ts | 10 +++++----- packages/sdk/explorer/src/base.ts | 2 +- .../sdk/wallets/wallet-local/src/local-wallet.test.ts | 2 +- packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/protocol/lib/compatibility/ast-version.ts b/packages/protocol/lib/compatibility/ast-version.ts index e3ba9f64faf..524049203cb 100644 --- a/packages/protocol/lib/compatibility/ast-version.ts +++ b/packages/protocol/lib/compatibility/ast-version.ts @@ -1,9 +1,9 @@ // tslint:disable: max-classes-per-file -import { Artifact } from '@celo/protocol/lib/compatibility/internal' -import { ContractVersion, ContractVersionChecker, ContractVersionCheckerIndex, ContractVersionDelta, ContractVersionDeltaIndex, ContractVersionIndex, DEFAULT_VERSION_STRING } from '@celo/protocol/lib/compatibility/version' -import { BuildArtifacts } from '@openzeppelin/upgrades' -import { isLibrary } from './report' -const VM = require('ethereumjs-vm').default +import { Artifact } from '@celo/protocol/lib/compatibility/internal'; +import { ContractVersion, ContractVersionChecker, ContractVersionCheckerIndex, ContractVersionDelta, ContractVersionDeltaIndex, ContractVersionIndex, DEFAULT_VERSION_STRING } from '@celo/protocol/lib/compatibility/version'; +import { BuildArtifacts } from '@openzeppelin/upgrades'; +import { isLibrary } from './report'; +const VM = require('@ethereumjs/vm').default const abi = require('ethereumjs-abi') /** diff --git a/packages/sdk/explorer/src/base.ts b/packages/sdk/explorer/src/base.ts index f9ae8b5eb0e..92d42c271ea 100644 --- a/packages/sdk/explorer/src/base.ts +++ b/packages/sdk/explorer/src/base.ts @@ -8,7 +8,7 @@ export interface ContractDetails { jsonInterface: AbiItem[] } -export const getContractDetailsFromContract = async ( +export const getContractDetailsFromContract: any = async ( kit: ContractKit, celoContract: CeloContract, address?: string diff --git a/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts b/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts index 74e69ec80e8..f75e6a80b7f 100644 --- a/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts +++ b/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts @@ -78,7 +78,7 @@ describe('Local wallet class', () => { wallet.addAccount('this is not a valid private key') throw new Error('Expected exception to be thrown') } catch (e: any) { - expect(e.message).toBe('private key length is invalid') + expect(e.message).toBe('Expected private key to be an Uint8Array with length 32') } }) diff --git a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts index 999252b2d6d..de6b627c540 100644 --- a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts +++ b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts @@ -107,7 +107,7 @@ testWithGanache('rpc-wallet', (web3) => { await rpcWallet.addAccount('this is not a valid private key', PASSPHRASE) throw new Error('Expected exception to be thrown') } catch (e: any) { - expect(e.message).toBe('private key length is invalid') + expect(e.message).toBe('Expected private key to be an Uint8Array with length 32') } }) From 4bfa24569562207c1dd1c91587d612835a6463f7 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 25 Feb 2023 15:35:08 -0500 Subject: [PATCH 004/184] split migration into JS & TS dir --- packages/protocol/.gitignore | 2 +- .../{migrations => migrations_ts}/00_initial_migration.ts | 0 packages/protocol/{migrations => migrations_ts}/01_libraries.ts | 0 packages/protocol/{migrations => migrations_ts}/02_registry.ts | 0 packages/protocol/{migrations => migrations_ts}/03_freezer.ts | 0 .../{migrations => migrations_ts}/03_transferwhitelist.ts | 0 packages/protocol/{migrations => migrations_ts}/03_whitelist.ts | 0 packages/protocol/{migrations => migrations_ts}/04_goldtoken.ts | 0 .../protocol/{migrations => migrations_ts}/05_sortedoracles.ts | 0 .../{migrations => migrations_ts}/06_gaspriceminimum.ts | 0 .../07_reserve_spender_multisig.ts | 0 packages/protocol/{migrations => migrations_ts}/08_reserve.ts | 0 .../{migrations => migrations_ts}/09_01_stableToken_EUR.ts | 0 .../{migrations => migrations_ts}/09_02_stableToken_BRL.ts | 0 .../{migrations => migrations_ts}/09_0_stabletoken_USD.ts | 0 .../{migrations => migrations_ts}/10_01_exchange_EUR.ts | 0 .../{migrations => migrations_ts}/10_02_exchange_BRL.ts | 0 .../protocol/{migrations => migrations_ts}/10_0_exchange_USD.ts | 0 packages/protocol/{migrations => migrations_ts}/11_accounts.ts | 0 .../protocol/{migrations => migrations_ts}/12_lockedgold.ts | 0 .../protocol/{migrations => migrations_ts}/13_validators.ts | 0 packages/protocol/{migrations => migrations_ts}/14_election.ts | 0 .../protocol/{migrations => migrations_ts}/15_epoch_rewards.ts | 0 packages/protocol/{migrations => migrations_ts}/16_random.ts | 0 .../protocol/{migrations => migrations_ts}/17_attestations.ts | 0 packages/protocol/{migrations => migrations_ts}/18_escrow.ts | 0 .../{migrations => migrations_ts}/19_blockchainparams.ts | 0 .../{migrations => migrations_ts}/20_governance_slasher.ts | 0 .../{migrations => migrations_ts}/21_double_signing_slasher.ts | 0 .../{migrations => migrations_ts}/22_downtime_slasher.ts | 0 .../23_governance_approver_multisig.ts | 0 .../protocol/{migrations => migrations_ts}/24_grandamento.ts | 0 .../{migrations => migrations_ts}/25_stableToken_registry.ts | 0 .../{migrations => migrations_ts}/26_federated_attestations.ts | 0 .../protocol/{migrations => migrations_ts}/27_odispayments.ts | 0 .../protocol/{migrations => migrations_ts}/28_governance.ts | 0 .../{migrations => migrations_ts}/29_elect_validators.ts | 0 packages/protocol/package.json | 2 +- 38 files changed, 2 insertions(+), 2 deletions(-) rename packages/protocol/{migrations => migrations_ts}/00_initial_migration.ts (100%) rename packages/protocol/{migrations => migrations_ts}/01_libraries.ts (100%) rename packages/protocol/{migrations => migrations_ts}/02_registry.ts (100%) rename packages/protocol/{migrations => migrations_ts}/03_freezer.ts (100%) rename packages/protocol/{migrations => migrations_ts}/03_transferwhitelist.ts (100%) rename packages/protocol/{migrations => migrations_ts}/03_whitelist.ts (100%) rename packages/protocol/{migrations => migrations_ts}/04_goldtoken.ts (100%) rename packages/protocol/{migrations => migrations_ts}/05_sortedoracles.ts (100%) rename packages/protocol/{migrations => migrations_ts}/06_gaspriceminimum.ts (100%) rename packages/protocol/{migrations => migrations_ts}/07_reserve_spender_multisig.ts (100%) rename packages/protocol/{migrations => migrations_ts}/08_reserve.ts (100%) rename packages/protocol/{migrations => migrations_ts}/09_01_stableToken_EUR.ts (100%) rename packages/protocol/{migrations => migrations_ts}/09_02_stableToken_BRL.ts (100%) rename packages/protocol/{migrations => migrations_ts}/09_0_stabletoken_USD.ts (100%) rename packages/protocol/{migrations => migrations_ts}/10_01_exchange_EUR.ts (100%) rename packages/protocol/{migrations => migrations_ts}/10_02_exchange_BRL.ts (100%) rename packages/protocol/{migrations => migrations_ts}/10_0_exchange_USD.ts (100%) rename packages/protocol/{migrations => migrations_ts}/11_accounts.ts (100%) rename packages/protocol/{migrations => migrations_ts}/12_lockedgold.ts (100%) rename packages/protocol/{migrations => migrations_ts}/13_validators.ts (100%) rename packages/protocol/{migrations => migrations_ts}/14_election.ts (100%) rename packages/protocol/{migrations => migrations_ts}/15_epoch_rewards.ts (100%) rename packages/protocol/{migrations => migrations_ts}/16_random.ts (100%) rename packages/protocol/{migrations => migrations_ts}/17_attestations.ts (100%) rename packages/protocol/{migrations => migrations_ts}/18_escrow.ts (100%) rename packages/protocol/{migrations => migrations_ts}/19_blockchainparams.ts (100%) rename packages/protocol/{migrations => migrations_ts}/20_governance_slasher.ts (100%) rename packages/protocol/{migrations => migrations_ts}/21_double_signing_slasher.ts (100%) rename packages/protocol/{migrations => migrations_ts}/22_downtime_slasher.ts (100%) rename packages/protocol/{migrations => migrations_ts}/23_governance_approver_multisig.ts (100%) rename packages/protocol/{migrations => migrations_ts}/24_grandamento.ts (100%) rename packages/protocol/{migrations => migrations_ts}/25_stableToken_registry.ts (100%) rename packages/protocol/{migrations => migrations_ts}/26_federated_attestations.ts (100%) rename packages/protocol/{migrations => migrations_ts}/27_odispayments.ts (100%) rename packages/protocol/{migrations => migrations_ts}/28_governance.ts (100%) rename packages/protocol/{migrations => migrations_ts}/29_elect_validators.ts (100%) diff --git a/packages/protocol/.gitignore b/packages/protocol/.gitignore index 292a8fecc12..bdf87119859 100644 --- a/packages/protocol/.gitignore +++ b/packages/protocol/.gitignore @@ -5,7 +5,7 @@ lib/**/*.js lib/**/*.js.map migrations/**/*.js -migrations/**/*.js.map +migrations_ts/**/*.js.map scripts/**/*.js scripts/**/*.js.map diff --git a/packages/protocol/migrations/00_initial_migration.ts b/packages/protocol/migrations_ts/00_initial_migration.ts similarity index 100% rename from packages/protocol/migrations/00_initial_migration.ts rename to packages/protocol/migrations_ts/00_initial_migration.ts diff --git a/packages/protocol/migrations/01_libraries.ts b/packages/protocol/migrations_ts/01_libraries.ts similarity index 100% rename from packages/protocol/migrations/01_libraries.ts rename to packages/protocol/migrations_ts/01_libraries.ts diff --git a/packages/protocol/migrations/02_registry.ts b/packages/protocol/migrations_ts/02_registry.ts similarity index 100% rename from packages/protocol/migrations/02_registry.ts rename to packages/protocol/migrations_ts/02_registry.ts diff --git a/packages/protocol/migrations/03_freezer.ts b/packages/protocol/migrations_ts/03_freezer.ts similarity index 100% rename from packages/protocol/migrations/03_freezer.ts rename to packages/protocol/migrations_ts/03_freezer.ts diff --git a/packages/protocol/migrations/03_transferwhitelist.ts b/packages/protocol/migrations_ts/03_transferwhitelist.ts similarity index 100% rename from packages/protocol/migrations/03_transferwhitelist.ts rename to packages/protocol/migrations_ts/03_transferwhitelist.ts diff --git a/packages/protocol/migrations/03_whitelist.ts b/packages/protocol/migrations_ts/03_whitelist.ts similarity index 100% rename from packages/protocol/migrations/03_whitelist.ts rename to packages/protocol/migrations_ts/03_whitelist.ts diff --git a/packages/protocol/migrations/04_goldtoken.ts b/packages/protocol/migrations_ts/04_goldtoken.ts similarity index 100% rename from packages/protocol/migrations/04_goldtoken.ts rename to packages/protocol/migrations_ts/04_goldtoken.ts diff --git a/packages/protocol/migrations/05_sortedoracles.ts b/packages/protocol/migrations_ts/05_sortedoracles.ts similarity index 100% rename from packages/protocol/migrations/05_sortedoracles.ts rename to packages/protocol/migrations_ts/05_sortedoracles.ts diff --git a/packages/protocol/migrations/06_gaspriceminimum.ts b/packages/protocol/migrations_ts/06_gaspriceminimum.ts similarity index 100% rename from packages/protocol/migrations/06_gaspriceminimum.ts rename to packages/protocol/migrations_ts/06_gaspriceminimum.ts diff --git a/packages/protocol/migrations/07_reserve_spender_multisig.ts b/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts similarity index 100% rename from packages/protocol/migrations/07_reserve_spender_multisig.ts rename to packages/protocol/migrations_ts/07_reserve_spender_multisig.ts diff --git a/packages/protocol/migrations/08_reserve.ts b/packages/protocol/migrations_ts/08_reserve.ts similarity index 100% rename from packages/protocol/migrations/08_reserve.ts rename to packages/protocol/migrations_ts/08_reserve.ts diff --git a/packages/protocol/migrations/09_01_stableToken_EUR.ts b/packages/protocol/migrations_ts/09_01_stableToken_EUR.ts similarity index 100% rename from packages/protocol/migrations/09_01_stableToken_EUR.ts rename to packages/protocol/migrations_ts/09_01_stableToken_EUR.ts diff --git a/packages/protocol/migrations/09_02_stableToken_BRL.ts b/packages/protocol/migrations_ts/09_02_stableToken_BRL.ts similarity index 100% rename from packages/protocol/migrations/09_02_stableToken_BRL.ts rename to packages/protocol/migrations_ts/09_02_stableToken_BRL.ts diff --git a/packages/protocol/migrations/09_0_stabletoken_USD.ts b/packages/protocol/migrations_ts/09_0_stabletoken_USD.ts similarity index 100% rename from packages/protocol/migrations/09_0_stabletoken_USD.ts rename to packages/protocol/migrations_ts/09_0_stabletoken_USD.ts diff --git a/packages/protocol/migrations/10_01_exchange_EUR.ts b/packages/protocol/migrations_ts/10_01_exchange_EUR.ts similarity index 100% rename from packages/protocol/migrations/10_01_exchange_EUR.ts rename to packages/protocol/migrations_ts/10_01_exchange_EUR.ts diff --git a/packages/protocol/migrations/10_02_exchange_BRL.ts b/packages/protocol/migrations_ts/10_02_exchange_BRL.ts similarity index 100% rename from packages/protocol/migrations/10_02_exchange_BRL.ts rename to packages/protocol/migrations_ts/10_02_exchange_BRL.ts diff --git a/packages/protocol/migrations/10_0_exchange_USD.ts b/packages/protocol/migrations_ts/10_0_exchange_USD.ts similarity index 100% rename from packages/protocol/migrations/10_0_exchange_USD.ts rename to packages/protocol/migrations_ts/10_0_exchange_USD.ts diff --git a/packages/protocol/migrations/11_accounts.ts b/packages/protocol/migrations_ts/11_accounts.ts similarity index 100% rename from packages/protocol/migrations/11_accounts.ts rename to packages/protocol/migrations_ts/11_accounts.ts diff --git a/packages/protocol/migrations/12_lockedgold.ts b/packages/protocol/migrations_ts/12_lockedgold.ts similarity index 100% rename from packages/protocol/migrations/12_lockedgold.ts rename to packages/protocol/migrations_ts/12_lockedgold.ts diff --git a/packages/protocol/migrations/13_validators.ts b/packages/protocol/migrations_ts/13_validators.ts similarity index 100% rename from packages/protocol/migrations/13_validators.ts rename to packages/protocol/migrations_ts/13_validators.ts diff --git a/packages/protocol/migrations/14_election.ts b/packages/protocol/migrations_ts/14_election.ts similarity index 100% rename from packages/protocol/migrations/14_election.ts rename to packages/protocol/migrations_ts/14_election.ts diff --git a/packages/protocol/migrations/15_epoch_rewards.ts b/packages/protocol/migrations_ts/15_epoch_rewards.ts similarity index 100% rename from packages/protocol/migrations/15_epoch_rewards.ts rename to packages/protocol/migrations_ts/15_epoch_rewards.ts diff --git a/packages/protocol/migrations/16_random.ts b/packages/protocol/migrations_ts/16_random.ts similarity index 100% rename from packages/protocol/migrations/16_random.ts rename to packages/protocol/migrations_ts/16_random.ts diff --git a/packages/protocol/migrations/17_attestations.ts b/packages/protocol/migrations_ts/17_attestations.ts similarity index 100% rename from packages/protocol/migrations/17_attestations.ts rename to packages/protocol/migrations_ts/17_attestations.ts diff --git a/packages/protocol/migrations/18_escrow.ts b/packages/protocol/migrations_ts/18_escrow.ts similarity index 100% rename from packages/protocol/migrations/18_escrow.ts rename to packages/protocol/migrations_ts/18_escrow.ts diff --git a/packages/protocol/migrations/19_blockchainparams.ts b/packages/protocol/migrations_ts/19_blockchainparams.ts similarity index 100% rename from packages/protocol/migrations/19_blockchainparams.ts rename to packages/protocol/migrations_ts/19_blockchainparams.ts diff --git a/packages/protocol/migrations/20_governance_slasher.ts b/packages/protocol/migrations_ts/20_governance_slasher.ts similarity index 100% rename from packages/protocol/migrations/20_governance_slasher.ts rename to packages/protocol/migrations_ts/20_governance_slasher.ts diff --git a/packages/protocol/migrations/21_double_signing_slasher.ts b/packages/protocol/migrations_ts/21_double_signing_slasher.ts similarity index 100% rename from packages/protocol/migrations/21_double_signing_slasher.ts rename to packages/protocol/migrations_ts/21_double_signing_slasher.ts diff --git a/packages/protocol/migrations/22_downtime_slasher.ts b/packages/protocol/migrations_ts/22_downtime_slasher.ts similarity index 100% rename from packages/protocol/migrations/22_downtime_slasher.ts rename to packages/protocol/migrations_ts/22_downtime_slasher.ts diff --git a/packages/protocol/migrations/23_governance_approver_multisig.ts b/packages/protocol/migrations_ts/23_governance_approver_multisig.ts similarity index 100% rename from packages/protocol/migrations/23_governance_approver_multisig.ts rename to packages/protocol/migrations_ts/23_governance_approver_multisig.ts diff --git a/packages/protocol/migrations/24_grandamento.ts b/packages/protocol/migrations_ts/24_grandamento.ts similarity index 100% rename from packages/protocol/migrations/24_grandamento.ts rename to packages/protocol/migrations_ts/24_grandamento.ts diff --git a/packages/protocol/migrations/25_stableToken_registry.ts b/packages/protocol/migrations_ts/25_stableToken_registry.ts similarity index 100% rename from packages/protocol/migrations/25_stableToken_registry.ts rename to packages/protocol/migrations_ts/25_stableToken_registry.ts diff --git a/packages/protocol/migrations/26_federated_attestations.ts b/packages/protocol/migrations_ts/26_federated_attestations.ts similarity index 100% rename from packages/protocol/migrations/26_federated_attestations.ts rename to packages/protocol/migrations_ts/26_federated_attestations.ts diff --git a/packages/protocol/migrations/27_odispayments.ts b/packages/protocol/migrations_ts/27_odispayments.ts similarity index 100% rename from packages/protocol/migrations/27_odispayments.ts rename to packages/protocol/migrations_ts/27_odispayments.ts diff --git a/packages/protocol/migrations/28_governance.ts b/packages/protocol/migrations_ts/28_governance.ts similarity index 100% rename from packages/protocol/migrations/28_governance.ts rename to packages/protocol/migrations_ts/28_governance.ts diff --git a/packages/protocol/migrations/29_elect_validators.ts b/packages/protocol/migrations_ts/29_elect_validators.ts similarity index 100% rename from packages/protocol/migrations/29_elect_validators.ts rename to packages/protocol/migrations_ts/29_elect_validators.ts diff --git a/packages/protocol/package.json b/packages/protocol/package.json index dbb46b86cae..b7898fde216 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -16,7 +16,7 @@ "test:devchain-release": "./scripts/bash/release-on-devchain.sh", "test:release-snapshots": "./scripts/bash/release-snapshots.sh", "test:generate-old-devchain-and-build": "./scripts/bash/generate-old-devchain-and-build.sh", - "build:ts": "rm -f migrations/*.js* && ts-node ./scripts/build.ts --truffleTypes ./types/typechain && tsc -b", + "build:ts": "rm -f migrations/*.js* && ts-node ./scripts/build.ts --truffleTypes ./types/typechain && tsc -b && mv migrations_ts/*js migrations", "gas": "yarn run test --gas", "build:sol": "ts-node ./scripts/build.ts --solidity ${BUILD_DIR:-./build}", "build": "yarn build:sol && yarn build:ts", From 855a0f21c489f0eba8b641bc6d9e2548493f6316 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 1 Mar 2023 11:44:34 -0500 Subject: [PATCH 005/184] build with latest node 18.14 --- .../wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts | 20 +++++++++ .../wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts | 29 +++++++++++++ .../lib/gcp-hsm-wallet.test.d.ts | 41 +++++++++++++++++++ .../sdk/wallets/wallet-hsm-gcp/lib/index.d.ts | 2 + 4 files changed, 92 insertions(+) create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts new file mode 100644 index 00000000000..d983dc23d1b --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts @@ -0,0 +1,20 @@ +/// +import { RLPEncodedTx, Signer } from '@celo/connect'; +import { EIP712TypedData } from '@celo/utils/lib/sign-typed-data-utils'; +import { Signature } from '@celo/wallet-hsm'; +import { KeyManagementServiceClient } from '@google-cloud/kms'; +import { BigNumber } from 'bignumber.js'; +export declare class GcpHsmSigner implements Signer { + private client; + private versionName; + private publicKey; + constructor(client: KeyManagementServiceClient, versionName: string, publicKey: BigNumber); + private findCanonicalSignature; + private sign; + signTransaction(addToV: number, encodedTx: RLPEncodedTx): Promise; + signPersonalMessage(data: string): Promise; + signTypedData(typedData: EIP712TypedData): Promise; + getNativeKey(): string; + decrypt(_ciphertext: Buffer): Promise; + computeSharedSecret(_publicKey: string): Promise; +} diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts new file mode 100644 index 00000000000..89aed1e1d41 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts @@ -0,0 +1,29 @@ +import { Address, ReadOnlyWallet } from '@celo/connect'; +import { RemoteWallet } from '@celo/wallet-remote'; +import { GcpHsmSigner } from './gcp-hsm-signer'; +/** + * A Cloud HSM wallet built on GCP. + */ +export declare class GcpHsmWallet extends RemoteWallet implements ReadOnlyWallet { + private readonly versionName; + private client; + constructor(versionName: string); + private generateKmsClient; + protected loadAccountSigners(): Promise>; + private getPublicKeyFromVersionName; + /** + * Converts key from PEM to DER encoding. + * + * DER (Distinguished Encoding Rules) is a binary encoding for X.509 certificates and private keys. + * Unlike PEM, DER-encoded files do not contain plain text statements such as -----BEGIN CERTIFICATE----- + * + * https://www.ssl.com/guide/pem-der-crt-and-cer-x-509-encodings-and-conversions/#:~:text=DER%20(Distinguished%20Encoding%20Rules)%20is,commonly%20seen%20in%20Java%20contexts. + */ + private pemToDerEncode; + /** + * Returns the EVM address for the given key + * Useful for initially getting the 'from' field given a keyName + * @param versionName GCP version name for the HSM + */ + getAddressFromVersionName(versionName: string): Promise
; +} diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts new file mode 100644 index 00000000000..89a78e233f2 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts @@ -0,0 +1,41 @@ +export declare const PRIVATE_KEY1 = "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"; +export declare const ACCOUNT_ADDRESS1: string; +export declare const PRIVATE_KEY2 = "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890fdeccc"; +export declare const ACCOUNT_ADDRESS2: string; +export declare const PRIVATE_KEY_NEVER = "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890ffffff"; +export declare const ACCOUNT_ADDRESS_NEVER: string; +export declare const CHAIN_ID = 44378; +export declare const TYPED_DATA: { + types: { + EIP712Domain: { + name: string; + type: string; + }[]; + Person: { + name: string; + type: string; + }[]; + Mail: { + name: string; + type: string; + }[]; + }; + primaryType: string; + domain: { + name: string; + version: string; + chainId: number; + verifyingContract: string; + }; + message: { + from: { + name: string; + wallet: string; + }; + to: { + name: string; + wallet: string; + }; + contents: string; + }; +}; diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts new file mode 100644 index 00000000000..a618782df6d --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts @@ -0,0 +1,2 @@ +export * from './gcp-hsm-signer'; +export * from './gcp-hsm-wallet'; From bea2954c5808e3abcdd66442a2c03c9f6c75e3f9 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 1 Mar 2023 12:30:39 -0500 Subject: [PATCH 006/184] =?UTF-8?q?--=20ganache.server=20promise=20wrapper?= =?UTF-8?q?=20=E2=88=86=20ganache.server=20option=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/dev-utils/src/ganache-setup.ts | 42 ++++++++-------------- packages/protocol/runTests.js | 32 +++++------------ packages/protocol/scripts/devchain.ts | 48 ++++++++++--------------- 3 files changed, 42 insertions(+), 80 deletions(-) diff --git a/packages/dev-utils/src/ganache-setup.ts b/packages/dev-utils/src/ganache-setup.ts index 61ada9b995e..8e5a6900857 100644 --- a/packages/dev-utils/src/ganache-setup.ts +++ b/packages/dev-utils/src/ganache-setup.ts @@ -1,6 +1,6 @@ // @ts-ignore -import * as ganache from 'ganache' import * as fs from 'fs-extra' +import * as ganache from 'ganache' import * as path from 'path' import * as targz from 'targz' @@ -67,36 +67,24 @@ async function launchServer(opts: { verbose?: boolean; from_targz?: boolean }, c } const server = ganache.server({ - default_balance_ether: 1000000, - logger: { - log: logFn, - }, - network_id: 1101, - db_path: chain, - mnemonic: MNEMONIC, - gasLimit: 20000000, - allowUnlimitedContractSize: true, + wallet: { mnemonic: MNEMONIC, defaultBalance: 1000000 }, + logging: { logger: { log: logFn } }, + database: { dbPath: chain }, + miner: { blockGasLimit: 20000000 }, + chain: { networkId: 1101, allowUnlimitedContractSize: true }, }) - await new Promise((resolve, reject) => { - server.listen(8545, async (err: any) => { - if (err) { - reject(err) - } else { - resolve() - } - }) + server.listen(8545, async (err: any) => { + if (err) throw err }) - return () => - new Promise(async (resolve, reject) => { - try { - await server.close() - resolve() - } catch (e) { - reject(e) - } - }) + return async () => { + try { + await server.close() + } catch (e) { + throw e + } + } } function decompressChain(tarPath: string, copyChainPath: string): Promise { diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index 64cc9149f4b..e7d17518b7e 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -14,33 +14,19 @@ const isCI = process.env.CI === 'true' async function startGanache() { const server = ganache.server({ - default_balance_ether: network.defaultBalance, - network_id: network.network_id, - mnemonic: network.mnemonic, - gasPrice: network.gasPrice, - gasLimit: 20000000, - allowUnlimitedContractSize: true, + wallet: { mnemonic: network.mnemonic, defaultBalance: network.defaultBalance }, + miner: { blockGasLimit: 20000000, gasPrice: network.gasPrice }, + chain: { networkId: network.network_id, allowUnlimitedContractSize: true }, }) - await new Promise((resolve, reject) => { - server.listen(8545, (err, blockchain) => { - if (err) { - reject(err) - } else { - resolve(blockchain) - } - }) + server.listen(8545, (err, blockchain) => { + if (err) throw err + blockchain }) - return () => - new Promise((resolve, reject) => { - server.close((err) => { - if (err) { - reject(err) - } else { - resolve() - } - }) + return async () => + await server.close((err) => { + if (err) throw err }) } diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 848cb0b3029..8eb6090f688 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -1,7 +1,7 @@ -import ganache from 'ganache' import chalk from 'chalk' import { spawn, SpawnOptions } from 'child_process' import fs from 'fs-extra' +import ganache from 'ganache' import path from 'path' import targz from 'targz' import tmp from 'tmp' @@ -119,39 +119,27 @@ async function startGanache(datadir: string, opts: { verbose?: boolean }) { } const server = ganache.server({ - default_balance_ether: 200000000, - logger: { - log: logFn, - }, - network_id: 1101, - db_path: datadir, - mnemonic: MNEMONIC, - gasLimit, - allowUnlimitedContractSize: true, + logging: { logger: { log: logFn } }, + database: { dbPath: datadir }, + wallet: { mnemonic: MNEMONIC, defaultBalance: 200000000 }, + miner: { blockGasLimit: gasLimit }, + chain: { networkId: 1101, allowUnlimitedContractSize: true }, }) - await new Promise((resolve, reject) => { - server.listen(8545, async (err) => { - if (err) { - reject(err) - } else { - // tslint:disable-next-line: no-console - console.log(chalk.red('Ganache STARTED')) - // console.log(blockchain) - resolve() - } - }) + server.listen(8545, async (err) => { + if (err) throw err + + console.log(chalk.red('Ganache STARTED')) }) - return () => - new Promise(async (resolve, reject) => { - try { - await server.close() - resolve() - } catch (e) { - reject(e) - } - }) + return async () => { + try { + await server.close() + console.log(chalk.red('GANACHE server closed')) + } catch (e) { + throw e + } + } } export function execCmd( From 6964637fc330973cd12cb70b1b78dc8cf2f7e3b1 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 1 Mar 2023 15:23:01 -0500 Subject: [PATCH 007/184] ignore migrations_ts js files --- packages/protocol/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/.gitignore b/packages/protocol/.gitignore index bdf87119859..984f57180c1 100644 --- a/packages/protocol/.gitignore +++ b/packages/protocol/.gitignore @@ -5,6 +5,7 @@ lib/**/*.js lib/**/*.js.map migrations/**/*.js +migrations_ts/**/*.js migrations_ts/**/*.js.map scripts/**/*.js From 98408bd4bc60d4254b9b29a21428b2fdcdb46ac8 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 2 Mar 2023 13:34:05 -0500 Subject: [PATCH 008/184] sync with master --- .circleci/config.yml | 22 +- .env | 26 +- .env.alfajores | 42 +- .env.baklava | 39 +- .env.mnemonic.alfajores.enc | Bin 1840 -> 1542 bytes .env.mnemonic.baklava.enc | Bin 1551 -> 1258 bytes .env.mnemonic.enc | Bin 1190 -> 978 bytes .env.mnemonic.rc1.enc | Bin 2033 -> 1821 bytes .env.rc1 | 42 +- .github/CODEOWNERS | 16 +- .vscode/extensions.json | 3 +- SECURITY.md | 53 +- cloudbuild.yaml | 10 - dependency-graph.json | 33 +- dockerfiles/attestation-service/Dockerfile | 55 - dockerfiles/phone-number-privacy/Dockerfile | 14 +- package.json | 3 - packages/attestation-proxy/.firebaserc | 5 - packages/attestation-proxy/.gitignore | 6 - packages/attestation-proxy/README.md | 4 - packages/attestation-proxy/firebase.json | 6 - packages/attestation-proxy/package.json | 26 - packages/attestation-proxy/src/index.ts | 69 - packages/attestation-proxy/tsconfig.json | 27 - packages/attestation-service/.gitignore | 4 - packages/attestation-service/README.md | 34 - .../config/.env.development | 98 - .../attestation-service/config/config.json | 21 - .../attestation-service/config/database.json | 11 - packages/attestation-service/index.d.ts | 3 - packages/attestation-service/jest.config.js | 5 - .../20191015211858-create-attestation.js | 60 - .../20200506234935-attestation-v2.js | 74 - .../20200903211921-attestation-v3.js | 90 - .../20200924232226-attestation-v4.js | 27 - .../20201005185559-attestation-v5.js | 32 - .../20201006231054-attestation-v6.js | 27 - .../20210625231054-attestation-v7.js | 32 - .../20211109200901-attestation-v8.js | 68 - packages/attestation-service/nodemon.json | 6 - .../attestation-service/package-lock.json | 461 --- packages/attestation-service/package.json | 83 - .../scripts/generate-signed-code.ts | 25 - .../scripts/test-send-sms-twilio.ts | 104 - packages/attestation-service/src/db.ts | 432 --- packages/attestation-service/src/env.ts | 75 - packages/attestation-service/src/index.ts | 106 - packages/attestation-service/src/logger.ts | 26 - packages/attestation-service/src/metrics.ts | 88 - .../src/models/attestation.ts | 117 - packages/attestation-service/src/request.ts | 135 - .../src/requestHandlers/attestation.ts | 285 -- .../src/requestHandlers/delivery.ts | 17 - .../src/requestHandlers/get_attestation.ts | 148 - .../src/requestHandlers/liveness.ts | 16 - .../src/requestHandlers/status.ts | 64 - .../src/requestHandlers/test_attestation.ts | 71 - packages/attestation-service/src/sms/base.ts | 53 - packages/attestation-service/src/sms/index.ts | 587 ---- .../src/sms/messagebird.ts | 115 - packages/attestation-service/src/sms/nexmo.ts | 174 - .../attestation-service/src/sms/telekom.ts | 105 - .../attestation-service/src/sms/twilio.ts | 64 - .../src/sms/twilioMessaging.ts | 49 - .../src/sms/twilioVerify.ts | 137 - .../test/__mocks__/twilio.ts | 59 - .../test/requestHandlers/attestation.test.ts | 219 -- .../test/sms/twilio.test.ts | 54 - .../attestation-service/test/testSetup.ts | 7 - packages/attestation-service/tsconfig.json | 10 - packages/attestation-service/tslint.json | 7 - packages/azure/.gitignore | 2 - packages/azure/README.md | 113 - packages/azure/README.mustache | 89 - packages/azure/attester/celo-attestations-run | 41 - .../azure/attester/celo-attestations.service | 13 - packages/azure/attester/celo-node-run | 46 - packages/azure/attester/celo-node.service | 12 - packages/azure/attester/libcelo.sh | 1 - packages/azure/attester/provider-init.sh | 1 - packages/azure/attester/startup.sh | 37 - packages/azure/build-docs.js | 27 - packages/azure/build-json.js | 70 - packages/azure/build-sh | 8 - packages/azure/components/compute.json | 328 -- packages/azure/components/identity.json | 30 - packages/azure/components/keyvault.json | 171 - packages/azure/components/main.json | 371 --- packages/azure/components/network.json | 291 -- packages/azure/components/other.json | 4 - packages/azure/components/postgres.json | 33 - packages/azure/createUiDefinition.json | 181 -- packages/azure/mainTemplate.json | 1289 -------- packages/azure/package-lock.json | 18 - packages/azure/package.json | 20 - packages/azure/proxy/celo-proxy-run | 48 - packages/azure/proxy/celo-proxy.service | 12 - packages/azure/proxy/exporter-run | 1 - packages/azure/proxy/geth-exporter.service | 1 - packages/azure/proxy/libcelo.sh | 1 - packages/azure/proxy/provider-init.sh | 1 - packages/azure/proxy/startup.sh | 37 - packages/azure/scripts/exporter-run | 17 - packages/azure/scripts/geth-exporter.service | 11 - packages/azure/scripts/libcelo.sh | 14 - packages/azure/scripts/provider-init.sh | 87 - packages/azure/scripts/startup-prefix.sh | 5 - packages/azure/validator/celo-validator-run | 65 - .../azure/validator/celo-validator.service | 12 - packages/azure/validator/exporter-run | 1 - .../azure/validator/geth-exporter.service | 1 - packages/azure/validator/libcelo.sh | 1 - packages/azure/validator/provider-init.sh | 1 - packages/azure/validator/startup.sh | 40 - packages/celotool/README.md | 7 +- packages/celotool/ci_test_attestations.sh | 21 - packages/celotool/package.json | 19 +- packages/celotool/src/cmds/account/invite.ts | 117 - packages/celotool/src/cmds/account/verify.ts | 207 -- .../src/cmds/account/weekly_faucet.ts | 48 - .../celotool/src/cmds/bots/auto-verify.ts | 225 -- .../cmds/deploy/destroy/attestation-bot.ts | 16 - .../deploy/destroy/attestation-service.ts | 16 - .../cmds/deploy/initial/attestation-bot.ts | 17 - .../deploy/initial/attestation-service.ts | 17 - .../src/cmds/deploy/initial/contracts.ts | 13 - .../celotool/src/cmds/deploy/upgrade/all.ts | 4 - .../cmds/deploy/upgrade/attestation-bot.ts | 17 - .../deploy/upgrade/attestation-service.ts | 17 - .../src/e2e-tests/attestations_tests.ts | 113 - packages/celotool/src/lib/attestation-bot.ts | 55 - .../celotool/src/lib/attestation-service.ts | 83 - packages/celotool/src/lib/attestation.ts | 145 - packages/celotool/src/lib/env-utils.ts | 30 +- packages/celotool/src/lib/k8s-oracle/rbac.ts | 9 +- packages/celotool/src/lib/odis.ts | 18 +- packages/celotool/src/lib/oracle.ts | 2 +- packages/celotool/twilio-config.enc | Bin 229 -> 0 bytes packages/cli/.npmignore | 28 +- packages/cli/npm-shrinkwrap.json | 1028 +----- packages/cli/package.json | 31 +- packages/cli/releasing.md | 20 +- .../account/claim-attestation-service-url.ts | 34 - .../cli/src/commands/account/deauthorize.ts | 3 +- .../account/set-payment-delegation.ts | 2 - .../cli/src/commands/governance/vote.test.ts | 1 - .../commands/governance/votePartially.test.ts | 63 + .../src/commands/governance/votePartially.ts | 57 + .../identity/current-attestation-services.ts | 74 - .../src/commands/identity/get-attestations.ts | 4 +- .../cli/src/commands/identity/identifier.ts | 4 +- .../identity/test-attestation-service.ts | 147 - packages/cli/src/utils/identity.ts | 27 +- .../dev-utils/src/migration-override.json | 4 +- .../docs/command-line-interface/account.md | 37 +- .../docs/command-line-interface/governance.md | 28 + .../docs/command-line-interface/identity.md | 54 - packages/env-tests/README.md | 9 +- packages/env-tests/package.json | 15 +- packages/env-tests/src/env.ts | 6 - packages/env-tests/src/monorepoRun.ts | 2 - packages/env-tests/src/shared/attestation.ts | 317 -- packages/env-tests/src/tests/attestation.ts | 213 -- packages/flake-tracker/src/jest/tracker.js | 9 +- .../helm-charts/attestation-bot/Chart.yaml | 8 - .../attestation-bot/templates/configmap.yaml | 12 - .../attestation-bot/templates/secret.yaml | 15 - .../templates/statefulset.yaml | 66 - .../helm-charts/attestation-bot/values.yaml | 1 - .../attestation-service/Chart.yaml | 12 - .../helm-charts/attestation-service/README.md | 5 - .../charts/postgresql-6.3.10.tgz | Bin 22539 -> 0 bytes .../templates/attestation.ingress.yaml | 32 - .../templates/attestation.secret.yaml | 19 - .../templates/attestation.service.yaml | 23 - .../templates/attestation.statefulset.yaml | 191 -- .../attestation-service/values.yaml | 7 - .../blockscout/templates/_helpers.tpl | 12 +- .../templates/blockscout-api.deployment.yaml | 16 +- .../blockscout-data-migration.job.yaml | 4 +- .../blockscout-event-stream.deployment.yaml | 108 + .../blockscout-indexer.deployment.yaml | 14 +- .../blockscout-metadata-crawler.cronjob.yaml | 4 +- .../templates/blockscout-migration.hook.yaml | 4 +- .../templates/blockscout-web.deployment.yaml | 28 +- .../templates/blockscout-web.ingress.yaml | 5 + .../values-alfajores-blockscout2.yaml | 54 +- .../values-alfajores-blockscout3.yaml | 54 +- .../values-baklava-blockscout2.yaml | 49 +- .../values-baklava-blockscout3.yaml | 46 +- ...lues-blockscoutstagingrc1-blockscout1.yaml | 1 + .../blockscout/values-rc1-blockscout1.yaml | 7 +- .../blockscout/values-rc1-blockscout3.yaml | 7 +- .../values-rc1staging-blockscout.yaml | 14 +- packages/helm-charts/blockscout/values.yaml | 64 +- .../odis/templates/signer-deployment.yaml | 8 +- packages/helm-charts/oracle/CELOBRL.yaml | 48 +- packages/helm-charts/oracle/CELOBTC.yaml | 19 - packages/helm-charts/oracle/CELOEUR.yaml | 48 +- packages/helm-charts/oracle/CELOUSD.yaml | 49 +- packages/helm-charts/oracle/USDCEUR.yaml | 39 + packages/helm-charts/oracle/USDCUSD.yaml | 34 + packages/helm-charts/testnet/Chart.yaml | 17 +- .../testnet/templates/_helpers.tpl | 88 +- .../templates/bootnode.deployment.yaml | 8 +- .../testnet/templates/bootnode.service.yaml | 6 +- .../testnet/templates/forno.ingress.yaml | 2 +- .../templates/geth-account.secret.yaml | 6 +- .../testnet/templates/geth.configmap.yaml | 2 +- .../testnet/templates/proxy.service.yaml | 26 +- .../testnet/templates/proxy.statefulset.yaml | 4 +- .../templates/secondaries.service.yaml | 22 +- .../templates/secondaries.statefulset.yaml | 49 +- .../templates/txnode-private.service.yaml | 16 +- .../templates/txnode-private.statefulset.yaml | 2 +- .../testnet/templates/txnode.service.yaml | 8 +- .../testnet/templates/txnode.statefulset.yaml | 2 +- .../testnet/templates/validators.service.yaml | 22 +- .../templates/validators.statefulset.yaml | 56 +- .../helm-charts/testnet/values-alfajores.yaml | 19 + packages/helm-charts/testnet/values.yaml | 13 + packages/metadata-crawler/package.json | 6 +- packages/metadata-crawler/src/crawler.ts | 119 - packages/phone-number-privacy/combiner/.env | 5 +- .../phone-number-privacy/combiner/README.md | 2 - .../combiner/jest.config.js | 7 + .../20200330212224_create-accounts-table.ts | 14 - ...0200330212301_create-number-pairs-table.ts | 14 - .../20210421212301_create-indices.ts | 27 - ...erPhoneNumber_columns_to_accounts_table.ts | 19 - .../combiner/package.json | 43 +- .../combiner/scripts/run-migrations.ts | 25 - .../combiner/src/common/action.ts | 8 + .../combiner/src/common/combine.ts | 175 + .../combiner/src/common/controller.ts | 25 + .../crypto-clients/bls-crypto-client.ts} | 58 +- .../common/crypto-clients/crypto-client.ts | 54 + .../crypto-clients/domain-crypto-client.ts | 40 + .../combiner/src/common/crypto-session.ts | 16 + .../combiner/src/common/error-utils.ts | 20 - .../combiner/src/common/io.ts | 167 + .../combiner/src/common/session.ts | 54 + .../combiner/src/common/sign.ts | 95 + .../combiner/src/config.ts | 193 +- .../combiner/src/database/database.ts | 16 - .../combiner/src/database/models/account.ts | 26 - .../src/database/models/numberPair.ts | 21 - .../combiner/src/database/wrappers/account.ts | 110 - .../src/database/wrappers/number-pairs.ts | 56 - .../src/domain/endpoints/disable/action.ts | 39 + .../src/domain/endpoints/disable/io.ts | 80 + .../src/domain/endpoints/quota/action.ts | 39 + .../combiner/src/domain/endpoints/quota/io.ts | 86 + .../src/domain/endpoints/sign/action.ts | 56 + .../combiner/src/domain/endpoints/sign/io.ts | 105 + .../src/domain/services/log-responses.ts | 59 + .../src/domain/services/threshold-state.ts | 78 + .../combiner/src/index.ts | 90 +- .../src/match-making/get-contact-matches.ts | 278 -- .../src/pnp/endpoints/quota/action.ts | 42 + .../combiner/src/pnp/endpoints/quota/io.ts | 100 + .../combiner/src/pnp/endpoints/sign/action.ts | 56 + .../src/pnp/endpoints/sign/io.legacy.ts | 118 + .../combiner/src/pnp/endpoints/sign/io.ts | 117 + .../src/pnp/services/log-responses.ts | 133 + .../src/pnp/services/threshold-state.ts | 49 + .../combiner/src/server.ts | 210 ++ .../src/signing/get-threshold-signature.ts | 390 --- .../combiner/src/web3/contracts.ts | 10 - .../combiner/test/end-to-end/domain.test.ts | 338 ++ .../end-to-end/get-contact-matches.test.ts | 145 - .../test/end-to-end/legacypnp.test.ts | 376 +++ .../combiner/test/end-to-end/pnp.test.ts | 454 +++ .../combiner/test/end-to-end/resources.ts | 34 +- ...t.ts => tmpBackwardsCompatibility.test.ts} | 79 +- .../combiner/test/index.test.ts | 567 ---- .../combiner/test/integration/domain.test.ts | 1283 ++++++++ .../test/integration/legacypnp.test.ts | 791 +++++ .../combiner/test/integration/pnp.test.ts | 1374 ++++++++ .../{signing => unit}/bls-signature.test.ts | 51 +- .../test/unit/domain-response-logger.test.ts | 350 ++ .../test/unit/domain-threshold-state.test.ts | 175 + .../test/unit/pnp-response-logger.test.ts | 713 ++++ .../test/unit/pnp-threshold-state.test.ts | 225 ++ .../combiner/test/utils.ts | 6 + .../combiner/tsconfig.json | 2 +- .../phone-number-privacy/common/README.md | 49 + .../common/jest.config.js | 7 + .../phone-number-privacy/common/package.json | 18 +- .../common/src/domains/sequential-delay.ts | 90 +- .../phone-number-privacy/common/src/index.ts | 12 +- .../common/src/interfaces/endpoints.ts | 79 + .../common/src/interfaces/error-utils.ts | 34 - .../common/src/interfaces/errors.ts | 60 + .../common/src/interfaces/index.ts | 3 +- .../common/src/interfaces/requests.ts | 202 +- .../common/src/interfaces/responses.ts | 215 +- .../phone-number-privacy/common/src/poprf.ts | 9 +- .../common/src/test/utils.ts | 128 +- .../common/src/test/values.ts | 132 +- .../common/src/utils/authentication.ts | 89 +- .../{config-utils.ts => config.utils.ts} | 0 .../common/src/utils/constants.ts | 4 +- .../common/src/utils/contracts.ts | 10 + .../common/src/utils/input-validation.ts | 34 +- .../common/src/utils/key-version.ts | 105 + .../common/src/utils/logger.ts | 41 +- .../common/src/utils/responses.utils.ts | 20 + .../{src/domains => test}/domains.test.ts | 6 +- .../common/test/interfaces/requests.test.ts | 45 +- .../common/test/poprf.test.ts | 14 +- .../common/test/utils/authentication.test.ts | 164 +- .../test/utils/input-validation.test.ts | 154 +- .../common/test/utils/key-version.test.ts | 228 ++ .../test/utils/sequential-delay.test.ts | 58 +- .../phone-number-privacy/monitor/package.json | 24 +- .../phone-number-privacy/monitor/src/index.ts | 30 +- .../phone-number-privacy/monitor/src/query.ts | 121 +- .../monitor/src/scripts/run-load-test.ts | 31 + .../monitor/src/scripts/runLoadTest.ts | 29 - .../phone-number-privacy/monitor/src/test.ts | 115 +- packages/phone-number-privacy/signer/.env | 32 +- .../phone-number-privacy/signer/README.md | 60 +- .../signer/azure-templates/README.md | 129 - .../azure-templates/container-parameters.json | 106 - .../azure-templates/container-template.json | 115 - .../signer/azure-templates/db-parameters.json | 51 - .../signer/azure-templates/db-template.json | 89 - .../azure-templates/frontdoor-template.json | 122 - .../azure-templates/prometheus-alfajores.yaml | 14 - .../azure-templates/prometheus-mainnet.yaml | 14 - .../prometheus-parameters.json | 130 - .../prometheus-service-account-key.json | 12 - .../azure-templates/prometheus-staging.yaml | 14 - .../azure-templates/prometheus-template.json | 132 - .../signer/jest.config.js | 7 + .../phone-number-privacy/signer/package.json | 59 +- .../signer/scripts/poprf-keygen.ts | 21 + .../signer/scripts/run-migrations.ts | 6 +- ...te-bls-keys.ts => threshold-bls-keygen.ts} | 10 +- .../signer/src/common/action.ts | 21 + .../bls/bls-cryptography-client.ts | 6 +- .../signer/src/common/controller.ts | 52 + .../src/{ => common}/database/database.ts | 64 +- .../20200330212224_create-accounts-table.ts | 11 +- .../20200811163913_create_requests_table.ts | 10 +- .../20210421212301_create-indices.ts | 17 + .../20210921173354_create-domain-state.ts | 22 + .../20220119165335_domain-requests.ts | 26 + .../20220923161710_pnp-requests-onchain.ts | 22 + .../20220923165433_pnp-accounts-onchain.ts | 18 + ...20221102141044_change-name-domain-state.ts | 11 + ...13125526_add-constraint-domain-requests.ts | 20 + .../src/common/database/models/account.ts | 24 + .../common/database/models/domain-request.ts | 25 + .../common/database/models/domain-state.ts | 46 + .../src/common/database/models/request.ts | 27 + .../signer/src/common/database/utils.ts | 42 + .../src/common/database/wrappers/account.ts | 105 + .../database/wrappers/domain-request.ts | 68 + .../common/database/wrappers/domain-state.ts | 141 + .../src/common/database/wrappers/request.ts | 67 + .../src/common/domain/domainState.mapper.ts | 12 - .../signer/src/common/error-utils.ts | 43 - .../signer/src/common/io.ts | 59 + .../common/key-management/aws-key-provider.ts | 71 + .../key-management/azure-key-provider.ts | 38 + .../key-management/google-key-provider.ts | 47 + .../key-management/key-provider-base.ts | 70 + .../src/common/key-management/key-provider.ts | 52 + .../key-management/mock-key-provider.ts | 51 + .../signer/src/common/metrics.ts | 42 +- .../signer/src/common/quota.ts | 34 + .../signer/src/common/web3/contracts.ts | 203 ++ .../phone-number-privacy/signer/src/config.ts | 117 +- .../signer/src/database/models/account.ts | 17 - .../signer/src/database/models/domainState.ts | 45 - .../signer/src/database/models/request.ts | 19 - .../signer/src/database/wrappers/account.ts | 83 - .../src/database/wrappers/domainState.ts | 166 - .../signer/src/database/wrappers/request.ts | 53 - .../src/domain/auth/domainAuth.interface.ts | 3 - .../src/domain/auth/domainAuth.service.ts | 8 - .../signer/src/domain/domain.interface.ts | 21 - .../signer/src/domain/domain.service.ts | 270 -- .../src/domain/endpoints/disable/action.ts | 63 + .../signer/src/domain/endpoints/disable/io.ts | 78 + .../src/domain/endpoints/quota/action.ts | 35 + .../signer/src/domain/endpoints/quota/io.ts | 83 + .../src/domain/endpoints/sign/action.ts | 175 + .../signer/src/domain/endpoints/sign/io.ts | 96 + .../src/domain/quota/domainQuota.interface.ts | 13 - .../src/domain/quota/domainQuota.service.ts | 61 - .../signer/src/domain/services/quota.ts | 63 + .../signer/src/domain/session.ts | 14 + .../phone-number-privacy/signer/src/index.ts | 46 +- .../src/key-management/aws-key-provider.ts | 62 - .../src/key-management/azure-key-provider.ts | 20 - .../src/key-management/google-key-provider.ts | 30 - .../src/key-management/key-provider-base.ts | 28 - .../signer/src/key-management/key-provider.ts | 42 - .../src/key-management/mock-key-provider.ts | 8 - .../20210421212301_create-indices.ts | 17 - .../20210921173354_create-domain-state.ts | 20 - .../signer/src/pnp/endpoints/quota/action.ts | 43 + .../src/pnp/endpoints/quota/io.legacy.ts | 103 + .../signer/src/pnp/endpoints/quota/io.ts | 101 + .../src/pnp/endpoints/sign/action.legacy.ts | 21 + .../src/pnp/endpoints/sign/action.onchain.ts | 21 + .../signer/src/pnp/endpoints/sign/action.ts | 160 + .../src/pnp/endpoints/sign/io.legacy.ts | 125 + .../signer/src/pnp/endpoints/sign/io.ts | 121 + .../signer/src/pnp/services/quota.legacy.ts | 280 ++ .../signer/src/pnp/services/quota.onchain.ts | 39 + .../signer/src/pnp/services/quota.ts | 157 + .../signer/src/pnp/session.ts | 19 + .../phone-number-privacy/signer/src/server.ts | 197 +- .../src/signing/get-partial-signature.ts | 209 -- .../signer/src/signing/query-quota.ts | 335 -- .../signer/src/web3/contracts.ts | 38 - .../signer/test/domain/domain.test.ts | 174 - .../test/end-to-end/disabled-apis.test.ts | 261 ++ .../signer/test/end-to-end/domain.test.ts | 620 ++++ .../test/end-to-end/get-blinded-sig.test.ts | 77 +- .../signer/test/end-to-end/pnp.test.ts | 502 +++ .../signer/test/end-to-end/utils.ts | 53 + .../signer/test/index.test.ts | 245 -- .../signer/test/integration/domain.test.ts | 1044 ++++++ .../signer/test/integration/legacypnp.test.ts | 1795 ++++++++++ .../signer/test/integration/pnp.test.ts | 1368 ++++++++ .../key-management/aws-key-provider.test.ts | 44 +- .../key-management/azure-key-provider.test.ts | 40 +- .../google-key-provider.test.ts | 40 +- .../signer/test/signing/bls-signature.test.ts | 24 +- .../signer/test/signing/query-quota.test.ts | 208 -- packages/protocol/.solhintignore | 1 + .../protocol/contracts/common/FeeBurner.sol | 434 +++ .../contracts/common/FeeCurrencyWhitelist.sol | 87 +- .../protocol/contracts/common/GoldToken.sol | 49 +- .../common/interfaces/ICeloToken.sol | 3 + .../interfaces/IFeeCurrencyWhitelist.sol | 1 + .../common/proxies/FeeBurnerProxy.sol | 6 + .../contracts/common/test/MockGoldToken.sol | 9 +- .../contracts/governance/Election.sol | 108 +- .../contracts/governance/Governance.sol | 313 +- .../contracts/governance/LockedGold.sol | 16 +- .../contracts/governance/Proposals.sol | 67 +- .../contracts/governance/Validators.sol | 12 +- .../governance/interfaces/IElection.sol | 1 + .../governance/interfaces/IGovernance.sol | 1 + .../governance/test/MockElection.sol | 5 + .../governance/test/MockGovernance.sol | 9 + .../contracts/identity/Attestations.sol | 235 +- .../identity/interfaces/IAttestations.sol | 4 - .../identity/test/AttestationsTest.sol | 178 + .../protocol/contracts/stability/Exchange.sol | 64 +- .../contracts/stability/ExchangeBRL.sol | 2 +- .../contracts/stability/ExchangeEUR.sol | 2 +- .../stability/StableTokenRegistry.sol | 128 - .../stability/interfaces/IExchange.sol | 1 - .../proxies/StableTokenRegistryProxy.sol | 6 - .../contracts/stability/test/MockReserve.sol | 6 + .../uniswap/interfaces/IUniswapV2Callee.sol | 6 + .../uniswap/interfaces/IUniswapV2ERC20.sol | 31 + .../uniswap/interfaces/IUniswapV2Factory.sol | 17 + .../interfaces/IUniswapV2FactoryMin.sol | 5 + .../uniswap/interfaces/IUniswapV2Pair.sol | 63 + .../uniswap/interfaces/IUniswapV2Router02.sol | 170 + .../interfaces/IUniswapV2RouterMin.sol | 16 + .../contracts/uniswap/interfaces/IWETH.sol | 7 + .../contracts/uniswap/test/MockERC20.sol | 10 + .../uniswap/test/MockUniswapV2Factory.sol | 53 + .../uniswap/test/MockUniswapV2Pair.sol | 228 ++ .../uniswap/test/MockUniswapV2Router02.sol | 514 +++ .../contracts/uniswap/test/UniswapV2ERC20.sol | 107 + .../contracts/uniswap/test/libraries/Math.sol | 23 + .../uniswap/test/libraries/SafeMath.sol | 17 + .../uniswap/test/libraries/TransferHelper.sol | 41 + .../uniswap/test/libraries/UQ112x112.sol | 20 + .../test/libraries/UniswapV2Library.sol | 127 + .../protocol/lib/compatibility/ast-layout.ts | 55 +- packages/protocol/lib/compatibility/report.ts | 3 +- .../protocol/lib/fed-attestations-utils.ts | 43 +- packages/protocol/lib/registry-utils.ts | 2 +- packages/protocol/lib/test-utils.ts | 91 +- packages/protocol/lib/web3-utils.ts | 52 +- packages/protocol/migrationsConfig.js | 6 - .../migrations_ts/10_01_exchange_EUR.ts | 2 - .../migrations_ts/10_02_exchange_BRL.ts | 2 - .../migrations_ts/10_0_exchange_USD.ts | 2 - ...ations.ts => 25_federated_attestations.ts} | 0 .../migrations_ts/25_stableToken_registry.ts | 14 - ...{27_odispayments.ts => 26_odispayments.ts} | 0 .../{28_governance.ts => 27_governance.ts} | 1 - ...t_validators.ts => 28_elect_validators.ts} | 0 packages/protocol/package.json | 14 +- .../initializationData/release9.json | 2 +- .../nonstandard/baklavaUpdate.json | 7 + .../nonstandar/baklava_fix_report_report.json | 840 +++++ .../protocol/scripts/bash/backupmigrations.sh | 1 + .../bash/generate-old-devchain-and-build.sh | 17 +- packages/protocol/scripts/bash/invite.sh | 41 - .../scripts/bash/release-on-devchain.sh | 1 + packages/protocol/scripts/build.ts | 8 +- packages/protocol/scripts/truffle/invite.ts | 110 - .../test-sol/stability/Exchange.t.sol | 91 +- packages/protocol/test/common/feeburner.ts | 506 +++ .../test/common/feecurrencywhitelist.ts | 111 + .../test/common/gascurrencywhitelist.ts | 40 - packages/protocol/test/common/goldtoken.ts | 58 + packages/protocol/test/common/integration.ts | 4 +- packages/protocol/test/common/onboarding.ts | 424 --- .../protocol/test/compatibility/ast-layout.ts | 59 + .../test/governance/network/governance.ts | 1058 +++++- .../test/governance/validators/validators.ts | 24 + .../test/governance/voting/election.ts | 256 +- .../test/governance/voting/lockedgold.ts | 55 +- .../protocol/test/identity/attestations.ts | 553 +--- .../Migrations.sol | 24 + .../TestContract.sol | 16 + .../TestLibrary.sol | 8 + .../TestParent.sol | 14 + .../Migrations.sol | 24 + .../TestContract.sol | 16 + .../TestLibrary.sol | 8 + .../TestParent.sol | 14 + .../Migrations.sol | 24 + .../TestContract.sol | 16 + .../TestLibrary.sol | 8 + .../TestParent.sol | 14 + .../Migrations.sol | 24 + .../TestContract.sol | 16 + .../TestLibrary.sol | 9 + .../TestParent.sol | 14 + .../Migrations.sol | 24 + .../TestContract.sol | 18 + .../TestLibrary.sol | 8 + .../TestParent.sol | 14 + .../Migrations.sol | 24 + .../TestContract.sol | 16 + .../TestLibrary.sol | 8 + .../TestParent.sol | 14 + .../test/stability/stabletokenregistry.ts | 157 - packages/sdk/base/package.json | 2 +- packages/sdk/base/src/address.test.ts | 23 +- packages/sdk/base/src/address.ts | 2 +- packages/sdk/base/src/attestations.test.ts | 72 - packages/sdk/base/src/attestations.ts | 124 - packages/sdk/base/src/identifier.test.ts | 33 + packages/sdk/base/src/identifier.ts | 84 + packages/sdk/base/src/index.ts | 2 +- packages/sdk/base/src/phoneNumbers.test.ts | 25 +- packages/sdk/base/src/phoneNumbers.ts | 17 - packages/sdk/connect/package.json | 6 +- packages/sdk/contractkit/package.json | 19 +- packages/sdk/contractkit/src/base.ts | 1 - .../sdk/contractkit/src/contract-cache.ts | 12 - .../sdk/contractkit/src/identity/metadata.ts | 8 +- packages/sdk/contractkit/src/kit.ts | 6 - packages/sdk/contractkit/src/setupForKits.ts | 9 +- .../contractkit/src/web3-contract-cache.ts | 8 +- .../contractkit/src/wrappers/Attestations.ts | 275 +- .../contractkit/src/wrappers/Escrow.test.ts | 33 + .../wrappers/FederatedAttestations.test.ts | 40 + .../src/wrappers/FederatedAttestations.ts | 43 +- .../src/wrappers/Governance.test.ts | 50 +- .../contractkit/src/wrappers/Governance.ts | 34 +- .../contractkit/src/wrappers/OdisPayments.ts | 11 +- .../src/wrappers/StableTokenRegistry.test.ts | 32 - .../src/wrappers/StableTokenRegistry.ts | 61 - packages/sdk/cryptographic-utils/package.json | 8 +- packages/sdk/dappkit/package.json | 8 +- packages/sdk/encrypted-backup/package.json | 12 +- .../sdk/encrypted-backup/src/backup.test.ts | 14 +- packages/sdk/encrypted-backup/src/config.ts | 92 +- .../sdk/encrypted-backup/src/odis.mock.ts | 37 +- packages/sdk/encrypted-backup/src/odis.ts | 44 +- .../explorer/fixtures/contract.metadata.json | 2895 +++++++++++++++++ .../sdk/explorer/fixtures/proxy.metadata.json | 198 ++ packages/sdk/explorer/jest.config.js | 13 + packages/sdk/explorer/jestSetup.ts | 7 + packages/sdk/explorer/package.json | 13 +- packages/sdk/explorer/src/block-explorer.ts | 128 +- packages/sdk/explorer/src/globals.d.ts | 5 + packages/sdk/explorer/src/sourcify.test.ts | 263 ++ packages/sdk/explorer/src/sourcify.ts | 209 ++ packages/sdk/governance/package.json | 12 +- packages/sdk/governance/src/proposals.ts | 96 +- packages/sdk/identity/package.json | 19 +- .../identity/src/odis/bls-blinding-client.ts | 16 +- ...identifier-backwards-compatibility.test.ts | 114 + .../sdk/identity/src/odis/identifier.test.ts | 156 + packages/sdk/identity/src/odis/identifier.ts | 304 ++ packages/sdk/identity/src/odis/index.ts | 6 +- .../sdk/identity/src/odis/matchmaking.test.ts | 82 - packages/sdk/identity/src/odis/matchmaking.ts | 120 - .../src/odis/phone-number-identifier.test.ts | 22 +- .../src/odis/phone-number-identifier.ts | 142 +- packages/sdk/identity/src/odis/query.ts | 251 +- packages/sdk/identity/src/odis/quota.test.ts | 54 + packages/sdk/identity/src/odis/quota.ts | 66 + .../identity/src/offchain/storage-writers.ts | 3 +- packages/sdk/keystores/package.json | 6 +- packages/sdk/network-utils/package.json | 2 +- packages/sdk/phone-utils/package.json | 6 +- packages/sdk/phone-utils/src/getPhoneHash.ts | 8 +- packages/sdk/transactions-uri/package.json | 10 +- packages/sdk/utils/package.json | 6 +- packages/sdk/utils/src/attestations.test.ts | 86 - packages/sdk/utils/src/attestations.ts | 87 - packages/sdk/utils/src/index.ts | 1 - .../sdk/utils/src/typed-data-constructors.ts | 41 + packages/sdk/wallets/wallet-base/package.json | 8 +- .../sdk/wallets/wallet-hsm-aws/package.json | 12 +- .../sdk/wallets/wallet-hsm-azure/package.json | 12 +- .../sdk/wallets/wallet-hsm-gcp/.env.example | 2 + .../sdk/wallets/wallet-hsm-gcp/.gitignore | 3 + .../sdk/wallets/wallet-hsm-gcp/.npmignore | 17 + .../sdk/wallets/wallet-hsm-gcp/jest.config.js | 5 + .../wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts | 20 - .../sdk/wallets/wallet-hsm-gcp/package.json | 47 + .../wallet-hsm-gcp/src/gcp-hsm-signer.ts | 115 + .../wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts | 293 ++ .../wallet-hsm-gcp/src/gcp-hsm-wallet.ts | 82 + .../sdk/wallets/wallet-hsm-gcp/src/index.ts | 2 + .../sdk/wallets/wallet-hsm-gcp/tsconfig.json | 9 + .../wallets/wallet-hsm-gcp}/tslint.json | 3 +- .../sdk/wallets/wallet-hsm-gcp/typedoc.json | 13 + packages/sdk/wallets/wallet-hsm/package.json | 4 +- .../sdk/wallets/wallet-ledger/package.json | 10 +- .../sdk/wallets/wallet-local/package.json | 8 +- .../sdk/wallets/wallet-remote/package.json | 8 +- packages/sdk/wallets/wallet-rpc/package.json | 12 +- scripts/deploy-sdks.ts | 11 +- scripts/run-docker-validator-network.sh | 471 --- scripts/validator-config.rc | 35 - yarn.lock | 2663 +++++---------- 637 files changed, 33686 insertions(+), 24410 deletions(-) delete mode 100644 dockerfiles/attestation-service/Dockerfile delete mode 100644 packages/attestation-proxy/.firebaserc delete mode 100644 packages/attestation-proxy/.gitignore delete mode 100644 packages/attestation-proxy/README.md delete mode 100644 packages/attestation-proxy/firebase.json delete mode 100644 packages/attestation-proxy/package.json delete mode 100644 packages/attestation-proxy/src/index.ts delete mode 100644 packages/attestation-proxy/tsconfig.json delete mode 100644 packages/attestation-service/.gitignore delete mode 100644 packages/attestation-service/README.md delete mode 100644 packages/attestation-service/config/.env.development delete mode 100644 packages/attestation-service/config/config.json delete mode 100644 packages/attestation-service/config/database.json delete mode 100644 packages/attestation-service/index.d.ts delete mode 100644 packages/attestation-service/jest.config.js delete mode 100644 packages/attestation-service/migrations/20191015211858-create-attestation.js delete mode 100644 packages/attestation-service/migrations/20200506234935-attestation-v2.js delete mode 100644 packages/attestation-service/migrations/20200903211921-attestation-v3.js delete mode 100644 packages/attestation-service/migrations/20200924232226-attestation-v4.js delete mode 100644 packages/attestation-service/migrations/20201005185559-attestation-v5.js delete mode 100644 packages/attestation-service/migrations/20201006231054-attestation-v6.js delete mode 100644 packages/attestation-service/migrations/20210625231054-attestation-v7.js delete mode 100644 packages/attestation-service/migrations/20211109200901-attestation-v8.js delete mode 100644 packages/attestation-service/nodemon.json delete mode 100644 packages/attestation-service/package-lock.json delete mode 100644 packages/attestation-service/package.json delete mode 100644 packages/attestation-service/scripts/generate-signed-code.ts delete mode 100644 packages/attestation-service/scripts/test-send-sms-twilio.ts delete mode 100644 packages/attestation-service/src/db.ts delete mode 100644 packages/attestation-service/src/env.ts delete mode 100644 packages/attestation-service/src/index.ts delete mode 100644 packages/attestation-service/src/logger.ts delete mode 100644 packages/attestation-service/src/metrics.ts delete mode 100644 packages/attestation-service/src/models/attestation.ts delete mode 100644 packages/attestation-service/src/request.ts delete mode 100644 packages/attestation-service/src/requestHandlers/attestation.ts delete mode 100644 packages/attestation-service/src/requestHandlers/delivery.ts delete mode 100644 packages/attestation-service/src/requestHandlers/get_attestation.ts delete mode 100644 packages/attestation-service/src/requestHandlers/liveness.ts delete mode 100644 packages/attestation-service/src/requestHandlers/status.ts delete mode 100644 packages/attestation-service/src/requestHandlers/test_attestation.ts delete mode 100644 packages/attestation-service/src/sms/base.ts delete mode 100644 packages/attestation-service/src/sms/index.ts delete mode 100644 packages/attestation-service/src/sms/messagebird.ts delete mode 100644 packages/attestation-service/src/sms/nexmo.ts delete mode 100644 packages/attestation-service/src/sms/telekom.ts delete mode 100644 packages/attestation-service/src/sms/twilio.ts delete mode 100644 packages/attestation-service/src/sms/twilioMessaging.ts delete mode 100644 packages/attestation-service/src/sms/twilioVerify.ts delete mode 100644 packages/attestation-service/test/__mocks__/twilio.ts delete mode 100644 packages/attestation-service/test/requestHandlers/attestation.test.ts delete mode 100644 packages/attestation-service/test/sms/twilio.test.ts delete mode 100644 packages/attestation-service/test/testSetup.ts delete mode 100644 packages/attestation-service/tsconfig.json delete mode 100644 packages/attestation-service/tslint.json delete mode 100644 packages/azure/.gitignore delete mode 100644 packages/azure/README.md delete mode 100644 packages/azure/README.mustache delete mode 100755 packages/azure/attester/celo-attestations-run delete mode 100644 packages/azure/attester/celo-attestations.service delete mode 100755 packages/azure/attester/celo-node-run delete mode 100644 packages/azure/attester/celo-node.service delete mode 120000 packages/azure/attester/libcelo.sh delete mode 120000 packages/azure/attester/provider-init.sh delete mode 100755 packages/azure/attester/startup.sh delete mode 100755 packages/azure/build-docs.js delete mode 100644 packages/azure/build-json.js delete mode 100755 packages/azure/build-sh delete mode 100644 packages/azure/components/compute.json delete mode 100644 packages/azure/components/identity.json delete mode 100644 packages/azure/components/keyvault.json delete mode 100644 packages/azure/components/main.json delete mode 100644 packages/azure/components/network.json delete mode 100644 packages/azure/components/other.json delete mode 100644 packages/azure/components/postgres.json delete mode 100644 packages/azure/createUiDefinition.json delete mode 100644 packages/azure/mainTemplate.json delete mode 100644 packages/azure/package-lock.json delete mode 100644 packages/azure/package.json delete mode 100755 packages/azure/proxy/celo-proxy-run delete mode 100644 packages/azure/proxy/celo-proxy.service delete mode 120000 packages/azure/proxy/exporter-run delete mode 120000 packages/azure/proxy/geth-exporter.service delete mode 120000 packages/azure/proxy/libcelo.sh delete mode 120000 packages/azure/proxy/provider-init.sh delete mode 100755 packages/azure/proxy/startup.sh delete mode 100755 packages/azure/scripts/exporter-run delete mode 100644 packages/azure/scripts/geth-exporter.service delete mode 100644 packages/azure/scripts/libcelo.sh delete mode 100644 packages/azure/scripts/provider-init.sh delete mode 100644 packages/azure/scripts/startup-prefix.sh delete mode 100755 packages/azure/validator/celo-validator-run delete mode 100644 packages/azure/validator/celo-validator.service delete mode 120000 packages/azure/validator/exporter-run delete mode 120000 packages/azure/validator/geth-exporter.service delete mode 120000 packages/azure/validator/libcelo.sh delete mode 120000 packages/azure/validator/provider-init.sh delete mode 100755 packages/azure/validator/startup.sh delete mode 100755 packages/celotool/ci_test_attestations.sh delete mode 100644 packages/celotool/src/cmds/account/invite.ts delete mode 100644 packages/celotool/src/cmds/account/verify.ts delete mode 100644 packages/celotool/src/cmds/account/weekly_faucet.ts delete mode 100644 packages/celotool/src/cmds/bots/auto-verify.ts delete mode 100644 packages/celotool/src/cmds/deploy/destroy/attestation-bot.ts delete mode 100644 packages/celotool/src/cmds/deploy/destroy/attestation-service.ts delete mode 100644 packages/celotool/src/cmds/deploy/initial/attestation-bot.ts delete mode 100644 packages/celotool/src/cmds/deploy/initial/attestation-service.ts delete mode 100644 packages/celotool/src/cmds/deploy/upgrade/attestation-bot.ts delete mode 100644 packages/celotool/src/cmds/deploy/upgrade/attestation-service.ts delete mode 100644 packages/celotool/src/e2e-tests/attestations_tests.ts delete mode 100644 packages/celotool/src/lib/attestation-bot.ts delete mode 100644 packages/celotool/src/lib/attestation-service.ts delete mode 100644 packages/celotool/src/lib/attestation.ts delete mode 100644 packages/celotool/twilio-config.enc delete mode 100644 packages/cli/src/commands/account/claim-attestation-service-url.ts create mode 100644 packages/cli/src/commands/governance/votePartially.test.ts create mode 100644 packages/cli/src/commands/governance/votePartially.ts delete mode 100644 packages/cli/src/commands/identity/current-attestation-services.ts delete mode 100644 packages/cli/src/commands/identity/test-attestation-service.ts delete mode 100644 packages/env-tests/src/shared/attestation.ts delete mode 100644 packages/env-tests/src/tests/attestation.ts delete mode 100644 packages/helm-charts/attestation-bot/Chart.yaml delete mode 100644 packages/helm-charts/attestation-bot/templates/configmap.yaml delete mode 100644 packages/helm-charts/attestation-bot/templates/secret.yaml delete mode 100644 packages/helm-charts/attestation-bot/templates/statefulset.yaml delete mode 100644 packages/helm-charts/attestation-bot/values.yaml delete mode 100644 packages/helm-charts/attestation-service/Chart.yaml delete mode 100644 packages/helm-charts/attestation-service/README.md delete mode 100644 packages/helm-charts/attestation-service/charts/postgresql-6.3.10.tgz delete mode 100644 packages/helm-charts/attestation-service/templates/attestation.ingress.yaml delete mode 100644 packages/helm-charts/attestation-service/templates/attestation.secret.yaml delete mode 100644 packages/helm-charts/attestation-service/templates/attestation.service.yaml delete mode 100644 packages/helm-charts/attestation-service/templates/attestation.statefulset.yaml delete mode 100644 packages/helm-charts/attestation-service/values.yaml create mode 100644 packages/helm-charts/blockscout/templates/blockscout-event-stream.deployment.yaml delete mode 100644 packages/helm-charts/oracle/CELOBTC.yaml create mode 100644 packages/helm-charts/oracle/USDCEUR.yaml create mode 100644 packages/helm-charts/oracle/USDCUSD.yaml create mode 100644 packages/helm-charts/testnet/values-alfajores.yaml delete mode 100644 packages/phone-number-privacy/combiner/migrations/20200330212224_create-accounts-table.ts delete mode 100644 packages/phone-number-privacy/combiner/migrations/20200330212301_create-number-pairs-table.ts delete mode 100644 packages/phone-number-privacy/combiner/migrations/20210421212301_create-indices.ts delete mode 100644 packages/phone-number-privacy/combiner/migrations/20210813105139_add_dekSigner_signedUserPhoneNumber_columns_to_accounts_table.ts delete mode 100644 packages/phone-number-privacy/combiner/scripts/run-migrations.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/action.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/combine.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/controller.ts rename packages/phone-number-privacy/combiner/src/{bls/bls-cryptography-client.ts => common/crypto-clients/bls-crypto-client.ts} (65%) create mode 100644 packages/phone-number-privacy/combiner/src/common/crypto-clients/crypto-client.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/crypto-clients/domain-crypto-client.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/crypto-session.ts delete mode 100644 packages/phone-number-privacy/combiner/src/common/error-utils.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/io.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/session.ts create mode 100644 packages/phone-number-privacy/combiner/src/common/sign.ts delete mode 100644 packages/phone-number-privacy/combiner/src/database/database.ts delete mode 100644 packages/phone-number-privacy/combiner/src/database/models/account.ts delete mode 100644 packages/phone-number-privacy/combiner/src/database/models/numberPair.ts delete mode 100644 packages/phone-number-privacy/combiner/src/database/wrappers/account.ts delete mode 100644 packages/phone-number-privacy/combiner/src/database/wrappers/number-pairs.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/endpoints/disable/action.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/endpoints/disable/io.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/endpoints/quota/action.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/endpoints/quota/io.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/endpoints/sign/action.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/endpoints/sign/io.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/services/log-responses.ts create mode 100644 packages/phone-number-privacy/combiner/src/domain/services/threshold-state.ts delete mode 100644 packages/phone-number-privacy/combiner/src/match-making/get-contact-matches.ts create mode 100644 packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/action.ts create mode 100644 packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/io.ts create mode 100644 packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/action.ts create mode 100644 packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.legacy.ts create mode 100644 packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.ts create mode 100644 packages/phone-number-privacy/combiner/src/pnp/services/log-responses.ts create mode 100644 packages/phone-number-privacy/combiner/src/pnp/services/threshold-state.ts create mode 100644 packages/phone-number-privacy/combiner/src/server.ts delete mode 100644 packages/phone-number-privacy/combiner/src/signing/get-threshold-signature.ts delete mode 100644 packages/phone-number-privacy/combiner/src/web3/contracts.ts create mode 100644 packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts delete mode 100644 packages/phone-number-privacy/combiner/test/end-to-end/get-contact-matches.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/end-to-end/legacypnp.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts rename packages/phone-number-privacy/combiner/test/end-to-end/{get-blinded-sig.test.ts => tmpBackwardsCompatibility.test.ts} (57%) delete mode 100644 packages/phone-number-privacy/combiner/test/index.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/integration/domain.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/integration/legacypnp.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/integration/pnp.test.ts rename packages/phone-number-privacy/combiner/test/{signing => unit}/bls-signature.test.ts (85%) create mode 100644 packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts create mode 100644 packages/phone-number-privacy/combiner/test/utils.ts create mode 100644 packages/phone-number-privacy/common/README.md create mode 100644 packages/phone-number-privacy/common/src/interfaces/endpoints.ts delete mode 100644 packages/phone-number-privacy/common/src/interfaces/error-utils.ts create mode 100644 packages/phone-number-privacy/common/src/interfaces/errors.ts rename packages/phone-number-privacy/common/src/utils/{config-utils.ts => config.utils.ts} (100%) create mode 100644 packages/phone-number-privacy/common/src/utils/contracts.ts create mode 100644 packages/phone-number-privacy/common/src/utils/key-version.ts create mode 100644 packages/phone-number-privacy/common/src/utils/responses.utils.ts rename packages/phone-number-privacy/common/{src/domains => test}/domains.test.ts (88%) create mode 100644 packages/phone-number-privacy/common/test/utils/key-version.test.ts create mode 100644 packages/phone-number-privacy/monitor/src/scripts/run-load-test.ts delete mode 100644 packages/phone-number-privacy/monitor/src/scripts/runLoadTest.ts delete mode 100644 packages/phone-number-privacy/signer/azure-templates/README.md delete mode 100644 packages/phone-number-privacy/signer/azure-templates/container-parameters.json delete mode 100644 packages/phone-number-privacy/signer/azure-templates/container-template.json delete mode 100644 packages/phone-number-privacy/signer/azure-templates/db-parameters.json delete mode 100644 packages/phone-number-privacy/signer/azure-templates/db-template.json delete mode 100644 packages/phone-number-privacy/signer/azure-templates/frontdoor-template.json delete mode 100644 packages/phone-number-privacy/signer/azure-templates/prometheus-alfajores.yaml delete mode 100644 packages/phone-number-privacy/signer/azure-templates/prometheus-mainnet.yaml delete mode 100644 packages/phone-number-privacy/signer/azure-templates/prometheus-parameters.json delete mode 100644 packages/phone-number-privacy/signer/azure-templates/prometheus-service-account-key.json delete mode 100644 packages/phone-number-privacy/signer/azure-templates/prometheus-staging.yaml delete mode 100644 packages/phone-number-privacy/signer/azure-templates/prometheus-template.json create mode 100644 packages/phone-number-privacy/signer/scripts/poprf-keygen.ts rename packages/phone-number-privacy/signer/scripts/{create-bls-keys.ts => threshold-bls-keygen.ts} (70%) create mode 100644 packages/phone-number-privacy/signer/src/common/action.ts rename packages/phone-number-privacy/signer/src/{ => common}/bls/bls-cryptography-client.ts (83%) create mode 100644 packages/phone-number-privacy/signer/src/common/controller.ts rename packages/phone-number-privacy/signer/src/{ => common}/database/database.ts (51%) rename packages/phone-number-privacy/signer/src/{ => common/database}/migrations/20200330212224_create-accounts-table.ts (55%) rename packages/phone-number-privacy/signer/src/{ => common/database}/migrations/20200811163913_create_requests_table.ts (65%) create mode 100644 packages/phone-number-privacy/signer/src/common/database/migrations/20210421212301_create-indices.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/migrations/20210921173354_create-domain-state.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/migrations/20220119165335_domain-requests.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/migrations/20220923161710_pnp-requests-onchain.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/migrations/20220923165433_pnp-accounts-onchain.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/migrations/20221102141044_change-name-domain-state.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/migrations/20221213125526_add-constraint-domain-requests.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/models/account.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/models/domain-request.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/models/domain-state.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/models/request.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/utils.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/wrappers/account.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/wrappers/domain-request.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/wrappers/domain-state.ts create mode 100644 packages/phone-number-privacy/signer/src/common/database/wrappers/request.ts delete mode 100644 packages/phone-number-privacy/signer/src/common/domain/domainState.mapper.ts delete mode 100644 packages/phone-number-privacy/signer/src/common/error-utils.ts create mode 100644 packages/phone-number-privacy/signer/src/common/io.ts create mode 100644 packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts create mode 100644 packages/phone-number-privacy/signer/src/common/key-management/azure-key-provider.ts create mode 100644 packages/phone-number-privacy/signer/src/common/key-management/google-key-provider.ts create mode 100644 packages/phone-number-privacy/signer/src/common/key-management/key-provider-base.ts create mode 100644 packages/phone-number-privacy/signer/src/common/key-management/key-provider.ts create mode 100644 packages/phone-number-privacy/signer/src/common/key-management/mock-key-provider.ts create mode 100644 packages/phone-number-privacy/signer/src/common/quota.ts create mode 100644 packages/phone-number-privacy/signer/src/common/web3/contracts.ts delete mode 100644 packages/phone-number-privacy/signer/src/database/models/account.ts delete mode 100644 packages/phone-number-privacy/signer/src/database/models/domainState.ts delete mode 100644 packages/phone-number-privacy/signer/src/database/models/request.ts delete mode 100644 packages/phone-number-privacy/signer/src/database/wrappers/account.ts delete mode 100644 packages/phone-number-privacy/signer/src/database/wrappers/domainState.ts delete mode 100644 packages/phone-number-privacy/signer/src/database/wrappers/request.ts delete mode 100644 packages/phone-number-privacy/signer/src/domain/auth/domainAuth.interface.ts delete mode 100644 packages/phone-number-privacy/signer/src/domain/auth/domainAuth.service.ts delete mode 100644 packages/phone-number-privacy/signer/src/domain/domain.interface.ts delete mode 100644 packages/phone-number-privacy/signer/src/domain/domain.service.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/endpoints/disable/action.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/endpoints/disable/io.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/endpoints/quota/action.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/endpoints/quota/io.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/endpoints/sign/action.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/endpoints/sign/io.ts delete mode 100644 packages/phone-number-privacy/signer/src/domain/quota/domainQuota.interface.ts delete mode 100644 packages/phone-number-privacy/signer/src/domain/quota/domainQuota.service.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/services/quota.ts create mode 100644 packages/phone-number-privacy/signer/src/domain/session.ts delete mode 100644 packages/phone-number-privacy/signer/src/key-management/aws-key-provider.ts delete mode 100644 packages/phone-number-privacy/signer/src/key-management/azure-key-provider.ts delete mode 100644 packages/phone-number-privacy/signer/src/key-management/google-key-provider.ts delete mode 100644 packages/phone-number-privacy/signer/src/key-management/key-provider-base.ts delete mode 100644 packages/phone-number-privacy/signer/src/key-management/key-provider.ts delete mode 100644 packages/phone-number-privacy/signer/src/key-management/mock-key-provider.ts delete mode 100644 packages/phone-number-privacy/signer/src/migrations/20210421212301_create-indices.ts delete mode 100644 packages/phone-number-privacy/signer/src/migrations/20210921173354_create-domain-state.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/quota/action.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.legacy.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.legacy.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.onchain.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.legacy.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/services/quota.legacy.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/services/quota.onchain.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/services/quota.ts create mode 100644 packages/phone-number-privacy/signer/src/pnp/session.ts delete mode 100644 packages/phone-number-privacy/signer/src/signing/get-partial-signature.ts delete mode 100644 packages/phone-number-privacy/signer/src/signing/query-quota.ts delete mode 100644 packages/phone-number-privacy/signer/src/web3/contracts.ts delete mode 100644 packages/phone-number-privacy/signer/test/domain/domain.test.ts create mode 100644 packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts create mode 100644 packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts create mode 100644 packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts create mode 100644 packages/phone-number-privacy/signer/test/end-to-end/utils.ts delete mode 100644 packages/phone-number-privacy/signer/test/index.test.ts create mode 100644 packages/phone-number-privacy/signer/test/integration/domain.test.ts create mode 100644 packages/phone-number-privacy/signer/test/integration/legacypnp.test.ts create mode 100644 packages/phone-number-privacy/signer/test/integration/pnp.test.ts delete mode 100644 packages/phone-number-privacy/signer/test/signing/query-quota.test.ts create mode 100644 packages/protocol/contracts/common/FeeBurner.sol create mode 100644 packages/protocol/contracts/common/proxies/FeeBurnerProxy.sol delete mode 100644 packages/protocol/contracts/stability/StableTokenRegistry.sol delete mode 100644 packages/protocol/contracts/stability/proxies/StableTokenRegistryProxy.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IUniswapV2Callee.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IUniswapV2ERC20.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IUniswapV2Factory.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IUniswapV2FactoryMin.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IUniswapV2Pair.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IUniswapV2Router02.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IUniswapV2RouterMin.sol create mode 100644 packages/protocol/contracts/uniswap/interfaces/IWETH.sol create mode 100644 packages/protocol/contracts/uniswap/test/MockERC20.sol create mode 100644 packages/protocol/contracts/uniswap/test/MockUniswapV2Factory.sol create mode 100644 packages/protocol/contracts/uniswap/test/MockUniswapV2Pair.sol create mode 100644 packages/protocol/contracts/uniswap/test/MockUniswapV2Router02.sol create mode 100644 packages/protocol/contracts/uniswap/test/UniswapV2ERC20.sol create mode 100644 packages/protocol/contracts/uniswap/test/libraries/Math.sol create mode 100644 packages/protocol/contracts/uniswap/test/libraries/SafeMath.sol create mode 100644 packages/protocol/contracts/uniswap/test/libraries/TransferHelper.sol create mode 100644 packages/protocol/contracts/uniswap/test/libraries/UQ112x112.sol create mode 100644 packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol rename packages/protocol/migrations_ts/{26_federated_attestations.ts => 25_federated_attestations.ts} (100%) delete mode 100644 packages/protocol/migrations_ts/25_stableToken_registry.ts rename packages/protocol/migrations_ts/{27_odispayments.ts => 26_odispayments.ts} (100%) rename packages/protocol/migrations_ts/{28_governance.ts => 27_governance.ts} (99%) rename packages/protocol/migrations_ts/{29_elect_validators.ts => 28_elect_validators.ts} (100%) create mode 100644 packages/protocol/releaseData/nonstandard/baklavaUpdate.json create mode 100644 packages/protocol/releaseData/versionReports/nonstandar/baklava_fix_report_report.json delete mode 100755 packages/protocol/scripts/bash/invite.sh delete mode 100644 packages/protocol/scripts/truffle/invite.ts create mode 100644 packages/protocol/test/common/feeburner.ts create mode 100644 packages/protocol/test/common/feecurrencywhitelist.ts delete mode 100644 packages/protocol/test/common/gascurrencywhitelist.ts delete mode 100644 packages/protocol/test/common/onboarding.ts create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/Migrations.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestContract.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestLibrary.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestParent.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/Migrations.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestContract.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestLibrary.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestParent.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/Migrations.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestContract.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestLibrary.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestParent.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/Migrations.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestContract.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestLibrary.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestParent.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/Migrations.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestContract.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestLibrary.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestParent.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/Migrations.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestContract.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestLibrary.sol create mode 100644 packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestParent.sol delete mode 100644 packages/protocol/test/stability/stabletokenregistry.ts delete mode 100644 packages/sdk/base/src/attestations.test.ts delete mode 100644 packages/sdk/base/src/attestations.ts create mode 100644 packages/sdk/base/src/identifier.test.ts create mode 100644 packages/sdk/base/src/identifier.ts delete mode 100644 packages/sdk/contractkit/src/wrappers/StableTokenRegistry.test.ts delete mode 100644 packages/sdk/contractkit/src/wrappers/StableTokenRegistry.ts create mode 100644 packages/sdk/explorer/fixtures/contract.metadata.json create mode 100644 packages/sdk/explorer/fixtures/proxy.metadata.json create mode 100644 packages/sdk/explorer/jest.config.js create mode 100644 packages/sdk/explorer/jestSetup.ts create mode 100644 packages/sdk/explorer/src/globals.d.ts create mode 100644 packages/sdk/explorer/src/sourcify.test.ts create mode 100644 packages/sdk/explorer/src/sourcify.ts create mode 100644 packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts create mode 100644 packages/sdk/identity/src/odis/identifier.test.ts create mode 100644 packages/sdk/identity/src/odis/identifier.ts delete mode 100644 packages/sdk/identity/src/odis/matchmaking.test.ts delete mode 100644 packages/sdk/identity/src/odis/matchmaking.ts create mode 100644 packages/sdk/identity/src/odis/quota.test.ts create mode 100644 packages/sdk/identity/src/odis/quota.ts delete mode 100644 packages/sdk/utils/src/attestations.test.ts delete mode 100644 packages/sdk/utils/src/attestations.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/.env.example create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/.gitignore create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/.npmignore create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/jest.config.js delete mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/package.json create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/src/index.ts create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/tsconfig.json rename packages/{attestation-proxy => sdk/wallets/wallet-hsm-gcp}/tslint.json (62%) create mode 100644 packages/sdk/wallets/wallet-hsm-gcp/typedoc.json delete mode 100755 scripts/run-docker-validator-network.sh delete mode 100644 scripts/validator-config.rc diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f9dfa7fbb9..c4926607311 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,6 +2,8 @@ # and https://github.com/facebook/react-native/blob/master/.circleci/config.yml version: 2.1 + + parameters: # When you need to force a rebuild of the node modules cache then bump this version node-modules-cache-version: @@ -128,6 +130,7 @@ jobs: # Source: https://circleci.com/docs/2.0/configuration-reference/#resource_class resource_class: large steps: + - restore_cache: keys: - source-v1-{{ .Branch }}-{{ .Revision }} @@ -784,21 +787,28 @@ jobs: name: Minor test of celocli command: ./node_modules/.bin/celocli account:new # Small test - phone-number-privacy-test: + odis-test: <<: *defaults + # Source: https://circleci.com/docs/2.0/configuration-reference/#resource_class + resource_class: large steps: - attach_workspace: at: ~/app - run: name: Check if the test should run command: | - ./scripts/ci_check_if_test_should_run_v2.sh @celo/phone-number-privacy-signer,@celo/phone-number-privacy-combiner + ./scripts/ci_check_if_test_should_run_v2.sh @celo/phone-number-privacy-signer,@celo/phone-number-privacy-combiner,@celo/phone-number-privacy-common + - run: + name: Run Tests for common package + command: yarn --cwd=packages/phone-number-privacy/common test:coverage - run: name: Run Tests for combiner - command: yarn --cwd=packages/phone-number-privacy/combiner test + no_output_timeout: 30m + command: yarn --cwd=packages/phone-number-privacy/combiner test:coverage - run: name: Run Tests for signer - command: yarn --cwd=packages/phone-number-privacy/signer test + no_output_timeout: 30m + command: yarn --cwd=packages/phone-number-privacy/signer test:coverage certora-test: working_directory: ~/app @@ -981,7 +991,7 @@ workflows: requires: - lint-checks - contractkit-test - - phone-number-privacy-test: + - odis-test: requires: - lint-checks - flakey-test-summary: @@ -1001,7 +1011,7 @@ workflows: - end-to-end-geth-sync-test - end-to-end-geth-validator-order-test - end-to-end-cip35-eth-compatibility-test - - phone-number-privacy-test + - odis-test npm-install-testing-cron-workflow: triggers: - schedule: diff --git a/.env b/.env index 4a2e209c7a8..8087faab907 100644 --- a/.env +++ b/.env @@ -64,9 +64,6 @@ EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto" EKSPORTISTO_DOCKER_IMAGE_TAG="12f9f9e822ea35db2f965be616abef126f1724fb" EKSPORTISTO_SUFFIX='1' -ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo" -ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-v1.1.0" - # Genesis Vars NETWORK_ID=1101 CONSENSUS_TYPE="istanbul" @@ -155,11 +152,6 @@ CHAOS_TEST_KILL_INTERVAL = 3m # # MOBILE_WALLET_PLAYSTORE_LINK="" -# Attestation Bot variables -ATTESTATION_BOT_INITIAL_WAIT_SECONDS=3 -ATTESTATION_BOT_IN_BETWEEN_WAIT_SECONDS=10 -ATTESTATION_BOT_MAX_ATTESTATIONS=3 - # Number of gold-holding bots that vote for validator groups VOTING_BOTS=3 # 10,000 CG @@ -207,6 +199,9 @@ CONTEXTS=azure-odis0-centralus,azure-odis1-centralus,azure-odis2-centralus ODIS_SIGNER_DOCKER_IMAGE_REPOSITORY=us.gcr.io/celo-testnet/celo-monorepo ODIS_SIGNER_DOCKER_IMAGE_TAG=oblivious-decentralized-identifier-service-1.1.10 ODIS_SIGNER_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org +ODIS_SIGNER_DOMAINS_API_ENABLED=true +ODIS_SIGNER_PNP_API_ENABLED=true +ODIS_SIGNER_LEGACY_PNP_API_ENABLED=true # ODIS signer 0 Azure info AZURE_ODIS0_CENTRALUS_AZURE_SUBSCRIPTION_ID=97e2b592-255b-4f92-bce0-127257163c36 @@ -224,7 +219,10 @@ AZURE_ODIS0_CENTRALUS_ODIS_SIGNER_DB_USERNAME=pgpnp@staging-pgpnp-centralus # ODIS signer 0 Key Vault AZURE_ODIS0_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_NAME=staging-pgpnp-cus -AZURE_ODIS0_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS0_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy0 +AZURE_ODIS0_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS0_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains0 +AZURE_ODIS0_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer 0 Network AZURE_ODIS0_CENTRALUS_ODIS_NETWORK=staging @@ -255,7 +253,10 @@ AZURE_ODIS1_CENTRALUS_ODIS_SIGNER_DB_USERNAME=pgpnp@staging-pgpnp1-centralus # ODIS Signer 1 Key Vault AZURE_ODIS1_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_NAME=staging-pgpnp-cus -AZURE_ODIS1_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share1 +AZURE_ODIS1_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy1 +AZURE_ODIS1_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS1_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains1 +AZURE_ODIS1_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS Signer 1 Prometheus config AZURE_ODIS1_CENTRALUS_PROM_SCRAPE_JOB_NAME=scrape-odis @@ -282,7 +283,10 @@ AZURE_ODIS2_CENTRALUS_ODIS_SIGNER_DB_USERNAME=pgpnp@staging-pgpnp2-centralus # ODIS Signer 2 Key Vault AZURE_ODIS2_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_NAME=staging-pgpnp-cus -AZURE_ODIS2_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share2 +AZURE_ODIS2_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy2 +AZURE_ODIS2_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS2_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains2 +AZURE_ODIS2_CENTRALUS_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS Signer 2 Prometheus config AZURE_ODIS2_CENTRALUS_PROM_SCRAPE_JOB_NAME=scrape-odis diff --git a/.env.alfajores b/.env.alfajores index a0b25998f59..461660183b3 100644 --- a/.env.alfajores +++ b/.env.alfajores @@ -33,7 +33,7 @@ CELOSTATS_BANNED_ADDRESSES="" CELOSTATS_RESERVED_ADDRESSES="" ORACLE_DOCKER_IMAGE_REPOSITORY="us-west1-docker.pkg.dev/celo-testnet-production/celo-oracle/celo-oracle" -ORACLE_DOCKER_IMAGE_TAG="1.0.0-rc3" +ORACLE_DOCKER_IMAGE_TAG="1.0.1" AZURE_ORACLE_CENTRALUS_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c AZURE_ORACLE_CENTRALUS_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e @@ -44,6 +44,7 @@ AZURE_ORACLE_CENTRALUS_CELOUSD_ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT=6 AZURE_ORACLE_CENTRALUS_CELOEUR_ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT=6 AZURE_ORACLE_CENTRALUS_CELOBTC_ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT=10 AZURE_ORACLE_CENTRALUS_CELOBRL_ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT=6 +AZURE_ORACLE_CENTRALUS_USDCUSD_ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT=5 AZURE_ORACLE_CENTRALUS_FULL_NODES_COUNT=2 AZURE_ORACLE_CENTRALUS_FULL_NODES_DISK_SIZE=30 AZURE_ORACLE_CENTRALUS_FULL_NODES_ROLLING_UPDATE_PARTITION=0 @@ -54,10 +55,10 @@ AZURE_ORACLE_CENTRALUS_FULL_NODES_WS_PORT="8546" # Temporarily point to celo-org repository to consume patched image. GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-org/geth" -GETH_NODE_DOCKER_IMAGE_TAG="1.6.0" +GETH_NODE_DOCKER_IMAGE_TAG="1.7.2" GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-org/geth-all" -GETH_BOOTNODE_DOCKER_IMAGE_TAG="1.6.0" +GETH_BOOTNODE_DOCKER_IMAGE_TAG="1.7.2" # Enable pprof and prometheus scrape labels GETH_ENABLE_METRICS=true @@ -85,24 +86,6 @@ EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto" EKSPORTISTO_DOCKER_IMAGE_TAG="c88f7e8babcdb01062a6a12ae729705ba9769add" EKSPORTISTO_SUFFIX='1' -# Attestation Bot variables -ATTESTATION_BOT_INITIAL_WAIT_SECONDS=1200 -ATTESTATION_BOT_IN_BETWEEN_WAIT_SECONDS=1800 -ATTESTATION_BOT_MAX_ATTESTATIONS=32 - -# If this is set, the bot will skip ODIS and use this salt (needed for baklava, where ODIS is not deployed) -ATTESTATION_BOT_SKIP_ODIS_SALT=bot - -ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo" -ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-c083d6da32ea2011653d2fe993addc443bc8708d" - -CELO_PROVIDER_BACKUPS=https://alfajores-forno.celo-testnet.org -TELEKOM_FROM="+14157389085" -SMS_PROVIDERS=twilio,nexmo,telekom -SMS_PROVIDERS_RANDOMIZED="1" - -NEXMO_APPLICATIONS=0e8afe80-29f8-4e88-af03-5b5066161944,775fb58b-331b-4040-b1eb-7aed298b5685,07bd882c-5565-4387-a9e8-48fa2de3b3cc,93a3355e-ebed-4eeb-bb93-61f0c752add9,7a194b22-6f3c-488a-b174-933f7e875875,06a4573b-406d-48f6-97db-ef5652ce98c4,90b0915b-eb5f-4d27-942b-7d90d137ec1f,9c572771-f37d-4b02-b783-69c7934fe5fb,d93e193d-367f-4315-95a5-6dfb108288e5,adfeb89a-7dfb-49b8-9e3e-2a1284719986 - # Genesis Vars NETWORK_ID=44787 CONSENSUS_TYPE="istanbul" @@ -124,7 +107,7 @@ FAUCET_CUSD_WEI=60000000000000000000000 VALIDATORS=10 VALIDATOR_PROXY_COUNTS=10:0 -TX_NODES=10 +TX_NODES=4 # Nodes whose RPC ports are only internally exposed PRIVATE_TX_NODES=2 STATIC_IPS_FOR_GETH_NODES=true @@ -179,7 +162,10 @@ AZURE_ODIS_EASTUS_1_ODIS_SIGNER_DB_USERNAME=cLabs@pgpnp-alfajores-db1v2 # ODIS signer 1 Key Vault AZURE_ODIS_EASTUS_1_ODIS_SIGNER_AZURE_KEYVAULT_NAME=pgpnp-alfajores-kv1 -AZURE_ODIS_EASTUS_1_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS_EASTUS_1_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy +AZURE_ODIS_EASTUS_1_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS_EASTUS_1_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains +AZURE_ODIS_EASTUS_1_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer 1 Network AZURE_ODIS_EASTUS_1_ODIS_NETWORK=alfajores @@ -209,7 +195,10 @@ AZURE_ODIS_EASTUS_2_ODIS_SIGNER_DB_USERNAME=clabs@pgpnp-alfajores-db2v2 # ODIS signer 2 Key Vault AZURE_ODIS_EASTUS_2_ODIS_SIGNER_AZURE_KEYVAULT_NAME=pgpnp-alfajores-kv2 -AZURE_ODIS_EASTUS_2_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS_EASTUS_2_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy +AZURE_ODIS_EASTUS_2_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS_EASTUS_2_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains +AZURE_ODIS_EASTUS_2_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer 2 Network AZURE_ODIS_EASTUS_2_ODIS_NETWORK=alfajores @@ -239,7 +228,10 @@ AZURE_ODIS_EASTUS_3_ODIS_SIGNER_DB_USERNAME=cLabs@pgpnp-alfajores-db3v2 # ODIS signer 3 Key Vault AZURE_ODIS_EASTUS_3_ODIS_SIGNER_AZURE_KEYVAULT_NAME=pgpnp-alfajores-kv3 -AZURE_ODIS_EASTUS_3_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS_EASTUS_3_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy +AZURE_ODIS_EASTUS_3_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS_EASTUS_3_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_SECRET_NAME=domains +AZURE_ODIS_EASTUS_3_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer 3 Network AZURE_ODIS_EASTUS_3_ODIS_NETWORK=alfajores diff --git a/.env.baklava b/.env.baklava index 35727ca0ef5..49874e9e09a 100644 --- a/.env.baklava +++ b/.env.baklava @@ -25,10 +25,10 @@ CELOSTATS_BANNED_ADDRESSES="" CELOSTATS_RESERVED_ADDRESSES="" GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-org/geth" -GETH_NODE_DOCKER_IMAGE_TAG="1.6.0" +GETH_NODE_DOCKER_IMAGE_TAG="1.7.0" GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-org/geth-all" -GETH_BOOTNODE_DOCKER_IMAGE_TAG="1.6.0" +GETH_BOOTNODE_DOCKER_IMAGE_TAG="1.7.0" CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo" CELOTOOL_DOCKER_IMAGE_TAG="celotool-4257fe61f91e935681f3a91bb4dcb44c8dd6df47" @@ -37,7 +37,7 @@ CELOCLI_STANDALONE_IMAGE_REPOSITORY="gcr.io/celo-testnet/celocli-standalone" CELOCLI_STANDALONE_IMAGE_TAG="0.0.30-beta2" ORACLE_DOCKER_IMAGE_REPOSITORY="us-west1-docker.pkg.dev/celo-testnet-production/celo-oracle/celo-oracle" -ORACLE_DOCKER_IMAGE_TAG="1.0.0-rc2" +ORACLE_DOCKER_IMAGE_TAG="1.0.1" # ---- Full Node Chain Restore ---- @@ -59,9 +59,10 @@ AZURE_ORACLE_WESTUS2_AZURE_REGION_NAME=westus2 AZURE_ORACLE_WESTUS2_KUBERNETES_CLUSTER_NAME=baklava-oracles-westus2 # Format should be a comma-separated sequence of: #
:: -AZURE_ORACLE_WESTUS2_CELOUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x460b3f8d3c203363bb65b1a18d89d4ffb6b0c981:baklava-oracle2:baklava-oracles-westus2,0x3b522230c454ca9720665d66e6335a72327291e8:baklava-oracle3:baklava-oracles-westus2,0x0AFe167600a5542d10912f4A07DFc4EEe0769672:baklava-oracle4:baklava-oracles-westus2 -AZURE_ORACLE_WESTUS2_CELOBTC_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x253d08392C5B25B8958A69d03711efb1c8998dF4:baklava-celobtc-oracle0:baklava-oracles-westus2,0x4a5D7dfA74293731E10fCa56811811Ab288Dc35c:baklava-celobtc-oracle1:baklava-oracles-westus2,0x95720eFd2277F8DA64711b105D4038C6465A5eCA:baklava-celobtc-oracle2:baklava-oracles-westus2,0x5DCE9f78AEdDFc1d5E03a96b2b74ee0BD4B5a563:baklava-celobtc-oracle3:baklava-oracles-westus2,0x9568A9140782b479a5777A9581f6d60Eda4CB182:baklava-celobtc-oracle4:baklava-oracles-westus2 -AZURE_ORACLE_WESTUS2_CELOEUR_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x042aC21b9CDA6171881135884DE16CF6aCa78375:baklava-celoeur-oracle2:baklava-oracles-westus2,0xc496d108C6781Fbc9967E48873Eac2eA14ca119a:baklava-celoeur-oracle3:baklava-oracles-westus2,0x54050b55eD9f78Ef143B5182E8C767A101DFe9CC:baklava-celoeur-oracle4:baklava-oracles-westus2 +AZURE_ORACLE_WESTUS2_CELOUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x460b3f8d3c203363bb65b1a18d89d4ffb6b0c981:baklava-oracle2:baklava-oracles-westus2,0x3b522230c454ca9720665d66e6335a72327291e8:baklava-oracle3:baklava-oracles-westus2 +AZURE_ORACLE_WESTUS2_CELOEUR_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x042aC21b9CDA6171881135884DE16CF6aCa78375:baklava-celoeur-oracle2:baklava-oracles-westus2,0xc496d108C6781Fbc9967E48873Eac2eA14ca119a:baklava-celoeur-oracle3:baklava-oracles-westus2 +AZURE_ORACLE_WESTUS2_CELOBRL_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x86f9c87d13347e6041e75f3a18533e07d284c419:baklava-celobrl-oracle0:baklava-oracles-westus2,0x3ee0a85e7d8e9d06617986d40623b1493139c5ae:baklava-celobrl-oracle1:baklava-oracles-westus2 +AZURE_ORACLE_WESTUS2_USDCUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x97ef27cf3ce65b2558161aeb1e3cff8b5f71fd04:baklava-usdcusd-oracle1:baklava-oracles-westus2,0x559702d23983eb29bcf30f2487d477945c0dbc6a:baklava-usdcusd-oracle3:baklava-oracles-westus2 AZURE_ORACLE_WESTUS2_FULL_NODES_COUNT=2 AZURE_ORACLE_WESTUS2_FULL_NODES_ROLLING_UPDATE_PARTITION=0 AZURE_ORACLE_WESTUS2_FULL_NODES_DISK_SIZE=30 @@ -78,9 +79,10 @@ AZURE_ORACLE_CENTRALUS_AZURE_REGION_NAME=centralus AZURE_ORACLE_CENTRALUS_KUBERNETES_CLUSTER_NAME=baklava-oracles-centralus # Format should be a comma-separated sequence of: #
:: -AZURE_ORACLE_CENTRALUS_CELOUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x02b1d1bea682fcab4448c0820f5db409cce4f702:baklava-oracle7:baklava-oracles-centralus,0xe90f891710f625f18ecbf1e02efb4fd1ab236a10:baklava-oracle8:baklava-oracles-centralus,0x28c52c722df87ed11c5d7665e585e84aa93d7964:baklava-oracle9:baklava-oracles-centralus -AZURE_ORACLE_CENTRALUS_CELOBTC_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0xA4fb648D6180183721c2a3Fb9D5b7841D4AA20C3:baklava-celobtc-oracle5:baklava-oracles-centralus,0x5716647dd1c618366D6B55dD421e339FEC5973ea:baklava-celobtc-oracle6:baklava-oracles-centralus,0xf7EC7C53BD02A9DE1fdED7804c93f00D53A25fd2:baklava-celobtc-oracle7:baklava-oracles-centralus,0x5F79fb6B2B388dd33b48D7d1F8ADd31ac87d3c56:baklava-celobtc-oracle8:baklava-oracles-centralus,0xdc91137F84332a5b865a4A3463E693273c735A25:baklava-celobtc-oracle9:baklava-oracles-centralus -AZURE_ORACLE_CENTRALUS_CELOEUR_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x4Ab2B594f08403b6324Cb0B172e332d8a08f1d5a:baklava-celoeur-oracle7:baklava-oracles-centralus,0x21d66472604A931211379A32710D26AFA203D190:baklava-celoeur-oracle8:baklava-oracles-centralus,0xECF4192Db52696CD08cB909e700b1F5962aa6fA2:baklava-celoeur-oracle9:baklava-oracles-centralus +AZURE_ORACLE_CENTRALUS_CELOUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x02b1d1bea682fcab4448c0820f5db409cce4f702:baklava-oracle7:baklava-oracles-centralus,0xe90f891710f625f18ecbf1e02efb4fd1ab236a10:baklava-oracle8:baklava-oracles-centralus +AZURE_ORACLE_CENTRALUS_CELOEUR_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x4Ab2B594f08403b6324Cb0B172e332d8a08f1d5a:baklava-celoeur-oracle7:baklava-oracles-centralus,0x21d66472604A931211379A32710D26AFA203D190:baklava-celoeur-oracle8:baklava-oracles-centralus +AZURE_ORACLE_CENTRALUS_CELOBRL_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0xe467003845bdcbef710192d86263716815ab39f6:baklava-celobrl-oracle2:baklava-oracles-centralus,0x4b7f9e7e18230a271109f67b60a70fb3b4d0268a:baklava-celobrl-oracle3:baklava-oracles-centralus +AZURE_ORACLE_CENTRALUS_USDCUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x6a0e5d8a496feb59464028250c88a08341ea0831:baklava-usdcusd-oracle0:baklava-oracles-centralus,0xb15833400aecc72cb759d4e57a3a5a9c2963a5c5:baklava-usdcusd-oracle2:baklava-oracles-centralus AZURE_ORACLE_CENTRALUS_FULL_NODES_COUNT=2 AZURE_ORACLE_CENTRALUS_FULL_NODES_ROLLING_UPDATE_PARTITION=0 AZURE_ORACLE_CENTRALUS_FULL_NODES_DISK_SIZE=30 @@ -128,17 +130,6 @@ EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto" EKSPORTISTO_DOCKER_IMAGE_TAG="b199a634866ef34c4fa1925381dff4de40eb0a3c" EKSPORTISTO_SUFFIX='1' -ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo" -ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-c083d6da32ea2011653d2fe993addc443bc8708d" - -CELO_PROVIDER_BACKUPS=https://baklava-forno.celo-testnet.org -TELEKOM_FROM="+14157389085" -SMS_PROVIDERS=twilio -SMS_PROVIDERS_RANDOMIZED="1" - -# We only configured 15 nexmo applications. So delivery receipts from the second 15 will always go to the wrong place for now -NEXMO_APPLICATIONS=ef341798-ab17-4029-8e35-eb574aaf3a59,dfffa813-14a9-4788-a920-9ba3ea6b954f,e4dec04f-9f80-4cdf-b640-db1a5ce6f891,089bad07-739a-45e5-a0ab-c24de477cfd2,fa5fad11-5a18-4f46-954b-250915003fa6,5c53815b-658e-415b-a6e2-709cc099b5da,0b494350-524d-4e0e-8b96-96e7f6d79e62,5e5fed3e-841f-4b09-b17c-c54dfea16493,2b537eeb-8409-4477-8922-c4f1a112b8d8,9870cd94-4281-45b5-b292-c0249632126b,1fdb10b6-45c0-4555-816b-2c11007286c1,1b1f3644-8e3c-47fb-af3f-49c44c133a7e,fba4f241-14ad-402a-a871-073e40eb8b48,2cec3a9e-cdbb-4f11-ad25-d83abd23e299,e6c77355-7113-4e57-b825-17078dec0c31,ef341798-ab17-4029-8e35-eb574aaf3a59,dfffa813-14a9-4788-a920-9ba3ea6b954f,e4dec04f-9f80-4cdf-b640-db1a5ce6f891,089bad07-739a-45e5-a0ab-c24de477cfd2,fa5fad11-5a18-4f46-954b-250915003fa6,5c53815b-658e-415b-a6e2-709cc099b5da,0b494350-524d-4e0e-8b96-96e7f6d79e62,5e5fed3e-841f-4b09-b17c-c54dfea16493,2b537eeb-8409-4477-8922-c4f1a112b8d8,9870cd94-4281-45b5-b292-c0249632126b,1fdb10b6-45c0-4555-816b-2c11007286c1,1b1f3644-8e3c-47fb-af3f-49c44c133a7e,fba4f241-14ad-402a-a871-073e40eb8b48,2cec3a9e-cdbb-4f11-ad25-d83abd23e299,e6c77355-7113-4e57-b825-17078dec0c31 - # Genesis Vars NETWORK_ID=62320 CONSENSUS_TYPE="istanbul" @@ -193,14 +184,6 @@ PROMETHEUS_DISABLE_STACKDRIVER_SIDECAR="true" MOBILE_WALLET_PLAYSTORE_LINK="https://play.google.com/apps/internaltest/4700990475000634666" -# Attestation Bot variables -ATTESTATION_BOT_INITIAL_WAIT_SECONDS=1200 -ATTESTATION_BOT_IN_BETWEEN_WAIT_SECONDS=1800 -ATTESTATION_BOT_MAX_ATTESTATIONS=32 - -# If this is set, the bot will skip ODIS and use this salt (needed for baklava, where ODIS is not deployed) -ATTESTATION_BOT_SKIP_ODIS_SALT=bot - # Number of gold-holding bots that vote for validator groups VOTING_BOTS=100 # 10,000 CG diff --git a/.env.mnemonic.alfajores.enc b/.env.mnemonic.alfajores.enc index 180532adb2461c90530387f5894a89ccae551502..dc214d6f47d1182b0482a947c12cafe1ab4ddee4 100644 GIT binary patch literal 1542 zcmV+h2Ko64BmmByEbD_?K9wzz@AgdJSLM5A>mjJsUr^0qWif;L9eI@gEE3%d0IIKC z5{EfsV3+ScPI}M=@23PD>~5m;kQy=I?NgmWIW^b+#7qdx`Ar37nB5YEo$VODV)Tuz zhS7Lx*rhsS6o5^q=PFM~1JVEx& zZs7oN6w@<^XJ`7o$k&8g*|-#Wxwaa`TLgD{kQIg7x?^*+kzfGC6Gl|fQ&(=~1pD{! z27bK*)mjn-S}eDo$5FeGCc+(brdUnOQd?@0&_(KqW?53q<2tA20zDfLz`DLeN@V)k zcq?>{1uPEXj56;GGe)Vwd`Lk&0(@sXveUMLov;LiL{-$dnDJROrSI69oYjA4f_Wys z9M|jDJ%j36s(!+8FH$T4AX4wx)|bQM`bb`AF=?S>iv-(lJ`>=EFrGlQ;Hr&#=~t^x zjxt{j&3`b2T?Zsz>M~be7TUQFONhwm%K)N_*GgO45M7d1mS1OYdmABw;hjB#=-Jpz zV({(lMd>suKbBG0o^H7>7xbTwu0yGTgd#HQw1=58@-Q^!2-FFT{846e0lsA6iku@P zLvL~n(rS1qNkSwYFOg2MqIU9spZ16_S{9g3yi8y%X^my$dVvoLXhXLNo>%ByH#YcG zvoZd}^+jY?8rnwca9#h~iJR<1qq)YKt{H(|(z|?_ajPSOd;@9mQzY=9S z_a+H_DXhEa97^fH zs3+$>wWEr?5uk`Ok)1a!Km|q{Z#RA^X`xfIK2yK<8yDJ^LodZo@b-4lY_dwELb8$a zCy_@T(STwA!*Ub!9Wd3A1cv%(I$A@6J~oVtEt*DatmWT`64+iwxAIg0iC7gTs2am9 z+&?v%GXsIB({c+Doi-u4Tf>B#T@AbzTLuZ)Xm`yR#E~$WxmXtDiz8v>56J~mkloZr z7Ry8Hf{R8QxQFNmSx9&sJ{1;NdQLD>ec*o3<$uVYOt)+bAAA9qP1z`or%?|>o{ZGDCb z{-O*-mFi}sA$0ISx9oQH<$k8CRBb8gz8rx5lTTZGR><&RdJY0R4DbWUINCYHNj!G| zzsdGm#Ku-|4EhAZff-j-4vZ_X4=q?%<@tp7tBU2yD zQ;Ly;Z^$8Xj%0XhrzwIngmmYv?l8HNzi7vBmZfuvQlDvXRo7f4&89AdYuHw&yRD zW_^h-gFIK_A1BlrXYWjIQS|q8fXk|;gSKq&Y@Zx&@~frJ6h)>_3SI651Ay`TVk&lK{qA&mbsdkLseCn z>(jF+0rTP8)C_WPx;l>&TCVlJC}f0lu1`yKvYGz67YNbK;`JUMoDif`%$lJFR7gne zQn>#fprWpYLq!NSFnmS`#fYMeYQf2+V>C?y{N-9)2~To<8gHIRF3v literal 1840 zcmV-02haElBmmByEbBQf)kO1MO+m5;k|W%frHK@=dgvICIE0IIKC z5(_7QS=rUV6eVTR$!9KtS7pfIlV&SN4shSKq^ObX2N(+? z$L_tcg$D_#2qik2Q*s{Ij?a0E$IKNby*V!@BRG5^q4BR~!I6lyfiDa}1khw*ooh(v zuiau6zy`+N+IWUvGe}#Qf#}zwznCHj8gi29)3an@WXxK~_9->3LjKoy%ze(rNTKW! zYHIpW;TBQYRMpu+q>3~3M?L zkRm7^;)pyGv+_o|+8Fej$9oCqrO@0^D`by;;oy9o{!3_{(+KXp7t*d2GK(9r;A^PP zod#Mja|HD02iSM3nxm*evk`~)Ujgo+E~dG@jk+b(8{_dG+C|yyLwciujA+acOS*a3 zVDwz_cN=rZ#lh@dRTgs+P-dtQ7Er}r?ch&zG`<#k?9tf3T2AG^OB(3;biKiaD(O=r z2bB7`A8-Q~>Y+IZmOH`psI;KOU{^u(2y^6D-7Yo)4O~~I#RB6jObG34z&Y#a;`u>zz^EtTmnn6hsC?7~>NGkp@A?*HhsmM3|p7@u)}F zUd2&_tw*FWrSfq$`7B7YEGhRjy;F7Q87ngHq)`das`~*}l)?bzhE7=s=Rod8_RRuQ zBFbiEW3dSxNfLz}nc21O##{+KElO+Id5eGWc|odGNWi? zLr6?mHZDd>*#q_w*#nC1lXgSi?wM{ycC^qx3#_ zZ)w-^>`>*X5-a%>at45iB+CP|FGAMXsWd@6r7A5dgwR)+r59)AOs=&@B_g`DQZGxu z=7yK0e!(u9Dzv*B5Lj`i4VNgt``emBHPRx^N(o-MevO~^c^jt~4ww-maRp*#c4noS z;Tq3Wf;0*@mHx-WD^f}P`*YPNa@_#v=UY#^a+d+YV`Li%AhRDvmyi|v-bcc^1+$?G zfXG?e{{iNQnHS76;!3p6VhEOd6@p97`VK^P45?2(dt{YC_X&VMC|gu8dFC|w;ks2M z@)rIpPTAw$Qg2TB82i{^exD+9sVP3nE@@j5vYi(MSkA<84gOmliJMsUC(XP!P`9_N2ar-(w(hE4io1d&m^sY zUWMYkUdrz!JWtGW!D;&dssMzl_~diMt(8@$IPqhS^%2 z(I&=4Y9$V5pgpfw_409ZgLl>~?my#v5Oyj!G^K-Qe!u&BX$8gWu)@l8HSddd?EkHS zNaY?_G~p%9z)$ogFfULsRr+)=z{P%lV@!2LFc-j(p-mwF(O{y=e=*v@cPK2t;cZL4 zQ+g{6JMoV;A?a|Ym8 z47R}0g<;8=UoMn$-@(3eR~ECGjv3*H+#dEU33t#Gi)2%5mUo zEb}TLc0v2IXr>!zJP%-|1C-y7Jx0>K4gZ)P$3PF11Xkrh1@5+2(`GszCg(Hjea%jo zOa;+^o6RY0)2=y%g5Tnt%f-WLe-YWO6Lrst?{}9gnK1;D`LWWfj=QdPo1lXiU=UNm e`@+}6S`;L5WrXw!0UoW>rIxLM84YSfgFbL7z3kE`M7mUKRuaJp0IIKC z611Hg%k1=Uvm%79HhSH_wf)yxc4$ym1H5{4$Jf>hD#=onF}qK@I5m4%9d-3d?G{*ok*Kr3^cS~~D>z^r|3 z(J}wJ&YRcUuyK?D`AGxb$`@Xo!LAz--G7pz5KOf|GD>^(*T%qLs6O|{ZsA3?VL0btmD z$s2!AWd*N+0XcKZi=P0o9&m9yy05jj=S;3KQjx>Th|Qrwzr|!1PU>}I7x6}?ULofE zVpdn0SuSaw7a1Y&KQbL{US^dLiamWcWnqRCCKdKcJAd1uSG+pnTXZO1!8diG=`J+Tr)6Fslwt%XEj~zj%`LW&B}YJo@*`OY)F; z<%}nwyIVuDLqvWflOkE2Ox_Bd;K9Z@h3=>APEY0SI3k<{QHCpq_H6o;oLCL6U(*iR zd1hDeu5P>uGb;TL+W;&H?%WLZ6&kVsGM8pd$rGv_unNo4GTZD_Sj{s1unkg$U`A|E=+HEd@QIOcpKu`y5BqHu`4w9{u&8r~G{ zt+HyM(lpU;e>meH-kUo+CoUy#3$R&y#^8tHwxcjw91t5P45a~4nt}8cK=9twnLvW&mx2|4q^5qW%Y(?Wro{Ux z3yav6nMbCC%oUbSf}AoHgvEFw3&70bTDEbJKu@k)FeH51aXeUXtB|rmyQYAigB7ZR zVQX_l<#fD8Du~cNz*WtyFy%L0#8Q+w0`IR`#(Y<}Evdo2GACSR!#(ZkKFVFtYr2Zx z#~S;|-r=Z@AmpOzQ^#d~F`n!JoXU(#P_=9{>oaWtcKD2xIhmmqfU UPE3qmR)9>W3Iq{ujLV7)2At7oc>n+a literal 1551 zcmV+q2Jra`BmmByEb9gImKYJd*ep&kxYx-!503kvXs?&Yk3k9x5P$+P=@RA(0IIKC z5;l5!TZ$i+H6 z9(Q-86k-G;59&YlX#pWt#4@1yPR4hr=&?W^2=qTmX7=M=2nM{<8QU#*AjS;U?cXR9 zKD=-BgZB$``5@we_)eW9rSYNLQOlrjwd94_idrBIG8#5TqY2a#I|oMEey-+tuEK!x zCFQ<8JSCP#O!13|p-UiMtnk41p<nL!#N6Q97KBxts_`LUkX?r#PlyZ~CWXDq;4P*>& z>wQN-*t1Wr@n^q`a{(r)G}-JlcjQkQ!`wp5%|t+LGCX-c6@&ptRFH0A?-ALK zjc}VdRaN2}CX0U=oLpbE^Aj4w;7?p-nzrV2xk7_!rs)I*N``Swrsxt8RA=4Kuhx&D zJb7OBJ-^q!X|aa`ZIW}iBro~y=S#530}=)CHNa)A%&7CErv={rWa7J^`@ryKwrmGo zDW@E}Qsk9~TYIGp7l?(f!binNoT8G7MZQBhe65?ks!8kZ(KsNv)DHLbYj{X`NXWT4 zzD#`ij2YD1gY78^w@Q0_0gfptJrK?{t9a5utXv?so;J})P4A>vvXC?#zInhQYue#+ zD8Ar}tb)hf>1~Nfi}oCpso#k zk!TQKBlG!?0>GF`CqZ(QyhLBNn^)IqluAG?d`+$g

W345UvesU8VaalwbPLiVh4>=GtD4!JS{3|wKqJkTPddo03=(~Gq?=+JY2ddI>98(~bO%}fEQ zh~Myzf8<1D{WhPtX7788UWD5b98CCV}`fEQNyiP z@rrJwMbZc@L6^w|$hi?C7^1uq<3Z7GXz(mwAosGpqDSF}1yCn&Eb-^lk$uj`A&%AH zE?)MMlLgie=>;TAgFcs|4EGSv_}asl7XCw&#GsJi%NV>DSt=-2ZO0v*(5R?(e1J?X zqV$nnhQfm+KJ*nregi?uv`@In7j+yeh}0>~mkgl^!i!*f_%hedy0sasu1)0;A(4v4vLxL?rDUJ}@$z%4}k?b~b8qB(CmA!p$ zZ2KByArCbw!;`~B9vf0wa@VTL*NoK)2>5o@hyr!zgu_$ju9iB2xvQMvp3tV2NueDeVI;xHF^GF7RIXH9u8fO;v?KqC z?Um|s$6%%F-q#MTFrdD)xTT)8SoR{1iVd^A{oS3WZK$hxUUQ!*Aokfgpmss&^oL$I B{!Rb@ diff --git a/.env.mnemonic.enc b/.env.mnemonic.enc index f78a2211e783ffa68c114ab8ef6a62d64ee8e45b..f2d0ca8971250f191c2fda9c5c181c781c8f33f9 100644 GIT binary patch literal 978 zcmV;@11<6y5Y?6M3c@n7y0IIKC z5(J&Fz#icH@xf{;XO|!&VLV$|owXV=wG~_7^2qZ9SMEi-_Gq5Q!wwXxk}tOb0Al|C zyRb$q%MFS4?&$(4XM)CY027sFVEzsd_t?$%JcOtH0WoiTyAGShk7y-)35%tf_$Z>{ zH(_OyccL(;tilr^ZBQ#+UuFQv55*D7wFD<@QIK zsm;&WnDhu(O-C~n6=EUx!Xu-WxKZ;grIPaa95KBGuOtsAC<6NW+cqBBEH#piN!X2L z8)+WT1n7SieIg|@5vjU*7B`81g|+_dBU;o^H9RhfXA!&Vkdc-ti77@zim#4Lp)M{P zomne^Y&qO47y5YQ8?TiN1BBh0Ee=1wUZxZ0&QW|}b_79FkKIb#cXdVICn>xd=Vsb_ z`tXv-)P`x!;^_vz)|_Ar57E57+fJ;qk;m@7)|~ofufBo032SnoQ%#7*UPb4v^wkTd zFh*&}jr1Ex`;l-gZ)OPsmLJG$_L+A|VTTC2JaM)-h)*x)dJGWahjk#krHYONS*O}N z;o>3ZBA-1d(idpU>GMRv0UAT5^+=3xmD^yRtSO-l;;Dw1Tl4H;84|3u1O=(f0Tbdn zTLG9ze)sa=3%i#<8$IREy2so4&%PZn<4RlBt1KX39gZO(o)- z#&7t_Bd0IRqniOeS8jrIGMbCK_35`)?s7U}J9C#y zt#}-j94ocz^;QV8jvS~>Vk0{0f4P?XHl%c;%Z`I7lX}3ol-y>~0GdfQ$@BX8`;Q(~ zV$1vMukP`(^U^^65NSn}HwA2wQ(A5!MEV}aWIg=E`bn=in!Iu^(NnmBPhZ352%fd9 z5vxpSht}4}x?OZ20a<8lw9?vPHJhw59o>p7tPM;Iex6FBVDkFRAOE>x<1bnN=8cQ| zz!x38HR4 A}fiC|JW{}=7t z^C0aQHbb$M4T#>&WUX71 z9x>F5qF0Myna~01^V`Q5-UxO*310?5KNGIVEjRjzh`n2tEr99Vlb1 z{DK;!lejGiZA_P^6d65SSI-W-BHdhwG39!4jHv1BSoN8wpDMTYrA^SE=4+w+2LvNG zpr7$fVkX&zi0vm$Mf0IUr{&-Vk4q0>6F!276Ya#%I0eY5r7!Z8j5|ex)~NmB>4U#Z z2pLmiuW4x4&3%N1(7A||NeghuiNN!gi3L@G;AhVUPf1WM(!9VVuxg?}cWMZ0Uk!7e z-E!*m|NUkfS`*{1V^NaPq*}6}2&T0Mal0}}x}Sk`FN}bDGgEw5kU|-U-2joSkL6#} zATdI%?%4H(C9z+MYjuYq-*$6E5AJiyS2YzGEkHsBHmWx}v+#!>rOh8kPcsA&h# zYuBWv-XdNz_+AY9Z(Bv95p0Gi(b_6t=N0cgQ`P(T`!@L48)S$M97aTjmJWsJ3^GWd zgn%hIoSV_VqL;$57jghUtryU0_leSQwL#H94(7!{?>^k*6x^0gAT^HG7+-k~OspSn^})l=kif>d0~^%q zs8XPGH#hHbU3|q?AApe7vU~NM?1`74fKd~TPww1zJciu4ghA7Cwk6DRVT;%8-aXk+ zD6L9`2J(GEc?}2o1)FjKK9y^!@+LE%UG5ut@lD}cZ!I>=J7J$YIB6hW5$>eW+|Mam zXnL;ZE-a4plX_gM<$r9Uw&mQ1#8bG~dQlxf>-QcxZ8dbfQQ!%8j*{JyhGunrngux- z?Dt8tFdxqFpBN#OqguqJfr+tesZ65QNFka?BHVm4wbKj?V0hXvM98kk9S{G3@-==k zy_hVYz4dPc;7n2AN>k^%GG+?LSb`B+f5cH7fZHfKZ&XVwL~QXlP97e0^18sv7EV1( zC+P`0NcD!*DPU@0{}a8b!L;t&y4$?fdutm~#9c!lVg8=)r;>vHF*Jx@U!ztH^;gvF z6_&yw21=F%&Eed*OrPE$4*3)5`t}-t3c??U!(Q1>10>v>3VnlR0DSx(_uh>yxmKRGEx^+^#dtI{-oXsDzU zL_JxQO9Y9!VWP_ZIYUn=?F3uG0lvZlU$Q$xj;w~)shJAF(uazd$lwOa(gmZI@6s#? z3M44f4H%k1=-xqkpDbOz EtI!-s$p8QV diff --git a/.env.mnemonic.rc1.enc b/.env.mnemonic.rc1.enc index 7a61587ec4bdefafb2ae0a1940eed9db1bc02f5f..37abb5321b6cec1ef16b45bfda5e6253c99eb74f 100644 GIT binary patch literal 1821 zcmV+&2jch&Bmm*Y?RoXb+bh(3)n(tvP*a^!Hz;i{2o;~=%%PDg*iT+u{}S{K0Gf)R zsLtapk&FX$exC7Hez?KZE>{krlDW|z{6le;2YP-kg8S6SisiU-lId~Z;P$*2;Di~e z#xS_$H;iegu%|ao3I|85o~5M`dI6)kYK9n()X|Fx~e>wW4Hj>Tv3kV)r`le5MnccQ$scheMZpsl@OrstcZ-%VZ63Fza znPZJ(%9mMp3$2t*hZ7*8Eg54mV@1G^jg%9iWZH4t?&oR=B@*!)G)j}O80l?l(-uS zfki$*ch@#Wy_rFbjBflI4%8q<`IHKQGmzXDLxLA)2CLn*ADZ7ertO#Bpx_)%AXwZu z&g+nc#(&ru#P~)wC}NveKtG@GQKC&0psAuL_}BqZ7WtiYf{-QLUUO}oi>-T04`+aj zd{xf@M7S&p??m}I0__*P%@+@GO3m=O3Tpg191w?XBK+v?Y$lF^syP|N&`I=BSg}*% zG)6Ip-2n35sy(_~4bia?)0D?ee;l_p_>S1ZpoE#6kLVy21 z40?h4q083&oROVzyP0mE+En{^P;5VB?tz^9{z3;haBk8p_e)z~ms-z7I~;Wue^D+K zysVhJYE=&m;J|PC?Q3>$_~@j=Y1DX9Xx;kw0d=|{X>&}Jy5>d_E} zGa5j@)$^H`nWvr>WkO7`+%z#Jrmp9aTRP=y0_p1)4v4~A2f<3;VXVGzo=3-7H;$ks z@!&ho2Ofkr%t{GxtRGsd_2oi3Snqq)1GSPRv-&Ndj+hpWvBr@~xXkOp31R$FDXj}i z04dfexNyeao9sf&=q>(`hgn1k#vY)dr?jSeO)rf z6od5QPo29D=YUU3eApv(8}9s)(WLt?PyaLdfI(_0n-qJA<+zAte8!Gfgo;K5zTtqY z2FBro;rVY5*@{<2Gy+@qZ}BXu!Y=^hy1F(710-tytHwMPnu~s7vG@OW`akECzv^5c z0PX&$Q7aQ$E}5_tTD;P-QfDT?1iND#BP$uY0=uK; zgyeS4zfiW0Z}($FnHGIe4c&=Cl8WKF?p+kJNTP$eCgb`WnDd)P{fN!6>(L}da7pe0 zK%wfvqMI{TYujg^09H*Z1zHpTSmVT7wQm-*No&j~V46q!F=&uq}?sUx4XSjNM zY_K(e%>3dyNRr*ER)q-ek>Q8WBI|3RL#M*NOtt9g+`#b08m0zDskNX;AFFdg1pBgH zi30LV2YQRW@u@uKxjJ46y)zq;+BJ@Yl8a4&Sb*F@;)32=d(6LsXqXLCbzZt1L32)? z5dWRUusNof$vQT6qnb~R<>UDAV=&=vHUMU(jZdMBZq4?2GN9wnbn|H5nu2M_?AXdA z-f&mX(59-V2Z#f%P~}&adP~0q?~;p^{aOzU24$$}w+h$;Z*7c?_Q1h})8hWN3U9k% zC~x)-gFm1&5>fr8EkGd{aBjDX0yQMHB7N+2p16pyrWRp@#%#6|5GBH#ST3E4uw==J zAspC%K@OY2I{e_3sO|N)-~adawgdE`ZEq87Bk`soOcu@r57GerpScGz zP^}wn&37f0!VqPKOE@VZA7+;P(XbP%QBC$F4jfA2&RYgRxy~*$gxlb;m=BEMBtDpd zv}|Zt2tx literal 2033 zcmVl@&rAZmQXW=m4^k8!vp&qNn2|+dM zlMsrxg{OsLo%TT0%@gLJH3O}T{LW}W$s!D}^Hd3mpdl|w@>`Uy1ir2+cmrt_!<&G> zIDH+%4)ej4C}D*tP_y z1p`@DGtl9ltX`a=Yk&pehni)x8k!r{U+h*9ln2cChKQ96an+=o@K8S)zPyg>S62xu{AmtWroF5b0nZe6_A=?c1mJO@785`WE<_`U zT?&?-!wZ0*`vO{i(7HKivmwKm*zI!!I1>l8XdUusUYFi(JmyU93^f%pt>e8>q=8~K zGo{f?8fT8;JB$K^a6aYfz)v~Ty=Tlwa$!v1<=~=V>zsA8yK`n}U}C<_;@99IwKTlM z3BEnO#rq4m1eF^N@^3EubVPCH+yrqB-r*V%6{U?s)d^%#$;z}CzTm*Z*Y}W%@@gAZKF+seUji39+k!yokH*{;H^9T+!}HNzH--R z$bnzGZoSN={!h+1^s(o$?WgHBn z>l?Of$SVhXASlqM3Us#K%dZNJ0ZLe#Y#_uY8_8YTP)In`!LWOk?;$&O*K9-wl*9Be z36NEMg)qqRminfytb62;=K_8V%5-`Bgjp}~GnDU@owt}(3EW2t7}0XQGO&bvN({~v zvwGJXSJ!*ccx;!myCMRQT{6u%9p^?nqE0#lWadxMC+x5t&U}?KXt&6jeZ_GTRUI-4 z1VIenP3Ywk3w6e$2TH-rY0v+4IxsFrqF|EUdZ zy2SK$1bUmPCqy^Qo6jT4;Q%k5t2pYQ8SM0A4&q$lUibJNW9pRv5GACsDmmPI z3=H-yX($%9Vnh7V()t~KxT^J`66!1QK_3N;~EZRQaMN`a;DC^7KxL1R*D)6hp^tDHp|~1<**-zg&T*z{h-9 zg)UF_kNd9Q>4L@~VnZ@7z@$YHXe>dXW8gAM0-TthLKSYJ&dCr2@>4Rp<~4Rp@cocq{w{n?~Tb^MPW} z4wN^(%NJX|28r6%o0-ukULtqm&n1EJfmvN_YQxU{J-(=jL93Efzj`BfW2$oYxRAHR z%PK*qh-@{Yl^KY;ULOxD(#dLrBQgn{PJ&mkYp7_tLx6TJW&}!zA`7jat##txP7:: AZURE_ORACLE_WESTUS_CELOUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x0aee051be85ba9c7c1bc635fb76b52039341ab26:mainnet-oracle0:mainnet-oracles-westus2,0xd3405621f6cdcd95519a79d37f91c78e7c79cefa:mainnet-oracle1:mainnet-oracles-westus2,0xe037f31121f3a96c0cc49d0cf55b2f5d6deff19e:mainnet-oracle2:mainnet-oracles-westus2,0x12bad172b47287a754048f0d294221a499d1690f:mainnet-oracle3:mainnet-oracles-westus2,0xacad5b2913e21ccc073b80e431fec651cd8231c6:mainnet-oracle4:mainnet-oracles-westus2 -AZURE_ORACLE_WESTUS_CELOEUR_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0xC5280DDbDEC37540436935C01C912869B2d5Ae1c:mainnet-eur-oracle-wus0:mainnet-oracles-westus2,0xb8bDBfdd591a5be5980983A7ba1710a5F46f42B5:mainnet-eur-oracle-wus2:mainnet-oracles-westus2,0x929Ad7f2b781CE830014E824CA2eF0b7b8de87C2:mainnet-eur-oracle-wus3:mainnet-oracles-westus2,0xCCC0B54edD8dAe3c15b5C002dd5d348495d4f7fe:mainnet-eur-oracle-wus4:mainnet-oracles-westus2 -AZURE_ORACLE_WESTUS_CELOBRL_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x57d8a7bf9e7f4113c49e077b140fd8e1d7f78a76:mainnet-brl-oracle-wus0:mainnet-oracles-westus2,0x1299dd007cd5120262e546dca893e30d1cff8a10:mainnet-brl-oracle-wus1:mainnet-oracles-westus2,0xd1f3d8fc2446d2ff0e2408ae33a0097a4c94e381:mainnet-brl-oracle-wus2:mainnet-oracles-westus2,0x116951e440aee97a328614f9937710c9bb2f0839:mainnet-brl-oracle-wus4:mainnet-oracles-westus2 +AZURE_ORACLE_WESTUS_CELOEUR_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0xb8bDBfdd591a5be5980983A7ba1710a5F46f42B5:mainnet-eur-oracle-wus2:mainnet-oracles-westus2,0x929Ad7f2b781CE830014E824CA2eF0b7b8de87C2:mainnet-eur-oracle-wus3:mainnet-oracles-westus2,0xCCC0B54edD8dAe3c15b5C002dd5d348495d4f7fe:mainnet-eur-oracle-wus4:mainnet-oracles-westus2 +AZURE_ORACLE_WESTUS_CELOBRL_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x57d8a7bf9e7f4113c49e077b140fd8e1d7f78a76:mainnet-brl-oracle-wus0:mainnet-oracles-westus2,0x1299dd007cd5120262e546dca893e30d1cff8a10:mainnet-brl-oracle-wus1:mainnet-oracles-westus2,0x116951e440aee97a328614f9937710c9bb2f0839:mainnet-brl-oracle-wus4:mainnet-oracles-westus2 +AZURE_ORACLE_WESTUS_USDCUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x2986c21824c9b804d170270a316ceb07149f79c5:mainnet-usdcusd-wus0,0x09e2e47bb5df7b3464407746970a65c7b02883b3:mainnet-usdcusd-wus1,0xd5e7454932f6e853af849f70044570b62ca2596e:mainnet-usdcusd-wus2,0xfe3276b7142dee2cda34b1d14852eb32f436483d:mainnet-usdcusd-wus3 AZURE_ORACLE_WESTUS_FULL_NODES_COUNT=5 AZURE_ORACLE_WESTUS_FULL_NODES_ROLLING_UPDATE_PARTITION=0 AZURE_ORACLE_WESTUS_FULL_NODES_DISK_SIZE=100 @@ -96,9 +97,10 @@ AZURE_ORACLE_WESTEUROPE_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-oracles-westeuro AZURE_ORACLE_WESTEUROPE_KUBERNETES_CLUSTER_NAME=mainnet-oracles-westeurope # Format should be a comma-separated sequence of: #

:: -AZURE_ORACLE_WESTEUROPE_CELOUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0xfe9925e6ae9c4cd50ae471b90766aaef37ad307e:mainnet-oracle-eu0:mainnet-oracles-westeurope,0x641c6466dae2c0b1f1f4f9c547bc3f54f4744a1d:mainnet-oracle-eu1:mainnet-oracles-westeurope,0x75becd8e400552bac29cbe0534d8c7d6cba49979:mainnet-oracle-eu2:mainnet-oracles-westeurope,0x223ab67272891dd352194be61597042ecf9c272a:mainnet-oracle-eu3:mainnet-oracles-westeurope +AZURE_ORACLE_WESTEUROPE_CELOUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0xfe9925e6ae9c4cd50ae471b90766aaef37ad307e:mainnet-oracle-eu0:mainnet-oracles-westeurope,0x641c6466dae2c0b1f1f4f9c547bc3f54f4744a1d:mainnet-oracle-eu1:mainnet-oracles-westeurope,0x75becd8e400552bac29cbe0534d8c7d6cba49979:mainnet-oracle-eu2:mainnet-oracles-westeurope AZURE_ORACLE_WESTEUROPE_CELOEUR_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x87C45738DAd8Dc3D2b1cCe779E0766329cc408C6:mainnet-eur-oracle-weu0:mainnet-oracles-westeurope,0xeF1E143C554EFC43B0537Af00Ac27C828dE6cF8D:mainnet-eur-oracle-weu1:mainnet-oracles-westeurope,0xF4B4AA107F30206EA019DE145A9b778a220f9fc0:mainnet-eur-oracle-weu2:mainnet-oracles-westeurope,0x24c303e6395DD19806F739619960A311764e3F40:mainnet-eur-oracle-weu3:mainnet-oracles-westeurope,0xDA413875FB45E5905950Bc08a908ebD246Ee6581:mainnet-eur-oracle-weu5:mainnet-oracles-westeurope AZURE_ORACLE_WESTEUROPE_CELOBRL_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x3b91bbb873f3b979bd6671dc018d5fc1848882dd:mainnet-brl-oracle-weu0:mainnet-oracles-westeurope,0xc3994b2af0e82490e432d49e9f2246cdfd84da8f:mainnet-brl-oracle-weu1:mainnet-oracles-westeurope,0x9b376b33c33325332df8c6ca951a9896889a6d1e:mainnet-brl-oracle-weu2:mainnet-oracles-westeurope,0x554ba7f4d200c7b233b93b7f2223bc1ea7c467fd:mainnet-brl-oracle-weu3:mainnet-oracles-westeurope,0x535cea1834d6b52e4e9724642fdd7008f569ba5c:mainnet-brl-oracle-weu4:mainnet-oracles-westeurope +AZURE_ORACLE_WESTEUROPE_USDCUSD_ORACLE_ADDRESS_AZURE_KEY_VAULTS=0x477185291403ca2ed5f56d59ed0d568a16222013:mainnet-usdcusd-weu0,0x9a0a52d483c62df76d54f41ab3283cc7cb41ba91:mainnet-usdcusd-weu1,0x2ddb86898a2c2c884fc5cc3ca344898b0170a00d:mainnet-usdcusd-weu2,0x79be0a692e3a4bcd22b96c3e93a108b485becbb2:mainnet-usdcusd-weu3 AZURE_ORACLE_WESTEUROPE_FULL_NODES_COUNT=5 AZURE_ORACLE_WESTEUROPE_FULL_NODES_ROLLING_UPDATE_PARTITION=0 AZURE_ORACLE_WESTEUROPE_FULL_NODES_DISK_SIZE=100 @@ -242,9 +244,6 @@ EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto" EKSPORTISTO_DOCKER_IMAGE_TAG="41fd75246c7108716be373d2d36cac13996034fc" EKSPORTISTO_SUFFIX='' -ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo" -ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-f4a55e143932ea559cf4bcbd9bcccc14da43d6ed" - # Genesis Vars NETWORK_ID=42220 CONSENSUS_TYPE="istanbul" @@ -293,11 +292,6 @@ PROMETHEUS_DISABLE_STACKDRIVER_SIDECAR="true" MOBILE_WALLET_PLAYSTORE_LINK="https://play.google.com/apps/internaltest/4700990475000634666" -# Attestation Bot variables -ATTESTATION_BOT_INITIAL_WAIT_SECONDS=600 -ATTESTATION_BOT_IN_BETWEEN_WAIT_SECONDS=600 -ATTESTATION_BOT_MAX_ATTESTATIONS=90 - # Number of gold-holding bots that vote for validator groups VOTING_BOTS=0 # 10,000 CG @@ -356,7 +350,10 @@ AZURE_ODIS_WESTUS2_A_ODIS_SIGNER_DB_USERNAME=clabs@mainnet-pgpnp-db-westus2 # ODIS signer WESTUS2 A Key Vault AZURE_ODIS_WESTUS2_A_ODIS_SIGNER_AZURE_KEYVAULT_NAME=mainnet-pgpnp-westus2 -AZURE_ODIS_WESTUS2_A_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS_WESTUS2_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy +AZURE_ODIS_WESTUS2_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS_WESTUS2_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains +AZURE_ODIS_WESTUS2_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer WESTUS2 A Network AZURE_ODIS_WESTUS2_A_ODIS_NETWORK=mainnet @@ -386,7 +383,10 @@ AZURE_ODIS_WESTEUROPE_A_ODIS_SIGNER_DB_USERNAME=cLabs@mainnet-pgpnp-westeurope # ODIS signer WESTEUROPE A Key Vault AZURE_ODIS_WESTEUROPE_A_ODIS_SIGNER_AZURE_KEYVAULT_NAME=mainnet-pgpnp-westeurope -AZURE_ODIS_WESTEUROPE_A_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS_WESTEUROPE_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy +AZURE_ODIS_WESTEUROPE_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS_WESTEUROPE_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains +AZURE_ODIS_WESTEUROPE_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer WESTEUROPE A Network AZURE_ODIS_WESTEUROPE_A_ODIS_NETWORK=mainnet @@ -416,7 +416,10 @@ AZURE_ODIS_EASTASIA_A_ODIS_SIGNER_DB_USERNAME=clabs@mainnet-pgpnp-db-eastasia # ODIS signer EASTASIA A Key Vault AZURE_ODIS_EASTASIA_A_ODIS_SIGNER_AZURE_KEYVAULT_NAME=mainnet-pgpnp-eastasia -AZURE_ODIS_EASTASIA_A_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS_EASTASIA_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy +AZURE_ODIS_EASTASIA_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS_EASTASIA_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains +AZURE_ODIS_EASTASIA_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer EASTASIA A Network AZURE_ODIS_EASTASIA_A_ODIS_NETWORK=mainnet @@ -446,7 +449,10 @@ AZURE_ODIS_BRAZILSOUTH_A_ODIS_SIGNER_DB_USERNAME=clabs@mainnet-pgpnp-db-brazilso # ODIS signer BRAZILSOUTH A Key Vault AZURE_ODIS_BRAZILSOUTH_A_ODIS_SIGNER_AZURE_KEYVAULT_NAME=mainnet-pgpnp-brazil -AZURE_ODIS_BRAZILSOUTH_A_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME=bls-share +AZURE_ODIS_BRAZILSOUTH_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE=phoneNumberPrivacy +AZURE_ODIS_BRAZILSOUTH_A_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION=1 +AZURE_ODIS_BRAZILSOUTH_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE=domains +AZURE_ODIS_BRAZILSOUTH_A_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION=1 # ODIS signer BRAZILSOUTH A Network AZURE_ODIS_BRAZILSOUTH_A_ODIS_NETWORK=mainnet diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ae1e45344b7..978502ea743 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -9,22 +9,22 @@ /packages/attestation-proxy/ @celo-org/identity /packages/attestation-service/ @celo-org/identity -/packages/azure/ @celo-org/devopsre -/packages/celotool/ @celo-org/protocol-owners +/packages/celotool/ @celo-org/devopsre /packages/cli/ @celo-org/applications /packages/dev-utils/ @celo-org/applications /packages/docs/ @celo-org/applications @celo-org/devrel -/packages/env-tests @celo-org/cap +/packages/env-tests/ @celo-org/applications /packages/faucet/ @celo-org/applications -/packages/flake-tracker @celo-org/flake-trackers +/packages/flake-tracker/ @celo-org/flake-trackers /packages/helm-charts/ @celo-org/devopsre -/packages/helm-charts/oracle/ @celo-org/platform-economics @celo-org/devopsre -/packages/metadata-crawler/ @celo-org/identity +/packages/helm-charts/blockscout/ @celo-org/data-services @celo-org/devopsre +/packages/helm-charts/oracle/ @celo-org/mento @celo-org/devopsre +/packages/metadata-crawler/ @celo-org/data-services /packages/phone-number-privacy/ @celo-org/identity -/packages/protocol/ @celo-org/cap @celo-org/protocol-owners +/packages/protocol/ @celo-org/primitives @celo-org/identity /packages/sdk/ @celo-org/applications /packages/sdk/identity/ @celo-org/identity @celo-org/applications -/packages/sdk/contractkit/ @celo-org/cap @celo-org/applications +/packages/sdk/contractkit/ @celo-org/applications /packages/terraform-modules-public/ @celo-org/devopsre /packages/terraform-modules/ @celo-org/devopsre /packages/typescript/ @celo-org/applications diff --git a/.vscode/extensions.json b/.vscode/extensions.json index e6c92b9177d..f24f6150e8a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -13,7 +13,8 @@ "pkief.material-icon-theme", "davidanson.vscode-markdownlint", "mikestead.dotenv", - "coenraads.bracket-pair-colorizer-2" + "coenraads.bracket-pair-colorizer-2", + "markis.code-coverage" ], // List of extensions recommended by VS Code that should not be recommended for users of this workspace. "unwantedRecommendations": [] diff --git a/SECURITY.md b/SECURITY.md index bf1d35b3a3b..3577e915963 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -112,57 +112,6 @@ The Celo community asks that all suspected vulnerabilities be privately and resp ### You may encrypt your email using this GPG key (but encryption is NOT required) ``` ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBGHci2oBEACp/wMmUFRU3k05tM7vCgAdhO/Y9QRrijlF6mm1+OBOes3Yrvjz -EUGXYj9PxXHBwKDEiHoMrgjkkfBHH/hYLoMdDUEjFOGYA8FnfrG6XnSNOmzv7BQ2 -XqAq0maklk5LIEvnzkvFfxSGLrqw/Jtj7rA0D2YhpUKQBF2aH3QowShyKL+y/Roz -IpD9D/jf4pyXA7NSm+06yLf8xVT6o5J9vK0dr+nG3BgB8JH66Px74S2liKlSJLmR -KTKLIoxxWLvPnVrA5YJul551QanbQAyARMa/y3gC3FCkhGKXjEHJufHo3F4rGgQ9 -RPOtTL3Y4l7AGzqrIZJGmkpZgb9cbu2QPJ62bBVPbqlkdGsSAmcvB1+CoaYljK/M -+w0NBEXGeny94Y9K3QWSsE1bln1YkIwQjr/iuus9t6/t42XstEzSzSKWKGEBRUD+ -fHG+85lZcrVFSPoFzxe9vieehs0hOPo4vweCR9UBVRx+4bgRAtWIBKpL+R9HioFL -0MCAv/RKs1fq0bcrizprVuszaQl7AXE9CF6wCHo9Zcb/72QJZawTrE9kdWsm1DHZ -zKHZRuugoOpEbhPgaERfxWhDoKOtpWlA8zr8/YdMFDA2ZTGo9BcLFQ1XABipxdb9 -vE3x6jHfwSOP8QhCM2Ifkdj9tO+7/AXGSpj6WJkn0tDc1vbdmKPwtVGJAwARAQAB -tCJDbGFicyBTZWN1cml0eSA8c2VjdXJpdHlAY2xhYnMuY28+iQJUBBMBCAA+FiEE -H75jpTellq32F3+eYOA4AaI4ZJcFAmHci2oCGwMFCQeGHycFCwkIBwIGFQoJCAsC -BBYCAwECHgECF4AACgkQYOA4AaI4ZJeCJRAAjUeSdL7LWIh9FfLAveuMvfNs+Nez -fH1L+wSxQ1c6NXe7SxEiOEJ6jJE2wy2d/lDJKaX0KeXwkom+DXjDuelz/bM+c/iw -5NV42tOwG0dM+uQJ7E6lrSmXa8YuwVYpV1NPtfeTP/C6r7470mQH87CNb94WzOR5 -DJHvIljhpNpj9Wam7GHWjKIei2/ol9FlDGhRzkNb6NZWeIekagLVtShb3ueIN3Aq -ONJeW9pBVuSmFcUoxnVc7w6fUJgEm0b/buptyx2sJP3CVxBUbnD7eop67nDA55wF -UiT4j1hEsvTAmfaHB29kBwSGQvtZdTXqkPdffR5xK3Os2tR5eLA6PZI0eU5nSBBv -JPRO3F9Vl46hMQUV59el0x3wrBZdnpHshaf0pIYrerjUDrrQ/pOotwgJxQ9Kuj65 -Eido3/N/IQjmcbiFeXuip1LNVaHiHgH4CzmOrOGspZgTGWbfH7F0dm/ktpHb0OC+ -cyK4x9MeCtKmwZxcINTUPjpLGPmle9h91J56XqlMq8da48idDcYAoMiEVHAA2qpi -r0ANFu9i1S0HD0daAUp5zKqbe6nlKZqhUKJbpDeHBhnWIZuHbmOU8s71i5I8S/rW -09Gk1jQekf0SliBGmDZFlxgN5UQayNDTPDum7c36s2IB18s+mw4zYdfj+vIOedtQ -+gDoihNS3KgFj4S5Ag0EYdyLagEQAMKhOuhokv/lp2aAvZfZA9PQGTy3RdT/Ek2l -zW0W4TSUGOdp+vN5kvdCncZqtj9TYbubkk8518bZm9FiVOjPzz11O4kllV06pqG9 -ukJ0gtodZaVGCKUgEHAKgjcp/dqgRxOpU5Ky4EPb5Wp9Y0Cnj/XXsO7TLjCnB5h/ -pW6a5Lua4iK2W52l9OxuZdZPcjHakOVdikdm9ablSt1rKP8Xz5I5Oo9Zf+/2dd6g -zVFnH54JXw+VhnMq+m6zFro4GsTNSjDk0L1fOSg3oPKw6yVvzpOzvYKn6nKYEKqB -atUsCsZxPFycPk9qq3TLnmeagpaP/OmKNnJCDqA6zvCuDkd5wAs/IPIxWHGI9fsC -pBHZDxhnl+p/3G52msdJMcSMxdh5Fj8GWSpR9zkehMbuSiMmqn/iQA+9AldUoA0F -BMaQJdR1hhxaeMa9LZDcgy1tLgf/sLJY3H+/Sc0lkKANpo7lzDit7pjAU92lTMAY -VzHPN66Uo8YSl/Uau9u/QwJ353Y2Bq7bMJV0wRbuuN4RjQp/Esb1qsidRCKBRqnD -KcYJ6BI22DE/HedqvF5vf87Zt8xy+pzU6BlmjuV61Age14xik2FPjFvLosdnYPJ/ -wlD8TPNI1sLW+bzKtJLbVpX6hKrar0rlsIF5PQpd7wqNgzsgJoqXpYln7+5T6q8m -kFWjzKRhABEBAAGJAjwEGAEIACYWIQQfvmOlN6WWrfYXf55g4DgBojhklwUCYdyL -agIbDAUJB4YfJwAKCRBg4DgBojhkl/3pD/9G1FiEIR0Vz2c+aJLC669yeKVmZyw0 -93qvi6bb31fuMUaauT8z5dcB0UEd+89sd7EtgEIXqKWOcR+EmOhXyaTb6jUGd6RQ -haSRrR98UC6/YlPstN3ARNGw8vdIvwjvUjocbfXbm86D23Zivx/hzfsJXswvvu6y -/MTd2NtW4Z+YRusDx0h7h+PskZqCRyfx39q2aEhjM532rDJQ7n9/AVDr+LBg6h6v -P8WYSyR7SpAs8uNr0Em/mKOKHujWYF9AfxGiJOENRt5tY7HO8B1bRF4RuvdFwpxh -+r/B8/4SFqgEScfXS4dPwmR1GzlrvHbGFQgqitrOCMZwh/MgMLZpV8RqSQ095Nzh -L6z/ucg56csA46MAWJmcy9gN6bFC0nFMmJdFgu9KI8bClwzkd85J0cyLDN0QLJnE -PjNh9mhJh28VVhQ+RKOFO1pNy7ZN9CMi/dkTZtTi09ISPpycrNi1KPUnIBjrIIcA -tmn+8P1e6PTAa8NGmJnFVhVntpJRlKGesZbgCv3QxJPkxg5lKvc9Xziaa48qOBos -lPx1N2cNZeX+AI1AMgtlmGer6Rq0xL4scTRgkOKb6uiHZZ7mBpoPLUETSntGm+pA -DKLDII/BV50ANfzLjTsSPuUs4lGhdbvvucYIf94SbCLnyitRyKG160oiHsH0BTJz -r9YaEiDVo3F6nA== -=juyY ------END PGP PUBLIC KEY BLOCK----- +PGP Fingerprint ID: A22B62A5EAFB6948 ``` diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 27e262d22c0..b022ac36161 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,21 +23,11 @@ steps: ] waitFor: ['-'] -- id: "docker:attestation-service" - name: gcr.io/kaniko-project/executor:v0.16.0 - args: [ - "--dockerfile=dockerfiles/attestation-service/Dockerfile", - "--cache=true", - "--destination=us.gcr.io/$PROJECT_ID/celo-monorepo:attestation-service-$COMMIT_SHA" - ] - waitFor: ['-'] - - id: "docker:phone-number-privacy-signer" name: gcr.io/kaniko-project/executor:v0.16.0 args: [ "--dockerfile=dockerfiles/phone-number-privacy/Dockerfile", "--cache=true", - "--build-arg=ONLY_PUBLISHED_DEPENDENCIES=", # Use unpublished dependencies. "--destination=us.gcr.io/$PROJECT_ID/celo-monorepo:phone-number-privacy-$COMMIT_SHA" ] waitFor: ['-'] diff --git a/dependency-graph.json b/dependency-graph.json index 1d3dc824e5f..3851403957c 100644 --- a/dependency-graph.json +++ b/dependency-graph.json @@ -1,21 +1,4 @@ { - "@celo/attestation-proxy": { - "location": "packages/attestation-proxy", - "dependencies": [] - }, - "@celo/attestation-service": { - "location": "packages/attestation-service", - "dependencies": [ - "@celo/contractkit", - "@celo/identity", - "@celo/keystores", - "@celo/phone-utils" - ] - }, - "celo-azure-build": { - "location": "packages/azure", - "dependencies": [] - }, "@celo/celotool": { "location": "packages/celotool", "dependencies": [ @@ -99,9 +82,12 @@ "location": "packages/phone-number-privacy/combiner", "dependencies": [ "@celo/contractkit", + "@celo/encrypted-backup", "@celo/flake-tracker", "@celo/identity", "@celo/phone-number-privacy-common", + "@celo/phone-number-privacy-signer", + "@celo/phone-utils", "@celo/utils" ] }, @@ -110,6 +96,7 @@ "dependencies": [ "@celo/base", "@celo/contractkit", + "@celo/phone-utils", "@celo/utils", "@celo/wallet-local" ] @@ -119,6 +106,7 @@ "dependencies": [ "@celo/contractkit", "@celo/cryptographic-utils", + "@celo/encrypted-backup", "@celo/identity", "@celo/phone-number-privacy-common", "@celo/utils", @@ -131,7 +119,6 @@ "@celo/base", "@celo/contractkit", "@celo/flake-tracker", - "@celo/identity", "@celo/phone-number-privacy-common", "@celo/utils", "@celo/wallet-hsm-azure" @@ -293,6 +280,16 @@ "@celo/wallet-remote" ] }, + "@celo/wallet-hsm-gcp": { + "location": "packages/sdk/wallets/wallet-hsm-gcp", + "dependencies": [ + "@celo/connect", + "@celo/utils", + "@celo/wallet-base", + "@celo/wallet-hsm", + "@celo/wallet-remote" + ] + }, "@celo/wallet-hsm": { "location": "packages/sdk/wallets/wallet-hsm", "dependencies": [ diff --git a/dockerfiles/attestation-service/Dockerfile b/dockerfiles/attestation-service/Dockerfile deleted file mode 100644 index d5106f6f22d..00000000000 --- a/dockerfiles/attestation-service/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -FROM node:18-alpine -WORKDIR /celo-monorepo - -RUN apk update && apk add python3 git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev bash - -# ensure yarn.lock is evaluated by kaniko cache diff -COPY lerna.json package.json yarn.lock ./ -COPY scripts/ scripts/ -COPY patches/ patches/ - -# Copy only pkg.json -COPY packages/sdk/base/package.json packages/sdk/base/ -COPY packages/sdk/utils/package.json packages/sdk/utils/ -COPY packages/typescript/package.json packages/typescript/ -COPY packages/dev-utils/package.json packages/dev-utils/ -COPY packages/sdk/connect/package.json packages/sdk/connect/ -COPY packages/sdk/wallets/wallet-base/package.json packages/sdk/wallets/wallet-base/ -COPY packages/sdk/wallets/wallet-local/package.json packages/sdk/wallets/wallet-local/ -COPY packages/protocol/package.json packages/protocol/ -COPY packages/sdk/contractkit/package.json packages/sdk/contractkit/ -COPY packages/sdk/keystores/package.json packages/sdk/keystores/ -COPY packages/attestation-service/package.json packages/attestation-service/ -COPY packages/flake-tracker/package.json packages/flake-tracker/package.json -COPY packages/sdk/identity/package.json packages/sdk/identity/ -COPY packages/sdk/phone-utils/package.json packages/sdk/phone-utils/package.json -COPY packages/sdk/cryptographic-utils/package.json packages/sdk/cryptographic-utils/package.json -COPY packages/phone-number-privacy/common/package.json packages/phone-number-privacy/common/ - -RUN yarn install --frozen-lockfile --network-timeout 100000 && yarn cache clean - -# Copy the rest -COPY packages/sdk/base packages/sdk/base/ -COPY packages/sdk/utils packages/sdk/utils/ -COPY packages/typescript packages/typescript/ -COPY packages/dev-utils packages/dev-utils/ -COPY packages/sdk/connect packages/sdk/connect/ -COPY packages/sdk/wallets/wallet-base packages/sdk/wallets/wallet-base -COPY packages/sdk/wallets/wallet-local packages/sdk/wallets/wallet-local -COPY packages/protocol packages/protocol/ -COPY packages/sdk/contractkit packages/sdk/contractkit/ -COPY packages/sdk/keystores packages/sdk/keystores/ -COPY packages/attestation-service packages/attestation-service/ -COPY packages/flake-tracker packages/flake-tracker -COPY packages/sdk/identity packages/sdk/identity -COPY packages/sdk/phone-utils packages/sdk/phone-utils/ -COPY packages/sdk/cryptographic-utils packages/sdk/cryptographic-utils/ -COPY packages/phone-number-privacy/common packages/phone-number-privacy/common - -ENV NODE_ENV production - -# build all -RUN yarn build - -WORKDIR /celo-monorepo/packages/attestation-service -ENTRYPOINT ["node", "lib/index.js"] diff --git a/dockerfiles/phone-number-privacy/Dockerfile b/dockerfiles/phone-number-privacy/Dockerfile index 7427f46b509..92fae5ba244 100644 --- a/dockerfiles/phone-number-privacy/Dockerfile +++ b/dockerfiles/phone-number-privacy/Dockerfile @@ -8,19 +8,18 @@ WORKDIR /celo-phone-number-privacy/ COPY packages/typescript packages/typescript COPY packages/dev-utils packages/dev-utils COPY packages/flake-tracker packages/flake-tracker -COPY packages/phone-number-privacy packages/phone-number-privacy +COPY packages/phone-number-privacy/signer packages/phone-number-privacy/signer +COPY packages/phone-number-privacy/common packages/phone-number-privacy/common COPY packages/protocol packages/protocol COPY packages/sdk/base packages/sdk/base COPY packages/sdk/connect packages/sdk/connect COPY packages/sdk/contractkit packages/sdk/contractkit COPY packages/sdk/cryptographic-utils packages/sdk/cryptographic-utils -COPY packages/sdk/identity packages/sdk/identity COPY packages/sdk/utils packages/sdk/utils COPY packages/sdk/phone-utils packages/sdk/phone-utils COPY packages/sdk/wallets/wallet-base packages/sdk/wallets/wallet-base COPY packages/sdk/wallets/wallet-hsm packages/sdk/wallets/wallet-hsm COPY packages/sdk/wallets/wallet-hsm-azure packages/sdk/wallets/wallet-hsm-azure -COPY packages/sdk/wallets/wallet-hsm-azure packages/sdk/wallets/wallet-hsm-azure COPY packages/sdk/wallets/wallet-local packages/sdk/wallets/wallet-local COPY packages/sdk/wallets/wallet-remote packages/sdk/wallets/wallet-remote @@ -34,20 +33,19 @@ COPY lerna.json package.json yarn.lock ./ COPY scripts/ scripts/ COPY patches/ patches/ -# Setting ONLY_PUBLISHED_DEPENDENCIES to true (default) or any non-empty string results in only the +# Setting ONLY_PUBLISHED_DEPENDENCIES to true or any non-empty string results in only the # phone-number-privacy package being copied into the image, and therefore it will only build using # published dependencies. Setting ONLY_PUBLISHED_DEPENDENCIES to "" will copy in all dependecies. -ARG ONLY_PUBLISHED_DEPENDENCIES=true -ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+phone-number-privacy} +ARG ONLY_PUBLISHED_DEPENDENCIES="" +ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+phone-number-privacy/signer} COPY --from=packages celo-phone-number-privacy/packages/${PACKAGE_SELECTOR} packages/${PACKAGE_SELECTOR} # Install dependencies and build. -# Note that thios command will fail with TARGET=production if any dependencies are unpublished. RUN yarn install --network-timeout 100000 --frozen-lockfile && yarn cache clean RUN yarn build # Setup and run the signer application. -ENV NODE_ENV=${TARGET} +ENV NODE_ENV production WORKDIR /celo-phone-number-privacy/packages/phone-number-privacy/signer EXPOSE 8080 ENTRYPOINT ["yarn", "start:docker"] diff --git a/package.json b/package.json index 0b3aa2e98c6..5abeaea663e 100644 --- a/package.json +++ b/package.json @@ -84,8 +84,5 @@ }, "resolutions": { "ganache": "npm:@soloseng/ganache@7.7.5-beta.3" - }, - "dependencies": { - } } diff --git a/packages/attestation-proxy/.firebaserc b/packages/attestation-proxy/.firebaserc deleted file mode 100644 index 48256b88b4a..00000000000 --- a/packages/attestation-proxy/.firebaserc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "projects": { - "default": "celo-mobile-mainnet" - } -} diff --git a/packages/attestation-proxy/.gitignore b/packages/attestation-proxy/.gitignore deleted file mode 100644 index ca4014bc284..00000000000 --- a/packages/attestation-proxy/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -dist/ - -# Firebase cache -.firebase/ - -*.log diff --git a/packages/attestation-proxy/README.md b/packages/attestation-proxy/README.md deleted file mode 100644 index 9ce4dbfc1a8..00000000000 --- a/packages/attestation-proxy/README.md +++ /dev/null @@ -1,4 +0,0 @@ -## Attestation proxy - -This package hosts a firebase function that is a proxy for making attestation reveal requests. -It accommodates attestation services that don't yet support TLS. diff --git a/packages/attestation-proxy/firebase.json b/packages/attestation-proxy/firebase.json deleted file mode 100644 index 028b3af2579..00000000000 --- a/packages/attestation-proxy/firebase.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "functions": { - "source": ".", - "predeploy": ["yarn run lint", "yarn run build"] - } -} diff --git a/packages/attestation-proxy/package.json b/packages/attestation-proxy/package.json deleted file mode 100644 index e5825c79b9f..00000000000 --- a/packages/attestation-proxy/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@celo/attestation-proxy", - "version": "1.0.0", - "description": "Basic attestation proxy for revealing", - "author": "Celo", - "license": "Apache-2.0", - "main": "dist/index.js", - "scripts": { - "serve": "firebase serve --only functions", - "deploy": "firebase deploy --only functions", - "clean": "tsc -b . --clean", - "build": "tsc -b .", - "lint": "tslint --project ." - }, - "dependencies": { - "firebase-functions": "^3.6.0", - "firebase-admin": "^8.10.0", - "node-fetch": "^2.6.1" - }, - "devDependencies": { - "firebase-functions-test": "^0.2.0" - }, - "engines": { - "node": ">=10" - } -} diff --git a/packages/attestation-proxy/src/index.ts b/packages/attestation-proxy/src/index.ts deleted file mode 100644 index 98f0ce68543..00000000000 --- a/packages/attestation-proxy/src/index.ts +++ /dev/null @@ -1,69 +0,0 @@ -import * as functions from 'firebase-functions' -import fetch from 'node-fetch' - -export const proxyReveal = functions.https.onCall(async (data, context) => { - // refuse requests that do not have basic auth - checkAuth(context) - - const { attestationServiceUrl, account, phoneNumber, issuer, salt, smsRetrieverAppSig } = data - const requestBody = { - account, - phoneNumber, - issuer, - salt, - smsRetrieverAppSig, - } - try { - const res = await fetch(attestationServiceUrl, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(requestBody), - }) - return { - status: res.status, - data: await res.text(), - } - } catch (error: any) { - // Firebase callable functions should throw errors of this type - // to be fed back to the user - throw new functions.https.HttpsError('unknown', error.message) - } -}) - -export const proxyRevealStatus = functions.https.onCall(async (data, context) => { - // refuse requests that do not have basic auth - checkAuth(context) - - const { attestationServiceUrl, phoneNumber, account, issuer, pepper } = data - try { - const urlParams = new URLSearchParams({ - phoneNumber, - salt: pepper ?? '', - issuer, - account, - }) - - const res = await fetch(attestationServiceUrl + '?' + urlParams, { - method: 'GET', - headers: { - 'Content-Type': 'application/json', - }, - }) - return { - status: res.status, - data: await res.text(), - } - } catch (error: any) { - // Firebase callable functions should throw errors of this type - // to be fed back to the user - throw new functions.https.HttpsError('unknown', error.message) - } -}) - -function checkAuth(context: functions.https.CallableContext) { - if (!context.auth) { - throw new functions.https.HttpsError('unauthenticated', 'Authentication required') - } -} diff --git a/packages/attestation-proxy/tsconfig.json b/packages/attestation-proxy/tsconfig.json deleted file mode 100644 index 5a050f2a779..00000000000 --- a/packages/attestation-proxy/tsconfig.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "compilerOptions": { - "plugins": [ - { - "name": "typescript-tslint-plugin" - } - ], - "lib": ["es2017"], - "module": "commonjs", - "strict": true, - "allowJs": false, - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "sourceMap": true, - "declaration": true, - "target": "es2017", - "rootDir": "src", - "outDir": "./dist", - "skipLibCheck": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "preserveConstEnums": true, - "composite": true - }, - "include": ["src", "index.d.ts"], - "compileOnSave": true -} diff --git a/packages/attestation-service/.gitignore b/packages/attestation-service/.gitignore deleted file mode 100644 index b80f64ba3f2..00000000000 --- a/packages/attestation-service/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -src/generated -lib/ -.devchain -db \ No newline at end of file diff --git a/packages/attestation-service/README.md b/packages/attestation-service/README.md deleted file mode 100644 index beb2fabee27..00000000000 --- a/packages/attestation-service/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Attestation Service - -A service run by validators on the Celo network to send SMS messages, enabling attestations of user phone numbers and their accounts on the Celo network. - -## Validators - -Please see [the Celo docs](https://docs.celo.org/validator-guide/attestation-service#configuration) for information on configuring and running an attestation service. - -## Developers - -More information about error codes and configuration parameters can be found in [the Celo docs](https://docs.celo.org/validator-guide/attestation-service). - -### Operations - -This service uses `bunyan` for structured logging with JSON lines. You can pipe STDOUT to `yarn run bunyan` for a more human friendly output. The `LOG_LEVEL` environment variable can specify desired log levels. We support the following `LOG_FORMAT`s: - -- Default are json lines `LOG_FORMAT=json` -- With `LOG_FORMAT=stackdriver` you can get stackdriver specific format to recover information such as error traces etc. -- To get something more human readable, use `LOG_FORMAT=human` - -This service exposes prometheus metrics under `/metrics`. - -### Running locally - -After checking out the source, you should create a local sqlite database by running: - -```sh -yarn run db:create:dev -yarn run db:migrate:dev -``` - -You will also have to set the environment variables in `.env.development` - -Then start the service with `yarn run dev` (you'll have to add the appropriate credentials for the text providers) diff --git a/packages/attestation-service/config/.env.development b/packages/attestation-service/config/.env.development deleted file mode 100644 index 49490058fc4..00000000000 --- a/packages/attestation-service/config/.env.development +++ /dev/null @@ -1,98 +0,0 @@ -DATABASE_URL=sqlite://db/dev.db -CELO_PROVIDERS=http://localhost:8545,http://localhost:8546 - -# Fill in these values -CELO_VALIDATOR_ADDRESS=x -ATTESTATION_SIGNER_ADDRESS=x - -# If using keystore for key management, uncomment and fill these in; -# if using full node (older versions of attestation service), leave commented out -# ATTESTATION_SIGNER_KEYSTORE_DIRPATH=x -# ATTESTATION_SIGNER_KEYSTORE_PASSPHRASE=x -# DISABLE_SMART_FALLBACK=false - -# List all SMS providers here. They are tried from first to last, unless -# you specify SMS_PROVIDERS_RANDOMIZED=1, in which case they are tried in a random order. -SMS_PROVIDERS=twilio -# SMS_PROVIDERS_RANDOMIZED=0 - -# Optional: set a different list or order of providers for a specific country. -# (They are tried from first to last, regardless of SMS_PROVIDERS_RANDOMIZED) -# We recommend the following country-specific settings: -# v1.5.0+ -SMS_PROVIDERS_CN=twiliomessaging -SMS_PROVIDERS_VN=messagebird,twilioverify -SMS_PROVIDERS_TR=twilioverify -# 10DLC - ensure toll-free number registered with messagebird or remove -SMS_PROVIDERS_US=twilioverify,messagebird -# v1.2.0+ -SMS_PROVIDERS_BR=messagebird,twilioverify,twiliomessaging -SMS_PROVIDERS_IN=messagebird,twilioverify,twiliomessaging -SMS_PROVIDERS_VE=messagebird,twilioverify,twiliomessaging -SMS_PROVIDERS_GH=messagebird,twilioverify,twiliomessaging -SMS_PROVIDERS_PH=messagebird,twilioverify,twiliomessaging,nexmo -SMS_PROVIDERS_DE=messagebird,twilioverify,twiliomessaging - -# Service requests on this port -PORT=3000 - -# Set the rate limit of requests per minute over all endpoints -# RATE_LIMIT_REQS_PER_MIN=100 - -# Override the URL base path for callbacks from providers. If not supplied, the value -# of the ATTESTATION_SERVICE_URL claim in the validator's metadata is used. -# The actual URL for callbacks is suffixed by /delivery_status_PROVIDER -# e.g delivery_status_nexmo. -# For Nexmo, if you are not using a specific Application, that value needs entering at -# https://dashboard.nexmo.com/settings or for an Application in its settings as 'status callback'. -# EXTERNAL_CALLBACK_HOSTPORT=http://host:3000 - -# Nexmo parameters (fill in values for 'x') -NEXMO_KEY=x -NEXMO_SECRET=x - -# If you specify a Nexmo application uuid, only numbers linked to this application -# are used. -# NEXMO_APPLICATION= - -NEXMO_ACCOUNT_BALANCE_METRIC=0 -NEXMO_UNSUPPORTED_REGIONS=CU,SY,KP,IR,SD - -# Twilio parameters (fill in values for 'x') -TWILIO_ACCOUNT_SID=x -TWILIO_MESSAGING_SERVICE_SID=x -TWILIO_VERIFY_SERVICE_SID=x -TWILIO_AUTH_TOKEN=x -TWILIO_UNSUPPORTED_REGIONS=CU,SY,KP,IR,SD - -# MessageBird parameters (fill in values for 'x') -MESSAGEBIRD_API_KEY=x -MESSAGEBIRD_UNSUPPORTED_REGIONS=CU,SY,KP,IR,SD - -# Total number of delivery attempts in total -MAX_DELIVERY_ATTEMPTS=3 - -# Client can rerequest an attestation within this window -MAX_REREQUEST_MINS=1440 - -# Maximum age of the latest block for the health check to pass -MAX_AGE_LATEST_BLOCK_SECS=20 - -# Refuse to start if signer or metadata is misconfigured -VERIFY_CONFIG_ON_STARTUP=1 - -# Attestations accessible in database for at least this long -DB_RECORD_EXPIRY_MINS=1440 - -# Options: json (default), human, stackdriver -LOG_FORMAT= human -# Options: fatal, error, warn, info, debug, trace -LOG_LEVEL=info - -APP_SIGNATURE=x - -# Phone number (prefixed with "+") for test-send-sms-twilio script -# TEST_SMS_RECIPIENT=x - -# mainnet, alfajores, or alfajoresstaging, default is mainnet -# NETWORK=x \ No newline at end of file diff --git a/packages/attestation-service/config/config.json b/packages/attestation-service/config/config.json deleted file mode 100644 index 4a471de5f52..00000000000 --- a/packages/attestation-service/config/config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "development": { - "username": "root", - "password": null, - "database": "database_development", - "host": "db/dev.db", - "dialect": "sqlite", - "operatorsAliases": false - }, - "test": { - "username": "root", - "password": null, - "database": "database_test", - "host": "127.0.0.1", - "dialect": "sqlite", - "operatorsAliases": false - }, - "production": { - "use_env_variable": "DATABASE_URL" - } -} diff --git a/packages/attestation-service/config/database.json b/packages/attestation-service/config/database.json deleted file mode 100644 index 76e76db046a..00000000000 --- a/packages/attestation-service/config/database.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "development": { - "use_env_variable": "DATABASE_URL" - }, - "staging": { - "use_env_variable": "DATABASE_URL" - }, - "production": { - "use_env_variable": "DATABASE_URL" - } -} diff --git a/packages/attestation-service/index.d.ts b/packages/attestation-service/index.d.ts deleted file mode 100644 index 0eea552204d..00000000000 --- a/packages/attestation-service/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare module 'nexmo' -declare module 'bunyan-debug-stream' -declare module 'node-fetch' diff --git a/packages/attestation-service/jest.config.js b/packages/attestation-service/jest.config.js deleted file mode 100644 index 345102a23d6..00000000000 --- a/packages/attestation-service/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - globalSetup: './test/testSetup.ts', - preset: 'ts-jest', - moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node', './nexmo.ts'], -} diff --git a/packages/attestation-service/migrations/20191015211858-create-attestation.js b/packages/attestation-service/migrations/20191015211858-create-attestation.js deleted file mode 100644 index e57863ec515..00000000000 --- a/packages/attestation-service/migrations/20191015211858-create-attestation.js +++ /dev/null @@ -1,60 +0,0 @@ -'use strict' -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.createTable('Attestations', { - id: { - allowNull: false, - autoIncrement: true, - primaryKey: true, - type: Sequelize.INTEGER, - }, - account: { - allowNull: false, - type: Sequelize.STRING, - }, - phoneNumber: { - allowNull: false, - type: Sequelize.STRING, - }, - issuer: { - allowNull: false, - type: Sequelize.STRING, - }, - status: { - allowNull: false, - type: Sequelize.STRING, - }, - smsProvider: { - allowNull: false, - type: Sequelize.STRING, - }, - createdAt: { - allowNull: false, - type: Sequelize.DATE, - }, - updatedAt: { - allowNull: false, - type: Sequelize.DATE, - }, - }) - - await queryInterface.addIndex( - 'Attestations', - ['account', 'phoneNumber', 'issuer'], - { fields: ['account', 'phoneNumber', 'issuer'], unique: true }, - { transaction } - ) - - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: (queryInterface, Sequelize) => { - return queryInterface.dropTable('Attestations') - }, -} diff --git a/packages/attestation-service/migrations/20200506234935-attestation-v2.js b/packages/attestation-service/migrations/20200506234935-attestation-v2.js deleted file mode 100644 index 2b4edcd28a9..00000000000 --- a/packages/attestation-service/migrations/20200506234935-attestation-v2.js +++ /dev/null @@ -1,74 +0,0 @@ -'use strict' -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.removeIndex( - 'Attestations', - ['account', 'phoneNumber', 'issuer'], - { fields: ['account', 'phoneNumber', 'issuer'], unique: true }, - { transaction } - ) - - await queryInterface.removeColumn('Attestations', 'phoneNumber') - - await queryInterface.addColumn('Attestations', 'identifier', { - type: Sequelize.STRING, - }) - - await queryInterface.addIndex( - 'Attestations', - ['account', 'identifier', 'issuer'], - { fields: ['account', 'identifier', 'issuer'], unique: true }, - { transaction } - ) - - await queryInterface.addIndex( - 'Attestations', - ['createdAt'], - { fields: ['createdAt'] }, - { transaction } - ) - - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - try { - await queryInterface.removeIndex( - 'Attestations', - ['account', 'identifier', 'issuer'], - { fields: ['account', 'identifier', 'issuer'], unique: true }, - { transaction } - ) - - await queryInterface.removeIndex( - 'Attestations', - ['createdAt'], - { fields: ['createdAt'] }, - { transaction } - ) - - await queryInterface.removeColumn('Attestations', 'identifier') - - await queryInterface.addColumn('Attestations', 'phoneNumber', { - type: Sequelize.STRING, - }) - - await queryInterface.addIndex( - 'Attestations', - ['account', 'phoneNumber', 'issuer'], - { fields: ['account', 'phoneNumber', 'issuer'], unique: true }, - { transaction } - ) - } catch (error) { - await transaction.rollback() - throw error - } - }, -} diff --git a/packages/attestation-service/migrations/20200903211921-attestation-v3.js b/packages/attestation-service/migrations/20200903211921-attestation-v3.js deleted file mode 100644 index 471b56d2661..00000000000 --- a/packages/attestation-service/migrations/20200903211921-attestation-v3.js +++ /dev/null @@ -1,90 +0,0 @@ -'use strict' -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.removeColumn('Attestations', 'smsProvider') - - await queryInterface.addColumn('Attestations', 'countryCode', { - type: Sequelize.STRING, - allowNull: true, - }) - - await queryInterface.addColumn('Attestations', 'phoneNumber', { - type: Sequelize.STRING, - allowNull: true, - }) - - await queryInterface.addColumn('Attestations', 'message', { - type: Sequelize.STRING, - allowNull: true, - }) - - await queryInterface.addColumn('Attestations', 'ongoingDeliveryId', { - type: Sequelize.STRING, - allowNull: true, - }) - - await queryInterface.addColumn('Attestations', 'providers', { - type: Sequelize.STRING, - allowNull: true, - }) - - await queryInterface.addColumn('Attestations', 'attempt', { - type: Sequelize.INTEGER, - allowNull: true, - }) - - await queryInterface.addColumn('Attestations', 'errors', { - type: Sequelize.STRING, - allowNull: true, - }) - - await queryInterface.addIndex( - 'Attestations', - ['ongoingDeliveryId'], - { fields: ['ongoingDeliveryId'], unique: true }, - { transaction } - ) - - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - try { - await queryInterface.removeIndex( - 'Attestations', - ['ongoingDeliveryId'], - { fields: ['ongoingDeliveryId'], unique: true }, - { transaction } - ) - - await queryInterface.removeColumn('Attestations', 'countryCode') - - await queryInterface.removeColumn('Attestations', 'phoneNumber') - - await queryInterface.removeColumn('Attestations', 'message') - - await queryInterface.removeColumn('Attestations', 'ongoingDeliveryId') - - await queryInterface.removeColumn('Attestations', 'providers') - - await queryInterface.removeColumn('Attestations', 'attempt') - - await queryInterface.removeColumn('Attestations', 'errors') - - await queryInterface.addColumn('Attestations', 'smsProvider', { - type: Sequelize.STRING, - allowNull: false, - }) - } catch (error) { - await transaction.rollback() - throw error - } - }, -} diff --git a/packages/attestation-service/migrations/20200924232226-attestation-v4.js b/packages/attestation-service/migrations/20200924232226-attestation-v4.js deleted file mode 100644 index 5466c97f5dd..00000000000 --- a/packages/attestation-service/migrations/20200924232226-attestation-v4.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict' -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.addColumn('Attestations', 'completedAt', { - type: Sequelize.DATE, - allowNull: true, - }) - - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - try { - await queryInterface.removeColumn('Attestations', 'completedAt') - } catch (error) { - await transaction.rollback() - throw error - } - }, -} diff --git a/packages/attestation-service/migrations/20201005185559-attestation-v5.js b/packages/attestation-service/migrations/20201005185559-attestation-v5.js deleted file mode 100644 index 2344007b765..00000000000 --- a/packages/attestation-service/migrations/20201005185559-attestation-v5.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict' -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.addColumn('Attestations', 'securityCode', { - type: Sequelize.STRING, - allowNull: true, - }) - await queryInterface.addColumn('Attestations', 'attestationCode', { - type: Sequelize.STRING, - allowNull: true, - }) - - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - try { - await queryInterface.removeColumn('Attestations', 'securityCode') - await queryInterface.removeColumn('Attestations', 'attestationCode') - } catch (error) { - await transaction.rollback() - throw error - } - }, -} diff --git a/packages/attestation-service/migrations/20201006231054-attestation-v6.js b/packages/attestation-service/migrations/20201006231054-attestation-v6.js deleted file mode 100644 index 45ae8ed56ed..00000000000 --- a/packages/attestation-service/migrations/20201006231054-attestation-v6.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict' -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.addColumn('Attestations', 'securityCodeAttempt', { - type: Sequelize.INTEGER, - allowNull: true, - }) - - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - try { - await queryInterface.removeColumn('Attestations', 'securityCodeAttempt') - } catch (error) { - await transaction.rollback() - throw error - } - }, -} diff --git a/packages/attestation-service/migrations/20210625231054-attestation-v7.js b/packages/attestation-service/migrations/20210625231054-attestation-v7.js deleted file mode 100644 index e777c76c24f..00000000000 --- a/packages/attestation-service/migrations/20210625231054-attestation-v7.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict' -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.addColumn('Attestations', 'appSignature', { - type: Sequelize.STRING, - allowNull: true, - }) - await queryInterface.addColumn('Attestations', 'language', { - type: Sequelize.STRING, - allowNull: true, - }) - - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - try { - await queryInterface.removeColumn('Attestations', 'appSignature') - await queryInterface.removeColumn('Attestations', 'language') - } catch (error) { - await transaction.rollback() - throw error - } - }, -} diff --git a/packages/attestation-service/migrations/20211109200901-attestation-v8.js b/packages/attestation-service/migrations/20211109200901-attestation-v8.js deleted file mode 100644 index 60095627459..00000000000 --- a/packages/attestation-service/migrations/20211109200901-attestation-v8.js +++ /dev/null @@ -1,68 +0,0 @@ -'use strict' - -module.exports = { - up: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - - try { - await queryInterface.removeIndex( - 'Attestations', - ['ongoingDeliveryId'], - { fields: ['ongoingDeliveryId'], unique: true }, - { transaction } - ) - await queryInterface.addIndex( - 'Attestations', - ['ongoingDeliveryId'], - { fields: ['ongoingDeliveryId'], unique: false }, - { transaction } - ) - await transaction.commit() - } catch (error) { - await transaction.rollback() - throw error - } - }, - down: async (queryInterface, Sequelize) => { - const transaction = await queryInterface.sequelize.transaction() - try { - await queryInterface.removeIndex( - 'Attestations', - ['ongoingDeliveryId'], - { fields: ['ongoingDeliveryId'], unique: false }, - { transaction } - ) - await queryInterface.addIndex( - 'Attestations', - ['ongoingDeliveryId'], - { fields: ['ongoingDeliveryId'], unique: true }, - { transaction } - ) - } catch (error) { - await transaction.rollback() - if ( - error.errors.length == 1 && - error.errors[0].path == 'ongoingDeliveryId' && - error.errors[0].type == 'unique violation' - ) { - try { - console.warn('Duplicates in ongoingDeliveryId; nulling out column and retrying.') - await queryInterface.removeColumn('Attestations', 'ongoingDeliveryId') - await queryInterface.addColumn('Attestations', 'ongoingDeliveryId', { - type: Sequelize.STRING, - allowNull: true, - }) - await queryInterface.addIndex( - 'Attestations', - ['ongoingDeliveryId'], - { fields: ['ongoingDeliveryId'], unique: true }, - { transaction } - ) - } catch (error) { - await transaction.rollback() - throw error - } - } - } - }, -} diff --git a/packages/attestation-service/nodemon.json b/packages/attestation-service/nodemon.json deleted file mode 100644 index 6e1eeec2d3e..00000000000 --- a/packages/attestation-service/nodemon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ignore": ["**/*.test.ts", "**/*.spec.ts", ".git", "node_modules"], - "watch": ["src"], - "exec": "yarn start-ts", - "ext": "ts" -} diff --git a/packages/attestation-service/package-lock.json b/packages/attestation-service/package-lock.json deleted file mode 100644 index 236339d3d77..00000000000 --- a/packages/attestation-service/package-lock.json +++ /dev/null @@ -1,461 +0,0 @@ -{ - "name": "@celo/attestation-service", - "version": "1.5.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "buffer-writer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", - "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "diff": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", - "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==", - "dev": true - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "es5-ext": { - "version": "0.10.53", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", - "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.3", - "next-tick": "~1.0.0" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "requires": { - "d": "^1.0.1", - "ext": "^1.1.2" - } - }, - "ext": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz", - "integrity": "sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==", - "requires": { - "type": "^2.5.0" - }, - "dependencies": { - "type": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz", - "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==" - } - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "is-fullwidth-code-point": { - "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=" - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "packet-reader": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz", - "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "pg": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz", - "integrity": "sha512-l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA==", - "requires": { - "buffer-writer": "2.0.0", - "packet-reader": "1.0.0", - "pg-connection-string": "0.1.3", - "pg-pool": "^2.0.4", - "pg-types": "^2.1.0", - "pgpass": "1.x", - "semver": "4.3.2" - } - }, - "pg-connection-string": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz", - "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=" - }, - "pg-int8": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", - "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==" - }, - "pg-pool": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz", - "integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==" - }, - "pg-types": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", - "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", - "requires": { - "pg-int8": "1.0.1", - "postgres-array": "~2.0.0", - "postgres-bytea": "~1.0.0", - "postgres-date": "~1.0.4", - "postgres-interval": "^1.1.0" - } - }, - "pgpass": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz", - "integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==", - "requires": { - "split2": "^3.1.1" - } - }, - "postgres-array": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", - "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==" - }, - "postgres-bytea": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", - "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=" - }, - "postgres-date": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", - "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==" - }, - "postgres-interval": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", - "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", - "requires": { - "xtend": "^4.0.0" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "semver": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz", - "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "split2": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", - "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", - "requires": { - "readable-stream": "^3.0.0" - } - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "string_decoder": { - "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==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "ts-mockito": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/ts-mockito/-/ts-mockito-2.6.1.tgz", - "integrity": "sha512-qU9m/oEBQrKq5hwfbJ7MgmVN5Gu6lFnIGWvpxSjrqq6YYEVv+RwVFWySbZMBgazsWqv6ctAyVBpo9TmAxnOEKw==", - "requires": { - "lodash": "^4.17.5" - }, - "dependencies": { - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - } - } - }, - "ts-node": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz", - "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==", - "dev": true, - "requires": { - "arg": "^4.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "source-map-support": "^0.5.6", - "yn": "^3.0.0" - } - }, - "type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - }, - "y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" - }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true - } - } -} diff --git a/packages/attestation-service/package.json b/packages/attestation-service/package.json deleted file mode 100644 index b2cd796c3eb..00000000000 --- a/packages/attestation-service/package.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "@celo/attestation-service", - "version": "1.6.0-dev", - "description": "Issues attestation messages for Celo's identity protocol", - "main": "./lib/index.js", - "types": "./lib/index.d.ts", - "author": "Celo", - "license": "Apache-2.0", - "homepage": "https://github.com/celo-org/celo-monorepo/tree/master/packages/attestation-service", - "repository": "https://github.com/celo-org/celo-monorepo/tree/master/packages/attestation-service", - "keywords": [ - "celo", - "blockchain" - ], - "scripts": { - "build": "tsc -b .", - "clean": "tsc -b . --clean", - "clean:all": "yarn clean && rm -rf lib", - "prepublishOnly": "yarn build:gen && yarn build", - "start-ts": "TS_NODE_FILES=true ts-node src/index.ts", - "start": "node lib/index.js", - "test": "jest", - "db:create:dev": "mkdir -p db && touch db/dev.db", - "db:migrate": "sequelize db:migrate", - "db:migrate:undo": "sequelize db:migrate:undo", - "db:migrate:dev": "sequelize db:migrate", - "dev": "NODE_ENV=dev CONFIG=config/.env.development nodemon", - "lint": "tslint -c tslint.json --project .", - "test-send-sms-twilio": "TS_NODE_FILES=true CONFIG=config/.env.development ts-node scripts/test-send-sms-twilio.ts" - }, - "dependencies": { - "@celo/contractkit": "2.2.1-dev", - "@celo/identity": "2.2.1-dev", - "@celo/keystores": "2.2.1-dev", - "@celo/phone-utils": "2.2.1-dev", - "bignumber.js": "^9.0.0", - "body-parser": "1.19.0", - "bunyan": "1.8.12", - "bunyan-debug-stream": "2.0.0", - "bunyan-gke-stackdriver": "0.1.2", - "debug": "^4.1.1", - "dotenv": "^8.2.0", - "eth-lib": "^0.2.8", - "express": "^4.17.1", - "express-rate-limit": "^5.1.1", - "express-request-id": "1.4.1", - "fp-ts": "2.1.1", - "io-ts": "2.0.1", - "lodash": "^4.17.21", - "messagebird": "^3.5.0", - "moment": "^2.29.0", - "mysql2": "^2.1.0", - "nexmo": "2.4.2", - "node-fetch": "^2.6.1", - "pg": "7.12.1", - "pg-hstore": "2.3.3", - "prom-client": "11.2.0", - "sequelize": "5.21.5", - "sqlite3": "4.0.9", - "ts-mockito": "^2.6.1", - "twilio": "^3.57.0", - "web3": "1.3.6", - "yargs": "13.3.0" - }, - "devDependencies": { - "@types/bunyan": "1.8.8", - "@types/debug": "^4.1.5", - "@types/dotenv": "^8.2.0", - "@types/express": "^4.17.12", - "@types/express-rate-limit": "^5.0.0", - "@types/express-request-id": "1.4.3", - "@types/express-serve-static-core": "^4.17.18", - "@types/node-fetch": "2.5.12", - "nodemon": "1.19.1", - "sequelize-cli": "^5.5.1", - "ts-node": "8.3.0", - "webpack": "4.39.1", - "webpack-cli": "3.3.6" - }, - "engines": { - "node": ">=8.13.0" - } -} diff --git a/packages/attestation-service/scripts/generate-signed-code.ts b/packages/attestation-service/scripts/generate-signed-code.ts deleted file mode 100644 index 795caf462cb..00000000000 --- a/packages/attestation-service/scripts/generate-signed-code.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { newKit } from '@celo/contractkit' -import { SignatureUtils } from '@celo/utils' -import { privateKeyToAddress } from '@celo/utils/lib/address' -import { attestationSecurityCode as buildSecurityCodeTypedData } from '@celo/utils/lib/typed-data-constructors' - -async function main() { - const [privateKey, code] = process.argv.slice(2) - - const kit = newKit('http://localhost:8545') - kit.addAccount(privateKey) - - const typedData = buildSecurityCodeTypedData(code) - console.log( - SignatureUtils.serializeSignature( - await kit.signTypedData(privateKeyToAddress(privateKey), typedData) - ) - ) -} - -main() - .then(() => process.exit(0)) - .catch((e) => { - console.error(e) - process.exit(1) - }) diff --git a/packages/attestation-service/scripts/test-send-sms-twilio.ts b/packages/attestation-service/scripts/test-send-sms-twilio.ts deleted file mode 100644 index e161008fc6b..00000000000 --- a/packages/attestation-service/scripts/test-send-sms-twilio.ts +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Script for testing TwilioSmsProvider.sendSms - * (Verify & Messaging Services) using the real twilio API. - * Uses `.env.development` file for sensitive info; set your phone number - * as TEST_SMS_RECIPIENT to receive the messages and check against - * expected output (logged in console). - * Comment out cases under `testCases` as desired. - */ - -import { fetchEnv, fetchEnvOrDefault } from '../src/env' -import { SmsFields } from '../src/models/attestation' -import { readUnsupportedRegionsFromEnv } from '../src/sms/base' -import { TwilioSmsProvider } from '../src/sms/twilio' -import { TwilioMessagingProvider } from '../src/sms/twilioMessaging' -import { TwilioVerifyProvider } from '../src/sms/twilioVerify' -;(async function main() { - const twilioSid = fetchEnv('TWILIO_ACCOUNT_SID') - const messagingServiceSid = fetchEnv('TWILIO_MESSAGING_SERVICE_SID') - const verifyServiceSid = fetchEnvOrDefault('TWILIO_VERIFY_SERVICE_SID', '') - const twilioAuthToken = fetchEnv('TWILIO_AUTH_TOKEN') - const unsupportedRegionCodes = readUnsupportedRegionsFromEnv( - 'TWILIO_UNSUPPORTED_REGIONS', - 'TWILIO_BLACKLIST' - ) - const testPhoneNumber = fetchEnv('TEST_SMS_RECIPIENT') - const countryCode = 'DE' - - enum SendMethod { - MESSAGE_SERVICE = 'message service', - VERIFY = 'verify API', - } - - type TestCase = { - id: string - expectedSendMethod: SendMethod - } - - const testCases: TestCase[] = [ - { - id: '000000', - expectedSendMethod: SendMethod.MESSAGE_SERVICE, - }, - { - id: '111111', - expectedSendMethod: SendMethod.VERIFY, - }, - ] - - testCases.map(async (testCase: TestCase) => { - const attestation: SmsFields = { - account: '0x123', - identifier: '0x456', - issuer: '0x789', - countryCode: countryCode, - phoneNumber: testPhoneNumber, - message: '', - securityCode: '', - attestationCode: '123', - appSignature: undefined, - language: 'en', - } - - let twilioSmsProvider: TwilioSmsProvider - let expectedMsg: string - let expectedSidStart: string - - switch (testCase.expectedSendMethod) { - case SendMethod.MESSAGE_SERVICE: - twilioSmsProvider = new TwilioMessagingProvider( - twilioSid, - twilioAuthToken, - unsupportedRegionCodes, - messagingServiceSid - ) - expectedMsg = attestation.message = 'via-message:' + testCase.id - expectedSidStart = 'SM' - break - case SendMethod.VERIFY: - twilioSmsProvider = new TwilioVerifyProvider( - twilioSid, - twilioAuthToken, - unsupportedRegionCodes, - verifyServiceSid - ) - expectedMsg = 'Your Celo verification code is: ' + testCase.id - attestation.securityCode = testCase.id - expectedSidStart = 'VE' - break - } - - try { - await twilioSmsProvider.initialize() - const messageSID = await twilioSmsProvider.sendSms(attestation) - const messageSIDStart = messageSID.substring(0, 2) - console.log(`Message SID for id ${testCase.id}: ${messageSID}`) - console.log(`SMS should match: ${expectedMsg}`) - if (messageSIDStart !== expectedSidStart) { - throw new Error(`Returned message SID did not match expected starting letters`) - } - } catch (e) { - console.error(e) - } - }) -})() diff --git a/packages/attestation-service/src/db.ts b/packages/attestation-service/src/db.ts deleted file mode 100644 index c4e9f5c1a31..00000000000 --- a/packages/attestation-service/src/db.ts +++ /dev/null @@ -1,432 +0,0 @@ -import { timeout } from '@celo/base' -import { Block } from '@celo/connect' -import { ContractKit, newKit } from '@celo/contractkit' -import { ClaimTypes, IdentityMetadataWrapper } from '@celo/contractkit/lib/identity' -import { FileKeystore, KeystoreWalletWrapper } from '@celo/keystores' -import { eqAddress } from '@celo/utils/lib/address' -import Logger from 'bunyan' -import moment from 'moment' -import { FindOptions, Op, Sequelize, Transaction } from 'sequelize' -import { - fetchEnv, - fetchEnvOrDefault, - getAccountAddress, - getAttestationSignerAddress, - getCeloProviders, - isYes, -} from './env' -import { rootLogger } from './logger' -import { Gauges } from './metrics' -import Attestation, { - AttestationKey, - AttestationModel, - AttestationStatic, -} from './models/attestation' -import { ErrorMessages } from './request' - -export let sequelize: Sequelize | undefined - -let dbRecordExpiryMins: number | null - -const maxAgeLatestBlock: number = parseInt(fetchEnvOrDefault('MAX_AGE_LATEST_BLOCK_SECS', '20'), 10) -const getBlockTimeout = parseInt(fetchEnvOrDefault('GET_BLOCK_TIMEOUT_MS', '500'), 10) - -// Process these once instead of at each reinitialization of the kits -const celoProviders = getCeloProviders() -const smartFallback = !isYes(fetchEnvOrDefault('DISABLE_SMART_FALLBACK', 'false')) -const keystoreDirpath = fetchEnvOrDefault('ATTESTATION_SIGNER_KEYSTORE_DIRPATH', '') -const keystorePassphrase = fetchEnvOrDefault('ATTESTATION_SIGNER_KEYSTORE_PASSPHRASE', '') -const signerAddress = fetchEnv('ATTESTATION_SIGNER_ADDRESS') - -export type SequelizeLogger = boolean | ((sql: string, timing?: number) => void) - -export function makeSequelizeLogger(logger: Logger): SequelizeLogger { - return (msg: string, sequelizeLogArgs: any) => - logger.debug({ sequelizeLogArgs, component: 'sequelize' }, msg) -} - -export async function initializeDB() { - if (sequelize === undefined) { - sequelize = new Sequelize(fetchEnv('DATABASE_URL'), { - logging: makeSequelizeLogger(rootLogger), - }) - rootLogger.info('Initializing Database') - await sequelize.authenticate() - - // Check four times every `dbRecordExpiryMins` period to delete records older than dbRecordExpiryMins - dbRecordExpiryMins = parseInt(fetchEnvOrDefault('DB_RECORD_EXPIRY_MINS', '60'), 10) - const dbRecordExpiryCheckEveryMs = dbRecordExpiryMins * 15 * 1000 - setInterval(purgeExpiredRecords, dbRecordExpiryCheckEveryMs) - } -} - -export function isDBOnline() { - if (sequelize === undefined) { - return initializeDB() - } else { - return sequelize.authenticate() as Promise - } -} - -const kits = new Array(celoProviders.length).fill(undefined) - -/** - * Decorator to wrap execution of f - * with an optional prioritization of kit1 and kit2 - * and retry logic if execution with the first kit fails - * @param f function to execute - * @param kit1 primary kit instance - * @param kit2 optional secondary kit instance - * @returns f(kit) - */ -async function execWithFallback( - f: (kit: ContractKit) => T, - kit1: ContractKit, - kit2?: ContractKit | undefined -): Promise { - let primaryKit = kit1 - let secondaryKit = kit2 - // Check if backup kit is ahead of primary kit; change prioritization as such - if ( - smartFallback && - kit2 && - // Prioritize block age over syncing/not; avoids complex checks for stalls - // and assumes that if one is stalled, the next block number check will correct this. - (!kit1 || - (await getAgeOfLatestBlockFromKit(kit2)).number > - (await getAgeOfLatestBlockFromKit(kit1)).number) - ) { - rootLogger.info('Prioritizing a backup provider') - primaryKit = kit2 - secondaryKit = kit1 - } - try { - return await f(primaryKit) - } catch (error) { - rootLogger.warn(`Using ContractKit failed: ${error}`) - if (secondaryKit) { - rootLogger.info(`Attempting to use secondary ContractKit`) - return f(secondaryKit!) - } else { - throw error - } - } -} - -export async function useKit(f: (kit: ContractKit) => T): Promise { - let usableKits = kits.filter((k) => k !== undefined) - - const reinitAndRetry = async () => { - await initializeKits(true) - usableKits = kits.filter((k) => k !== undefined) - return execWithFallback(f, usableKits[0]!, usableKits[1]) - } - - if (!usableKits.length) { - // This throws an error if no kits are initialized - return reinitAndRetry() - } else { - try { - return await execWithFallback(f, usableKits[0]!, usableKits[1]) - } catch (error) { - return reinitAndRetry() - } - } -} - -async function isNodeSyncingFromKit(k: ContractKit) { - const syncProgress = await k.isSyncing() - return typeof syncProgress === 'boolean' && syncProgress -} - -export async function isNodeSyncing() { - return useKit(isNodeSyncingFromKit) -} - -export async function getAgeOfLatestBlockFromKit(k: ContractKit) { - try { - return await timeout( - async () => { - let latestBlock: Block - try { - // Differentiate between errors with getBlock and timeouts - latestBlock = await k!.connection.getBlock('latest') - } catch (error: any) { - throw new Error(`Error fetching latest block: ${error.message}`) - } - const ageOfLatestBlock = Date.now() / 1000 - Number(latestBlock.timestamp) - return { - ageOfLatestBlock, - number: latestBlock.number, - } - }, - [], - getBlockTimeout, - new Error(`Timeout fetching block after ${getBlockTimeout} ms`) - ) - } catch (error: any) { - rootLogger.warn(error.message) - // On failure return values that should always be comparatively out-of-date - return { - ageOfLatestBlock: maxAgeLatestBlock + 1, - number: -1, - } - } -} - -export async function getAgeOfLatestBlock() { - return useKit(getAgeOfLatestBlockFromKit) -} - -export async function isAttestationSignerUnlocked() { - // The only way to see if a key is unlocked is to try to sign something - try { - await useKit((k) => k.connection.sign('DO_NOT_USE', getAttestationSignerAddress())) - return true - } catch { - return false - } -} - -// Verify a signer and validator address are provided, are valid, match the on-chain signer, -// that signer account is unlocked, that metadata is accessible and valid and that the -// attestationServiceURL claim is present in the metadata (external name/port may be -// different to instance, so we cannot validate its details) -export async function verifyConfigurationAndGetURL() { - const signer = getAttestationSignerAddress() - const validator = getAccountAddress() - - const accounts = await useKit((k) => k.contracts.getAccounts()) - if (!(await accounts.isAccount(validator))) { - throw Error(`${validator} is not registered as an account!`) - } - - if (!(await accounts.hasAuthorizedAttestationSigner(validator))) { - throw Error(`No attestation signer authorized for ${validator}!`) - } - - const signerOnChain = await accounts.getAttestationSigner(validator) - if (!eqAddress(signerOnChain, signer)) { - throw Error( - `Different attestation signer in config ${signer} than on-chain ${signerOnChain} for ${validator}!` - ) - } - - if (!(await isAttestationSignerUnlocked())) { - throw Error(`Need to unlock attestation signer account ${signer}`) - } - - const metadataURL = await accounts.getMetadataURL(validator) - try { - const metadata = await IdentityMetadataWrapper.fetchFromURL(accounts, metadataURL) - const claim = metadata.findClaim(ClaimTypes.ATTESTATION_SERVICE_URL) - if (!claim) { - throw Error('Missing ATTESTATION_SERVICE_URL claim') - } - return claim.url - } catch (error) { - throw Error(`Could not verify metadata at ${metadataURL}: ${error}`) - } -} - -/** - * Function to initialize each kit in the global array of Contract Kit(s) - * @param force if true, reinitialize kit(s) whether or not they already exist - */ -export async function initializeKits(force: boolean = false) { - rootLogger.info('Initializing Contract Kit(s)') - let keystoreWalletWrapper: KeystoreWalletWrapper | undefined - // Prefer to use keystore if these variables are set - if (keystoreDirpath && keystorePassphrase) { - keystoreWalletWrapper = new KeystoreWalletWrapper(new FileKeystore(keystoreDirpath)) - try { - await keystoreWalletWrapper.unlockAccount(signerAddress, keystorePassphrase) - } catch (error: any) { - throw new Error( - `Unlocking keystore file for account ${signerAddress} failed: ` + error.message - ) - } - } - - const failedConnections = await Promise.all( - kits.map(async (kit, i) => { - // Return whether kit_i fails to connect to the given provider - if (kit === undefined || force) { - try { - kits[i] = keystoreWalletWrapper - ? newKit(celoProviders[i], keystoreWalletWrapper.getLocalWallet()) - : newKit(celoProviders[i]) - // Copied from @celo/cli/src/utils/helpers - await kits[i]!.connection.getBlock('latest') - rootLogger.info(`Connected to Celo node at ${celoProviders[i]}`) - return false - } catch (error) { - kits[i] = undefined - rootLogger.warn(`Failed to connect to Celo node at ${celoProviders[i]}`) - return true - } - } - }) - ) - // No kits successfully reinitialized nor existing kits that work - if (failedConnections && failedConnections.filter(Boolean).length === kits.length) { - throw new Error(`Initializing ContractKit failed for all providers: ${celoProviders}.`) - } -} - -export async function startPeriodicHealthCheck() { - await tryHealthCheck() - setInterval(tryHealthCheck, 60 * 1000) -} - -export async function startPeriodicKitsCheck() { - // Cover the edge case where one kit is set to undefined, - // causing prioritization logic to always default to the other kits - // without reinitializing this kit. - const checkUndefinedKits = async () => { - if (kits.filter((k) => k !== undefined).length < kits.length) { - // Only attempt to reinitialize undefined kits - try { - await initializeKits(false) - } catch (error: any) { - rootLogger.error(`Periodic kits check failed: ${error.message}`) - } - } - } - setInterval(checkUndefinedKits, 60 * 1000) -} - -let AttestationTable: AttestationStatic - -async function getAttestationTable() { - if (AttestationTable) { - return AttestationTable - } - AttestationTable = await Attestation(sequelize!) - return AttestationTable -} - -export async function findAttestationByKey( - key: AttestationKey, - options: FindOptions = {} -): Promise { - return (await getAttestationTable()).findOne({ - where: { ...key }, - ...options, - }) -} - -export async function findAttestationByDeliveryId( - ongoingDeliveryId: string, - options: FindOptions = {} -): Promise { - return (await getAttestationTable()).findOne({ - where: { ongoingDeliveryId }, - // Ensure deterministic result, since deliveryId uniqueness is not enforced - order: [['createdAt', 'DESC']], - ...options, - }) -} - -export async function findOrCreateAttestation( - key: AttestationKey, - defaults: object | undefined, - transaction: Transaction -): Promise { - const attestationTable = await getAttestationTable() - await attestationTable.findOrCreate({ - where: { - ...key, - }, - defaults, - transaction, - }) - - // Query to lock the record - const attestationRecord = await findAttestationByKey( - { - ...key, - }, - { transaction, lock: Transaction.LOCK.UPDATE } - ) - - if (!attestationRecord) { - // This should never happen - throw new Error(`Somehow we did not get an attestation record`) - } - - return attestationRecord -} - -async function purgeExpiredRecords() { - try { - const sequelizeLogger = makeSequelizeLogger(rootLogger) - const transaction = await sequelize!.transaction({ logging: sequelizeLogger }) - try { - const table = await getAttestationTable() - const rowsDeleted = await table.destroy({ - where: { - createdAt: { - [Op.lte]: moment().subtract(dbRecordExpiryMins!, 'minutes').toDate(), - }, - }, - transaction, - }) - await transaction.commit() - if (rowsDeleted) { - rootLogger.info({ rowsDeleted }, 'Purged expired records') - } - } catch (err) { - rootLogger.error({ err }, 'Cannot purge expired records') - await transaction.rollback() - } - } catch (err) { - rootLogger.error({ err }, 'Cannot purge expired records') - } -} - -// Do the health check to update the gauge -async function tryHealthCheck() { - try { - const failureReason = await doHealthCheck() - if (failureReason) { - rootLogger.warn(`Health check failed: ${failureReason}`) - } - } catch { - rootLogger.warn(`Health check failed`) - } -} - -// Check health and return failure reason, null on success. -export async function doHealthCheck(): Promise { - try { - if (!(await isAttestationSignerUnlocked())) { - Gauges.healthy.set(0) - return ErrorMessages.ATTESTATION_SIGNER_CANNOT_SIGN - } - - if (await isNodeSyncing()) { - Gauges.healthy.set(0) - return ErrorMessages.NODE_IS_SYNCING - } - - const { ageOfLatestBlock } = await getAgeOfLatestBlock() - if (ageOfLatestBlock > maxAgeLatestBlock) { - Gauges.healthy.set(0) - return ErrorMessages.NODE_IS_STUCK - } - - try { - await isDBOnline() - } catch (error) { - Gauges.healthy.set(0) - return ErrorMessages.DATABASE_IS_OFFLINE - } - - Gauges.healthy.set(1) - return null - } catch (error) { - Gauges.healthy.set(0) - return ErrorMessages.UNKNOWN_ERROR - } -} diff --git a/packages/attestation-service/src/env.ts b/packages/attestation-service/src/env.ts deleted file mode 100644 index c8c0e3fa010..00000000000 --- a/packages/attestation-service/src/env.ts +++ /dev/null @@ -1,75 +0,0 @@ -import * as dotenv from 'dotenv' -import { isValidAddress, toChecksumAddress } from 'ethereumjs-util' - -if (process.env.CONFIG) { - dotenv.config({ path: process.env.CONFIG }) -} - -export function fetchEnv(name: string): string { - if (process.env[name] === undefined || process.env[name] === '') { - console.error(`ENV var '${name}' was not defined`) - throw new Error(`ENV var '${name}' was not defined`) - } - return process.env[name] as string -} - -export function fetchEnvOrDefault(name: string, defaultValue: string): string { - return process.env[name] === undefined || process.env[name] === '' - ? defaultValue - : (process.env[name] as string) -} - -export function isYes(value: string) { - switch (value.toLowerCase().trim()) { - case '1': - case 'y': - case 'yes': - case 't': - case 'true': - return true - default: - return false - } -} - -export function getAttestationSignerAddress() { - if ( - process.env.ATTESTATION_SIGNER_ADDRESS === undefined || - !isValidAddress(process.env.ATTESTATION_SIGNER_ADDRESS) - ) { - console.error('Did not specify valid ATTESTATION_SIGNER_ADDRESS') - throw new Error('Did not specify valid ATTESTATION_SIGNER_ADDRESS') - } - - return process.env.ATTESTATION_SIGNER_ADDRESS -} - -export function getAccountAddress() { - if ( - process.env.CELO_VALIDATOR_ADDRESS === undefined || - !isValidAddress(process.env.CELO_VALIDATOR_ADDRESS) - ) { - console.error('Did not specify valid CELO_VALIDATOR_ADDRESS') - throw new Error('Did not specify valid CELO_VALIDATOR_ADDRESS') - } - - return toChecksumAddress(process.env.CELO_VALIDATOR_ADDRESS) -} - -export function isDevMode() { - return fetchEnvOrDefault('NODE_ENV', '').toLowerCase() === 'dev' -} - -export function getCeloProviders(): string[] { - const celoProvider = process.env.CELO_PROVIDER - const celoProviders = process.env.CELO_PROVIDERS - if ((celoProvider && celoProviders) || (!celoProvider && !celoProviders)) { - // Intent is unclear, so do not allow this - throw new Error('Must specify exactly one of: CELO_PROVIDER and CELO_PROVIDERS') - } else if (celoProvider) { - // Backwards comaptibility - return [celoProvider] - } else { - return celoProviders!.split(',').filter((t) => t != null && t !== '') - } -} diff --git a/packages/attestation-service/src/index.ts b/packages/attestation-service/src/index.ts deleted file mode 100644 index f4eae0d3580..00000000000 --- a/packages/attestation-service/src/index.ts +++ /dev/null @@ -1,106 +0,0 @@ -import { - AttestationRequestType, - AttestationServiceTestRequestType, - GetAttestationRequestType, -} from '@celo/phone-utils/lib/io' -import express from 'express' -import rateLimit from 'express-rate-limit' -import requestIdMiddleware from 'express-request-id' -import * as PromClient from 'prom-client' -import { - initializeDB, - initializeKits, - startPeriodicHealthCheck, - startPeriodicKitsCheck, - verifyConfigurationAndGetURL, -} from './db' -import { fetchEnv, fetchEnvOrDefault, isDevMode, isYes } from './env' -import { rootLogger } from './logger' -import { asyncHandler, createValidatedHandler, loggerMiddleware } from './request' -import { handleAttestationRequest } from './requestHandlers/attestation' -import { handleAttestationDeliveryStatus } from './requestHandlers/delivery' -import { handleGetAttestationRequest } from './requestHandlers/get_attestation' -import { handleLivenessRequest } from './requestHandlers/liveness' -import { handleStatusRequest, StatusRequestType } from './requestHandlers/status' -import { handleTestAttestationRequest } from './requestHandlers/test_attestation' -import { initializeSmsProviders, smsProvidersWithDeliveryStatus } from './sms' - -async function init() { - await initializeDB() - await initializeKits() - - let externalURL: string - - // Verify configuration if VERIFY_CONFIG_ON_STARTUP is set. - // (in this case, we can use the URL in the claim if EXTERNAL_CALLBACK_HOSTPORT is missing) - if (!isDevMode() && isYes(fetchEnvOrDefault('VERIFY_CONFIG_ON_STARTUP', '1'))) { - const claimURL = await verifyConfigurationAndGetURL() - externalURL = fetchEnvOrDefault('EXTERNAL_CALLBACK_HOSTPORT', claimURL) - } else { - externalURL = fetchEnv('EXTERNAL_CALLBACK_HOSTPORT') - } - - const deliveryStatusURLForProviderType = (t: string) => `${externalURL}/delivery_status_${t}` - - await initializeSmsProviders(deliveryStatusURLForProviderType) - - await startPeriodicHealthCheck() - await startPeriodicKitsCheck() - - const rateLimitReqsPerMin = parseInt(fetchEnvOrDefault('RATE_LIMIT_REQS_PER_MIN', '100'), 10) - const rateLimiter = rateLimit({ - windowMs: 60 * 1000, // 1 minute - max: rateLimitReqsPerMin, - }) - - const app = express() - app.use([requestIdMiddleware(), loggerMiddleware, rateLimiter]) - const port = process.env.PORT || 3000 - app.listen(port, () => - rootLogger.info({ port, rateLimitReqsPerMin }, 'Attestation Service started') - ) - - app.get('/metrics', (_req, res) => { - res.send(PromClient.register.metrics()) - }) - app.get('/status', createValidatedHandler(StatusRequestType, handleStatusRequest)) - app.get('/ready', (_req, res) => { - res.send('Ready').status(200) - }) - app.get('/healthz', asyncHandler(handleLivenessRequest)) - app.get( - '/get_attestations', - createValidatedHandler(GetAttestationRequestType, handleGetAttestationRequest) - ) - app.post( - '/attestations', - express.json(), - createValidatedHandler(AttestationRequestType, handleAttestationRequest) - ) - app.post( - '/test_attestations', - express.json(), - createValidatedHandler(AttestationServiceTestRequestType, handleTestAttestationRequest) - ) - - for (const p of smsProvidersWithDeliveryStatus()) { - const path = `/delivery_status_${p.type}` - const method = p.deliveryStatusMethod() - rootLogger.info( - { method, url: deliveryStatusURLForProviderType(p.type) }, - 'Registered delivery status handler' - ) - if (method === 'POST') { - app.post(path, ...p.deliveryStatusHandlers(), handleAttestationDeliveryStatus(p.type)) - } else if (method === 'GET') { - app.get(path, ...p.deliveryStatusHandlers(), handleAttestationDeliveryStatus(p.type)) - } else { - throw new Error(`Unknown method ${method} for ${path}`) - } - } -} - -init().catch((err) => { - rootLogger.error({ err }, 'Unexpected error during intialization') - process.exit(1) -}) diff --git a/packages/attestation-service/src/logger.ts b/packages/attestation-service/src/logger.ts deleted file mode 100644 index 0a8402b3d6f..00000000000 --- a/packages/attestation-service/src/logger.ts +++ /dev/null @@ -1,26 +0,0 @@ -import Logger, { createLogger, levelFromName, LogLevelString, stdSerializers } from 'bunyan' -import bunyanDebugStream from 'bunyan-debug-stream' -import { createStream } from 'bunyan-gke-stackdriver' -import { fetchEnvOrDefault } from './env' - -const logLevel = fetchEnvOrDefault('LOG_LEVEL', 'info') as LogLevelString -const logFormat = fetchEnvOrDefault('LOG_FORMAT', 'human') - -let stream: any -switch (logFormat) { - case 'stackdriver': - stream = createStream(levelFromName[logLevel]) - break - case 'json': - stream = { stream: process.stdout, level: logLevel } - break - default: - stream = { level: logLevel, stream: bunyanDebugStream() } - break -} - -export const rootLogger: Logger = createLogger({ - name: 'attestation-service', - serializers: stdSerializers, - streams: [stream], -}) diff --git a/packages/attestation-service/src/metrics.ts b/packages/attestation-service/src/metrics.ts deleted file mode 100644 index 67ef33262e4..00000000000 --- a/packages/attestation-service/src/metrics.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { Counter, Gauge } from 'prom-client' - -export const Counters = { - attestationRequestsTotal: new Counter({ - name: 'attestation_requests_total', - help: 'Counter for the number of attestation requests', - }), - attestationRequestsAlreadySent: new Counter({ - name: 'attestation_requests_already_sent', - help: 'Counter for the number of attestation requests that were already sent', - }), - attestationRequestsWrongIssuer: new Counter({ - name: 'attestation_requests_wrong_issuer', - help: 'Counter for the number of attestation requests that specified the wrong issuer', - }), - attestationRequestsWOIncompleteAttestation: new Counter({ - name: 'attestation_requests_without_incomplete_attestation', - help: 'Counter for the number of attestation requests for which no incomplete attestations could be found', - }), - attestationRequestsValid: new Counter({ - name: 'attestation_requests_valid', - help: 'Counter for the number of requests involving valid attestation requests', - }), - attestationRequestsRerequest: new Counter({ - name: 'attestation_requests_rerequest', - help: 'Counter for the number of requests that are re-requests', - }), - attestationRequestsAttestationErrors: new Counter({ - name: 'attestation_requests_attestation_errors', - help: 'Counter for the number of requests for which producing the attestation failed', - }), - attestationRequestsUnableToServe: new Counter({ - name: 'attestation_requests_unable_to_serve', - labelNames: ['country'], - help: 'Counter for requests not served because no provider was configured, by country', - }), - attestationRequestsSentSms: new Counter({ - name: 'attestation_requests_sent_sms', - help: 'Counter for the number of sms sent', - }), - attestationRequestsFailedToSendSms: new Counter({ - name: 'attestation_requests_failed_to_send_sms', - help: 'Counter for the number of sms that failed to send', - }), - attestationRequestsBelievedDelivered: new Counter({ - name: 'attestation_requests_believed_delivered_sms', - help: 'Counter for the number of sms that delivered with or without receipt', - }), - attestationRequestsFailedToDeliverSms: new Counter({ - name: 'attestation_requests_failed_to_deliver_sms', - help: 'Counter for the number of sms that sent but failed to deliver', - }), - attestationRequestUnexpectedErrors: new Counter({ - name: 'attestation_requests_unexpected_errors', - help: 'Counter for the number of unexpected errors', - }), - attestationProviderDeliveryStatus: new Counter({ - name: 'attestation_attempts_delivery_status', - labelNames: ['provider', 'country', 'status'], - help: 'Counter for status of each delivery attempt by provider and country', - }), - attestationProviderDeliveryErrorCodes: new Counter({ - name: 'attestation_attempts_delivery_error_codes', - labelNames: ['provider', 'country', 'code'], - help: 'Counter for error code of each failed delivery attempt by provider and country', - }), - attestationRequestsByNumberType: new Counter({ - name: 'attestation_requests_number_type', - labelNames: ['country', 'type'], - help: 'Counter for requests by country and type of phone number', - }), - attestationRequestsDidNotProvideSignature: new Counter({ - name: 'attestation_requests_did_not_provide_signature', - help: 'Counter for the number of requests which did not provide a phone number signature', - }), -} - -export const Gauges = { - attestationProviderBalance: new Gauge({ - name: 'attestation_provider_balance', - labelNames: ['provider'], - help: 'Gauge for provider outstanding account balance', - }), - healthy: new Gauge({ - name: 'attestation_service_healthy', - help: 'Gauge for overall health check passing', - }), -} diff --git a/packages/attestation-service/src/models/attestation.ts b/packages/attestation-service/src/models/attestation.ts deleted file mode 100644 index 91881229259..00000000000 --- a/packages/attestation-service/src/models/attestation.ts +++ /dev/null @@ -1,117 +0,0 @@ -import { E164Number } from '@celo/phone-utils/lib/io' -import { BuildOptions, DataTypes, Model, Sequelize } from 'sequelize' - -// Split out SmsFields from the underlying data model; -// Contains fields relevant to the message itself, not to meta-info -// about how/when the message was sent. -export interface SmsFields { - account: string - identifier: string - issuer: string - countryCode: string - phoneNumber: E164Number - message: string - securityCode: string | null - attestationCode: string | null - appSignature: string | undefined - language: string | undefined -} - -export interface AttestationModel extends Model, SmsFields { - readonly id: number - securityCodeAttempt: number - ongoingDeliveryId: string | null - providers: string - attempt: number - status: AttestationStatus - errors: string | null - createdAt: Date - completedAt: Date | null - key: () => AttestationKey - provider: () => string | null - recordError: (error: string) => void - failure: () => boolean - currentError: () => string | undefined -} - -export interface AttestationKey { - account: string - identifier: string - issuer: string -} - -// Attestations only transition from lower to higher -export enum AttestationStatus { - NotSent, // Not yet received ok by a provider - Sent, // Received ok by provider - Queued, // Buffered or queued, but still in flight - Upstream, // Reached upstream carrier - Other, - Failed, // We will try to retransmit. - Delivered, // Success! -} - -export type AttestationStatic = typeof Model & - (new (values?: object, options?: BuildOptions) => AttestationModel) - -export default (sequelize: Sequelize) => { - const model = sequelize.define('Attestations', { - account: DataTypes.STRING, - identifier: DataTypes.STRING, - issuer: DataTypes.STRING, - countryCode: DataTypes.STRING, - phoneNumber: DataTypes.STRING, - message: DataTypes.STRING, - securityCode: DataTypes.STRING, - securityCodeAttempt: DataTypes.INTEGER, - attestationCode: DataTypes.STRING, - ongoingDeliveryId: DataTypes.STRING, - providers: DataTypes.STRING, - attempt: DataTypes.INTEGER, - status: DataTypes.STRING, - errors: DataTypes.STRING, - createdAt: DataTypes.DATE, - completedAt: DataTypes.DATE, - appSignature: DataTypes.STRING, - language: DataTypes.STRING, - }) as AttestationStatic - - model.prototype.key = function (): AttestationKey { - return { account: this.account, identifier: this.identifier, issuer: this.issuer } - } - - model.prototype.provider = function (): string | null { - const pl = this.providers.split(',') - return this.providers ? pl[this.attempt % pl.length] : null - } - - model.prototype.recordError = function (error: string) { - const errors = this.errors ? JSON.parse(this.errors) : {} - - errors[this.attempt] = { - provider: this.provider(), - error, - } - this.errors = JSON.stringify(errors) - } - - model.prototype.failure = function (): boolean { - return ( - // tslint:disable-next-line: triple-equals - this.status == AttestationStatus.NotSent.valueOf() || - // tslint:disable-next-line: triple-equals - this.status == AttestationStatus.Failed.valueOf() - ) - } - - model.prototype.currentError = function () { - if (this.failure()) { - const errors = this.errors ? JSON.parse(this.errors) : {} - return errors[this.attempt]?.error ?? errors[this.attempt - 1]?.error ?? undefined - } else { - return undefined - } - } - - return model -} diff --git a/packages/attestation-service/src/request.ts b/packages/attestation-service/src/request.ts deleted file mode 100644 index 5fa6960747c..00000000000 --- a/packages/attestation-service/src/request.ts +++ /dev/null @@ -1,135 +0,0 @@ -import { AttestationResponseType } from '@celo/phone-utils/lib/io' -import Logger from 'bunyan' -import express from 'express' -import { isLeft } from 'fp-ts/lib/Either' -import * as t from 'io-ts' -import { rootLogger } from './logger' -import { AttestationModel, AttestationStatus } from './models/attestation' - -export enum ErrorMessages { - INVALID_SIGNATURE = 'Invalid signature provided', - NO_PROVIDER_SETUP = 'No provider was setup for this phone number', - UNKNOWN_ERROR = 'Something went wrong', - ATTESTATION_SIGNER_CANNOT_SIGN = 'Node offline or attestation signer account not unlocked', - DATABASE_IS_OFFLINE = 'Database is offline', - NODE_IS_SYNCING = 'Node is not synced', - NODE_IS_STUCK = 'Node is not up to date', -} - -export function asyncHandler(handler: (req: express.Request, res: Response) => Promise) { - return (req: express.Request, res: Response) => { - const handleUnknownError = (error: Error) => { - if (res.locals.logger) { - res.locals.logger.error(error) - } - respondWithError(res, 500, ErrorMessages.UNKNOWN_ERROR) - } - try { - handler(req, res) - .then(() => res.locals.logger.info({ res })) - .catch(handleUnknownError) - } catch (error: any) { - handleUnknownError(error instanceof Error ? error : new Error(error)) - } - } -} - -export function createValidatedHandler( - requestType: t.Type, - handler: (req: express.Request, res: Response, parsedRequest: T) => Promise -) { - return asyncHandler(async (req: express.Request, res: Response) => { - const parsedRequest = requestType.decode({ ...req.query, ...req.body }) - if (isLeft(parsedRequest)) { - res.status(422).json({ - success: false, - error: 'Error parsing invalid request', - errors: serializeErrors(parsedRequest.left), - }) - } else { - return handler(req, res, parsedRequest.right) - } - }) -} - -function serializeErrors(errors: t.Errors) { - let serializedErrors: any = {} - errors.map((error) => { - const expectedType = error.context[error.context.length - 1].type - const path = error.context.map(({ key }) => key).join('.') - const value = - error.message || - `Expected value at path ${path} to be of type ${expectedType.name}, but received ${error.value}` - - // Create recursive payload in case of nested properties - let payload: any = value - for (let index = error.context.length - 1; index > 0; index--) { - const innerError = payload - payload = {} - payload[error.context[index].key] = innerError - } - - serializedErrors = { ...serializedErrors, ...payload } - }) - return serializedErrors -} - -export function respondWithError(res: express.Response, statusCode: number, error: string) { - res.status(statusCode).json({ success: false, error }) -} - -export function respondWithAttestation( - res: express.Response, - attestation: AttestationModel, - alwaysSuccess?: boolean | undefined, - salt?: string | undefined, - attestationCode?: string | null -) { - res.status(alwaysSuccess ? 200 : attestation.failure() ? 422 : 200).json( - AttestationResponseType.encode({ - success: alwaysSuccess ? true : !attestation.failure(), - identifier: attestation.identifier, - account: attestation.account, - issuer: attestation.issuer, - attempt: attestation.attempt, - countryCode: attestation.countryCode, - status: AttestationStatus[attestation.status], - salt, - provider: attestation.provider() ?? undefined, - errors: attestation.errors ?? undefined, - error: attestation.currentError(), - duration: attestation.completedAt - ? attestation.completedAt!.getTime() - attestation.createdAt.getTime() - : undefined, - attestationCode: attestationCode ?? undefined, - }) - ) -} - -export type Response = Omit & { - locals: { logger: Logger } & Omit -} - -export function loggerMiddleware( - req: express.Request, - res: express.Response, - next: express.NextFunction -) { - const requestLogger = rootLogger.child({ - // @ts-ignore express-request-id adds this - req_id: req.id, - }) - - res.locals.logger = requestLogger - requestLogger.info({ req }) - next() -} - -export class ErrorWithResponse extends Error { - responseCode: number | undefined - constructor(message?: string, responseCode?: number) { - super(message) - Object.setPrototypeOf(this, new.target.prototype) - this.responseCode = responseCode - } -} diff --git a/packages/attestation-service/src/requestHandlers/attestation.ts b/packages/attestation-service/src/requestHandlers/attestation.ts deleted file mode 100644 index 9e014f899d4..00000000000 --- a/packages/attestation-service/src/requestHandlers/attestation.ts +++ /dev/null @@ -1,285 +0,0 @@ -import { AttestationState } from '@celo/contractkit/lib/wrappers/Attestations' -import { OdisUtils } from '@celo/identity' -import { getPepperFromThresholdSignature } from '@celo/identity/lib/odis/phone-number-identifier' -import { PhoneNumberUtils } from '@celo/phone-utils' -import { AttestationRequest } from '@celo/phone-utils/lib/io' -import { AttestationUtils } from '@celo/utils' -import { eqAddress } from '@celo/utils/lib/address' -import { sleep } from '@celo/utils/lib/async' -import Logger from 'bunyan' -import { randomBytes } from 'crypto' -import express from 'express' -import { findAttestationByKey, makeSequelizeLogger, SequelizeLogger, useKit } from '../db' -import { - fetchEnvOrDefault, - getAccountAddress, - getAttestationSignerAddress, - isDevMode, -} from '../env' -import { Counters } from '../metrics' -import { AttestationKey, AttestationModel } from '../models/attestation' -import { ErrorWithResponse, respondWithAttestation, respondWithError, Response } from '../request' -import { rerequestAttestation, startSendSms } from '../sms' -import { obfuscateNumber } from '../sms/base' - -const ATTESTATION_ERROR = 'Valid attestation could not be provided' -const NO_INCOMPLETE_ATTESTATION_FOUND_ERROR = 'No incomplete attestation found' -export const INVALID_SIGNATURE_ERROR = 'Signature is invalid' - -const odisPubKey = OdisUtils.Query.getServiceContext( - fetchEnvOrDefault('NETWORK', 'mainnet') -).odisPubKey -const thresholdBls = require('blind-threshold-bls') - -function toBase64(str: string) { - return Buffer.from(str.slice(2), 'hex').toString('base64') -} - -function getAttestationKey(attestationRequest: AttestationRequest): AttestationKey { - return { - identifier: PhoneNumberUtils.getPhoneHash( - attestationRequest.phoneNumber, - attestationRequest.salt - ), - account: attestationRequest.account, - issuer: attestationRequest.issuer, - } -} - -// TODO proper localization -function getSecurityCodeText(language: string | undefined) { - switch (language) { - case 'es': - case 'es-419': - case 'es-US': - case 'es-LA': { - return 'Código de seguridad de Celo' - } - case 'pt': - case 'pt-BR': { - return 'Esse é o seu código de segurança Celo' - } - default: { - return 'Celo security code' - } - } -} - -class AttestationRequestHandler { - logger: Logger - key: AttestationKey - sequelizeLogger: SequelizeLogger - constructor(public readonly attestationRequest: AttestationRequest, logger: Logger) { - this.logger = logger.child({ - account: attestationRequest.account, - issuer: attestationRequest.issuer, - phoneNumber: obfuscateNumber(attestationRequest.phoneNumber), - }) - this.sequelizeLogger = makeSequelizeLogger(this.logger) - this.key = getAttestationKey(this.attestationRequest) - } - - async findOrValidateRequest(): Promise { - const { account, issuer } = this.attestationRequest - - const address = getAccountAddress() - if (!eqAddress(address, issuer)) { - Counters.attestationRequestsWrongIssuer.inc() - throw new ErrorWithResponse(`Mismatching issuer, I am ${address}`, 422) - } - - const attestation = await findAttestationByKey(this.key, { - logging: this.sequelizeLogger, - }) - - await this.verifyPepperIfApplicable() - - // Re-requests for existing attestations skip the on-chain check. - if (attestation) { - Counters.attestationRequestsRerequest.inc() - return attestation - } - - if (isDevMode()) { - return attestation - } - - // Check the on-chain status of the attestation. If it's marked Complete, don't do it. - // If it's missing, the full node could be behind by a block or two. Try a few times before erroring. - const attestations = await useKit((kit) => kit.contracts.getAttestations()) - for (let i = 0; i < 4; i++) { - try { - const state = await attestations.getAttestationState(this.key.identifier, account, issuer) - if (state?.attestationState === AttestationState.Incomplete) { - Counters.attestationRequestsValid.inc() - return null - } else if (state?.attestationState === AttestationState.Complete) { - break - } - // tslint:disable-next-line: no-empty - } catch {} - await sleep(2500) - } - - Counters.attestationRequestsWOIncompleteAttestation.inc() - throw new ErrorWithResponse(NO_INCOMPLETE_ATTESTATION_FOUND_ERROR, 422) - - // TODO: Check expiration - } - - async signAttestation() { - const { phoneNumber, account, salt } = this.attestationRequest - const message = AttestationUtils.getAttestationMessageToSignFromPhoneNumber( - phoneNumber, - account, - salt - ) - - try { - return await useKit((kit) => kit.connection.sign(message, getAttestationSignerAddress())) - } catch (error) { - if (isDevMode()) { - return randomBytes(65).toString('hex') - } else { - throw error - } - } - } - - async validateAttestationCode(attestationCode: string) { - if (!isDevMode()) { - const { account } = this.attestationRequest - const address = getAccountAddress() - const attestations = await useKit((kit) => kit.contracts.getAttestations()) - const isValid = await attestations.validateAttestationCode( - this.key.identifier, - account, - address, - attestationCode - ) - - if (!isValid) { - Counters.attestationRequestsAttestationErrors.inc() - throw new ErrorWithResponse(ATTESTATION_ERROR, 422) - } - } - } - - // Main process for handling an attestation. - async doAttestation() { - Counters.attestationRequestsTotal.inc() - if ( - !this.attestationRequest.securityCodePrefix || - this.attestationRequest.securityCodePrefix.length !== 1 - ) { - throw new ErrorWithResponse('Invalid securityCodePrefix', 422) - } - - let attestation = await this.findOrValidateRequest() - - if (attestation && attestation.message) { - // Re-request existing attestation. In this case, security code prefix is ignored (the message sent is the same as before) - attestation = await rerequestAttestation( - this.key, - this.attestationRequest.smsRetrieverAppSig, - this.attestationRequest.language, - this.attestationRequest.securityCodePrefix, - this.logger, - this.sequelizeLogger - ) - } else { - // New attestation: create new attestation code, new delivery. - const attestationCode = await this.signAttestation() - await this.validateAttestationCode(attestationCode) - // This attestation code is stored in the attestation object - // and will be returned to the user with the get_attestation call - const attestationCodeDeeplink = `celo://wallet/v/${toBase64(attestationCode)}` - - let messageBase, securityCode - - // Generate a security code to be sent over SMS - securityCode = randomBytes(7) - .map((x) => x % 10) - .join('') - securityCode = `${this.attestationRequest.securityCodePrefix}${securityCode}` - messageBase = `${getSecurityCodeText(this.attestationRequest.language)}: ${securityCode}` - - let textMessage - - // Append with the retriever appsig. - if (this.attestationRequest.smsRetrieverAppSig) { - if (!this.attestationRequest.smsRetrieverAppSig.match('^[\\w+]{5,12}$')) { - throw new ErrorWithResponse('Invalid smsRetrieverAppSig', 422) - } - textMessage = `<#> ${messageBase} ${this.attestationRequest.smsRetrieverAppSig}` - } else { - textMessage = messageBase - } - - attestation = await startSendSms( - this.key, - this.attestationRequest.phoneNumber, - textMessage, - securityCode, - attestationCodeDeeplink, - this.attestationRequest.smsRetrieverAppSig, - this.attestationRequest.language, - this.logger, - this.sequelizeLogger - ) - } - - if (attestation.failure()) { - Counters.attestationRequestsFailedToSendSms.inc() - } else { - Counters.attestationRequestsSentSms.inc() - } - - return attestation - } - - private async verifyPepperIfApplicable(): Promise { - if (this.attestationRequest.phoneNumberSignature && this.attestationRequest.salt) { - const sigBuf = Buffer.from(this.attestationRequest.phoneNumberSignature, 'base64') - - try { - await thresholdBls.verify( - Buffer.from(odisPubKey, 'base64'), - Buffer.from(this.attestationRequest.phoneNumber, 'base64'), - sigBuf - ) - - const pepper = getPepperFromThresholdSignature(sigBuf) - if (pepper !== this.attestationRequest.salt) { - this.logger.error('Pepper is invalid') - // temporarily only silently fail, so as not to block users - // throw new ErrorWithResponse('Pepper is invalid', 422) - } - } catch (e) { - this.logger.error('Cannot get phone number from signature', e) - throw new ErrorWithResponse(INVALID_SIGNATURE_ERROR, 422) - } - } - Counters.attestationRequestsDidNotProvideSignature.inc() - } -} - -export async function handleAttestationRequest( - _req: express.Request, - res: Response, - attestationRequest: AttestationRequest -) { - const handler = new AttestationRequestHandler(attestationRequest, res.locals.logger) - try { - const attestation = await handler.doAttestation() - respondWithAttestation(res, attestation) - } catch (error: any) { - if (!error.responseCode) { - handler.logger.error({ error }) - Counters.attestationRequestUnexpectedErrors.inc() - } else { - handler.logger.info({ error }) - } - respondWithError(res, error.responseCode ?? 500, `${error.message ?? error}`) - } -} diff --git a/packages/attestation-service/src/requestHandlers/delivery.ts b/packages/attestation-service/src/requestHandlers/delivery.ts deleted file mode 100644 index 9cb33440b0b..00000000000 --- a/packages/attestation-service/src/requestHandlers/delivery.ts +++ /dev/null @@ -1,17 +0,0 @@ -import express from 'express' -import { ErrorMessages, respondWithError } from '../request' -import { smsProviderOfType } from '../sms' - -export function handleAttestationDeliveryStatus(providerType: string) { - return async (_req: express.Request, res: express.Response) => { - const provider = smsProviderOfType(providerType) - - if (provider === undefined) { - respondWithError(res, 422, ErrorMessages.NO_PROVIDER_SETUP) - return - } - - await provider!.receiveDeliveryStatusReport(_req, res.locals.logger) - res.json({ success: true }).status(200) - } -} diff --git a/packages/attestation-service/src/requestHandlers/get_attestation.ts b/packages/attestation-service/src/requestHandlers/get_attestation.ts deleted file mode 100644 index 866d15799dc..00000000000 --- a/packages/attestation-service/src/requestHandlers/get_attestation.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { PhoneNumberUtils } from '@celo/phone-utils' -import { GetAttestationRequest } from '@celo/phone-utils/lib/io' -import { isValidAddress, publicKeyToAddress } from '@celo/utils/lib/address' -import { verifyEIP712TypedDataSigner } from '@celo/utils/lib/signatureUtils' -import { attestationSecurityCode as buildSecurityCodeTypedData } from '@celo/utils/lib/typed-data-constructors' -import Logger from 'bunyan' -import express from 'express' -import { Transaction } from 'sequelize' -import { - findAttestationByKey, - makeSequelizeLogger, - sequelize, - SequelizeLogger, - useKit, -} from '../db' -import { AttestationKey, AttestationModel } from '../models/attestation' -import { ErrorWithResponse, respondWithAttestation, respondWithError } from '../request' -import { obfuscateNumber } from '../sms/base' - -const MAX_SECURITY_CODE_ATTEMPTS = 5 - -function obfuscateGetAttestationRequest(getRequest: GetAttestationRequest) { - const obfuscatedRequest = { ...getRequest } - obfuscatedRequest.phoneNumber = obfuscateNumber(getRequest.phoneNumber) - if (obfuscatedRequest.securityCode) { - obfuscatedRequest.securityCode = 'XXX' - } - return obfuscatedRequest -} - -function getAttestationKey(getRequest: GetAttestationRequest): AttestationKey { - return { - identifier: PhoneNumberUtils.getPhoneHash(getRequest.phoneNumber, getRequest.salt), - account: getRequest.account, - issuer: getRequest.issuer, - } -} - -class GetAttestationRequestHandler { - logger: Logger - key: AttestationKey - sequelizeLogger: SequelizeLogger - constructor(public readonly getRequest: GetAttestationRequest, logger: Logger) { - this.logger = logger.child({ - getRequest: obfuscateGetAttestationRequest(getRequest), - }) - this.sequelizeLogger = makeSequelizeLogger(this.logger) - this.key = getAttestationKey(getRequest) - } - - async withAttestationAndSecurityCodeChecked( - callback: (attestation: AttestationModel, attestationCode: string | null) => any - ) { - const transaction = await sequelize!.transaction({ - logging: this.sequelizeLogger, - type: Transaction.TYPES.IMMEDIATE, - }) - try { - const attestation = await findAttestationByKey(this.key, { - transaction, - lock: Transaction.LOCK.UPDATE, - }) - - if (!attestation) { - throw new ErrorWithResponse('Attestation not found', 404) - } - - if (attestation.securityCodeAttempt >= MAX_SECURITY_CODE_ATTEMPTS) { - throw new ErrorWithResponse('Security code attempts exceeded', 403) - } - - // No security code supplied in request. Just show other metadata. - if (!this.getRequest.securityCode) { - callback(attestation, null) - await transaction.commit() - return - } - - // Security code is supplied. Check it's correct. - // Check with both methods (can remove second method after 1.3.0) - if ( - attestation.securityCode && - (attestation.securityCode.slice(1) === this.getRequest.securityCode || - attestation.securityCode === this.getRequest.securityCode) - ) { - callback(attestation, attestation.attestationCode) - await transaction.commit() - return - } - - attestation.securityCodeAttempt += 1 - await attestation.save({ transaction, logging: this.sequelizeLogger }) - await transaction.commit() - } catch (error) { - transaction.rollback() - throw error - } - - throw new ErrorWithResponse('Invalid security code', 403) - } -} - -export async function handleGetAttestationRequest( - req: express.Request, - res: express.Response, - getRequest: GetAttestationRequest -) { - if (getRequest.securityCode) { - const { - headers: { authentication }, - } = req - if (!authentication) { - respondWithError(res, 401, 'Missing authentication') - return - } - - const typedData = buildSecurityCodeTypedData(getRequest.securityCode) - const accounts = await useKit((kit) => kit.contracts.getAccounts()) - const [walletAddress, dekAddress] = await Promise.all([ - accounts.getWalletAddress(getRequest.account), - accounts.getDataEncryptionKey(getRequest.account).then((x) => x && publicKeyToAddress(x)), - ]) - - const validSignature = [getRequest.account, walletAddress, dekAddress] - .filter(Boolean) - .filter(isValidAddress) - .find((address) => verifyEIP712TypedDataSigner(typedData, authentication as string, address)) - if (!validSignature) { - respondWithError(res, 401, 'Invalid signature') - return - } - } - - try { - const handler = new GetAttestationRequestHandler(getRequest, res.locals.logger) - - await handler.withAttestationAndSecurityCodeChecked((attestation, attestationCode) => { - respondWithAttestation(res, attestation, true, undefined, attestationCode) - }) - } catch (error: any) { - if (!error.responseCode) { - res.locals.logger.error({ error }) - } else { - res.locals.logger.info({ error }) - } - respondWithError(res, error.responseCode ?? 500, `${error.message ?? error}`) - } -} diff --git a/packages/attestation-service/src/requestHandlers/liveness.ts b/packages/attestation-service/src/requestHandlers/liveness.ts deleted file mode 100644 index b446dad4fa9..00000000000 --- a/packages/attestation-service/src/requestHandlers/liveness.ts +++ /dev/null @@ -1,16 +0,0 @@ -import express from 'express' -import { doHealthCheck } from '../db' -import { ErrorMessages, respondWithError } from '../request' - -export async function handleLivenessRequest(_req: express.Request, res: express.Response) { - try { - const failureReason = await doHealthCheck() - if (failureReason) { - respondWithError(res, 500, failureReason) - } else { - res.json({ status: 'live' }).status(200) - } - } catch (error) { - respondWithError(res, 500, ErrorMessages.UNKNOWN_ERROR) - } -} diff --git a/packages/attestation-service/src/requestHandlers/status.ts b/packages/attestation-service/src/requestHandlers/status.ts deleted file mode 100644 index 8a906ad24f2..00000000000 --- a/packages/attestation-service/src/requestHandlers/status.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { AttestationServiceStatusResponseType, SignatureType } from '@celo/utils/lib/io' -import express from 'express' -import * as t from 'io-ts' -import { getAgeOfLatestBlock, isNodeSyncing, useKit } from '../db' -import { fetchEnvOrDefault, getAccountAddress, getAttestationSignerAddress, isYes } from '../env' -import { ErrorMessages, respondWithError } from '../request' -import { configuredSmsProviders } from '../sms' - -export const VERSION = process.env.npm_package_version as string -export const SIGNATURE_PREFIX = 'attestation-service-status-signature:' -export const StatusRequestType = t.type({ - messageToSign: t.union([SignatureType, t.undefined]), -}) - -export type StatusRequest = t.TypeOf - -function produceSignature(message: string | undefined) { - if (!message) { - return undefined - } - - return useKit((kit) => - kit.connection.sign(SIGNATURE_PREFIX + message, getAttestationSignerAddress()) - ) -} - -export async function handleStatusRequest( - _req: express.Request, - res: express.Response, - statusRequest: StatusRequest -) { - try { - const { ageOfLatestBlock, number: latestBlock } = await getAgeOfLatestBlock() - res - .json( - AttestationServiceStatusResponseType.encode({ - status: 'ok', - smsProviders: configuredSmsProviders(), - blacklistedRegionCodes: [], // for backwards compatibility - accountAddress: getAccountAddress(), - signature: await produceSignature(statusRequest.messageToSign), - version: VERSION, - latestBlock, - ageOfLatestBlock, - isNodeSyncing: await isNodeSyncing(), - appSignature: fetchEnvOrDefault('APP_SIGNATURE', 'unknown'), - smsProvidersRandomized: isYes(fetchEnvOrDefault('SMS_PROVIDERS_RANDOMIZED', '0')), - maxDeliveryAttempts: parseInt( - fetchEnvOrDefault( - 'MAX_DELIVERY_ATTEMPTS', - fetchEnvOrDefault('MAX_PROVIDER_RETRIES', '3') - ), - 10 - ), - maxRerequestMins: parseInt(fetchEnvOrDefault('MAX_REREQUEST_MINS', '55'), 10), - twilioVerifySidProvided: !!fetchEnvOrDefault('TWILIO_VERIFY_SERVICE_SID', ''), - }) - ) - .status(200) - } catch (error) { - console.error(error) - respondWithError(res, 500, ErrorMessages.UNKNOWN_ERROR) - } -} diff --git a/packages/attestation-service/src/requestHandlers/test_attestation.ts b/packages/attestation-service/src/requestHandlers/test_attestation.ts deleted file mode 100644 index e9dea64a21e..00000000000 --- a/packages/attestation-service/src/requestHandlers/test_attestation.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { PhoneNumberUtils } from '@celo/phone-utils' -import { AttestationServiceTestRequest } from '@celo/phone-utils/lib/io' -import { verifySignature } from '@celo/utils/lib/signatureUtils' -import { randomBytes } from 'crypto' -import express from 'express' -import { getAccountAddress, getAttestationSignerAddress, isDevMode } from '../env' -import { ErrorMessages, respondWithAttestation, respondWithError } from '../request' -import { startSendSms } from '../sms' -import { obfuscateNumber } from '../sms/base' - -export async function handleTestAttestationRequest( - _req: express.Request, - res: express.Response, - testRequest: AttestationServiceTestRequest -) { - const logger = res.locals.logger.child({ - testProvider: testRequest.provider, - phoneNumber: obfuscateNumber(testRequest.phoneNumber), - }) - - try { - // Signature may be via account key or attestation signer (for ReleaseGold specifically) - // If we're in dev mode, don't do a signature check. - const accountIsValid = - isDevMode() || - verifySignature( - testRequest.phoneNumber + testRequest.message, - testRequest.signature, - getAccountAddress() - ) || - verifySignature( - testRequest.phoneNumber + testRequest.message, - testRequest.signature, - getAttestationSignerAddress() - ) - - if (!accountIsValid) { - respondWithError(res, 422, ErrorMessages.INVALID_SIGNATURE) - return - } - - // Generate attestation key for the test - const salt = randomBytes(32).toString('hex') - const key = { - identifier: PhoneNumberUtils.getPhoneHash(testRequest.phoneNumber, salt), - account: getAccountAddress(), - issuer: getAccountAddress(), - } - - const sequelizeLogger = (msg: string, sequelizeLogArgs: any) => - logger.debug({ sequelizeLogArgs, component: 'sequelize' }, msg) - - const attestation = await startSendSms( - key, - testRequest.phoneNumber, - testRequest.message, - '12345678', - testRequest.message, - undefined, - undefined, - logger, - sequelizeLogger, - testRequest.provider - ) - - respondWithAttestation(res, attestation, false, salt) - } catch (error: any) { - logger.error(error) - respondWithError(res, 500, `${error.message ?? error}`) - } -} diff --git a/packages/attestation-service/src/sms/base.ts b/packages/attestation-service/src/sms/base.ts deleted file mode 100644 index d7545b6ac17..00000000000 --- a/packages/attestation-service/src/sms/base.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { E164Number } from '@celo/phone-utils/lib/io' -import Logger from 'bunyan' -import express from 'express' -import { fetchEnvOrDefault } from '../env' -import { SmsFields } from '../models/attestation' - -export abstract class SmsProvider { - abstract type: SmsProviderType - unsupportedRegionCodes: string[] = [] - - canServePhoneNumber(countryCode: string, _: E164Number) { - return !this.unsupportedRegionCodes.includes(countryCode.toUpperCase()) - } - // Should throw Error when unsuccesful, return if successful - abstract sendSms(attestation: SmsFields): Promise - - // if this provider supports delivery status updates to an endpoint delivery_/, should return 'GET' or 'POST' - abstract deliveryStatusMethod(): string | null - - abstract deliveryStatusHandlers(): express.Handler[] - - // Should throw Error when unsuccesful, return if successful - abstract receiveDeliveryStatusReport(req: express.Request, logger: Logger): Promise -} - -export enum SmsProviderType { - NEXMO = 'nexmo', - UNKNOWN = 'unknown', - TWILIO = 'twilio', - TWILIO_MESSAGING = 'twiliomessaging', - TWILIO_VERIFY = 'twilioverify', - MESSAGEBIRD = 'messagebird', - TELEKOM = 'telekom', -} - -export function readUnsupportedRegionsFromEnv(...envVarNames: string[]) { - return envVarNames - .map((envVarName) => - fetchEnvOrDefault(envVarName, '') - .toUpperCase() - .split(',') - .filter((code) => code !== '') - ) - .reduce((acc, v) => acc.concat(v), []) -} - -export function obfuscateNumber(phoneNumber: string): string { - try { - return phoneNumber.slice(0, 7) + '...' - } catch { - return '' - } -} diff --git a/packages/attestation-service/src/sms/index.ts b/packages/attestation-service/src/sms/index.ts deleted file mode 100644 index c2e37ecb201..00000000000 --- a/packages/attestation-service/src/sms/index.ts +++ /dev/null @@ -1,587 +0,0 @@ -import { E164Number } from '@celo/phone-utils/lib/io' -import { sleep } from '@celo/utils/lib/async' -import { intersection } from '@celo/utils/lib/collections' -import Logger from 'bunyan' -import { PhoneNumberType, PhoneNumberUtil } from 'google-libphonenumber' -import { shuffle } from 'lodash' -import { Transaction } from 'sequelize' -import { - findAttestationByDeliveryId, - findAttestationByKey, - findOrCreateAttestation, - makeSequelizeLogger, - sequelize, - SequelizeLogger, -} from '../db' -import { fetchEnv, fetchEnvOrDefault, isYes } from '../env' -import { Counters } from '../metrics' -import { AttestationKey, AttestationModel, AttestationStatus } from '../models/attestation' -import { ErrorWithResponse } from '../request' -import { obfuscateNumber, SmsProvider, SmsProviderType } from './base' -import { MessageBirdSmsProvider } from './messagebird' -import { NexmoSmsProvider } from './nexmo' -import { TelekomSmsProvider } from './telekom' -import { TwilioMessagingProvider, TwilioVerifyProvider } from './twilio' - -// Maximum delivery attempts (including first) regardless of provider -const maxDeliveryAttempts = parseInt( - fetchEnvOrDefault('MAX_DELIVERY_ATTEMPTS', fetchEnvOrDefault('MAX_PROVIDER_RETRIES', '3')), - 10 -) - -// Time within which we allow forcing a retry of completed (or any state) attestations -const allowRetryWithinCompletedMs = - 1000 * 60 * parseInt(fetchEnvOrDefault('MAX_REREQUEST_MINS', '55'), 10) -const maxErrorLength = 255 - -const smsProviders: SmsProvider[] = [] -const smsProvidersByType: any = {} - -const phoneUtil = PhoneNumberUtil.getInstance() - -// Sadly PhoneNumberType doesn't have associated string literals -function phoneNumberTypeToString(t: PhoneNumberType): string { - switch (t) { - case PhoneNumberType.FIXED_LINE: - return 'fixed_line' - case PhoneNumberType.MOBILE: - return 'mobile' - case PhoneNumberType.FIXED_LINE_OR_MOBILE: - return 'fixed_line_or_mobile' - case PhoneNumberType.TOLL_FREE: - return 'toll_free' - case PhoneNumberType.PREMIUM_RATE: - return 'premium_rate' - case PhoneNumberType.SHARED_COST: - return 'shared_cost' - case PhoneNumberType.VOIP: - return 'voip' - case PhoneNumberType.PERSONAL_NUMBER: - return 'personal_number' - case PhoneNumberType.PAGER: - return 'pager' - case PhoneNumberType.UAN: - return 'uan' - case PhoneNumberType.VOICEMAIL: - return 'voicemail' - case PhoneNumberType.UNKNOWN: - return 'unknown' - } -} - -function providerNamesToList(providers: string) { - return ( - providers - // Backwards compatibility: 'twilio' as syntactic sugar for 'twilioverify,twiliomessaging' - .replace( - new RegExp(`\\b(${SmsProviderType.TWILIO})\\b`, 'g'), - `${SmsProviderType.TWILIO_VERIFY},${SmsProviderType.TWILIO_MESSAGING}` - ) - .split(',') - .filter((t) => t != null && t !== '') - ) -} - -export async function initializeSmsProviders( - deliveryStatusURLForProviderType: (type: string) => string -) { - const smsProvidersToConfigure = providerNamesToList(fetchEnv('SMS_PROVIDERS')) - if (smsProvidersToConfigure.length === 0) { - throw new Error('You have to specify at least one sms provider') - } - - for (const configuredSmsProvider of smsProvidersToConfigure) { - if (smsProvidersByType[configuredSmsProvider]) { - throw new Error(`Providers in SMS_PROVIDERS must be unique: dupe: ${configuredSmsProvider}`) - } - switch (configuredSmsProvider) { - case SmsProviderType.TELEKOM: - const telekomProvider = TelekomSmsProvider.fromEnv() - await telekomProvider.initialize(deliveryStatusURLForProviderType(configuredSmsProvider)) - smsProviders.push(telekomProvider) - smsProvidersByType[SmsProviderType.TELEKOM] = telekomProvider - break - case SmsProviderType.MESSAGEBIRD: - const messageBirdProvider = MessageBirdSmsProvider.fromEnv() - await messageBirdProvider.initialize( - deliveryStatusURLForProviderType(configuredSmsProvider) - ) - smsProviders.push(messageBirdProvider) - smsProvidersByType[SmsProviderType.MESSAGEBIRD] = messageBirdProvider - break - case SmsProviderType.NEXMO: - const nexmoProvider = NexmoSmsProvider.fromEnv() - await nexmoProvider.initialize(deliveryStatusURLForProviderType(configuredSmsProvider)) - smsProviders.push(nexmoProvider) - smsProvidersByType[SmsProviderType.NEXMO] = nexmoProvider - break - case SmsProviderType.TWILIO_VERIFY: - const twilioVerifyProvider = TwilioVerifyProvider.fromEnv() - await twilioVerifyProvider.initialize( - deliveryStatusURLForProviderType(configuredSmsProvider) - ) - smsProviders.push(twilioVerifyProvider) - smsProvidersByType[SmsProviderType.TWILIO_VERIFY] = twilioVerifyProvider - break - case SmsProviderType.TWILIO_MESSAGING: - const twilioMessagingProvider = TwilioMessagingProvider.fromEnv() - await twilioMessagingProvider.initialize( - deliveryStatusURLForProviderType(configuredSmsProvider) - ) - smsProviders.push(twilioMessagingProvider) - smsProvidersByType[SmsProviderType.TWILIO_MESSAGING] = twilioMessagingProvider - break - default: - throw new Error(`Unknown sms provider type specified: ${configuredSmsProvider}`) - } - } -} - -// Return all SMS providers for the given phone number, in order of preference for that region, -// and not including any providers that has that region on its denylist. -function smsProvidersFor( - countryCode: string, - phoneNumber: E164Number, - logger: Logger -): SmsProvider[] { - const providersForRegion = providerNamesToList( - fetchEnvOrDefault(`SMS_PROVIDERS_${countryCode}`, '') - ) - let providers = - providersForRegion.length > 0 - ? providersForRegion.map((name) => smsProvidersByType[name]) - : // Use default list of providers, possibly shuffled (per-country provider lists are never shuffled) - isYes(fetchEnvOrDefault('SMS_PROVIDERS_RANDOMIZED', '0')) - ? shuffle(smsProviders) - : smsProviders - providers = providers.filter( - (provider) => provider != null && provider.canServePhoneNumber(countryCode, phoneNumber) - ) - if (providers.length === 0) { - logger.warn( - { - countryCode, - phoneNumber: obfuscateNumber(phoneNumber), - countryProvidersConfigValue: providersForRegion, - }, - 'No providers found that could serve number: check all providers are listed under SMS_PROVIDERS, ' + - `check *_UNSUPPORTED_REGIONS are not overly restrictive, and that if provided SMS_PROVIDERS_${countryCode} lists valid providers` - ) - } else { - logger.debug( - { - countryCode, - phoneNumber: obfuscateNumber(phoneNumber), - providers: providers.map((provider) => provider.type), - }, - 'Providers found' - ) - } - return providers -} - -export function smsProviderOfType(type: string) { - return smsProviders.find((provider) => provider.type === type) -} - -export function configuredSmsProviders() { - return smsProviders.map((provider) => provider.type) -} - -export function smsProvidersWithDeliveryStatus() { - return smsProviders.filter((provider) => provider.deliveryStatusMethod()) -} - -export function unsupportedRegionCodes() { - return intersection(smsProviders.map((provider) => provider.unsupportedRegionCodes)) -} - -function providersToCsv(providers: SmsProvider[]) { - return providers.map((provider) => provider.type).join(',') -} - -// This list may be a strict subset of the valid providers (e.g. when forcing a provider for a test), -// but cannot require providers not configured or unsupported for this country code. -function getProvidersFor(attestation: AttestationModel, logger: Logger) { - const validProviders = smsProvidersFor(attestation.countryCode, attestation.phoneNumber, logger) - const attestationProviders = providerNamesToList(attestation.providers).map( - (name) => smsProvidersByType[name] - ) - - for (const p of attestationProviders) { - if (!validProviders.find((v) => p.type === v.type)) { - throw new Error(`Detected inconsistent provider configuration between instances`) - } - } - return attestationProviders -} - -// Main entry point for sending SMS. -export async function startSendSms( - key: AttestationKey, - phoneNumber: E164Number, - messageToSend: string, - securityCode: string | null = null, - attestationCode: string | null = null, - appSignature: string | undefined, - language: string | undefined, - logger: Logger, - sequelizeLogger: SequelizeLogger, - onlyUseProvider: string | null = null -): Promise { - let shouldRetry = false - let attestation: AttestationModel | null = null - - const transaction = await sequelize!.transaction({ - logging: sequelizeLogger, - type: Transaction.TYPES.IMMEDIATE, - }) - - try { - const parsedNumber = phoneUtil.parse(phoneNumber) - const numberType = parsedNumber ? phoneUtil.getNumberType(parsedNumber) : null - const countryCode = parsedNumber ? phoneUtil.getRegionCodeForNumber(parsedNumber) : null - - let providers: SmsProvider[] = countryCode - ? smsProvidersFor(countryCode, phoneNumber, logger) - : [] - - if (onlyUseProvider) { - // If onlyUseProvider is specified, filter returned list to make it only item. - providers = providers.filter((provider) => provider.type === onlyUseProvider!) - } - - attestation = await findOrCreateAttestation( - key, - { - phoneNumber, - countryCode, - status: AttestationStatus.NotSent, - message: messageToSend, - attestationCode, - providers: providersToCsv(providers), - attempt: 0, - errors: undefined, - ongoingDeliveryId: null, - securityCode, - securityCodeAttempt: 0, - appSignature, - language, - }, - transaction - ) - - if (!countryCode) { - Counters.attestationRequestsUnableToServe.labels('unknown').inc() - attestation.recordError(`Could not parse ${phoneNumber}`) - } else if (providers.length === 0) { - Counters.attestationRequestsUnableToServe.labels(countryCode).inc() - attestation.recordError(`No matching SMS providers`) - } else { - if (numberType !== null) { - Counters.attestationRequestsByNumberType - .labels(countryCode, phoneNumberTypeToString(numberType)) - .inc() - } - - // Parsed number and found providers. Attempt delivery. - shouldRetry = await doSendSms(attestation, providers, logger) - } - - await attestation.save({ transaction, logging: sequelizeLogger }) - await transaction.commit() - } catch (err) { - logger.error({ err }) - await transaction.rollback() - throw err - } - - // If there was an error sending, backoff and retry while holding open client conn. - if (shouldRetry && attestation) { - await sleep(Math.pow(2, attestation!.attempt) * 1000) - attestation = await findAttestationAndSendSms(key, logger, sequelizeLogger) - } - - return attestation -} - -// Force an existing attestation (could have received a delivery status or not) to be rerequested -// immediately if there are sufficient attempts remaining. -export async function rerequestAttestation( - key: AttestationKey, - appSignature: string | undefined, - language: string | undefined, - securityCodePrefix: string, - logger: Logger, - sequelizeLogger: SequelizeLogger -): Promise { - let shouldRetry = false - let attestation: AttestationModel | null = null - - const transaction = await sequelize!.transaction({ - logging: sequelizeLogger, - type: Transaction.TYPES.IMMEDIATE, - }) - - try { - attestation = await findAttestationByKey(key, { transaction, lock: Transaction.LOCK.UPDATE }) - if (!attestation) { - throw new Error('Cannot retrieve attestation') - } - // For backward compatibility - // Can be removed after 1.3.0 - if (!attestation.appSignature) { - attestation.appSignature = appSignature - } - if (!attestation.language) { - attestation.language = language - } - // Old security code approach did not store the prefix - if (attestation.securityCode?.length === 7) { - attestation.securityCode = `${securityCodePrefix}${attestation.securityCode}` - } - - if (attestation.completedAt) { - const completedAgo = Date.now() - attestation.completedAt!.getTime() - if (completedAgo >= allowRetryWithinCompletedMs) { - Counters.attestationRequestsAlreadySent.inc() - throw new ErrorWithResponse('Attestation can no longer be rerequested', 422) - } - } - - attestation.recordError(`Rerequested when status was ${AttestationStatus[attestation.status]}`) - attestation.status = AttestationStatus.NotSent - attestation.ongoingDeliveryId = null - attestation.completedAt = null - attestation.attempt += 1 - - if (attestation.attempt >= maxDeliveryAttempts) { - Counters.attestationRequestsAlreadySent.inc() - throw new ErrorWithResponse('Delivery attempts exceeded', 422) - } - - const providers = getProvidersFor(attestation, logger) - shouldRetry = await doSendSms(attestation, providers, logger) - - await attestation.save({ transaction, logging: sequelizeLogger }) - await transaction.commit() - } catch (err) { - logger.error({ err }) - await transaction.rollback() - throw err - } - - // If there was an error sending, backoff and retry while holding open client conn. - if (shouldRetry && attestation) { - await sleep(Math.pow(2, attestation.attempt) * 1000) - attestation = await findAttestationAndSendSms(key, logger, sequelizeLogger) - } - - return attestation -} - -async function findAttestationAndSendSms( - key: AttestationKey, - logger: Logger, - sequelizeLogger: SequelizeLogger -): Promise { - let shouldRetry = false - let attestation: AttestationModel | null = null - - const transaction = await sequelize!.transaction({ - logging: sequelizeLogger, - type: Transaction.TYPES.IMMEDIATE, - }) - - try { - attestation = await findAttestationByKey(key, { transaction, lock: Transaction.LOCK.UPDATE }) - if (!attestation) { - throw new Error('Cannot retrieve attestation') - } - - const providers = getProvidersFor(attestation, logger) - - // Parsed number and found providers. Attempt delivery. - shouldRetry = await doSendSms(attestation, providers, logger) - - await attestation.save({ transaction, logging: sequelizeLogger }) - await transaction.commit() - } catch (err) { - logger.error({ err }) - await transaction.rollback() - throw err - } - - // If there was an error sending, backoff and retry while holding open client conn. - if (shouldRetry && attestation) { - await sleep(Math.pow(2, attestation.attempt) * 1000) - attestation = await findAttestationAndSendSms(key, logger, sequelizeLogger) - } - - return attestation -} - -// Make first or next delivery attempt -- returns true if we should retry. -async function doSendSms( - attestation: AttestationModel, - providers: SmsProvider[], - logger: Logger -): Promise { - const provider = providers[attestation.attempt % providers.length] - - try { - logger.info( - { - provider: provider.type, - attempt: attestation.attempt, - }, - 'Attempting to create SMS' - ) - - const deliveryId = await provider.sendSms(attestation) - - attestation.status = AttestationStatus.Sent - attestation.ongoingDeliveryId = deliveryId - - logger.info( - { - provider: provider.type, - attempt: attestation.attempt, - deliveryId, - }, - 'Sent SMS' - ) - - Counters.attestationProviderDeliveryStatus - .labels(provider.type, attestation.countryCode, AttestationStatus[AttestationStatus.Sent]) - .inc() - - return false - } catch (error: any) { - attestation.status = AttestationStatus.NotSent - const errorMsg = `${error.message ?? error}`.slice(0, maxErrorLength) - attestation.recordError(errorMsg) - attestation.ongoingDeliveryId = null - attestation.attempt += 1 - - logger.info( - { - provider: provider.type, - attempt: attestation.attempt, - error: errorMsg, - }, - 'SMS creation failed' - ) - - if (attestation.attempt >= maxDeliveryAttempts) { - attestation.completedAt = new Date() - logger.info('Final failure to send') - Counters.attestationRequestsFailedToDeliverSms.inc() - return false - } - - return true - } -} - -// Act on a delivery report for an SMS, scheduling a resend if last one failed. -export async function receivedDeliveryReport( - deliveryId: string, - deliveryStatus: AttestationStatus, - errorCode: string | null, - logger: Logger -) { - if (!deliveryId) { - return - } - - let shouldRetry = false - let attestation: AttestationModel | null = null - - let childLogger = logger.child({ - deliveryId, - }) - const sequelizeLogger = makeSequelizeLogger(childLogger) - const transaction = await sequelize!.transaction({ - logging: sequelizeLogger, - type: Transaction.TYPES.IMMEDIATE, - }) - - try { - attestation = await findAttestationByDeliveryId(deliveryId, { - transaction, - lock: Transaction.LOCK.UPDATE, - }) - - if (attestation) { - // First time we can associate this info with the request. - childLogger = logger.child({ - issuer: attestation.issuer, - phoneNumber: obfuscateNumber(attestation.phoneNumber), - }) - - if (attestation.status < deliveryStatus) { - const providers = getProvidersFor(attestation, childLogger) - const provider = providers[attestation.attempt % providers.length] - - childLogger.info( - { - provider: provider.type, - status: AttestationStatus[deliveryStatus], - errorCode, - }, - 'Received delivery status' - ) - - attestation.status = deliveryStatus - - Counters.attestationProviderDeliveryStatus - .labels(provider.type, attestation.countryCode, AttestationStatus[deliveryStatus]) - .inc() - - if (errorCode != null) { - Counters.attestationProviderDeliveryErrorCodes - .labels(provider.type, attestation.countryCode, errorCode) - .inc() - } - - if (deliveryStatus === AttestationStatus.Failed) { - // Record the error before incrementing attempt - attestation.recordError(errorCode ?? 'Failed') - - // Next attempt - attestation.ongoingDeliveryId = null - attestation.attempt += 1 - - if (attestation.attempt >= maxDeliveryAttempts) { - attestation.completedAt = new Date() - logger.info( - { - deliveryId, - }, - 'Final failure to send' - ) - Counters.attestationRequestsFailedToDeliverSms.inc() - } else { - shouldRetry = true - } - } else if (deliveryStatus === AttestationStatus.Delivered) { - attestation.completedAt = new Date() - Counters.attestationRequestsBelievedDelivered.inc() - attestation.ongoingDeliveryId = null - } - } - await attestation.save({ transaction, logging: sequelizeLogger }) - } - transaction.commit() - } catch (err) { - childLogger.error(err) - transaction.rollback() - } - - if (attestation && shouldRetry) { - const key = attestation.key() - const timeout = Math.pow(2, attestation.attempt) * 1000 - setTimeout(() => findAttestationAndSendSms(key, childLogger, sequelizeLogger), timeout) - } -} diff --git a/packages/attestation-service/src/sms/messagebird.ts b/packages/attestation-service/src/sms/messagebird.ts deleted file mode 100644 index 807960bd0eb..00000000000 --- a/packages/attestation-service/src/sms/messagebird.ts +++ /dev/null @@ -1,115 +0,0 @@ -import bodyParser from 'body-parser' -import Logger from 'bunyan' -import { randomBytes } from 'crypto' -import express from 'express' -import initMB, { MessageBird } from 'messagebird' -import fetch from 'node-fetch' -import util from 'util' -import { fetchEnv } from '../env' -import { AttestationStatus, SmsFields } from '../models/attestation' -import { readUnsupportedRegionsFromEnv, SmsProvider, SmsProviderType } from './base' -import { receivedDeliveryReport } from './index' - -export class MessageBirdSmsProvider extends SmsProvider { - static fromEnv() { - return new MessageBirdSmsProvider( - fetchEnv('MESSAGEBIRD_API_KEY'), - readUnsupportedRegionsFromEnv('MESSAGEBIRD_UNSUPPORTED_REGIONS') - ) - } - - messagebird: MessageBird - type = SmsProviderType.MESSAGEBIRD - deliveryStatusURL: string | undefined - apiKey: string - - constructor(apiKey: string, unsupportedRegionCodes: string[]) { - super() - this.apiKey = apiKey - this.messagebird = initMB(apiKey) - this.unsupportedRegionCodes = unsupportedRegionCodes - } - - async receiveDeliveryStatusReport(req: express.Request, logger: Logger) { - if (typeof req.query.reference === 'string' && typeof req.query.status === 'string') { - await receivedDeliveryReport( - req.query.reference, - this.deliveryStatus(req.query.status), - typeof req.query.statusErrorCode === 'string' ? req.query.statusErrorCode : null, - logger - ) - } - } - - deliveryStatus(status: string | null): AttestationStatus { - switch (status) { - case 'delivered': - return AttestationStatus.Delivered - case 'failed': - case 'delivery_failed': - case 'expired': - return AttestationStatus.Failed - case 'sent': - return AttestationStatus.Upstream - case 'buffered': - case 'scheduled': - return AttestationStatus.Queued - } - return AttestationStatus.Other - } - - deliveryStatusMethod = () => 'GET' - - deliveryStatusHandlers() { - return [bodyParser.urlencoded({ extended: false })] - } - - async getUSNumbers(): Promise { - const response = await fetch('https://numbers.messagebird.com/v1/phone-numbers?features=sms', { - method: 'GET', - headers: { - Accept: 'application/json', - Authorization: `AccessKey ${this.apiKey}`, - }, - }) - if (!response.ok) { - throw new Error('Could not list numbers! ' + response.status) - } - const body = JSON.parse(await response.text()) - return body.items - ? body.items - .filter((n: any) => n.country === 'US' && n.kycStatus === 'ok') - .map((n: any) => n.number) - : [] - } - - async initialize(deliveryStatusURL: string) { - this.deliveryStatusURL = deliveryStatusURL - let numbers - try { - // Ensure at least one KYC-ed US based sms number is available for SMS. - numbers = await this.getUSNumbers() - } catch (error) { - throw new Error(`MessageBird: could not access numbers: ${error}`) - } - if (numbers.length === 0) { - throw new Error('MessageBird: complete KYC and purchase a US-based number enabled for SMS') - } - } - - async sendSms(attestation: SmsFields) { - const reference = randomBytes(8).toString('hex') - const m = await util.promisify(this.messagebird.messages.create)({ - originator: 'Celo', - recipients: [attestation.phoneNumber], - body: attestation.message, - reference, - reportUrl: this.deliveryStatusURL, - }) - - if (!m || !m.id || !m.reference) { - throw new Error('Could not send SMS!') - } - return reference - } -} diff --git a/packages/attestation-service/src/sms/nexmo.ts b/packages/attestation-service/src/sms/nexmo.ts deleted file mode 100644 index 28141a1ed07..00000000000 --- a/packages/attestation-service/src/sms/nexmo.ts +++ /dev/null @@ -1,174 +0,0 @@ -import bodyParser from 'body-parser' -import Logger from 'bunyan' -import express from 'express' -import { PhoneNumberUtil } from 'google-libphonenumber' -import Nexmo from 'nexmo' -import { receivedDeliveryReport } from '.' -import { fetchEnv, fetchEnvOrDefault, isYes } from '../env' -import { Gauges } from '../metrics' -import { AttestationStatus, SmsFields } from '../models/attestation' -import { readUnsupportedRegionsFromEnv, SmsProvider, SmsProviderType } from './base' - -const phoneUtil = PhoneNumberUtil.getInstance() - -export class NexmoSmsProvider extends SmsProvider { - static fromEnv() { - return new NexmoSmsProvider( - fetchEnv('NEXMO_KEY'), - fetchEnv('NEXMO_SECRET'), - fetchEnvOrDefault('NEXMO_APPLICATION', ''), - readUnsupportedRegionsFromEnv('NEXMO_UNSUPPORTED_REGIONS', 'NEXMO_BLACKLIST'), - isYes(fetchEnvOrDefault('NEXMO_ACCOUNT_BALANCE_METRIC', '')) - ) - } - type = SmsProviderType.NEXMO - client: any - nexmoNumbers: Array<{ - code: string - phoneNumber: string - type: string - }> = [] - balanceMetric: boolean - deliveryStatusURL: string | undefined - applicationId: string | null = null - tollFreeType: string = 'landline-toll-free' - - constructor( - apiKey: string, - apiSecret: string, - applicationId: string, - unsupportedRegionCodes: string[], - balanceMetric: boolean - ) { - super() - this.applicationId = applicationId - if (applicationId) { - this.client = new Nexmo({ - apiKey, - apiSecret, - applicationId, - }) - } else { - this.client = new Nexmo({ - apiKey, - apiSecret, - }) - } - this.balanceMetric = balanceMetric - this.unsupportedRegionCodes = unsupportedRegionCodes - } - - initialize = async (deliveryStatusURL: string) => { - this.deliveryStatusURL = deliveryStatusURL - - const availableNumbers = await this.getAvailableNumbers() - - if (!availableNumbers) { - throw new Error( - 'You have no phone numbers in your Nexmo account. Please buy at least one number at https://dashboard.nexmo.com/buy-numbers' - ) - } - this.nexmoNumbers = availableNumbers.map((number: any) => ({ - phoneNumber: number.msisdn, - code: phoneUtil.getRegionCodeForNumber(phoneUtil.parse('+' + number.msisdn)), - type: number.type, - })) - } - - async receiveDeliveryStatusReport(req: express.Request, logger: Logger) { - const errCode = - req.body['err-code'] == null || req.body['err-code'] === '0' ? null : req.body['err-code'] - await receivedDeliveryReport( - req.body.messageId, - this.deliveryStatus(req.body.status), - errCode, - logger - ) - } - - deliveryStatus(messageStatus: string | null): AttestationStatus { - switch (messageStatus) { - case 'delivered': - return AttestationStatus.Delivered - case 'failed': - return AttestationStatus.Failed - case 'rejected': - return AttestationStatus.Failed - case 'accepted': - return AttestationStatus.Upstream - case 'buffered': - return AttestationStatus.Queued - } - return AttestationStatus.Other - } - - deliveryStatusMethod = () => 'POST' - - deliveryStatusHandlers = () => [bodyParser.json()] - - async sendSms(attestation: SmsFields) { - const nexmoNumber = this.getMatchingNumber(attestation.countryCode) - return new Promise((resolve, reject) => { - this.client.message.sendSms( - nexmoNumber, - attestation.phoneNumber, - attestation.message, - { callback: this.deliveryStatusURL }, - (err: Error, responseData: any) => { - if (err) { - reject(err) - } else { - if (responseData.messages[0].status === '0') { - if (this.balanceMetric) { - try { - const balance = parseInt(responseData.messages[0]['remaining-balance'], 10) - Gauges.attestationProviderBalance.labels(this.type).set(balance) - } catch { - /* tslint:disable noempty */ - } - } - resolve(responseData.messages[0]['message-id']) - } else { - reject(responseData.messages[0]['error-text']) - } - } - } - ) - }) - } - - // The only effect of supplying an applicationId is to select from numbers linked to - // that application rather than the global pool. - private getAvailableNumbers = async (): Promise => { - return new Promise((resolve, reject) => { - const options = this.applicationId - ? { application_id: this.applicationId, has_application: true } - : null - this.client.number.get(options, (err: Error, responseData: any) => { - if (err) { - reject(err) - } else { - resolve(responseData.numbers) - } - }) - }) - } - - private getMatchingNumber = (countryCode: string) => { - // Use toll-free number for +1 numbers to satisfy 10DLC requirements - const matchingNumber = this.nexmoNumbers.find( - (number) => - number.code === countryCode && (countryCode !== 'US' || number.type === this.tollFreeType) - ) - if (matchingNumber !== undefined) { - return matchingNumber.phoneNumber - } - - // Toll free numbers cannot send internationally - let defaultNumber = this.nexmoNumbers.find((number) => number.type !== this.tollFreeType) - if (!defaultNumber) { - defaultNumber = this.nexmoNumbers[0] - } - return defaultNumber.phoneNumber - } -} diff --git a/packages/attestation-service/src/sms/telekom.ts b/packages/attestation-service/src/sms/telekom.ts deleted file mode 100644 index d00f5cac2dd..00000000000 --- a/packages/attestation-service/src/sms/telekom.ts +++ /dev/null @@ -1,105 +0,0 @@ -import bodyParser from 'body-parser' -import Logger from 'bunyan' -import express from 'express' -import fetch from 'node-fetch' -import { receivedDeliveryReport } from '.' -import { fetchEnv, fetchEnvOrDefault } from '../env' -import { AttestationStatus, SmsFields } from '../models/attestation' -import { readUnsupportedRegionsFromEnv, SmsProvider, SmsProviderType } from './base' - -export class TelekomSmsProvider extends SmsProvider { - static fromEnv() { - return new TelekomSmsProvider( - fetchEnv('TELEKOM_API_KEY'), - fetchEnv('TELEKOM_FROM'), - fetchEnvOrDefault('TELEKOM_URL', 'https://developer-api.telekom.com/vms/Messages.json'), - readUnsupportedRegionsFromEnv('TELEKOM_UNSUPPORTED_REGIONS') - ) - } - - type = SmsProviderType.TELEKOM - apiKey: string - deliveryStatusURL: string | undefined - fromNumber: string - serviceURL: string - - constructor( - apiKey: string, - fromNumber: string, - serviceURL: string, - unsupportedRegionCodes: string[] - ) { - super() - this.apiKey = apiKey - this.fromNumber = fromNumber - this.serviceURL = serviceURL - this.unsupportedRegionCodes = unsupportedRegionCodes - } - - async receiveDeliveryStatusReport(req: express.Request, logger: Logger) { - await receivedDeliveryReport( - req.body.MessageSid, - this.deliveryStatus(req.body.MessageStatus), - req.body.ErrorCode, - logger - ) - } - - deliveryStatus(messageStatus: string | null): AttestationStatus { - switch (messageStatus) { - case 'delivered': - return AttestationStatus.Delivered - case 'failed': - return AttestationStatus.Failed - case 'undelivered': - return AttestationStatus.Failed - case 'sent': - return AttestationStatus.Upstream - case 'queued': - return AttestationStatus.Queued - } - return AttestationStatus.Other - } - - deliveryStatusMethod = () => 'POST' - - deliveryStatusHandlers() { - return [bodyParser.urlencoded({ extended: false })] - } - - async initialize(deliveryStatusURL: string) { - this.deliveryStatusURL = deliveryStatusURL - } - - async sendSms(attestation: SmsFields) { - const response = await fetch(this.serviceURL, { - method: 'POST', - headers: { - accept: 'application/json', - Authorization: this.apiKey, - 'Content-Type': 'application/x-www-form-urlencoded', - }, - body: new URLSearchParams({ - From: this.fromNumber, - To: attestation.phoneNumber, - Body: attestation.message, - StatusCallback: this.deliveryStatusURL!, - }).toString(), - }) - - if (!response.ok) { - throw new Error('Could not send SMS! ' + response.status) - } - - const body = JSON.parse(await response.text()) - if ( - !body.sid || - !body.status || - this.deliveryStatus(body.status) === AttestationStatus.Failed - ) { - throw new Error('Could not send SMS!') - } - - return body.sid - } -} diff --git a/packages/attestation-service/src/sms/twilio.ts b/packages/attestation-service/src/sms/twilio.ts deleted file mode 100644 index eb0c9ef4f44..00000000000 --- a/packages/attestation-service/src/sms/twilio.ts +++ /dev/null @@ -1,64 +0,0 @@ -import Logger from 'bunyan' -import express from 'express' -import twilio, { Twilio } from 'twilio' -import { AttestationStatus, SmsFields } from '../models/attestation' -import { SmsProvider, SmsProviderType } from './base' -import { receivedDeliveryReport } from './index' - -export abstract class TwilioSmsProvider extends SmsProvider { - client: Twilio - type = SmsProviderType.TWILIO - deliveryStatusURL: string | undefined - - constructor(twilioSid: string, twilioAuthToken: string, unsupportedRegionCodes: string[]) { - super() - this.client = twilio(twilioSid, twilioAuthToken) - this.unsupportedRegionCodes = unsupportedRegionCodes - } - - initialize(deliveryStatusURL?: string) { - this.deliveryStatusURL = deliveryStatusURL - } - - async receiveDeliveryStatusReport(req: express.Request, logger: Logger) { - await receivedDeliveryReport( - req.body.MessageSid, - this.deliveryStatus(req.body.MessageStatus), - req.body.ErrorCode, - logger - ) - } - - deliveryStatus(messageStatus: string | null): AttestationStatus { - switch (messageStatus) { - case 'delivered': - return AttestationStatus.Delivered - case 'failed': - return AttestationStatus.Failed - case 'undelivered': - return AttestationStatus.Failed - case 'sent': - return AttestationStatus.Upstream - case 'queued': - return AttestationStatus.Queued - } - return AttestationStatus.Other - } - - deliveryStatusMethod = () => 'POST' - - deliveryStatusHandlers() { - return [ - express.urlencoded({ extended: false }), - twilio.webhook({ url: this.deliveryStatusURL! }), - ] - } - - async sendSms(_attestation: SmsFields): Promise { - throw new Error('Not implemented') - } -} - -// Importing in index directly from the files causes a circular import error -export { TwilioMessagingProvider } from './twilioMessaging' -export { TwilioVerifyProvider } from './twilioVerify' diff --git a/packages/attestation-service/src/sms/twilioMessaging.ts b/packages/attestation-service/src/sms/twilioMessaging.ts deleted file mode 100644 index a69798b0368..00000000000 --- a/packages/attestation-service/src/sms/twilioMessaging.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { fetchEnv } from '../env' -import { SmsFields } from '../models/attestation' -import { readUnsupportedRegionsFromEnv, SmsProviderType } from './base' -import { TwilioSmsProvider } from './twilio' - -export class TwilioMessagingProvider extends TwilioSmsProvider { - static fromEnv() { - return new TwilioMessagingProvider( - fetchEnv('TWILIO_ACCOUNT_SID'), - fetchEnv('TWILIO_AUTH_TOKEN'), - readUnsupportedRegionsFromEnv('TWILIO_UNSUPPORTED_REGIONS', 'TWILIO_BLACKLIST'), - fetchEnv('TWILIO_MESSAGING_SERVICE_SID') - ) - } - - messagingServiceSid: string - type = SmsProviderType.TWILIO_MESSAGING - - constructor( - twilioSid: string, - twilioAuthToken: string, - unsupportedRegionCodes: string[], - messagingServiceSid: string - ) { - // Initializes twilio client - super(twilioSid, twilioAuthToken, unsupportedRegionCodes) - this.messagingServiceSid = messagingServiceSid - } - - async initialize(deliveryStatusURL?: string) { - super.initialize(deliveryStatusURL) - try { - // Ensure the messaging service exists - await this.client.messaging.services.get(this.messagingServiceSid).fetch() - } catch (error) { - throw new Error(`Twilio Messaging Service could not be fetched: ${error}`) - } - } - - async sendSms(attestation: SmsFields) { - const m = await this.client.messages.create({ - body: attestation.message, - to: attestation.phoneNumber, - from: this.messagingServiceSid, - statusCallback: this.deliveryStatusURL, - }) - return m.sid - } -} diff --git a/packages/attestation-service/src/sms/twilioVerify.ts b/packages/attestation-service/src/sms/twilioVerify.ts deleted file mode 100644 index 77fe228f75e..00000000000 --- a/packages/attestation-service/src/sms/twilioVerify.ts +++ /dev/null @@ -1,137 +0,0 @@ -import { fetchEnv } from '../env' -import { SmsFields } from '../models/attestation' -import { readUnsupportedRegionsFromEnv, SmsProviderType } from './base' -import { TwilioSmsProvider } from './twilio' - -export class TwilioVerifyProvider extends TwilioSmsProvider { - static fromEnv() { - return new TwilioVerifyProvider( - fetchEnv('TWILIO_ACCOUNT_SID'), - fetchEnv('TWILIO_AUTH_TOKEN'), - readUnsupportedRegionsFromEnv('TWILIO_UNSUPPORTED_REGIONS', 'TWILIO_BLACKLIST'), - fetchEnv('TWILIO_VERIFY_SERVICE_SID') - ) - } - - verifyServiceSid: string - type = SmsProviderType.TWILIO_VERIFY - - // https://www.twilio.com/docs/verify/api/verification#start-new-verification - twilioSupportedLocales = [ - 'af', - 'ar', - 'ca', - 'cs', - 'da', - 'de', - 'el', - 'en', - 'en-gb', - 'es', - 'fi', - 'fr', - 'he', - 'hi', - 'hr', - 'hu', - 'id', - 'it', - 'ja', - 'ko', - 'ms', - 'nb', - 'nl', - 'pl', - 'pt', - 'pr-br', - 'ro', - 'ru', - 'sv', - 'th', - 'tl', - 'tr', - 'vi', - 'zh', - 'zh-cn', - 'zh-hk', - ] - - constructor( - twilioSid: string, - twilioAuthToken: string, - unsupportedRegionCodes: string[], - verifyServiceSid: string - ) { - // Initializes twilio client - super(twilioSid, twilioAuthToken, unsupportedRegionCodes) - this.verifyServiceSid = verifyServiceSid - } - - async initialize(deliveryStatusURL?: string) { - super.initialize(deliveryStatusURL) - try { - await this.client.verify.services - .get(this.verifyServiceSid) - .fetch() - .then((service) => { - if (!service.customCodeEnabled) { - // Make sure that custom code is enabled - throw new Error( - 'TWILIO_VERIFY_SERVICE_SID is specified, but customCode is not enabled. Please contact Twilio support to enable it.' - ) - } - }) - } catch (error) { - throw new Error(`Twilio Verify Service could not be fetched: ${error}`) - } - } - - async sendSms(attestation: SmsFields) { - const requestParams: any = { - to: attestation.phoneNumber, - channel: 'sms', - customCode: attestation.securityCode, - } - - // This param tells Twilio to add the <#> prefix and app hash postfix - if (attestation.appSignature) { - requestParams.appHash = attestation.appSignature - } - // Normalize to locales that Twilio supports - // If locale is not supported, Twilio API will throw an error - if (attestation.language) { - const locale = attestation.language.toLocaleLowerCase() - if (['es-419', 'es-us', 'es-la'].includes(locale)) { - attestation.language = 'es' - } - if (this.twilioSupportedLocales.includes(locale)) { - requestParams.locale = locale - } - } - - // Note: SID returned by Verify API is not unique for a phone number (within a 10 min interval) - // i.e. re-requests to the same phone number in <10 min will return an exisiting SID - - try { - const m = await this.client.verify - .services(this.verifyServiceSid) - .verifications.create(requestParams) - return m.sid - } catch (e) { - // Verify landlines using voice - if ( - e instanceof Error && - e.message.includes('SMS is not supported by landline phone number') - ) { - requestParams.appHash = undefined - requestParams.channel = 'call' - const m = await this.client.verify - .services(this.verifyServiceSid) - .verifications.create(requestParams) - return m.sid - } else { - throw e - } - } - } -} diff --git a/packages/attestation-service/test/__mocks__/twilio.ts b/packages/attestation-service/test/__mocks__/twilio.ts deleted file mode 100644 index 49cb41174f5..00000000000 --- a/packages/attestation-service/test/__mocks__/twilio.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* Simplest mock of `twilio` to test sms module */ - -// Innermost functions that actually send the SMS -export const mockVerifyCreate = jest.fn((_obj: Object) => { - return { - sid: undefined, - } -}) -export const mockVerifyUpdate = jest.fn() -export const mockMessagesCreate = jest.fn((_obj: Object) => { - return { - sid: undefined, - } -}) - -const twilio = jest.fn().mockImplementation((_twilioSid, _twilioAuthToken) => { - return { - messaging: { - services: { - get: (val: string) => { - return { fetch: () => val } - }, - }, - }, - messages: { - create: mockMessagesCreate, - }, - verify: { - services: Object.assign( - (_sid: string) => { - return { - verifications: Object.assign( - (_sid: string) => { - return { - update: mockVerifyUpdate, - } - }, - { - create: mockVerifyCreate, - } - ), - } - }, - { - get: (_sid: string) => { - return { - fetch: () => - Promise.resolve({ - customCodeEnabled: true, - }), - } - }, - } - ), - }, - } -}) - -export default twilio diff --git a/packages/attestation-service/test/requestHandlers/attestation.test.ts b/packages/attestation-service/test/requestHandlers/attestation.test.ts deleted file mode 100644 index 9b457b4c871..00000000000 --- a/packages/attestation-service/test/requestHandlers/attestation.test.ts +++ /dev/null @@ -1,219 +0,0 @@ -import * as Logger from 'bunyan' -import { Request } from 'express' -import { anyNumber, capture, instance, mock, reset, verify, when } from 'ts-mockito' -import { findAttestationByKey } from '../../src/db' -import { Response } from '../../src/request' -import { - handleAttestationRequest, - INVALID_SIGNATURE_ERROR, -} from '../../src/requestHandlers/attestation' -import { rerequestAttestation } from '../../src/sms' - -import ethereumJsUtil = require('ethereumjs-util') -const isValidAddressMock = jest.spyOn(ethereumJsUtil, 'isValidAddress') -const toChecksumAddressMock = jest.spyOn(ethereumJsUtil, 'toChecksumAddress') - -jest.mock('../../src/db') -const findAttestationByKeyMock = findAttestationByKey as jest.Mock - -jest.mock('../../src/sms') -const rerequestAttestationMock = rerequestAttestation as jest.Mock - -jest.mock('@celo/identity', () => { - const OdisUtils = { - Query: { - getServiceContext: () => { - return { - odisPubKey: - 'ru+9GmEsBi+/SHtNc4lBwR+evpvcVLcmVDYhzyveWXVwaN7EdUGF+GgUvOMMqpUAaxQl+4DkgtbTP4CIFFAUyGnZF0nRLqo64PVSv/mrGrTet0ej5cJeS1Fla+n8o5sB', - } - }, - }, - } - return { OdisUtils } -}) - -describe('Attestation request handler', () => { - const requestMock = mock() - const responseMock = mock() - - beforeEach(() => { - reset(requestMock) - reset(responseMock) - - isValidAddressMock.mockReset() - toChecksumAddressMock.mockReset() - findAttestationByKeyMock.mockReset() - rerequestAttestationMock.mockReset() - - when(responseMock.locals).thenReturn({ - logger: Logger.createLogger({ - level: 'info', - name: 'logger', - }), - }) - }) - - describe('handleAttestationRequest tests', () => { - it('Should re-request for existing attestation', async () => { - const address = '0x2F015C60E0be116B1f0CD534704Db9c92118FB6A' - isValidAddressMock.mockReturnValue(true) - toChecksumAddressMock.mockReturnValue(address) - const sampleAttestation = { - message: 'message', - failure: () => false, - } - findAttestationByKeyMock.mockResolvedValue(sampleAttestation) - rerequestAttestationMock.mockResolvedValue(sampleAttestation) - when(responseMock.status(anyNumber())).thenReturn(responseMock) - - await handleAttestationRequest(instance(requestMock), instance(responseMock), { - phoneNumber: '+14155550000', - language: 'en', - account: 'account', - issuer: address, - salt: 'salt', - securityCodePrefix: 'p', - smsRetrieverAppSig: 'sig', - phoneNumberSignature: undefined, - }) - - expect(findAttestationByKeyMock).toBeCalledTimes(1) - expect(rerequestAttestationMock).toBeCalledTimes(1) - verify(responseMock.status(200)).once() - }) - - it('Should fail with 422 code with missing security code', async () => { - const address = '0x2F015C60E0be116B1f0CD534704Db9c92118FB6A' - isValidAddressMock.mockReturnValue(true) - toChecksumAddressMock.mockReturnValue(address) - const responseMockInstance = instance(responseMock) - when(responseMock.status(anyNumber())).thenReturn(responseMockInstance) - - await handleAttestationRequest(instance(requestMock), responseMockInstance, { - phoneNumber: '+14155550000', - language: 'en', - account: 'account', - issuer: address, - salt: 'salt', - securityCodePrefix: '', - smsRetrieverAppSig: 'sig', - phoneNumberSignature: undefined, - }) - - expect(findAttestationByKeyMock).toBeCalledTimes(0) - expect(rerequestAttestationMock).toBeCalledTimes(0) - verify(responseMock.status(422)).once() - const [body] = capture(responseMock.json).last() - expect(body['success']).toBeFalsy() - expect(body['error']).toEqual('Invalid securityCodePrefix') - }) - - it('Should fail with 422 code when address and issuer are different', async () => { - const address = '0x2F015C60E0be116B1f0CD534704Db9c92118FB6A' - isValidAddressMock.mockReturnValue(true) - toChecksumAddressMock.mockReturnValue(address) - const responseMockInstance = instance(responseMock) - when(responseMock.status(anyNumber())).thenReturn(responseMockInstance) - - await handleAttestationRequest(instance(requestMock), responseMockInstance, { - phoneNumber: '+14155550000', - language: 'en', - account: 'account', - issuer: address + '5', - salt: 'salt', - securityCodePrefix: 'p', - smsRetrieverAppSig: 'sig', - phoneNumberSignature: undefined, - }) - - expect(findAttestationByKeyMock).toBeCalledTimes(0) - expect(rerequestAttestationMock).toBeCalledTimes(0) - verify(responseMock.status(422)).once() - const [body] = capture(responseMock.json).last() - expect(body['success']).toBeFalsy() - expect(body['error']).toEqual(`Mismatching issuer, I am ${address}`) - }) - - it('Should fail with 422 code with wrong signature', async () => { - const address = '0x2F015C60E0be116B1f0CD534704Db9c92118FB6A' - isValidAddressMock.mockReturnValue(true) - toChecksumAddressMock.mockReturnValue(address) - findAttestationByKeyMock.mockResolvedValue(null) - const responseMockInstance = instance(responseMock) - when(responseMock.status(anyNumber())).thenReturn(responseMockInstance) - - await handleAttestationRequest(instance(requestMock), responseMockInstance, { - phoneNumber: '+14155550000', - language: 'en', - account: 'account', - issuer: address, - salt: 'salt', - securityCodePrefix: 'p', - smsRetrieverAppSig: 'sig', - phoneNumberSignature: 'wrongSignature', - }) - - expect(findAttestationByKeyMock).toBeCalledTimes(1) - expect(rerequestAttestationMock).toBeCalledTimes(0) - verify(responseMock.status(422)).once() - const [body] = capture(responseMock.json).last() - expect(body['success']).toBeFalsy() - expect(body['error']).toEqual(INVALID_SIGNATURE_ERROR) - }) - - it('Should verify correctly blinded signature and return attestation', async () => { - const address = '0x2F015C60E0be116B1f0CD534704Db9c92118FB6A' - isValidAddressMock.mockReturnValue(true) - toChecksumAddressMock.mockReturnValue(address) - const sampleAttestation = { - message: 'message', - failure: () => false, - } - findAttestationByKeyMock.mockResolvedValue(sampleAttestation) - rerequestAttestationMock.mockResolvedValue(sampleAttestation) - when(responseMock.status(anyNumber())).thenReturn(responseMock) - - await handleAttestationRequest(instance(requestMock), instance(responseMock), { - phoneNumber: '+14155550000', - language: 'en', - account: 'account', - issuer: address, - salt: '4EcPvcixnoe/N', - securityCodePrefix: 'p', - smsRetrieverAppSig: 'sig', - phoneNumberSignature: 'xNOQZWEa6JIyuAhGf9H0Evjx60BB8PQ6E9498CTLod2PhYRypKMdwGVDtLNkptAA', - }) - - expect(findAttestationByKeyMock).toBeCalledTimes(1) - expect(rerequestAttestationMock).toBeCalledTimes(1) - verify(responseMock.status(200)).once() - }) - - it('Should fail with 500 code when validator address is invalid', async () => { - const address = '0x2F015C60E0be116B1f0CD534704Db9c92118FB6A' - isValidAddressMock.mockReturnValue(false) - toChecksumAddressMock.mockReturnValue(address) - const responseMockInstance = instance(responseMock) - when(responseMock.status(anyNumber())).thenReturn(responseMockInstance) - - await handleAttestationRequest(instance(requestMock), responseMockInstance, { - phoneNumber: '+14155550000', - language: 'en', - account: 'account', - issuer: address, - salt: 'salt', - securityCodePrefix: 'p', - smsRetrieverAppSig: 'sig', - phoneNumberSignature: undefined, - }) - - expect(findAttestationByKeyMock).toBeCalledTimes(0) - expect(rerequestAttestationMock).toBeCalledTimes(0) - verify(responseMock.status(500)).once() - const [body] = capture(responseMock.json).last() - expect(body['success']).toBeFalsy() - expect(body['error']).toEqual('Did not specify valid CELO_VALIDATOR_ADDRESS') - }) - }) -}) diff --git a/packages/attestation-service/test/sms/twilio.test.ts b/packages/attestation-service/test/sms/twilio.test.ts deleted file mode 100644 index 2f3215c6072..00000000000 --- a/packages/attestation-service/test/sms/twilio.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { SmsFields } from '../../src/models/attestation' -import { TwilioMessagingProvider, TwilioVerifyProvider } from '../../src/sms/twilio' -import { mockMessagesCreate, mockVerifyCreate } from '../__mocks__/twilio' - -jest.mock('../__mocks__/twilio') - -describe('TwilioSmsProvider tests', () => { - const twilioSid = 'twilioSid-123!' - const verifyServiceSid = 'verify-sid-123!' - const twilioAuthToken = 'fakeAuth-123!' - const unsupportedRegionCodes = ['GH', 'IJ', 'KL'] - const messagingServiceSid = 'messagingId-123!' - let attestation: SmsFields - - beforeEach(() => { - jest.clearAllMocks() - attestation = { - account: '0x123', - identifier: '0x456', - issuer: '0x789', - countryCode: 'AB', - phoneNumber: '+123456789', - message: 'test-message', - securityCode: '01234', - attestationCode: '56789', - appSignature: undefined, - language: 'en', - } - }) - it('should initialize and send SMS via TwilioVerifyProvider', async () => { - const twilioVerifyProvider = new TwilioVerifyProvider( - twilioSid, - twilioAuthToken, - unsupportedRegionCodes, - verifyServiceSid - ) - await twilioVerifyProvider.initialize('fake-delivery-status-url') - await twilioVerifyProvider.sendSms(attestation) - expect(mockVerifyCreate).toBeCalledTimes(1) - expect(mockMessagesCreate).not.toBeCalled() - }) - it('should initialize and send SMS via TwilioMessagingProvider', async () => { - const twilioMessagingProvider = new TwilioMessagingProvider( - twilioSid, - twilioAuthToken, - unsupportedRegionCodes, - messagingServiceSid - ) - await twilioMessagingProvider.initialize('fake-delivery-status-url') - await twilioMessagingProvider.sendSms(attestation) - expect(mockMessagesCreate).toBeCalledTimes(1) - expect(mockVerifyCreate).not.toBeCalled() - }) -}) diff --git a/packages/attestation-service/test/testSetup.ts b/packages/attestation-service/test/testSetup.ts deleted file mode 100644 index fe5600ead96..00000000000 --- a/packages/attestation-service/test/testSetup.ts +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = () => { - process.env.NETWORK = 'mainnet' - process.env.ATTESTATION_SIGNER_ADDRESS = 'signerAddress' - process.env.CELO_VALIDATOR_ADDRESS = '0x2F015C60E0be116B1f0CD534704Db9c92118FB6A' - process.env.CELO_PROVIDERS = 'provider' - process.env.NODE_ENV = 'dev' -} diff --git a/packages/attestation-service/tsconfig.json b/packages/attestation-service/tsconfig.json deleted file mode 100644 index 521e51fd232..00000000000 --- a/packages/attestation-service/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@celo/typescript/tsconfig.library.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "lib", - "resolveJsonModule": true - }, - "include": ["src", "index.d.ts"], - "references": [{ "path": "../sdk/utils" }] -} diff --git a/packages/attestation-service/tslint.json b/packages/attestation-service/tslint.json deleted file mode 100644 index dfc1be41d87..00000000000 --- a/packages/attestation-service/tslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": ["@celo/typescript/tslint.json"], - "rules": { - "no-global-arrow-functions": false, - "no-console": false - } -} diff --git a/packages/azure/.gitignore b/packages/azure/.gitignore deleted file mode 100644 index 1ac31fe772e..00000000000 --- a/packages/azure/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -app.zip diff --git a/packages/azure/README.md b/packages/azure/README.md deleted file mode 100644 index 233d2a29112..00000000000 --- a/packages/azure/README.md +++ /dev/null @@ -1,113 +0,0 @@ -# Azure ARM Templates - -## Current state - -This set of ARM templates deploys an Azure infrastructure (_e.g._, -compute nodes, firewall rules, public IPs, secret management) for -running a validator system (validator node, proxy, attestation -service), and configures the software (_e.g._, `geth`, -attestation-service) on the compute nodes. - -## Pre-built template - -[mainTemplate.json](./mainTemplate.json) is a pre-built ARM template. - -## Build - -The JSON files in [components/](components/) define resources for the -validator network. You must merge them into a single JSON -`mainTemplate.json` file before deploying: - -``` -npm run build -``` - -## Usage - -Pick a location and create a resource group: - -``` -LOCATION=... # e.g., westus2 -GROUP=... # e.g., celoValidator -az group create \ - --name $GROUP --location $LOCATION -``` - -Deploy `mainTemplate.json`, specifying all the required parameters: - -``` -az group deployment create \ - --resource-group $GROUP \ - --name ${GROUP}-deployment \ - --template-file=mainTemplate.json \ - --parameters \ - proxyName=... \ - validatorName=... \ - adminUsername=... \ - adminPublicKey=... \ - attesterPostgreSQLUsername=... \ - attesterPostgreSQLPassword=... \ - validatorAccountAddress=... \ - proxyPublicKey=... \ - proxyPrivateKey=... \ - validatorPrivateKey=... \ - attesterAccountAddress=... \ - attesterPrivateKey=... \ - attesterTwilioAccountSID=... \ - attesterTwilioAuthToken=... \ - attesterTwilioMessageServiceSID=... \ -``` - -You can delete all the services you created with: - -``` -az group delete --name $GROUP -``` - -### Required Parameters - -| Parameter | Type | Description | -| --------- | -----| ----------- | -| `proxyName` | string | The proxy name for ethstats | -| `validatorName` | string | The validator name for ethstats | -| `adminUsername` | string | Admin username for SSH access | -| `adminPublicKey` | secureString | Admin public key for SSH access | -| `attesterPostgreSQLUsername` | string | Admin username for Attester PostgreSQL server | -| `attesterPostgreSQLPassword` | secureString | Admin password for Attester PostgreSQL server | -| `validatorAccountAddress` | string | Authorized validator signer etherbase account address | -| `proxyPublicKey` | string | Proxy enode public key | -| `proxyPrivateKey` | secureString | Proxy etherbase account private key | -| `validatorPrivateKey` | secureString | Authorized validator signer etherbase account private key | -| `attesterAccountAddress` | string | Attester account address | -| `attesterPrivateKey` | secureString | Attester account private key | -| `attesterTwilioAccountSID` | string | Attester Twilio account SID | -| `attesterTwilioAuthToken` | secureString | Attester Twilio authentication token | -| `attesterTwilioMessageServiceSID` | string | Attester Twilio message service SID | - -### SSH access - -The proxy and attester expose port 22 on their public IP addresses. - -You can access the validator by starting an [Azure -Bastion](https://azure.microsoft.com/en-us/services/azure-bastion/) or -by attaching public IP address manually: - -``` -az network public-ip create \ - --name validatorPublicIpAddress \ - --resource-group $GROUP -az network nic ip-config update \ - --name ipconfig1 \ - --nic-name validatorNetworkInterface \ - --resource-group ${GROUP} \ - --public-ip-address validatorPublicIpAddress -``` - -## Future work - -1. Use UniqueString for naming issues with Key Value and PostgreSQL. -1. Move validator, proxy, and attester to self-contained templates. -1. Instructions for "Running a Validator on Azure". -1. Tune the default values for resources sizes (*e.g.*, VM, disk, etc). -1. Convert to an [Azure Managed - Application](https://docs.microsoft.com/en-us/azure/azure-resource-manager/managed-applications/overview). diff --git a/packages/azure/README.mustache b/packages/azure/README.mustache deleted file mode 100644 index 3332dffec50..00000000000 --- a/packages/azure/README.mustache +++ /dev/null @@ -1,89 +0,0 @@ -# Azure ARM Templates - -## Current state - -This set of ARM templates deploys an Azure infrastructure (_e.g._, -compute nodes, firewall rules, public IPs, secret management) for -running a validator system (validator node, proxy, attestation -service), and configures the software (_e.g._, `geth`, -attestation-service) on the compute nodes. - -## Pre-built template - -[mainTemplate.json](./mainTemplate.json) is a pre-built ARM template. - -## Build - -The JSON files in [components/](components/) define resources for the -validator network. You must merge them into a single JSON -`mainTemplate.json` file before deploying: - -``` -npm run build -``` - -## Usage - -Pick a location and create a resource group: - -``` -LOCATION=... # e.g., westus2 -GROUP=... # e.g., celoValidator -az group create \ - --name $GROUP --location $LOCATION -``` - -Deploy `mainTemplate.json`, specifying all the required parameters: - -``` -az group deployment create \ - --resource-group $GROUP \ - --name ${GROUP}-deployment \ - --template-file=mainTemplate.json \ - --parameters \ -{{#parameters}} - {{name}}=... \ -{{/parameters}} -``` - -You can delete all the services you created with: - -``` -az group delete --name $GROUP -``` - -### Required Parameters - -| Parameter | Type | Description | -| --------- | -----| ----------- | -{{#parameters}} -| `{{name}}` | {{type}} | {{description}} | -{{/parameters}} - -### SSH access - -The proxy and attester expose port 22 on their public IP addresses. - -You can access the validator by starting an [Azure -Bastion](https://azure.microsoft.com/en-us/services/azure-bastion/) or -by attaching public IP address manually: - -``` -az network public-ip create \ - --name validatorPublicIpAddress \ - --resource-group $GROUP -az network nic ip-config update \ - --name ipconfig1 \ - --nic-name validatorNetworkInterface \ - --resource-group ${GROUP} \ - --public-ip-address validatorPublicIpAddress -``` - -## Future work - -1. Use UniqueString for naming issues with Key Value and PostgreSQL. -1. Move validator, proxy, and attester to self-contained templates. -1. Instructions for "Running a Validator on Azure". -1. Tune the default values for resources sizes (*e.g.*, VM, disk, etc). -1. Convert to an [Azure Managed - Application](https://docs.microsoft.com/en-us/azure/azure-resource-manager/managed-applications/overview). diff --git a/packages/azure/attester/celo-attestations-run b/packages/azure/attester/celo-attestations-run deleted file mode 100755 index c7d9b3e786e..00000000000 --- a/packages/azure/attester/celo-attestations-run +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -set -e - -. /etc/default/celo - -SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm) -cleanup () { - rm -rf ${SECRET_DIR} -} -trap cleanup EXIT - -DB_PASSWORD=$(get_secret $ATTESTER_KEY_VAULT 'attesterPostgreSQLPassword') -DB_USERNAME=$ATTESTER_DB_USERNAME -DATABASE_URL="postgres://${DB_USERNAME}:${DB_PASSWORD}@${ATTESTER_DB_HOSTNAME}:5432/postgres" - -CELO_PROVIDER=http://localhost:8545 -TWILIO_AUTH_TOKEN=$(get_secret $ATTESTER_KEY_VAULT 'attesterTwilioAuthToken') - -/usr/bin/docker run \ - --name $1 \ - --net=host \ - --entrypoint /bin/bash \ - -v $DATA_DIR:$DATA_DIR \ - -e NODE_ENV=production \ - -e PORT=80 \ - -e DATABASE_URL="$DATABASE_URL" \ - -e ATTESTATION_SIGNER_ADDRESS="$ATTESTER_ACCOUNT_ADDRESS" \ - -e CELO_VALIDATOR_ADDRESS="$VALIDATOR_ACCOUNT_ADDRESS" \ - -e CELO_PROVIDER="$CELO_PROVIDER" \ - -e SMS_PROVIDERS="$SMS_PROVIDERS" \ - -e TWILIO_ACCOUNT_SID="$ATTESTER_TWILIO_ACCOUNT_SID" \ - -e TWILIO_MESSAGING_SERVICE_SID="$ATTESTER_TWILIO_MESSAGE_SERVICE_SID" \ - -e TWILIO_AUTH_TOKEN="$TWILIO_AUTH_TOKEN" \ - -e TWILIO_BLACKLIST="$TWILIO_BLACKLIST" \ - $ATTESTATION_SERVICE_DOCKER_IMAGE -c "\ - ( \ - cd /celo-monorepo/packages/attestation-service && \ - yarn run db:migrate && \ - yarn start \ - )" diff --git a/packages/azure/attester/celo-attestations.service b/packages/azure/attester/celo-attestations.service deleted file mode 100644 index ec159d8ff36..00000000000 --- a/packages/azure/attester/celo-attestations.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Docker Container %N -Requires=docker.service -Requires=celo-node.service -After=docker.service - -[Service] -Restart=always -ExecStart=/usr/local/bin/celo-attestations-run %N -ExecStop=/usr/bin/docker rm -f %N - -[Install] -WantedBy=default.target diff --git a/packages/azure/attester/celo-node-run b/packages/azure/attester/celo-node-run deleted file mode 100755 index 2a779135da4..00000000000 --- a/packages/azure/attester/celo-node-run +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -set -e - -. /etc/default/celo - -SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm) -cleanup () { - rm -rf ${SECRET_DIR} -} -trap cleanup EXIT - -get_secret $ATTESTER_KEY_VAULT 'attesterPrivateKey' > ${SECRET_DIR}/attesterPrivateKey -generate_password > ${SECRET_DIR}/accountPassword - -set -x - -docker run \ - --rm \ - -v $DATA_DIR:$DATA_DIR \ - -v $SECRET_DIR:$SECRET_DIR \ - $GETH_NODE_DOCKER_IMAGE \ - account import \ - --keystore=${SECRET_DIR} \ - --password=${SECRET_DIR}/accountPassword \ - ${SECRET_DIR}/attesterPrivateKey - -docker run \ - --name $1 \ - --restart=always \ - -p 8545:8545 \ - -v $DATA_DIR:$DATA_DIR \ - -v $SECRET_DIR:$SECRET_DIR \ - $GETH_NODE_DOCKER_IMAGE \ - --password=$SECRET_DIR/accountPassword \ - --keystore=${SECRET_DIR} \ - --unlock=$ATTESTER_ACCOUNT_ADDRESS \ - --bootnodes="$BOOTNODES" \ - --rpc \ - --rpcaddr 0.0.0.0 \ - --rpcapi=eth,net,web3,debug,admin \ - --networkid=${NETWORK_ID} \ - --syncmode=full \ - --consoleformat=json \ - --consoleoutput=stdout \ - --verbosity=${GETH_VERBOSITY} diff --git a/packages/azure/attester/celo-node.service b/packages/azure/attester/celo-node.service deleted file mode 100644 index dde6d27383e..00000000000 --- a/packages/azure/attester/celo-node.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Docker Container %N -Requires=docker.service -After=docker.service - -[Service] -Restart=always -ExecStart=/usr/local/bin/celo-node-run %N -ExecStop=/usr/bin/docker rm -f %N - -[Install] -WantedBy=default.target diff --git a/packages/azure/attester/libcelo.sh b/packages/azure/attester/libcelo.sh deleted file mode 120000 index eab76afc76e..00000000000 --- a/packages/azure/attester/libcelo.sh +++ /dev/null @@ -1 +0,0 @@ -../scripts/libcelo.sh \ No newline at end of file diff --git a/packages/azure/attester/provider-init.sh b/packages/azure/attester/provider-init.sh deleted file mode 120000 index f25ad9e735d..00000000000 --- a/packages/azure/attester/provider-init.sh +++ /dev/null @@ -1 +0,0 @@ -../scripts/provider-init.sh \ No newline at end of file diff --git a/packages/azure/attester/startup.sh b/packages/azure/attester/startup.sh deleted file mode 100755 index b723c025826..00000000000 --- a/packages/azure/attester/startup.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -x -set -e - -. ./provider-init.sh -. /etc/default/celo - -echo "Pulling geth..." -docker pull $GETH_NODE_DOCKER_IMAGE - -# Load configuration to files -curl -o $DATA_DIR/genesis.json https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${CELO_ENV}?alt=media - -echo "Starting geth..." -docker run \ - --rm \ - --net=host \ - -v $DATA_DIR:$DATA_DIR \ - --entrypoint /bin/sh \ - -i $GETH_NODE_DOCKER_IMAGE \ - -c "geth init $DATA_DIR/genesis.json" - -cp celo-node-run /usr/local/bin -cp celo-node.service /etc/systemd/system/celo-node.service -systemctl daemon-reload -systemctl enable celo-node.service -systemctl restart celo-node.service - -echo "Pulling attestation service..." -docker pull $ATTESTATION_SERVICE_DOCKER_IMAGE - -cp celo-attestations-run /usr/local/bin -cp celo-attestations.service /etc/systemd/system/celo-attestations.service -systemctl daemon-reload -systemctl enable celo-attestations.service -systemctl restart celo-attestations.service diff --git a/packages/azure/build-docs.js b/packages/azure/build-docs.js deleted file mode 100755 index 5dc26582fc1..00000000000 --- a/packages/azure/build-docs.js +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env node - -const fs = require('fs') -const mustache = require('mustache') - -function main() { - const template = fs.readFileSync('./README.mustache').toString() - const parameters = require('./components/main.json').parameters - const view = { - parameters: Object.entries(parameters).reduce((acc, [name, value]) => { - if (value.defaultValue) { - return acc - } - acc.push({ - name, - type: value.type, - defaultValue: value.defaultValue, - description: value.metadata.description, - }) - return acc - }, []), - } - const docs = mustache.render(template, view) - process.stdout.write(docs) -} - -main() diff --git a/packages/azure/build-json.js b/packages/azure/build-json.js deleted file mode 100644 index 5a109d2b29e..00000000000 --- a/packages/azure/build-json.js +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env node - -const fs = require('fs') -const path = require('path') - -const merge = require('deepmerge') -const mustache = require('mustache') - -function load(acc, pathname) { - const stat = fs.lstatSync(pathname) - if (!stat.isDirectory()) { - return acc.concat([fs.readFileSync(pathname).toString()]) - } - fs.readdirSync(pathname).forEach((entry) => { - acc = load(acc, path.join(pathname, entry)) - }) - return acc -} - -function main() { - const components = process.argv.slice(2) - const contents = components.reduce(load, []) - const variables = contents - .map((string) => JSON.parse(string)) - .reduce((acc, val) => { - return acc.concat( - Object.entries(val.variables || {}) - .filter(([name, variable]) => typeof variable === 'string') - .map(([name, variable]) => `'${name}=', variables('${name}'), ';'`) - ) - }, []) - .join(',') - const parameters = contents - .map((string) => JSON.parse(string)) - .reduce((acc, val) => { - return acc.concat( - Object.entries(val.parameters || {}) - .filter(([name, parameter]) => parameter.type === 'string' || parameter.type === 'int') - .map(([name, parameter]) => `'${name}=', parameters('${name}'), ';'`) - ) - }, []) - .join(',') - const proxyIps = [ - `'proxyInternalIpAddress='`, - `reference(variables('proxyNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress`, - `';'`, - `'proxyExternalIpAddress='`, - `reference(variables('proxyPublicIpAddressName')).ipAddress`, - `';'`, - ].join(',') - const validatorIps = [ - `'validatorInternalIpAddress='`, - `reference(variables('validatorNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress`, - `';'`, - ].join(',') - const context = { - attesterScript: fs.readFileSync('./build/attester-startup.sh').toString('base64'), - proxyScript: fs.readFileSync('./build/proxy-startup.sh').toString('base64'), - validatorScript: fs.readFileSync('./build/validator-startup.sh').toString('base64'), - variables, - parameters, - proxyIps, - validatorIps, - } - const objects = contents.map((content) => JSON.parse(mustache.render(content, context))) - const armTemplate = merge.all(objects) - process.stdout.write(JSON.stringify(armTemplate, null, 2)) -} - -main() diff --git a/packages/azure/build-sh b/packages/azure/build-sh deleted file mode 100755 index a8d46dcf056..00000000000 --- a/packages/azure/build-sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -mkdir -p build -cat scripts/startup-prefix.sh > build/$1-startup.sh -(cd $1 && tar -cvhf ../build/$1.tar .) -cat build/$1.tar >> build/$1-startup.sh diff --git a/packages/azure/components/compute.json b/packages/azure/components/compute.json deleted file mode 100644 index 8844ec686fe..00000000000 --- a/packages/azure/components/compute.json +++ /dev/null @@ -1,328 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "name": "[variables('validatorDataDiskName')]", - "type": "Microsoft.Compute/disks", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "properties": { - "diskSizeGB": "[parameters('validatorDiskSize')]", - "creationData": { - "createOption": "empty" - } - }, - "sku": { - "name": "Premium_LRS" - } - }, - { - "name": "[variables('proxyDataDiskName')]", - "type": "Microsoft.Compute/disks", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "properties": { - "diskSizeGB": "[parameters('proxyDiskSize')]", - "creationData": { - "createOption": "empty" - } - }, - "sku": { - "name": "Premium_LRS" - } - }, - { - "name": "[variables('attesterDataDiskName')]", - "type": "Microsoft.Compute/disks", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "properties": { - "diskSizeGB": "[parameters('attesterDiskSize')]", - "creationData": { - "createOption": "empty" - } - }, - "sku": { - "name": "Premium_LRS" - } - }, - { - "name": "[variables('validatorVirtualMachineName')]", - "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('validatorDataDiskName')]", - "[variables('validatorNetworkInterfaceName')]", - "[variables('validatorUserAssignedIdentityName')]", - "[variables('validatorKeyVaultName')]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[parameters('validatorVirtualMachineSize')]" - }, - "storageProfile": { - "osDisk": { - "createOption": "fromImage", - "managedDisk": { - "storageAccountType": "[parameters('osDiskType')]" - } - }, - "imageReference": "[variables('imageReference')]", - "dataDisks": [ - { - "lun": 0, - "createOption": "attach", - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', variables('validatorDataDiskName'))]" - } - } - ] - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": - "[resourceId('Microsoft.Network/networkInterfaces', variables('validatorNetworkInterfaceName'))]" - } - ] - }, - "osProfile": { - "computerName": "[variables('validatorVirtualMachineName')]", - "adminUsername": "[parameters('adminUsername')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "ssh": { - "publicKeys": [ - { - "path": - "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]", - "keyData": "[parameters('adminPublicKey')]" - } - ] - } - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": false - } - } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "[resourceId(resourceGroup().name, 'Microsoft.ManagedIdentity/userAssignedIdentities', variables('validatorUserAssignedIdentityName'))]": {} - } - }, - "resources": [ - { - "name": "validatorCustomScript", - "type": "extensions", - "location": "[resourceGroup().location]", - "apiVersion": "2019-03-01", - "dependsOn": [ - "[variables('validatorVirtualMachineName')]", - "[variables('validatorNetworkInterfaceName')]", - "[variables('proxyNetworkInterfaceName')]" - ], - "properties": { - "publisher": "Microsoft.Azure.Extensions", - "type": "CustomScript", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "protectedSettings": { - "script": "[base64(concat('echo \"', {{{proxyIps}}}, {{{validatorIps}}}, {{{variables}}}, {{{parameters}}}, '\" > startup-env.sh;', base64ToString('{{{validatorScript}}}')))]" - } - } - } - ] - }, - { - "name": "[variables('proxyVirtualMachineName')]", - "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('proxyDataDiskName')]", - "[variables('proxyNetworkInterfaceName')]", - "[variables('proxyUserAssignedIdentityName')]", - "[variables('proxyKeyVaultName')]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[parameters('proxyVirtualMachineSize')]" - }, - "storageProfile": { - "osDisk": { - "createOption": "fromImage", - "managedDisk": { - "storageAccountType": "[parameters('osDiskType')]" - } - }, - "imageReference": "[variables('imageReference')]", - "dataDisks": [ - { - "lun": 0, - "createOption": "attach", - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', variables('proxyDataDiskName'))]" - } - } - ] - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": - "[resourceId('Microsoft.Network/networkInterfaces', variables('proxyNetworkInterfaceName'))]" - } - ] - }, - "osProfile": { - "computerName": "[variables('proxyVirtualMachineName')]", - "adminUsername": "[parameters('adminUsername')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "ssh": { - "publicKeys": [ - { - "path": - "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]", - "keyData": "[parameters('adminPublicKey')]" - } - ] - } - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": false - } - } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "[resourceId(resourceGroup().name, 'Microsoft.ManagedIdentity/userAssignedIdentities', variables('proxyUserAssignedIdentityName'))]": {} - } - }, - "resources": [ - { - "name": "proxyCustomScript", - "type": "extensions", - "location": "[resourceGroup().location]", - "apiVersion": "2019-03-01", - "dependsOn": [ - "[variables('proxyVirtualMachineName')]", - "[variables('proxyNetworkInterfaceName')]", - "[variables('validatorNetworkInterfaceName')]" - ], - "properties": { - "publisher": "Microsoft.Azure.Extensions", - "type": "CustomScript", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "protectedSettings": { - "script": "[base64(concat('echo \"', {{{proxyIps}}}, {{{validatorIps}}}, {{{variables}}}, {{{parameters}}}, '\" > startup-env.sh;', base64ToString('{{{proxyScript}}}')))]" - } - } - } - ] - }, - { - "name": "[variables('attesterVirtualMachineName')]", - "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('attesterDataDiskName')]", - "[variables('attesterNetworkInterfaceName')]", - "[variables('attesterUserAssignedIdentityName')]", - "[variables('attesterKeyVaultName')]", - "[variables('attesterDBName')]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[parameters('attesterVirtualMachineSize')]" - }, - "storageProfile": { - "osDisk": { - "createOption": "fromImage", - "managedDisk": { - "storageAccountType": "[parameters('osDiskType')]" - } - }, - "imageReference": "[variables('imageReference')]", - "dataDisks": [ - { - "lun": 0, - "createOption": "attach", - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', variables('attesterDataDiskName'))]" - } - } - ] - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": - "[resourceId('Microsoft.Network/networkInterfaces', variables('attesterNetworkInterfaceName'))]" - } - ] - }, - "osProfile": { - "computerName": "[variables('attesterVirtualMachineName')]", - "adminUsername": "[parameters('adminUsername')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "ssh": { - "publicKeys": [ - { - "path": - "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]", - "keyData": "[parameters('adminPublicKey')]" - } - ] - } - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": false - } - } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "[resourceId(resourceGroup().name, 'Microsoft.ManagedIdentity/userAssignedIdentities', variables('attesterUserAssignedIdentityName'))]": {} - } - }, - "resources": [ - { - "name": "attesterCustomScript", - "type": "extensions", - "location": "[resourceGroup().location]", - "apiVersion": "2019-03-01", - "dependsOn": [ - "[variables('attesterVirtualMachineName')]", - "[variables('proxyNetworkInterfaceName')]" - ], - "properties": { - "publisher": "Microsoft.Azure.Extensions", - "type": "CustomScript", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "protectedSettings": { - "script": - "[base64(concat('echo \"', {{{proxyIps}}}, {{{validatorIps}}}, {{{variables}}}, {{{parameters}}}, '\" > startup-env.sh;', base64ToString('{{{attesterScript}}}')))]" - } - } - } - ] - } - ] -} diff --git a/packages/azure/components/identity.json b/packages/azure/components/identity.json deleted file mode 100644 index a5b6bb9accb..00000000000 --- a/packages/azure/components/identity.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "name": "[variables('validatorUserAssignedIdentityName')]", - "apiVersion": "2018-11-30", - "location": "[parameters('location')]", - "tags": {}, - "properties": {} - }, - { - "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "name": "[variables('proxyUserAssignedIdentityName')]", - "apiVersion": "2018-11-30", - "location": "[parameters('location')]", - "tags": {}, - "properties": {} - }, - { - "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "name": "[variables('attesterUserAssignedIdentityName')]", - "apiVersion": "2018-11-30", - "location": "[parameters('location')]", - "tags": {}, - "properties": {} - } - ] -} diff --git a/packages/azure/components/keyvault.json b/packages/azure/components/keyvault.json deleted file mode 100644 index 2c50045836f..00000000000 --- a/packages/azure/components/keyvault.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "apiVersion": "2018-02-14", - "name": "[variables('validatorKeyVaultName')]", - "location": "[parameters('location')]", - "type": "Microsoft.KeyVault/vaults", - "properties": { - "enabledForDeployment": true, - "enabledForTemplateDeployment": true, - "enabledForDiskEncryption": false, - "enableRbacAuthorization": false, - "accessPolicies": [ - { - "objectId": - "[reference(concat('Microsoft.ManagedIdentity/userAssignedIdentities/', variables('validatorUserAssignedIdentityName')), '2018-11-30', 'Full').properties.principalId]", - "tenantId": "[subscription().tenantId]", - "permissions": { - "keys": [], - "secrets": ["Get"], - "certificates": [] - } - } - ], - "tenantId": "[subscription().tenantId]", - "sku": { - "name": "Standard", - "family": "A" - }, - "networkAcls": { - "defaultAction": "allow", - "bypass": "AzureServices", - "ipRules": [], - "virtualNetworkRules": [] - } - }, - "tags": {}, - "dependsOn": ["[variables('validatorUserAssignedIdentityName')]"] - }, - { - "apiVersion": "2018-02-14", - "name": "[variables('proxyKeyVaultName')]", - "location": "[parameters('location')]", - "type": "Microsoft.KeyVault/vaults", - "properties": { - "enabledForDeployment": true, - "enabledForTemplateDeployment": true, - "enabledForDiskEncryption": false, - "enableRbacAuthorization": false, - "accessPolicies": [ - { - "objectId": - "[reference(concat('Microsoft.ManagedIdentity/userAssignedIdentities/', variables('proxyUserAssignedIdentityName')), '2018-11-30', 'Full').properties.principalId]", - "tenantId": "[subscription().tenantId]", - "permissions": { - "keys": [], - "secrets": ["Get"], - "certificates": [] - } - } - ], - "tenantId": "[subscription().tenantId]", - "sku": { - "name": "Standard", - "family": "A" - }, - "networkAcls": { - "defaultAction": "allow", - "bypass": "AzureServices", - "ipRules": [], - "virtualNetworkRules": [] - } - }, - "tags": {}, - "dependsOn": ["[variables('proxyUserAssignedIdentityName')]"] - }, - { - "apiVersion": "2018-02-14", - "name": "[variables('attesterKeyVaultName')]", - "location": "[parameters('location')]", - "type": "Microsoft.KeyVault/vaults", - "properties": { - "enabledForDeployment": true, - "enabledForTemplateDeployment": true, - "enabledForDiskEncryption": false, - "enableRbacAuthorization": false, - "accessPolicies": [ - { - "objectId": - "[reference(concat('Microsoft.ManagedIdentity/userAssignedIdentities/', variables('attesterUserAssignedIdentityName')), '2018-11-30', 'Full').properties.principalId]", - "tenantId": "[subscription().tenantId]", - "permissions": { - "keys": [], - "secrets": ["Get"], - "certificates": [] - } - } - ], - "tenantId": "[subscription().tenantId]", - "sku": { - "name": "Standard", - "family": "A" - }, - "networkAcls": { - "defaultAction": "allow", - "bypass": "AzureServices", - "ipRules": [], - "virtualNetworkRules": [] - } - }, - "tags": {}, - "dependsOn": ["[variables('attesterUserAssignedIdentityName')]"] - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": - "[concat(variables('proxyKeyVaultName'), '/', variables('proxyPrivateKeyName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": ["[variables('proxyKeyVaultName')]"], - "properties": { - "value": "[parameters('proxyPrivateKey')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": - "[concat(variables('validatorKeyVaultName'), '/', variables('validatorPrivateKeyName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": ["[variables('validatorKeyVaultName')]"], - "properties": { - "value": "[parameters('validatorPrivateKey')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": "[concat(variables('attesterKeyVaultName'), '/attesterPostgreSQLPassword')]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": ["[variables('attesterKeyVaultName')]"], - "properties": { - "value": "[parameters('attesterPostgreSQLPassword')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": - "[concat(variables('attesterKeyVaultName'), '/', variables('attesterPrivateKeyName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": ["[variables('attesterKeyVaultName')]"], - "properties": { - "value": "[parameters('attesterPrivateKey')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": - "[concat(variables('attesterKeyVaultName'), '/', variables('attesterTwilioAuthTokenName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": ["[variables('attesterKeyVaultName')]"], - "properties": { - "value": "[parameters('attesterTwilioAuthToken')]" - } - } - ] -} diff --git a/packages/azure/components/main.json b/packages/azure/components/main.json deleted file mode 100644 index 451dc152570..00000000000 --- a/packages/azure/components/main.json +++ /dev/null @@ -1,371 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "proxyName": { - "type": "string", - "metadata": { - "description": "The proxy name for ethstats" - } - }, - "validatorName": { - "type": "string", - "metadata": { - "description": "The validator name for ethstats" - } - }, - "adminUsername": { - "type": "string", - "metadata": { - "description": "Admin username for SSH access" - } - }, - "adminPublicKey": { - "type": "secureString", - "metadata": { - "description": "Admin public key for SSH access" - } - }, - "attesterPostgreSQLUsername": { - "type": "string", - "metadata": { - "description": "Admin username for Attester PostgreSQL server" - } - }, - "attesterPostgreSQLPassword": { - "type": "secureString", - "metadata": { - "description": "Admin password for Attester PostgreSQL server" - } - }, - "validatorAccountAddress": { - "type": "string", - "metadata": { - "description": "Authorized validator signer etherbase account address" - } - }, - "proxyPublicKey": { - "type": "string", - "metadata": { - "description": "Proxy enode public key" - } - }, - "proxyPrivateKey": { - "type": "secureString", - "metadata": { - "description": "Proxy etherbase account private key" - } - }, - "validatorPrivateKey": { - "type": "secureString", - "metadata": { - "description": "Authorized validator signer etherbase account private key" - } - }, - "attesterAccountAddress": { - "type": "string", - "metadata": { - "description": "Attester account address" - } - }, - "attesterPrivateKey": { - "type": "secureString", - "metadata": { - "description": "Attester account private key" - } - }, - "attesterTwilioAccountSID": { - "type": "string", - "metadata": { - "description": "Attester Twilio account SID" - } - }, - "attesterTwilioAuthToken": { - "type": "secureString", - "metadata": { - "description": "Attester Twilio authentication token" - } - }, - "attesterTwilioMessageServiceSID": { - "type": "string", - "metadata": { - "description": "Attester Twilio message service SID" - } - }, - "bootnodes": { - "type": "string", - "defaultValue": "enode://5aaf10664b12431c250597e980aacd7d5373cae00f128be5b00364344bb96bce7555b50973664bddebd1cb7a6d3fb927bec81527f80e22a26fa373c375fcdefc@34.82.45.71:30301", - "metadata": { - "description": "geth --bootnodes argument" - } - }, - "gethVerbosity": { - "type": "int", - "defaultValue": 3, - "metadata": { - "description": "geth --verbosity argument" - } - }, - "celoEnv": { - "type": "string", - "defaultValue": "baklava", - "metadata": { - "description": "Celo network environment name" - } - }, - "networkId": { - "type": "string", - "defaultValue": "200110", - "metadata": { - "description": "Numeric Celo network ID" - } - }, - "gethNodeDockerImageRepository": { - "type": "string", - "defaultValue": "us.gcr.io/celo-testnet/celo-node", - "metadata": { - "description": "Celo geth Docker image repository" - } - }, - "gethNodeDockerImageTag": { - "type": "string", - "defaultValue": "[parameters('celoEnv')]", - "metadata": { - "description": "Celo geth Docker image tag" - } - }, - "gethExporterDockerImageRepository": { - "type": "string", - "defaultValue": "gcr.io/celo-testnet-production/geth-exporter", - "metadata": { - "description": "Celo geth-exporter Docker image repository" - } - }, - "gethExporterDockerImageTag": { - "type": "string", - "defaultValue": "ed7d21bd50592709173368cd697ef73c1774a261", - "metadata": { - "description": "Celo geth-exporter Docker image tag" - } - }, - "attestationServiceDockerImageRepository": { - "type": "string", - "defaultValue": "us.gcr.io/celo-testnet/celo-monorepo", - "metadata": { - "description": "Celo attestation service Docker image repository" - } - }, - "attestationServiceDockerImageTag": { - "type": "string", - "defaultValue": "[concat('attestation-service-', parameters('celoEnv'))]", - "metadata": { - "description": "Celo attestation service Docker image tag" - } - }, - "blockTime": { - "type": "int", - "defaultValue": 5, - "metadata": { - "description": "The ethereum network block time" - } - }, - "istanbulRequestTimeoutMs": { - "type": "int", - "defaultValue": 10000, - "metadata": { - "description": "The ethereum request timeout" - } - }, - "proxyMaxPeers": { - "type": "int", - "defaultValue": 120, - "metadata": { - "description": "Max number of peers to connect with" - } - }, - "ethstatsHost": { - "type": "string", - "defaultValue": "[concat(parameters('celoEnv'), '-ethstats.celo-testnet.org')]", - "metadata": { - "description": "Ethstats host to report data" - } - }, - "location": { - "type": "string", - "defaultValue": "[resourceGroup().location]", - "metadata": { - "description": "Location for all resources." - } - }, - "virtualNetworkAddressPrefix": { - "type": "string", - "defaultValue": "10.0.0.0/16", - "metadata": { - "description": "Virtual Network Address prefix" - } - }, - "defaultNetworkAddressPrefix": { - "type": "string", - "defaultValue": "10.0.1.0/24", - "metadata": { - "description": "Default Virtual Network Address prefix" - } - }, - "bastionNetworkAddressPrefix": { - "type": "string", - "defaultValue": "10.0.0.0/24", - "metadata": { - "description": "Bastion Virtual Network Address prefix" - } - }, - "validatorDiskSize": { - "type": "int", - "defaultValue": 1024, - "metadata": { - "description": "Validator data disk size in gigabytes" - } - }, - "validatorVirtualMachineSize": { - "type": "string", - "defaultValue": "Standard_D2s_v3", - "metadata": { - "description": "Validator Virtual Machine size" - } - }, - "proxyPublicIpAddressType": { - "type": "string", - "defaultValue": "Static", - "metadata": { - "description": "Public IP Address type" - } - }, - "proxyPublicIpAddressSku": { - "type": "string", - "defaultValue": "Basic", - "metadata": { - "description": "Public IP Address SKU" - } - }, - "proxyDiskSize": { - "type": "int", - "defaultValue": 1024, - "metadata": { - "description": "Validator data disk size in gigabytes" - } - }, - "proxyVirtualMachineSize": { - "type": "string", - "defaultValue": "Standard_D2s_v3", - "metadata": { - "description": "Proxy Virtual Machine size" - } - }, - "attesterPublicIpAddressType": { - "type": "string", - "defaultValue": "Static", - "metadata": { - "description": "Public IP Address type" - } - }, - "attesterPublicIpAddressSku": { - "type": "string", - "defaultValue": "Basic", - "metadata": { - "description": "Public IP Address SKU" - } - }, - "attesterVirtualMachineSize": { - "type": "string", - "defaultValue": "Standard_D2s_v3", - "metadata": { - "description": "Attester Virtual Machine size" - } - }, - "attesterDiskSize": { - "type": "int", - "defaultValue": 1024, - "metadata": { - "description": "Attester data disk size in gigabytes" - } - }, - "osDiskType": { - "type": "string", - "defaultValue": "Standard_LRS", - "metadata": { - "description": "OS Disk Type for every Virtual Machine" - } - } - }, - "variables": { - "virtualNetworkName": "[concat(deployment().name, '-', 'virtualNetwork')]", - "virtualNetworkId": - "[resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]", - "subnetId": "[concat(variables('virtualNetworkId'), '/subnets/default')]", - "validatorKeyVaultName": "[concat('validator-', celo.globalName('keyvault'))]", - "validatorPrivateKeyName": "validatorPrivateKey", - "validatorDataDiskName": "validatorDataDisk", - "validatorVirtualMachineName": "validatorVirtualMachine", - "validatorNetworkInterfaceName": "validatorNetworkInterface", - "validatorNetworkSecurityGroupName": "validatorNetworkSecurityGroup", - "validatorUserAssignedIdentityName": - "[concat(deployment().name, '-validatorUserAssignedIdentity')]", - "proxyKeyVaultName": "[concat('proxy-', celo.globalName('keyvault'))]", - "proxyPrivateKeyName": "proxyPrivateKey", - "proxyPublicIpAddressName": "proxyPublicIpAddress", - "proxyNetworkSecurityGroupName": "proxyNetworkSecurityGroup", - "proxyDataDiskName": "proxyDataDisk", - "proxyVirtualMachineName": "proxyVirtualMachine", - "proxyNetworkInterfaceName": "proxyNetworkInterface", - "proxyUserAssignedIdentityName": "[concat(deployment().name, '-proxyUserAssignedIdentity')]", - "attesterKeyVaultName": "[concat('attester-', celo.globalName('keyvault'))]", - "attesterPrivateKeyName": "attesterPrivateKey", - "attesterTwilioAuthTokenName": "attesterTwilioAuthToken", - "attesterPublicIpAddressName": "attesterPublicIpAddress", - "attesterNetworkSecurityGroupName": "attesterNetworkSecurityGroup", - "attesterVirtualMachineName": "attesterVirtualMachine", - "attesterNetworkInterfaceName": "attesterNetworkInterface", - "attesterUserAssignedIdentityName": - "[concat(deployment().name, '-attesterUserAssignedIdentity')]", - "attesterDataDiskName": "attesterDataDisk", - "attesterDBName": "[concat('attester-', celo.globalName('postgresql'))]", - "attesterPostgreSQLVersion": "9.6", - "attesterPostgreSQLStorageProfile": { - "storageMB": 51200, - "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "storageAutoGrow": "Enabled" - }, - "attesterPostgreSQLSku": { - "name": "GP_Gen5_4", - "tier": "GeneralPurpose", - "capacity": 4, - "size": 51200, - "family": "Gen5" - }, - "imageReference": { - "publisher": "credativ", - "offer": "Debian", - "sku": "9-backports", - "version": "latest" - } - }, - "functions": [ - { - "namespace": "celo", - "members": { - "globalName": { - "parameters": [ - { - "name": "name", - "type": "string" - } - ], - "output": { - "type": "string", - "value": "[uniqueString(subscription().subscriptionId, resourceGroup().name, parameters('name'))]" - } - } - } - } - ] -} diff --git a/packages/azure/components/network.json b/packages/azure/components/network.json deleted file mode 100644 index 80da047bb78..00000000000 --- a/packages/azure/components/network.json +++ /dev/null @@ -1,291 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "type": "Microsoft.Network/virtualNetworks", - "apiVersion": "2019-09-01", - "name": "[variables('virtualNetworkName')]", - "location": "[parameters('location')]", - "properties": { - "addressSpace": { - "addressPrefixes": ["[parameters('virtualNetworkAddressPrefix')]"] - }, - "subnets": [ - { - "name": "default", - "properties": { - "addressPrefix": "[parameters('defaultNetworkAddressPrefix')]", - "serviceEndpoints": [ - { - "service": "Microsoft.Sql", - "locations": [ - "[parameters('location')]" - ] - } - ], - "delegations": [], - "privateEndpointNetworkPolicies": "Enabled", - "privateLinkServiceNetworkPolicies": "Enabled" - } - }, - { - "name": "AzureBastionSubnet", - "properties": { - "addressPrefix": "[parameters('bastionNetworkAddressPrefix')]", - "delegations": [], - "privateEndpointNetworkPolicies": "Enabled", - "privateLinkServiceNetworkPolicies": "Enabled" - } - } - ], - "virtualNetworkPeerings": [], - "enableDdosProtection": false, - "enableVmProtection": false - } - }, - { - "name": "[variables('proxyPublicIpAddressName')]", - "type": "Microsoft.Network/publicIpAddresses", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "publicIpAllocationMethod": "[parameters('proxyPublicIpAddressType')]" - }, - "sku": { - "name": "[parameters('proxyPublicIpAddressSku')]" - } - }, - { - "name": "[variables('attesterPublicIpAddressName')]", - "type": "Microsoft.Network/publicIpAddresses", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "publicIpAllocationMethod": "[parameters('attesterPublicIpAddressType')]" - }, - "sku": { - "name": "[parameters('attesterPublicIpAddressSku')]" - } - }, - { - "name": "[variables('validatorNetworkSecurityGroupName')]", - "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "securityRules": [ - { - "name": "SSH", - "properties": { - "priority": 300, - "protocol": "TCP", - "access": "Deny", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "22" - } - } - ] - } - }, - { - "name": "[variables('proxyNetworkSecurityGroupName')]", - "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "securityRules": [ - { - "name": "SSH", - "properties": { - "priority": 300, - "protocol": "TCP", - "access": "Deny", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "22" - } - }, - { - "name": "ProxyTcpExternal", - "properties": { - "protocol": "*", - "sourcePortRange": "*", - "destinationPortRange": "30303", - "sourceAddressPrefix": "*", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 100, - "direction": "Inbound", - "sourcePortRanges": [], - "destinationPortRanges": [], - "sourceAddressPrefixes": [], - "destinationAddressPrefixes": [] - } - }, - { - "name": "ProxyTcpInternal", - "properties": { - "protocol": "Tcp", - "sourcePortRange": "*", - "destinationPortRange": "30503", - "sourceAddressPrefix": "[parameters('virtualNetworkAddressPrefix')]", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 101, - "direction": "Inbound", - "sourcePortRanges": [], - "destinationPortRanges": [], - "sourceAddressPrefixes": [], - "destinationAddressPrefixes": [] - } - } - ] - } - }, - { - "name": "[variables('attesterNetworkSecurityGroupName')]", - "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "securityRules": [ - { - "name": "SSH", - "properties": { - "priority": 300, - "protocol": "TCP", - "access": "Deny", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "22" - } - }, - { - "name": "AttesterNodeAllExternal", - "properties": { - "protocol": "*", - "sourcePortRange": "*", - "destinationPortRange": "30303", - "sourceAddressPrefix": "*", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 100, - "direction": "Inbound", - "sourcePortRanges": [], - "destinationPortRanges": [], - "sourceAddressPrefixes": [], - "destinationAddressPrefixes": [] - } - }, - { - "name": "HTTP", - "properties": { - "priority": 200, - "protocol": "TCP", - "access": "Allow", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "80" - } - } - ] - } - }, - { - "name": "[variables('validatorNetworkInterfaceName')]", - "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": ["[variables('validatorNetworkSecurityGroupName')]"], - "properties": { - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "subnet": { - "id": "[variables('subnetId')]" - }, - "privateIPAllocationMethod": "Dynamic" - } - } - ], - "networkSecurityGroup": { - "id": - "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('validatorNetworkSecurityGroupName'))]" - } - } - }, - { - "name": "[variables('proxyNetworkInterfaceName')]", - "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[concat('Microsoft.Network/networkSecurityGroups/', variables('proxyNetworkSecurityGroupName'))]", - "[concat('Microsoft.Network/publicIpAddresses/', variables('proxyPublicIpAddressName'))]" - ], - "properties": { - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "subnet": { - "id": "[variables('subnetId')]" - }, - "privateIPAllocationMethod": "Dynamic", - "publicIpAddress": { - "id": - "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', variables('proxyPublicIpAddressName'))]" - } - } - } - ], - "networkSecurityGroup": { - "id": - "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('proxyNetworkSecurityGroupName'))]" - } - } - }, - { - "name": "[variables('attesterNetworkInterfaceName')]", - "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[concat('Microsoft.Network/networkSecurityGroups/', variables('attesterNetworkSecurityGroupName'))]", - "[concat('Microsoft.Network/publicIpAddresses/', variables('attesterPublicIpAddressName'))]" - ], - "properties": { - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "subnet": { - "id": "[variables('subnetId')]" - }, - "privateIPAllocationMethod": "Dynamic", - "publicIpAddress": { - "id": - "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', variables('attesterPublicIpAddressName'))]" - } - } - } - ], - "networkSecurityGroup": { - "id": - "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('attesterNetworkSecurityGroupName'))]" - } - } - } - ] -} diff --git a/packages/azure/components/other.json b/packages/azure/components/other.json deleted file mode 100644 index d1d09c46eff..00000000000 --- a/packages/azure/components/other.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0" -} diff --git a/packages/azure/components/postgres.json b/packages/azure/components/postgres.json deleted file mode 100644 index 74d130e7054..00000000000 --- a/packages/azure/components/postgres.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "name": "[variables('attesterDBName')]", - "type": "Microsoft.DBforPostgreSQL/servers", - "apiVersion": "2017-12-01", - "location": "[parameters('location')]", - "sku": "[variables('attesterPostgreSQLSku')]", - "properties": { - "version": "[variables('attesterPostgreSQLVersion')]", - "sslEnforcement": "Disabled", - "administratorLogin": "[parameters('attesterPostgreSQLUsername')]", - "administratorLoginPassword": "[parameters('attesterPostgreSQLPassword')]", - "storageProfile": "[variables('attesterPostgreSQLStorageProfile')]" - }, - "resources": [ - { - "name": "[concat(variables('attesterDBName'), '/config')]", - "dependsOn": [ - "[variables('attesterDBName')]" - ], - "type": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules", - "apiVersion": "2017-12-01", - "properties": { - "virtualNetworkSubnetId": "[variables('subnetId')]" - } - } - ] - } - ] -} diff --git a/packages/azure/createUiDefinition.json b/packages/azure/createUiDefinition.json deleted file mode 100644 index be515ba7f1c..00000000000 --- a/packages/azure/createUiDefinition.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/0.1.2-preview/CreateUIDefinition.MultiVm.json#", - "handler": "Microsoft.Azure.CreateUIDef", - "version": "0.1.2-preview", - "parameters": { - "basics": [ - {} - ], - "steps": [ - { - "name": "clusterSettings", - "label": "Cluster settings", - "subLabel": { - "preValidation": "Configure cluster", - "postValidation": "Done" - }, - "bladeTitle": "Cluster settings", - "elements": [ - { - "name": "adminUsername", - "type": "Microsoft.Common.TextBox", - "label": "adminUsername", - "visible": true - }, - { - "name": "adminPublicKey", - "type": "Microsoft.Common.TextBox", - "label": "adminPublicKey", - "visible": true - } - ] - }, - { - "name": "validatorSettings", - "label": "Validator settings", - "bladeTitle": "Validator settings", - "subLabel": { - "preValidation": "Configure Validator", - "postValidation": "Done" - }, - "elements": [ - { - "name": "validatorName", - "type": "Microsoft.Common.TextBox", - "label": "validatorName", - "visible": true - }, - { - "name": "validatorAccountAddress", - "type": "Microsoft.Common.TextBox", - "label": "validatorAccountAddress", - "visible": true - }, - { - "name": "validatorPrivateKey", - "type": "Microsoft.Common.PasswordBox", - "label": { - "password": "Validator private key" - }, - "visible": true, - "options": { - "hideConfirmation": true - } - } - ] - }, - { - "name": "proxySettings", - "label": "Proxy settings", - "bladeTitle": "Proxy settings", - "subLabel": { - "preValidation": "Configure Proxy", - "postValidation": "Done" - }, - "elements": [ - { - "name": "proxyName", - "type": "Microsoft.Common.TextBox", - "label": "proxyName", - "visible": true - }, - { - "name": "proxyPublicKey", - "type": "Microsoft.Common.TextBox", - "label": "proxyPublicKey", - "visible": true - }, - { - "name": "proxyPrivateKey", - "type": "Microsoft.Common.PasswordBox", - "label": { - "password": "Proxy private key" - }, - "visible": true, - "options": { - "hideConfirmation": true - } - } - ] - }, - { - "name": "attesterSettings", - "label": "Attestation service settings", - "bladeTitle": "Attestation service settings", - "subLabel": { - "preValidation": "Configure Attestation service", - "postValidation": "Done" - }, - "elements": [ - { - "name": "attesterPostgreSQLUsername", - "type": "Microsoft.Common.TextBox", - "label": "DB admin username", - "visible": true - }, - { - "name": "attesterPostgreSQLPassword", - "type": "Microsoft.Common.PasswordBox", - "label": { - "password": "DB admin password", - "confirmPassword": "Confirm DB admin password" - }, - "visible": true - }, - { - "name": "attesterAccountAddress", - "type": "Microsoft.Common.TextBox", - "label": "attesterAccountAddress", - "visible": true - }, - { - "name": "attesterPrivateKey", - "type": "Microsoft.Common.PasswordBox", - "label": { - "password": "Attester private key" - }, - "visible": true, - "options": { - "hideConfirmation": true - } - }, - { - "name": "attesterTwilioAccountSID", - "type": "Microsoft.Common.TextBox", - "label": "attesterTwilioAccountSID", - "visible": true - }, - { - "name": "attesterTwilioAuthToken", - "type": "Microsoft.Common.TextBox", - "label": "attesterTwilioAuthToken", - "visible": true - }, - { - "name": "attesterTwilioMessageServiceSID", - "type": "Microsoft.Common.TextBox", - "label": "attesterTwilioMessageServiceSID", - "visible": true - } - ] - } - ], - "outputs": { - "proxyName": "[steps('allSettings').proxyName]", - "validatorName": "[steps('allSettings').validatorName]", - "adminUsername": "[steps('allSettings').adminUsername]", - "adminPublicKey": "[steps('allSettings').adminPublicKey]", - "attesterPostgreSQLUsername": "[steps('allSettings').attesterPostgreSQLUsername]", - "attesterPostgreSQLPassword": "[steps('allSettings').attesterPostgreSQLPassword]", - "validatorAccountAddress": "[steps('allSettings').validatorAccountAddress]", - "proxyPublicKey": "[steps('allSettings').proxyPublicKey]", - "proxyPrivateKey": "[steps('allSettings').proxyPrivateKey]", - "validatorPrivateKey": "[steps('allSettings').validatorPrivateKey]", - "attesterAccountAddress": "[steps('allSettings').attesterAccountAddress]", - "attesterPrivateKey": "[steps('allSettings').attesterPrivateKey]", - "attesterTwilioAccountSID": "[steps('allSettings').attesterTwilioAccountSID]", - "attesterTwilioAuthToken": "[steps('allSettings').attesterTwilioAuthToken]", - "attesterTwilioMessageServiceSID": "[steps('allSettings').attesterTwilioMessageServiceSID]" - } - } -} diff --git a/packages/azure/mainTemplate.json b/packages/azure/mainTemplate.json deleted file mode 100644 index 8aae0e740af..00000000000 --- a/packages/azure/mainTemplate.json +++ /dev/null @@ -1,1289 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "name": "[variables('validatorDataDiskName')]", - "type": "Microsoft.Compute/disks", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "properties": { - "diskSizeGB": "[parameters('validatorDiskSize')]", - "creationData": { - "createOption": "empty" - } - }, - "sku": { - "name": "Premium_LRS" - } - }, - { - "name": "[variables('proxyDataDiskName')]", - "type": "Microsoft.Compute/disks", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "properties": { - "diskSizeGB": "[parameters('proxyDiskSize')]", - "creationData": { - "createOption": "empty" - } - }, - "sku": { - "name": "Premium_LRS" - } - }, - { - "name": "[variables('attesterDataDiskName')]", - "type": "Microsoft.Compute/disks", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "properties": { - "diskSizeGB": "[parameters('attesterDiskSize')]", - "creationData": { - "createOption": "empty" - } - }, - "sku": { - "name": "Premium_LRS" - } - }, - { - "name": "[variables('validatorVirtualMachineName')]", - "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('validatorDataDiskName')]", - "[variables('validatorNetworkInterfaceName')]", - "[variables('validatorUserAssignedIdentityName')]", - "[variables('validatorKeyVaultName')]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[parameters('validatorVirtualMachineSize')]" - }, - "storageProfile": { - "osDisk": { - "createOption": "fromImage", - "managedDisk": { - "storageAccountType": "[parameters('osDiskType')]" - } - }, - "imageReference": "[variables('imageReference')]", - "dataDisks": [ - { - "lun": 0, - "createOption": "attach", - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', variables('validatorDataDiskName'))]" - } - } - ] - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('validatorNetworkInterfaceName'))]" - } - ] - }, - "osProfile": { - "computerName": "[variables('validatorVirtualMachineName')]", - "adminUsername": "[parameters('adminUsername')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "ssh": { - "publicKeys": [ - { - "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]", - "keyData": "[parameters('adminPublicKey')]" - } - ] - } - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": false - } - } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "[resourceId(resourceGroup().name, 'Microsoft.ManagedIdentity/userAssignedIdentities', variables('validatorUserAssignedIdentityName'))]": {} - } - }, - "resources": [ - { - "name": "validatorCustomScript", - "type": "extensions", - "location": "[resourceGroup().location]", - "apiVersion": "2019-03-01", - "dependsOn": [ - "[variables('validatorVirtualMachineName')]", - "[variables('validatorNetworkInterfaceName')]", - "[variables('proxyNetworkInterfaceName')]" - ], - "properties": { - "publisher": "Microsoft.Azure.Extensions", - "type": "CustomScript", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "protectedSettings": { - "script": "[base64(concat('echo \"', 'proxyInternalIpAddress=',reference(variables('proxyNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress,';','proxyExternalIpAddress=',reference(variables('proxyPublicIpAddressName')).ipAddress,';', 'validatorInternalIpAddress=',reference(variables('validatorNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress,';', 'virtualNetworkName=', variables('virtualNetworkName'), ';','virtualNetworkId=', variables('virtualNetworkId'), ';','subnetId=', variables('subnetId'), ';','validatorKeyVaultName=', variables('validatorKeyVaultName'), ';','validatorPrivateKeyName=', variables('validatorPrivateKeyName'), ';','validatorDataDiskName=', variables('validatorDataDiskName'), ';','validatorVirtualMachineName=', variables('validatorVirtualMachineName'), ';','validatorNetworkInterfaceName=', variables('validatorNetworkInterfaceName'), ';','validatorNetworkSecurityGroupName=', variables('validatorNetworkSecurityGroupName'), ';','validatorUserAssignedIdentityName=', variables('validatorUserAssignedIdentityName'), ';','proxyKeyVaultName=', variables('proxyKeyVaultName'), ';','proxyPrivateKeyName=', variables('proxyPrivateKeyName'), ';','proxyPublicIpAddressName=', variables('proxyPublicIpAddressName'), ';','proxyNetworkSecurityGroupName=', variables('proxyNetworkSecurityGroupName'), ';','proxyDataDiskName=', variables('proxyDataDiskName'), ';','proxyVirtualMachineName=', variables('proxyVirtualMachineName'), ';','proxyNetworkInterfaceName=', variables('proxyNetworkInterfaceName'), ';','proxyUserAssignedIdentityName=', variables('proxyUserAssignedIdentityName'), ';','attesterKeyVaultName=', variables('attesterKeyVaultName'), ';','attesterPrivateKeyName=', variables('attesterPrivateKeyName'), ';','attesterTwilioAuthTokenName=', variables('attesterTwilioAuthTokenName'), ';','attesterPublicIpAddressName=', variables('attesterPublicIpAddressName'), ';','attesterNetworkSecurityGroupName=', variables('attesterNetworkSecurityGroupName'), ';','attesterVirtualMachineName=', variables('attesterVirtualMachineName'), ';','attesterNetworkInterfaceName=', variables('attesterNetworkInterfaceName'), ';','attesterUserAssignedIdentityName=', variables('attesterUserAssignedIdentityName'), ';','attesterDataDiskName=', variables('attesterDataDiskName'), ';','attesterDBName=', variables('attesterDBName'), ';','attesterPostgreSQLVersion=', variables('attesterPostgreSQLVersion'), ';', 'proxyName=', parameters('proxyName'), ';','validatorName=', parameters('validatorName'), ';','adminUsername=', parameters('adminUsername'), ';','attesterPostgreSQLUsername=', parameters('attesterPostgreSQLUsername'), ';','validatorAccountAddress=', parameters('validatorAccountAddress'), ';','proxyPublicKey=', parameters('proxyPublicKey'), ';','attesterAccountAddress=', parameters('attesterAccountAddress'), ';','attesterTwilioAccountSID=', parameters('attesterTwilioAccountSID'), ';','attesterTwilioMessageServiceSID=', parameters('attesterTwilioMessageServiceSID'), ';','bootnodes=', parameters('bootnodes'), ';','gethVerbosity=', parameters('gethVerbosity'), ';','celoEnv=', parameters('celoEnv'), ';','networkId=', parameters('networkId'), ';','gethNodeDockerImageRepository=', parameters('gethNodeDockerImageRepository'), ';','gethNodeDockerImageTag=', parameters('gethNodeDockerImageTag'), ';','gethExporterDockerImageRepository=', parameters('gethExporterDockerImageRepository'), ';','gethExporterDockerImageTag=', parameters('gethExporterDockerImageTag'), ';','attestationServiceDockerImageRepository=', parameters('attestationServiceDockerImageRepository'), ';','attestationServiceDockerImageTag=', parameters('attestationServiceDockerImageTag'), ';','blockTime=', parameters('blockTime'), ';','istanbulRequestTimeoutMs=', parameters('istanbulRequestTimeoutMs'), ';','proxyMaxPeers=', parameters('proxyMaxPeers'), ';','ethstatsHost=', parameters('ethstatsHost'), ';','location=', parameters('location'), ';','virtualNetworkAddressPrefix=', parameters('virtualNetworkAddressPrefix'), ';','defaultNetworkAddressPrefix=', parameters('defaultNetworkAddressPrefix'), ';','bastionNetworkAddressPrefix=', parameters('bastionNetworkAddressPrefix'), ';','validatorDiskSize=', parameters('validatorDiskSize'), ';','validatorVirtualMachineSize=', parameters('validatorVirtualMachineSize'), ';','proxyPublicIpAddressType=', parameters('proxyPublicIpAddressType'), ';','proxyPublicIpAddressSku=', parameters('proxyPublicIpAddressSku'), ';','proxyDiskSize=', parameters('proxyDiskSize'), ';','proxyVirtualMachineSize=', parameters('proxyVirtualMachineSize'), ';','attesterPublicIpAddressType=', parameters('attesterPublicIpAddressType'), ';','attesterPublicIpAddressSku=', parameters('attesterPublicIpAddressSku'), ';','attesterVirtualMachineSize=', parameters('attesterVirtualMachineSize'), ';','attesterDiskSize=', parameters('attesterDiskSize'), ';','osDiskType=', parameters('osDiskType'), ';', '\" > startup-env.sh;', base64ToString('archive=$(grep --text --line-number '__TARBALL__:$' $0 | cut -f1 -d:)
tail -n +$((archive + 1)) $0 | tar -xvf - > /dev/null
./startup.sh
exit 0
__TARBALL__:
./                                                                                                  0000775 0001750 0001750 00000000000 13627362311 007371  5                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    ./celo-validator.service                                                                            0000664 0001750 0001750 00000000342 13625335166 013665  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    [Unit]
Description=Docker Container %N
Requires=docker.service
After=docker.service

[Service]
Restart=always
ExecStart=/usr/local/bin/celo-validator-run %N
ExecStop=/usr/bin/docker rm -f %N

[Install]
WantedBy=default.target
                                                                                                                                                                                                                                                                                              ./celo-validator-run                                                                                0000775 0001750 0001750 00000003321 13627362311 013025  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -e

. /etc/default/celo

SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm)
cleanup () {
    rm -rf ${SECRET_DIR}
}
trap cleanup EXIT

get_secret $VALIDATOR_KEY_VAULT 'validatorPrivateKey' > ${SECRET_DIR}/validatorPrivateKey
generate_password > ${SECRET_DIR}/accountPassword

set -x

docker run \
  --rm \
  -v $DATA_DIR:$DATA_DIR \
  -v $SECRET_DIR:$SECRET_DIR \
  $GETH_NODE_DOCKER_IMAGE \
    account import \
    --keystore=${SECRET_DIR} \
    --password=${SECRET_DIR}/accountPassword \
    ${SECRET_DIR}/validatorPrivateKey

docker run \
  --name $1 \
  --restart=always \
  --net=host \
  -v $DATA_DIR:$DATA_DIR \
  -v $SECRET_DIR:$SECRET_DIR \
  --entrypoint /bin/sh \
  $GETH_NODE_DOCKER_IMAGE -c "\
    geth \
      --bootnodes=${BOOTNODES} \
      --keystore=${SECRET_DIR} \
      --password=${SECRET_DIR}/accountPassword \
      --unlock=$VALIDATOR_ACCOUNT_ADDRESS \
      --mine \
      --rpc \
      --rpcaddr 0.0.0.0 \
      --rpcapi=eth,net,web3 \
      --rpccorsdomain='*' \
      --rpcvhosts=* \
      --ws \
      --wsaddr 0.0.0.0 \
      --wsorigins=* \
      --wsapi=eth,net,web3 \
      --nodekey=$SECRET_DIR/validatorPrivateKey \
      --etherbase=$VALIDATOR_ACCOUNT_ADDRESS \
      --networkid=${NETWORK_ID} \
      --syncmode=full \
      --consoleformat=json \
      --consoleoutput=stdout \
      --verbosity=${GETH_VERBOSITY} \
      --ethstats=${VALIDATOR_NAME}@${ETHSTATS_HOST} \
      --istanbul.blockperiod=${BLOCK_TIME} \
      --istanbul.requesttimeout=${ISTANBUL_REQUEST_TIMEOUT_MS} \
      --maxpeers=${VALIDATOR_MAX_PEERS} \
      --nat=extip:${VALIDATOR_INTERNAL_IP_ADDRESS} \
      --metrics \
      --nodiscover \
      --proxy.proxied \
      --proxy.proxyenodeurlpair=\"$PROXY_URL\" \
"
                                                                                                                                                                                                                                                                                                               ./libcelo.sh                                                                                        0000664 0001750 0001750 00000001135 13627362311 011336  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    get_secret () {
    local vault=$1
    local key=$2

    local token=$(curl -s 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://vault.azure.net' -H Metadata:true)
    local access_token=$(echo $token | jq -r '.access_token')
    local result=$(curl -s -H "Authorization: Bearer $access_token" https://${vault}.vault.azure.net/secrets/${key}?api-version=2016-10-01)
    echo $(echo $result | jq -r '.value')
}

generate_password() {
    # Generate 24 character long password using base64 characters.
    dd bs=18 count=1 if=/dev/urandom status=none | base64
}
                                                                                                                                                                                                                                                                                                                                                                                                                                   ./startup.sh                                                                                        0000775 0001750 0001750 00000002001 13625335166 011431  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -x
set -e

. ./provider-init.sh
. /etc/default/celo

echo "Validator address: $VALIDATOR_ACCOUNT_ADDRESS"
echo "Proxy URL: $PROXY_URL"

echo "Pulling geth..."
docker pull $GETH_NODE_DOCKER_IMAGE

# Load configuration to files
curl -o $DATA_DIR/genesis.json https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${CELO_ENV}?alt=media

echo "Starting geth..."
docker run \
  --rm \
  --net=host \
  -v $DATA_DIR:$DATA_DIR \
  --entrypoint /bin/sh \
  -i $GETH_NODE_DOCKER_IMAGE \
  -c "geth init $DATA_DIR/genesis.json"

cp celo-validator-run /usr/local/bin
cp celo-validator.service /etc/systemd/system/celo-validator.service
systemctl daemon-reload
systemctl enable celo-validator.service
systemctl restart celo-validator.service

echo "Pulling geth exporter..."
docker pull $GETH_EXPORTER_DOCKER_IMAGE

cp exporter-run /usr/local/bin
cp geth-exporter.service /etc/systemd/system/geth-exporter.service
systemctl daemon-reload
systemctl enable geth-exporter.service
systemctl restart geth-exporter.service
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ./provider-init.sh                                                                                  0000664 0001750 0001750 00000006152 13625335166 012532  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    test -f startup-env.sh && source startup-env.sh
cat <<EOF >/etc/default/celo
DATA_DIR=/root/.celo
CELO_ENV=${celoEnv}
BOOTNODES=${bootnodes}
VALIDATOR_KEY_VAULT=${validatorKeyVaultName}
PROXY_KEY_VAULT=${proxyKeyVaultName}
ATTESTER_KEY_VAULT=${attesterKeyVaultName}
GETH_NODE_DOCKER_IMAGE=${gethNodeDockerImageRepository}:${gethNodeDockerImageTag}
GETH_EXPORTER_DOCKER_IMAGE=${gethExporterDockerImageRepository}:${gethExporterDockerImageTag}
ATTESTATION_SERVICE_DOCKER_IMAGE=${attestationServiceDockerImageRepository}:${attestationServiceDockerImageTag}
NETWORK_ID=${networkId}
GETH_VERBOSITY=${gethVerbosity}
VALIDATOR_NAME=${validatorName}
PROXY_NAME=${proxyName}
ETHSTATS_HOST=${ethstatsHost}
BLOCK_TIME=${blockTime}
ISTANBUL_REQUEST_TIMEOUT_MS=${istanbulRequestTimeoutMs}
PROXY_MAX_PEERS=${proxyMaxPeers}
VALIDATOR_MAX_PEERS=${proxyMaxPeers}
PROXY_EXTERNAL_IP_ADDRESS=${proxyExternalIpAddress}
PROXY_INTERNAL_IP_ADDRESS=${proxyInternalIpAddress}
VALIDATOR_INTERNAL_IP_ADDRESS=${validatorInternalIpAddress}
ATTESTER_ACCOUNT_ADDRESS=${attesterAccountAddress}
VALIDATOR_ACCOUNT_ADDRESS=${validatorAccountAddress}
PROXY_URL="enode://${proxyPublicKey}@${proxyInternalIpAddress}:30503;enode://${proxyPublicKey}@${proxyExternalIpAddress}:30303"
SMS_PROVIDERS=twilio
ATTESTER_TWILIO_ACCOUNT_SID=${attesterTwilioAccountSID}
ATTESTER_TWILIO_MESSAGE_SERVICE_SID=${attesterTwilioMessageServiceSID}
ATTESTER_DB_USERNAME="${attesterPostgreSQLUsername}@${attesterDBName}"
ATTESTER_DB_HOSTNAME="${attesterDBName}.postgres.database.azure.com"
EOF
cat ./libcelo.sh >> /etc/default/celo

. /etc/default/celo

apt update -y && apt upgrade -y

apt install -y \
    curl \
    jq

DISK_LUN=lun0
DISK_PATH=`readlink -f /dev/disk/azure/scsi1/${DISK_LUN}`

echo "Setting up persistent disk at $DISK_PATH..."

DISK_FORMAT=ext4
CURRENT_DISK_FORMAT=`lsblk -i -n -o fstype $DISK_PATH`

echo "Checking if disk $DISK_PATH format $CURRENT_DISK_FORMAT matches desired $DISK_FORMAT..."

# If the disk has already been formatted previously (this will happen
# if this instance has been recreated with the same disk), we skip formatting
if [[ $CURRENT_DISK_FORMAT == $DISK_FORMAT ]]; then
  echo "Disk $DISK_PATH is correctly formatted as $DISK_FORMAT"
else
  echo "Disk $DISK_PATH is not formatted correctly, formatting as $DISK_FORMAT..."
  mkfs.ext4 -m 0 -F -E lazy_itable_init=0,lazy_journal_init=0,discard $DISK_PATH
fi

echo "Mounting $DISK_PATH onto $DATA_DIR"
mkdir -p $DATA_DIR
DISK_UUID=`blkid $DISK_PATH | cut -d \" -f 2`
echo "UUID=${DISK_UUID}     $DATA_DIR   auto    discard,defaults    0    0" >> /etc/fstab
mount $DATA_DIR

echo "Installing Docker..."
apt install -y apt-transport-https ca-certificates curl software-properties-common gnupg2
curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
apt update -y && apt upgrade -y
apt install -y docker-ce
systemctl start docker

echo "Configuring Docker..."
cat <<'EOF' > '/etc/docker/daemon.json'
{
  "log-driver": "json-file",
  "log-opts": {
    "max-size": "10m",
    "max-file": "3"
  }
}
EOF
systemctl restart docker
                                                                                                                                                                                                                                                                                                                                                                                                                      ./exporter-run                                                                                      0000775 0001750 0001750 00000000435 13625335166 012001  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -e

. /etc/default/celo

set -x

/usr/bin/docker run \
  --name $1 \
  --restart=always \
  -v $DATA_DIR:$DATA_DIR \
  --net=host \
  $GETH_EXPORTER_DOCKER_IMAGE \
  /usr/local/bin/geth_exporter \
    -ipc $DATA_DIR/geth.ipc \
    -filter "(.*overall|percentiles_95)"
                                                                                                                                                                                                                                   ./geth-exporter.service                                                                             0000664 0001750 0001750 00000000325 13625335166 013556  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    Description=Docker Container %N
Requires=docker.service
After=docker.service

[Service]
Restart=always
ExecStart=/usr/local/bin/exporter-run %N
ExecStop=/usr/bin/docker rm -f %N

[Install]
WantedBy=default.target
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           ')))]" - } - } - } - ] - }, - { - "name": "[variables('proxyVirtualMachineName')]", - "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('proxyDataDiskName')]", - "[variables('proxyNetworkInterfaceName')]", - "[variables('proxyUserAssignedIdentityName')]", - "[variables('proxyKeyVaultName')]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[parameters('proxyVirtualMachineSize')]" - }, - "storageProfile": { - "osDisk": { - "createOption": "fromImage", - "managedDisk": { - "storageAccountType": "[parameters('osDiskType')]" - } - }, - "imageReference": "[variables('imageReference')]", - "dataDisks": [ - { - "lun": 0, - "createOption": "attach", - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', variables('proxyDataDiskName'))]" - } - } - ] - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('proxyNetworkInterfaceName'))]" - } - ] - }, - "osProfile": { - "computerName": "[variables('proxyVirtualMachineName')]", - "adminUsername": "[parameters('adminUsername')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "ssh": { - "publicKeys": [ - { - "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]", - "keyData": "[parameters('adminPublicKey')]" - } - ] - } - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": false - } - } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "[resourceId(resourceGroup().name, 'Microsoft.ManagedIdentity/userAssignedIdentities', variables('proxyUserAssignedIdentityName'))]": {} - } - }, - "resources": [ - { - "name": "proxyCustomScript", - "type": "extensions", - "location": "[resourceGroup().location]", - "apiVersion": "2019-03-01", - "dependsOn": [ - "[variables('proxyVirtualMachineName')]", - "[variables('proxyNetworkInterfaceName')]", - "[variables('validatorNetworkInterfaceName')]" - ], - "properties": { - "publisher": "Microsoft.Azure.Extensions", - "type": "CustomScript", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "protectedSettings": { - "script": "[base64(concat('echo \"', 'proxyInternalIpAddress=',reference(variables('proxyNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress,';','proxyExternalIpAddress=',reference(variables('proxyPublicIpAddressName')).ipAddress,';', 'validatorInternalIpAddress=',reference(variables('validatorNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress,';', 'virtualNetworkName=', variables('virtualNetworkName'), ';','virtualNetworkId=', variables('virtualNetworkId'), ';','subnetId=', variables('subnetId'), ';','validatorKeyVaultName=', variables('validatorKeyVaultName'), ';','validatorPrivateKeyName=', variables('validatorPrivateKeyName'), ';','validatorDataDiskName=', variables('validatorDataDiskName'), ';','validatorVirtualMachineName=', variables('validatorVirtualMachineName'), ';','validatorNetworkInterfaceName=', variables('validatorNetworkInterfaceName'), ';','validatorNetworkSecurityGroupName=', variables('validatorNetworkSecurityGroupName'), ';','validatorUserAssignedIdentityName=', variables('validatorUserAssignedIdentityName'), ';','proxyKeyVaultName=', variables('proxyKeyVaultName'), ';','proxyPrivateKeyName=', variables('proxyPrivateKeyName'), ';','proxyPublicIpAddressName=', variables('proxyPublicIpAddressName'), ';','proxyNetworkSecurityGroupName=', variables('proxyNetworkSecurityGroupName'), ';','proxyDataDiskName=', variables('proxyDataDiskName'), ';','proxyVirtualMachineName=', variables('proxyVirtualMachineName'), ';','proxyNetworkInterfaceName=', variables('proxyNetworkInterfaceName'), ';','proxyUserAssignedIdentityName=', variables('proxyUserAssignedIdentityName'), ';','attesterKeyVaultName=', variables('attesterKeyVaultName'), ';','attesterPrivateKeyName=', variables('attesterPrivateKeyName'), ';','attesterTwilioAuthTokenName=', variables('attesterTwilioAuthTokenName'), ';','attesterPublicIpAddressName=', variables('attesterPublicIpAddressName'), ';','attesterNetworkSecurityGroupName=', variables('attesterNetworkSecurityGroupName'), ';','attesterVirtualMachineName=', variables('attesterVirtualMachineName'), ';','attesterNetworkInterfaceName=', variables('attesterNetworkInterfaceName'), ';','attesterUserAssignedIdentityName=', variables('attesterUserAssignedIdentityName'), ';','attesterDataDiskName=', variables('attesterDataDiskName'), ';','attesterDBName=', variables('attesterDBName'), ';','attesterPostgreSQLVersion=', variables('attesterPostgreSQLVersion'), ';', 'proxyName=', parameters('proxyName'), ';','validatorName=', parameters('validatorName'), ';','adminUsername=', parameters('adminUsername'), ';','attesterPostgreSQLUsername=', parameters('attesterPostgreSQLUsername'), ';','validatorAccountAddress=', parameters('validatorAccountAddress'), ';','proxyPublicKey=', parameters('proxyPublicKey'), ';','attesterAccountAddress=', parameters('attesterAccountAddress'), ';','attesterTwilioAccountSID=', parameters('attesterTwilioAccountSID'), ';','attesterTwilioMessageServiceSID=', parameters('attesterTwilioMessageServiceSID'), ';','bootnodes=', parameters('bootnodes'), ';','gethVerbosity=', parameters('gethVerbosity'), ';','celoEnv=', parameters('celoEnv'), ';','networkId=', parameters('networkId'), ';','gethNodeDockerImageRepository=', parameters('gethNodeDockerImageRepository'), ';','gethNodeDockerImageTag=', parameters('gethNodeDockerImageTag'), ';','gethExporterDockerImageRepository=', parameters('gethExporterDockerImageRepository'), ';','gethExporterDockerImageTag=', parameters('gethExporterDockerImageTag'), ';','attestationServiceDockerImageRepository=', parameters('attestationServiceDockerImageRepository'), ';','attestationServiceDockerImageTag=', parameters('attestationServiceDockerImageTag'), ';','blockTime=', parameters('blockTime'), ';','istanbulRequestTimeoutMs=', parameters('istanbulRequestTimeoutMs'), ';','proxyMaxPeers=', parameters('proxyMaxPeers'), ';','ethstatsHost=', parameters('ethstatsHost'), ';','location=', parameters('location'), ';','virtualNetworkAddressPrefix=', parameters('virtualNetworkAddressPrefix'), ';','defaultNetworkAddressPrefix=', parameters('defaultNetworkAddressPrefix'), ';','bastionNetworkAddressPrefix=', parameters('bastionNetworkAddressPrefix'), ';','validatorDiskSize=', parameters('validatorDiskSize'), ';','validatorVirtualMachineSize=', parameters('validatorVirtualMachineSize'), ';','proxyPublicIpAddressType=', parameters('proxyPublicIpAddressType'), ';','proxyPublicIpAddressSku=', parameters('proxyPublicIpAddressSku'), ';','proxyDiskSize=', parameters('proxyDiskSize'), ';','proxyVirtualMachineSize=', parameters('proxyVirtualMachineSize'), ';','attesterPublicIpAddressType=', parameters('attesterPublicIpAddressType'), ';','attesterPublicIpAddressSku=', parameters('attesterPublicIpAddressSku'), ';','attesterVirtualMachineSize=', parameters('attesterVirtualMachineSize'), ';','attesterDiskSize=', parameters('attesterDiskSize'), ';','osDiskType=', parameters('osDiskType'), ';', '\" > startup-env.sh;', base64ToString('archive=$(grep --text --line-number '__TARBALL__:$' $0 | cut -f1 -d:)
tail -n +$((archive + 1)) $0 | tar -xvf - > /dev/null
./startup.sh
exit 0
__TARBALL__:
./                                                                                                  0000775 0001750 0001750 00000000000 13625335166 007377  5                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    ./celo-proxy-run                                                                                    0000775 0001750 0001750 00000002352 13625335166 012232  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -e

. /etc/default/celo

SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm)
cleanup () {
    rm -rf ${SECRET_DIR}
}
trap cleanup EXIT

get_secret $PROXY_KEY_VAULT 'proxyPrivateKey' > ${SECRET_DIR}/pkey

set -x
/usr/bin/docker run \
  --name $1 \
  --restart=always \
  --net=host \
  -v $DATA_DIR:$DATA_DIR \
  -v $SECRET_DIR:$SECRET_DIR \
  --entrypoint /bin/sh \
  $GETH_NODE_DOCKER_IMAGE -c "\
    geth \
      --bootnodes=${BOOTNODES} \
      --rpc \
      --rpcaddr 0.0.0.0 \
      --rpcapi=eth,net,web3 \
      --rpccorsdomain='*' \
      --rpcvhosts=* \
      --ws \
      --wsaddr 0.0.0.0 \
      --wsorigins=* \
      --wsapi=eth,net,web3 \
      --nodekey=${SECRET_DIR}/pkey \
      --networkid=${NETWORK_ID} \
      --syncmode=full \
      --consoleformat=json \
      --consoleoutput=stdout \
      --verbosity=${GETH_VERBOSITY} \
      --ethstats=${PROXY_NAME}@${ETHSTATS_HOST} \
      --istanbul.blockperiod=${BLOCK_TIME} \
      --istanbul.requesttimeout=${ISTANBUL_REQUEST_TIMEOUT_MS} \
      --maxpeers=${PROXY_MAX_PEERS} \
      --nat=extip:${PROXY_EXTERNAL_IP_ADDRESS} \
      --metrics \
      --proxy.proxy \
      --proxy.proxiedvalidatoraddress ${VALIDATOR_ACCOUNT_ADDRESS} \
      --proxy.internalendpoint :30503 \
"
                                                                                                                                                                                                                                                                                      ./libcelo.sh                                                                                        0000664 0001750 0001750 00000001135 13627362311 011336  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    get_secret () {
    local vault=$1
    local key=$2

    local token=$(curl -s 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://vault.azure.net' -H Metadata:true)
    local access_token=$(echo $token | jq -r '.access_token')
    local result=$(curl -s -H "Authorization: Bearer $access_token" https://${vault}.vault.azure.net/secrets/${key}?api-version=2016-10-01)
    echo $(echo $result | jq -r '.value')
}

generate_password() {
    # Generate 24 character long password using base64 characters.
    dd bs=18 count=1 if=/dev/urandom status=none | base64
}
                                                                                                                                                                                                                                                                                                                                                                                                                                   ./startup.sh                                                                                        0000775 0001750 0001750 00000001632 13625335166 011442  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -x
set -e

. ./provider-init.sh
. /etc/default/celo

echo "Pulling geth..."
docker pull $GETH_NODE_DOCKER_IMAGE

# Load configuration to files
curl -o $DATA_DIR/genesis.json https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${CELO_ENV}?alt=media

echo "Starting geth..."
docker run \
  --rm \
  --net=host \
  -v $DATA_DIR:$DATA_DIR \
  --entrypoint /bin/sh \
  -i $GETH_NODE_DOCKER_IMAGE \
  -c "geth init $DATA_DIR/genesis.json"

cp celo-proxy-run /usr/local/bin
cp celo-proxy.service /etc/systemd/system/celo-proxy.service
systemctl daemon-reload
systemctl enable celo-proxy.service
systemctl restart celo-proxy.service

echo "Pulling geth exporter..."
docker pull $GETH_EXPORTER_DOCKER_IMAGE

cp exporter-run /usr/local/bin
cp geth-exporter.service /etc/systemd/system/geth-exporter.service
systemctl daemon-reload
systemctl enable geth-exporter.service
systemctl restart geth-exporter.service
                                                                                                      ./provider-init.sh                                                                                  0000664 0001750 0001750 00000006152 13625335166 012532  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    test -f startup-env.sh && source startup-env.sh
cat <<EOF >/etc/default/celo
DATA_DIR=/root/.celo
CELO_ENV=${celoEnv}
BOOTNODES=${bootnodes}
VALIDATOR_KEY_VAULT=${validatorKeyVaultName}
PROXY_KEY_VAULT=${proxyKeyVaultName}
ATTESTER_KEY_VAULT=${attesterKeyVaultName}
GETH_NODE_DOCKER_IMAGE=${gethNodeDockerImageRepository}:${gethNodeDockerImageTag}
GETH_EXPORTER_DOCKER_IMAGE=${gethExporterDockerImageRepository}:${gethExporterDockerImageTag}
ATTESTATION_SERVICE_DOCKER_IMAGE=${attestationServiceDockerImageRepository}:${attestationServiceDockerImageTag}
NETWORK_ID=${networkId}
GETH_VERBOSITY=${gethVerbosity}
VALIDATOR_NAME=${validatorName}
PROXY_NAME=${proxyName}
ETHSTATS_HOST=${ethstatsHost}
BLOCK_TIME=${blockTime}
ISTANBUL_REQUEST_TIMEOUT_MS=${istanbulRequestTimeoutMs}
PROXY_MAX_PEERS=${proxyMaxPeers}
VALIDATOR_MAX_PEERS=${proxyMaxPeers}
PROXY_EXTERNAL_IP_ADDRESS=${proxyExternalIpAddress}
PROXY_INTERNAL_IP_ADDRESS=${proxyInternalIpAddress}
VALIDATOR_INTERNAL_IP_ADDRESS=${validatorInternalIpAddress}
ATTESTER_ACCOUNT_ADDRESS=${attesterAccountAddress}
VALIDATOR_ACCOUNT_ADDRESS=${validatorAccountAddress}
PROXY_URL="enode://${proxyPublicKey}@${proxyInternalIpAddress}:30503;enode://${proxyPublicKey}@${proxyExternalIpAddress}:30303"
SMS_PROVIDERS=twilio
ATTESTER_TWILIO_ACCOUNT_SID=${attesterTwilioAccountSID}
ATTESTER_TWILIO_MESSAGE_SERVICE_SID=${attesterTwilioMessageServiceSID}
ATTESTER_DB_USERNAME="${attesterPostgreSQLUsername}@${attesterDBName}"
ATTESTER_DB_HOSTNAME="${attesterDBName}.postgres.database.azure.com"
EOF
cat ./libcelo.sh >> /etc/default/celo

. /etc/default/celo

apt update -y && apt upgrade -y

apt install -y \
    curl \
    jq

DISK_LUN=lun0
DISK_PATH=`readlink -f /dev/disk/azure/scsi1/${DISK_LUN}`

echo "Setting up persistent disk at $DISK_PATH..."

DISK_FORMAT=ext4
CURRENT_DISK_FORMAT=`lsblk -i -n -o fstype $DISK_PATH`

echo "Checking if disk $DISK_PATH format $CURRENT_DISK_FORMAT matches desired $DISK_FORMAT..."

# If the disk has already been formatted previously (this will happen
# if this instance has been recreated with the same disk), we skip formatting
if [[ $CURRENT_DISK_FORMAT == $DISK_FORMAT ]]; then
  echo "Disk $DISK_PATH is correctly formatted as $DISK_FORMAT"
else
  echo "Disk $DISK_PATH is not formatted correctly, formatting as $DISK_FORMAT..."
  mkfs.ext4 -m 0 -F -E lazy_itable_init=0,lazy_journal_init=0,discard $DISK_PATH
fi

echo "Mounting $DISK_PATH onto $DATA_DIR"
mkdir -p $DATA_DIR
DISK_UUID=`blkid $DISK_PATH | cut -d \" -f 2`
echo "UUID=${DISK_UUID}     $DATA_DIR   auto    discard,defaults    0    0" >> /etc/fstab
mount $DATA_DIR

echo "Installing Docker..."
apt install -y apt-transport-https ca-certificates curl software-properties-common gnupg2
curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
apt update -y && apt upgrade -y
apt install -y docker-ce
systemctl start docker

echo "Configuring Docker..."
cat <<'EOF' > '/etc/docker/daemon.json'
{
  "log-driver": "json-file",
  "log-opts": {
    "max-size": "10m",
    "max-file": "3"
  }
}
EOF
systemctl restart docker
                                                                                                                                                                                                                                                                                                                                                                                                                      ./celo-proxy.service                                                                                0000664 0001750 0001750 00000000336 13625335166 013064  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    [Unit]
Description=Docker Container %N
Requires=docker.service
After=docker.service

[Service]
Restart=always
ExecStart=/usr/local/bin/celo-proxy-run %N
ExecStop=/usr/bin/docker rm -f %N

[Install]
WantedBy=default.target
                                                                                                                                                                                                                                                                                                  ./exporter-run                                                                                      0000775 0001750 0001750 00000000435 13625335166 012001  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -e

. /etc/default/celo

set -x

/usr/bin/docker run \
  --name $1 \
  --restart=always \
  -v $DATA_DIR:$DATA_DIR \
  --net=host \
  $GETH_EXPORTER_DOCKER_IMAGE \
  /usr/local/bin/geth_exporter \
    -ipc $DATA_DIR/geth.ipc \
    -filter "(.*overall|percentiles_95)"
                                                                                                                                                                                                                                   ./geth-exporter.service                                                                             0000664 0001750 0001750 00000000325 13625335166 013556  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    Description=Docker Container %N
Requires=docker.service
After=docker.service

[Service]
Restart=always
ExecStart=/usr/local/bin/exporter-run %N
ExecStop=/usr/bin/docker rm -f %N

[Install]
WantedBy=default.target
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           ')))]" - } - } - } - ] - }, - { - "name": "[variables('attesterVirtualMachineName')]", - "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('attesterDataDiskName')]", - "[variables('attesterNetworkInterfaceName')]", - "[variables('attesterUserAssignedIdentityName')]", - "[variables('attesterKeyVaultName')]", - "[variables('attesterDBName')]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[parameters('attesterVirtualMachineSize')]" - }, - "storageProfile": { - "osDisk": { - "createOption": "fromImage", - "managedDisk": { - "storageAccountType": "[parameters('osDiskType')]" - } - }, - "imageReference": "[variables('imageReference')]", - "dataDisks": [ - { - "lun": 0, - "createOption": "attach", - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', variables('attesterDataDiskName'))]" - } - } - ] - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('attesterNetworkInterfaceName'))]" - } - ] - }, - "osProfile": { - "computerName": "[variables('attesterVirtualMachineName')]", - "adminUsername": "[parameters('adminUsername')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "ssh": { - "publicKeys": [ - { - "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]", - "keyData": "[parameters('adminPublicKey')]" - } - ] - } - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": false - } - } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "[resourceId(resourceGroup().name, 'Microsoft.ManagedIdentity/userAssignedIdentities', variables('attesterUserAssignedIdentityName'))]": {} - } - }, - "resources": [ - { - "name": "attesterCustomScript", - "type": "extensions", - "location": "[resourceGroup().location]", - "apiVersion": "2019-03-01", - "dependsOn": [ - "[variables('attesterVirtualMachineName')]", - "[variables('proxyNetworkInterfaceName')]" - ], - "properties": { - "publisher": "Microsoft.Azure.Extensions", - "type": "CustomScript", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "protectedSettings": { - } - } - } - ] - }, - { - "name": "[variables('attesterVirtualMachineName')]", - "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('attesterDataDiskName')]", - "[variables('attesterNetworkInterfaceName')]", - "[variables('attesterUserAssignedIdentityName')]", - "[variables('attesterKeyVaultName')]", - "[variables('attesterDBName')]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[parameters('attesterVirtualMachineSize')]" - }, - "storageProfile": { - "osDisk": { - "createOption": "fromImage", - "managedDisk": { - "storageAccountType": "[parameters('osDiskType')]" - } - }, - "imageReference": "[variables('imageReference')]", - "dataDisks": [ - { - "lun": 0, - "createOption": "attach", - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', variables('attesterDataDiskName'))]" - } - } - ] - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('attesterNetworkInterfaceName'))]" - } - ] - }, - "osProfile": { - "computerName": "[variables('attesterVirtualMachineName')]", - "adminUsername": "[parameters('adminUsername')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "ssh": { - "publicKeys": [ - { - "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]", - "keyData": "[parameters('adminPublicKey')]" - } - ] - } - } - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": false - } - } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "[resourceId(resourceGroup().name, 'Microsoft.ManagedIdentity/userAssignedIdentities', variables('attesterUserAssignedIdentityName'))]": {} - } - }, - "resources": [ - { - "name": "attesterCustomScript", - "type": "extensions", - "location": "[resourceGroup().location]", - "apiVersion": "2019-03-01", - "dependsOn": [ - "[variables('attesterVirtualMachineName')]", - "[variables('proxyNetworkInterfaceName')]" - ], - "properties": { - "publisher": "Microsoft.Azure.Extensions", - "type": "CustomScript", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "protectedSettings": { - "script": "[base64(concat('echo \"', 'proxyInternalIpAddress=',reference(variables('proxyNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress,';','proxyExternalIpAddress=',reference(variables('proxyPublicIpAddressName')).ipAddress,';', 'validatorInternalIpAddress=',reference(variables('validatorNetworkInterfaceName')).ipConfigurations[0].properties.privateIPAddress,';', 'virtualNetworkName=', variables('virtualNetworkName'), ';','virtualNetworkId=', variables('virtualNetworkId'), ';','subnetId=', variables('subnetId'), ';','validatorKeyVaultName=', variables('validatorKeyVaultName'), ';','validatorPrivateKeyName=', variables('validatorPrivateKeyName'), ';','validatorDataDiskName=', variables('validatorDataDiskName'), ';','validatorVirtualMachineName=', variables('validatorVirtualMachineName'), ';','validatorNetworkInterfaceName=', variables('validatorNetworkInterfaceName'), ';','validatorNetworkSecurityGroupName=', variables('validatorNetworkSecurityGroupName'), ';','validatorUserAssignedIdentityName=', variables('validatorUserAssignedIdentityName'), ';','proxyKeyVaultName=', variables('proxyKeyVaultName'), ';','proxyPrivateKeyName=', variables('proxyPrivateKeyName'), ';','proxyPublicIpAddressName=', variables('proxyPublicIpAddressName'), ';','proxyNetworkSecurityGroupName=', variables('proxyNetworkSecurityGroupName'), ';','proxyDataDiskName=', variables('proxyDataDiskName'), ';','proxyVirtualMachineName=', variables('proxyVirtualMachineName'), ';','proxyNetworkInterfaceName=', variables('proxyNetworkInterfaceName'), ';','proxyUserAssignedIdentityName=', variables('proxyUserAssignedIdentityName'), ';','attesterKeyVaultName=', variables('attesterKeyVaultName'), ';','attesterPrivateKeyName=', variables('attesterPrivateKeyName'), ';','attesterTwilioAuthTokenName=', variables('attesterTwilioAuthTokenName'), ';','attesterPublicIpAddressName=', variables('attesterPublicIpAddressName'), ';','attesterNetworkSecurityGroupName=', variables('attesterNetworkSecurityGroupName'), ';','attesterVirtualMachineName=', variables('attesterVirtualMachineName'), ';','attesterNetworkInterfaceName=', variables('attesterNetworkInterfaceName'), ';','attesterUserAssignedIdentityName=', variables('attesterUserAssignedIdentityName'), ';','attesterDataDiskName=', variables('attesterDataDiskName'), ';','attesterDBName=', variables('attesterDBName'), ';','attesterPostgreSQLVersion=', variables('attesterPostgreSQLVersion'), ';', 'proxyName=', parameters('proxyName'), ';','validatorName=', parameters('validatorName'), ';','adminUsername=', parameters('adminUsername'), ';','attesterPostgreSQLUsername=', parameters('attesterPostgreSQLUsername'), ';','validatorAccountAddress=', parameters('validatorAccountAddress'), ';','proxyPublicKey=', parameters('proxyPublicKey'), ';','attesterAccountAddress=', parameters('attesterAccountAddress'), ';','attesterTwilioAccountSID=', parameters('attesterTwilioAccountSID'), ';','attesterTwilioMessageServiceSID=', parameters('attesterTwilioMessageServiceSID'), ';','bootnodes=', parameters('bootnodes'), ';','gethVerbosity=', parameters('gethVerbosity'), ';','celoEnv=', parameters('celoEnv'), ';','networkId=', parameters('networkId'), ';','gethNodeDockerImageRepository=', parameters('gethNodeDockerImageRepository'), ';','gethNodeDockerImageTag=', parameters('gethNodeDockerImageTag'), ';','gethExporterDockerImageRepository=', parameters('gethExporterDockerImageRepository'), ';','gethExporterDockerImageTag=', parameters('gethExporterDockerImageTag'), ';','attestationServiceDockerImageRepository=', parameters('attestationServiceDockerImageRepository'), ';','attestationServiceDockerImageTag=', parameters('attestationServiceDockerImageTag'), ';','blockTime=', parameters('blockTime'), ';','istanbulRequestTimeoutMs=', parameters('istanbulRequestTimeoutMs'), ';','proxyMaxPeers=', parameters('proxyMaxPeers'), ';','ethstatsHost=', parameters('ethstatsHost'), ';','location=', parameters('location'), ';','virtualNetworkAddressPrefix=', parameters('virtualNetworkAddressPrefix'), ';','defaultNetworkAddressPrefix=', parameters('defaultNetworkAddressPrefix'), ';','bastionNetworkAddressPrefix=', parameters('bastionNetworkAddressPrefix'), ';','validatorDiskSize=', parameters('validatorDiskSize'), ';','validatorVirtualMachineSize=', parameters('validatorVirtualMachineSize'), ';','proxyPublicIpAddressType=', parameters('proxyPublicIpAddressType'), ';','proxyPublicIpAddressSku=', parameters('proxyPublicIpAddressSku'), ';','proxyDiskSize=', parameters('proxyDiskSize'), ';','proxyVirtualMachineSize=', parameters('proxyVirtualMachineSize'), ';','attesterPublicIpAddressType=', parameters('attesterPublicIpAddressType'), ';','attesterPublicIpAddressSku=', parameters('attesterPublicIpAddressSku'), ';','attesterVirtualMachineSize=', parameters('attesterVirtualMachineSize'), ';','attesterDiskSize=', parameters('attesterDiskSize'), ';','osDiskType=', parameters('osDiskType'), ';', '\" > startup-env.sh;', base64ToString('archive=$(grep --text --line-number '__TARBALL__:$' $0 | cut -f1 -d:)
tail -n +$((archive + 1)) $0 | tar -xvf - > /dev/null
./startup.sh
exit 0
__TARBALL__:
./                                                                                                  0000775 0001750 0001750 00000000000 13627362311 007371  5                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    ./celo-node-run                                                                                     0000775 0001750 0001750 00000002046 13627362311 011770  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -e

. /etc/default/celo

SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm)
cleanup () {
    rm -rf ${SECRET_DIR}
}
trap cleanup EXIT

get_secret $ATTESTER_KEY_VAULT 'attesterPrivateKey' > ${SECRET_DIR}/attesterPrivateKey
generate_password > ${SECRET_DIR}/accountPassword

set -x

docker run \
  --rm \
  -v $DATA_DIR:$DATA_DIR \
  -v $SECRET_DIR:$SECRET_DIR \
  $GETH_NODE_DOCKER_IMAGE \
    account import \
    --keystore=${SECRET_DIR} \
    --password=${SECRET_DIR}/accountPassword \
    ${SECRET_DIR}/attesterPrivateKey

docker run \
  --name $1 \
  --restart=always \
  -p 8545:8545 \
  -v $DATA_DIR:$DATA_DIR \
  -v $SECRET_DIR:$SECRET_DIR \
  $GETH_NODE_DOCKER_IMAGE \
    --password=$SECRET_DIR/accountPassword \
    --keystore=${SECRET_DIR} \
    --unlock=$ATTESTER_ACCOUNT_ADDRESS \
    --bootnodes="$BOOTNODES" \
    --rpc \
    --rpcaddr 0.0.0.0 \
    --rpcapi=eth,net,web3,debug,admin \
    --networkid=${NETWORK_ID} \
    --syncmode=full \
    --consoleformat=json \
    --consoleoutput=stdout \
    --verbosity=${GETH_VERBOSITY}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ./celo-attestations-run                                                                             0000775 0001750 0001750 00000002322 13625335166 013570  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -e

. /etc/default/celo

SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm)
cleanup () {
    rm -rf ${SECRET_DIR}
}
trap cleanup EXIT

DB_PASSWORD=$(get_secret $ATTESTER_KEY_VAULT 'attesterPostgreSQLPassword')
DB_USERNAME=$ATTESTER_DB_USERNAME
DATABASE_URL="postgres://${DB_USERNAME}:${DB_PASSWORD}@${ATTESTER_DB_HOSTNAME}:5432/postgres"

CELO_PROVIDER=http://localhost:8545
TWILIO_AUTH_TOKEN=$(get_secret $ATTESTER_KEY_VAULT 'attesterTwilioAuthToken')

/usr/bin/docker run \
  --name $1 \
  --net=host \
  --entrypoint /bin/bash \
  -v $DATA_DIR:$DATA_DIR \
  -e NODE_ENV=production \
  -e PORT=80 \
  -e DATABASE_URL="$DATABASE_URL" \
  -e ATTESTATION_SIGNER_ADDRESS="$ATTESTER_ACCOUNT_ADDRESS" \
  -e CELO_VALIDATOR_ADDRESS="$VALIDATOR_ACCOUNT_ADDRESS" \
  -e CELO_PROVIDER="$CELO_PROVIDER" \
  -e SMS_PROVIDERS="$SMS_PROVIDERS" \
  -e TWILIO_ACCOUNT_SID="$ATTESTER_TWILIO_ACCOUNT_SID" \
  -e TWILIO_MESSAGING_SERVICE_SID="$ATTESTER_TWILIO_MESSAGE_SERVICE_SID" \
  -e TWILIO_AUTH_TOKEN="$TWILIO_AUTH_TOKEN" \
  -e TWILIO_BLACKLIST="$TWILIO_BLACKLIST" \
  $ATTESTATION_SERVICE_DOCKER_IMAGE -c "\
  ( \
      cd /celo-monorepo/packages/attestation-service && \
      yarn run db:migrate && \
      yarn start \
  )"
                                                                                                                                                                                                                                                                                                              ./libcelo.sh                                                                                        0000664 0001750 0001750 00000001135 13627362311 011336  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    get_secret () {
    local vault=$1
    local key=$2

    local token=$(curl -s 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://vault.azure.net' -H Metadata:true)
    local access_token=$(echo $token | jq -r '.access_token')
    local result=$(curl -s -H "Authorization: Bearer $access_token" https://${vault}.vault.azure.net/secrets/${key}?api-version=2016-10-01)
    echo $(echo $result | jq -r '.value')
}

generate_password() {
    # Generate 24 character long password using base64 characters.
    dd bs=18 count=1 if=/dev/urandom status=none | base64
}
                                                                                                                                                                                                                                                                                                                                                                                                                                   ./startup.sh                                                                                        0000775 0001750 0001750 00000001672 13625335166 011446  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    #!/bin/bash

set -x
set -e

. ./provider-init.sh
. /etc/default/celo

echo "Pulling geth..."
docker pull $GETH_NODE_DOCKER_IMAGE

# Load configuration to files
curl -o $DATA_DIR/genesis.json https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${CELO_ENV}?alt=media

echo "Starting geth..."
docker run \
  --rm \
  --net=host \
  -v $DATA_DIR:$DATA_DIR \
  --entrypoint /bin/sh \
  -i $GETH_NODE_DOCKER_IMAGE \
  -c "geth init $DATA_DIR/genesis.json"

cp celo-node-run /usr/local/bin
cp celo-node.service /etc/systemd/system/celo-node.service
systemctl daemon-reload
systemctl enable celo-node.service
systemctl restart celo-node.service

echo "Pulling attestation service..."
docker pull $ATTESTATION_SERVICE_DOCKER_IMAGE

cp celo-attestations-run /usr/local/bin
cp celo-attestations.service /etc/systemd/system/celo-attestations.service
systemctl daemon-reload
systemctl enable celo-attestations.service
systemctl restart celo-attestations.service
                                                                      ./celo-node.service                                                                                 0000664 0001750 0001750 00000000335 13625335166 012627  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    [Unit]
Description=Docker Container %N
Requires=docker.service
After=docker.service

[Service]
Restart=always
ExecStart=/usr/local/bin/celo-node-run %N
ExecStop=/usr/bin/docker rm -f %N

[Install]
WantedBy=default.target
                                                                                                                                                                                                                                                                                                   ./provider-init.sh                                                                                  0000664 0001750 0001750 00000006152 13625335166 012532  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    test -f startup-env.sh && source startup-env.sh
cat <<EOF >/etc/default/celo
DATA_DIR=/root/.celo
CELO_ENV=${celoEnv}
BOOTNODES=${bootnodes}
VALIDATOR_KEY_VAULT=${validatorKeyVaultName}
PROXY_KEY_VAULT=${proxyKeyVaultName}
ATTESTER_KEY_VAULT=${attesterKeyVaultName}
GETH_NODE_DOCKER_IMAGE=${gethNodeDockerImageRepository}:${gethNodeDockerImageTag}
GETH_EXPORTER_DOCKER_IMAGE=${gethExporterDockerImageRepository}:${gethExporterDockerImageTag}
ATTESTATION_SERVICE_DOCKER_IMAGE=${attestationServiceDockerImageRepository}:${attestationServiceDockerImageTag}
NETWORK_ID=${networkId}
GETH_VERBOSITY=${gethVerbosity}
VALIDATOR_NAME=${validatorName}
PROXY_NAME=${proxyName}
ETHSTATS_HOST=${ethstatsHost}
BLOCK_TIME=${blockTime}
ISTANBUL_REQUEST_TIMEOUT_MS=${istanbulRequestTimeoutMs}
PROXY_MAX_PEERS=${proxyMaxPeers}
VALIDATOR_MAX_PEERS=${proxyMaxPeers}
PROXY_EXTERNAL_IP_ADDRESS=${proxyExternalIpAddress}
PROXY_INTERNAL_IP_ADDRESS=${proxyInternalIpAddress}
VALIDATOR_INTERNAL_IP_ADDRESS=${validatorInternalIpAddress}
ATTESTER_ACCOUNT_ADDRESS=${attesterAccountAddress}
VALIDATOR_ACCOUNT_ADDRESS=${validatorAccountAddress}
PROXY_URL="enode://${proxyPublicKey}@${proxyInternalIpAddress}:30503;enode://${proxyPublicKey}@${proxyExternalIpAddress}:30303"
SMS_PROVIDERS=twilio
ATTESTER_TWILIO_ACCOUNT_SID=${attesterTwilioAccountSID}
ATTESTER_TWILIO_MESSAGE_SERVICE_SID=${attesterTwilioMessageServiceSID}
ATTESTER_DB_USERNAME="${attesterPostgreSQLUsername}@${attesterDBName}"
ATTESTER_DB_HOSTNAME="${attesterDBName}.postgres.database.azure.com"
EOF
cat ./libcelo.sh >> /etc/default/celo

. /etc/default/celo

apt update -y && apt upgrade -y

apt install -y \
    curl \
    jq

DISK_LUN=lun0
DISK_PATH=`readlink -f /dev/disk/azure/scsi1/${DISK_LUN}`

echo "Setting up persistent disk at $DISK_PATH..."

DISK_FORMAT=ext4
CURRENT_DISK_FORMAT=`lsblk -i -n -o fstype $DISK_PATH`

echo "Checking if disk $DISK_PATH format $CURRENT_DISK_FORMAT matches desired $DISK_FORMAT..."

# If the disk has already been formatted previously (this will happen
# if this instance has been recreated with the same disk), we skip formatting
if [[ $CURRENT_DISK_FORMAT == $DISK_FORMAT ]]; then
  echo "Disk $DISK_PATH is correctly formatted as $DISK_FORMAT"
else
  echo "Disk $DISK_PATH is not formatted correctly, formatting as $DISK_FORMAT..."
  mkfs.ext4 -m 0 -F -E lazy_itable_init=0,lazy_journal_init=0,discard $DISK_PATH
fi

echo "Mounting $DISK_PATH onto $DATA_DIR"
mkdir -p $DATA_DIR
DISK_UUID=`blkid $DISK_PATH | cut -d \" -f 2`
echo "UUID=${DISK_UUID}     $DATA_DIR   auto    discard,defaults    0    0" >> /etc/fstab
mount $DATA_DIR

echo "Installing Docker..."
apt install -y apt-transport-https ca-certificates curl software-properties-common gnupg2
curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
apt update -y && apt upgrade -y
apt install -y docker-ce
systemctl start docker

echo "Configuring Docker..."
cat <<'EOF' > '/etc/docker/daemon.json'
{
  "log-driver": "json-file",
  "log-opts": {
    "max-size": "10m",
    "max-file": "3"
  }
}
EOF
systemctl restart docker
                                                                                                                                                                                                                                                                                                                                                                                                                      ./celo-attestations.service                                                                         0000664 0001750 0001750 00000000400 13625335166 014415  0                                                                                                    ustar   sbw                             sbw                                                                                                                                                                                                                    [Unit]
Description=Docker Container %N
Requires=docker.service
Requires=celo-node.service
After=docker.service

[Service]
Restart=always
ExecStart=/usr/local/bin/celo-attestations-run %N
ExecStop=/usr/bin/docker rm -f %N

[Install]
WantedBy=default.target
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ')))]" - } - } - } - ] - }, - { - "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "name": "[variables('validatorUserAssignedIdentityName')]", - "apiVersion": "2018-11-30", - "location": "[parameters('location')]", - "tags": {}, - "properties": {} - }, - { - "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "name": "[variables('proxyUserAssignedIdentityName')]", - "apiVersion": "2018-11-30", - "location": "[parameters('location')]", - "tags": {}, - "properties": {} - }, - { - "type": "Microsoft.ManagedIdentity/userAssignedIdentities", - "name": "[variables('attesterUserAssignedIdentityName')]", - "apiVersion": "2018-11-30", - "location": "[parameters('location')]", - "tags": {}, - "properties": {} - }, - { - "apiVersion": "2018-02-14", - "name": "[variables('validatorKeyVaultName')]", - "location": "[parameters('location')]", - "type": "Microsoft.KeyVault/vaults", - "properties": { - "enabledForDeployment": true, - "enabledForTemplateDeployment": true, - "enabledForDiskEncryption": false, - "enableRbacAuthorization": false, - "accessPolicies": [ - { - "objectId": "[reference(concat('Microsoft.ManagedIdentity/userAssignedIdentities/', variables('validatorUserAssignedIdentityName')), '2018-11-30', 'Full').properties.principalId]", - "tenantId": "[subscription().tenantId]", - "permissions": { - "keys": [], - "secrets": [ - "Get" - ], - "certificates": [] - } - } - ], - "tenantId": "[subscription().tenantId]", - "sku": { - "name": "Standard", - "family": "A" - }, - "networkAcls": { - "defaultAction": "allow", - "bypass": "AzureServices", - "ipRules": [], - "virtualNetworkRules": [] - } - }, - "tags": {}, - "dependsOn": [ - "[variables('validatorUserAssignedIdentityName')]" - ] - }, - { - "apiVersion": "2018-02-14", - "name": "[variables('proxyKeyVaultName')]", - "location": "[parameters('location')]", - "type": "Microsoft.KeyVault/vaults", - "properties": { - "enabledForDeployment": true, - "enabledForTemplateDeployment": true, - "enabledForDiskEncryption": false, - "enableRbacAuthorization": false, - "accessPolicies": [ - { - "objectId": "[reference(concat('Microsoft.ManagedIdentity/userAssignedIdentities/', variables('proxyUserAssignedIdentityName')), '2018-11-30', 'Full').properties.principalId]", - "tenantId": "[subscription().tenantId]", - "permissions": { - "keys": [], - "secrets": [ - "Get" - ], - "certificates": [] - } - } - ], - "tenantId": "[subscription().tenantId]", - "sku": { - "name": "Standard", - "family": "A" - }, - "networkAcls": { - "defaultAction": "allow", - "bypass": "AzureServices", - "ipRules": [], - "virtualNetworkRules": [] - } - }, - "tags": {}, - "dependsOn": [ - "[variables('proxyUserAssignedIdentityName')]" - ] - }, - { - "apiVersion": "2018-02-14", - "name": "[variables('attesterKeyVaultName')]", - "location": "[parameters('location')]", - "type": "Microsoft.KeyVault/vaults", - "properties": { - "enabledForDeployment": true, - "enabledForTemplateDeployment": true, - "enabledForDiskEncryption": false, - "enableRbacAuthorization": false, - "accessPolicies": [ - { - "objectId": "[reference(concat('Microsoft.ManagedIdentity/userAssignedIdentities/', variables('attesterUserAssignedIdentityName')), '2018-11-30', 'Full').properties.principalId]", - "tenantId": "[subscription().tenantId]", - "permissions": { - "keys": [], - "secrets": [ - "Get" - ], - "certificates": [] - } - } - ], - "tenantId": "[subscription().tenantId]", - "sku": { - "name": "Standard", - "family": "A" - }, - "networkAcls": { - "defaultAction": "allow", - "bypass": "AzureServices", - "ipRules": [], - "virtualNetworkRules": [] - } - }, - "tags": {}, - "dependsOn": [ - "[variables('attesterUserAssignedIdentityName')]" - ] - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": "[concat(variables('proxyKeyVaultName'), '/', variables('proxyPrivateKeyName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('proxyKeyVaultName')]" - ], - "properties": { - "value": "[parameters('proxyPrivateKey')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": "[concat(variables('validatorKeyVaultName'), '/', variables('validatorPrivateKeyName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('validatorKeyVaultName')]" - ], - "properties": { - "value": "[parameters('validatorPrivateKey')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": "[concat(variables('attesterKeyVaultName'), '/attesterPostgreSQLPassword')]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('attesterKeyVaultName')]" - ], - "properties": { - "value": "[parameters('attesterPostgreSQLPassword')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": "[concat(variables('attesterKeyVaultName'), '/', variables('attesterPrivateKeyName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('attesterKeyVaultName')]" - ], - "properties": { - "value": "[parameters('attesterPrivateKey')]" - } - }, - { - "type": "Microsoft.KeyVault/vaults/secrets", - "name": "[concat(variables('attesterKeyVaultName'), '/', variables('attesterTwilioAuthTokenName'))]", - "apiVersion": "2018-02-14", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('attesterKeyVaultName')]" - ], - "properties": { - "value": "[parameters('attesterTwilioAuthToken')]" - } - }, - { - "type": "Microsoft.Network/virtualNetworks", - "apiVersion": "2019-09-01", - "name": "[variables('virtualNetworkName')]", - "location": "[parameters('location')]", - "properties": { - "addressSpace": { - "addressPrefixes": [ - "[parameters('virtualNetworkAddressPrefix')]" - ] - }, - "subnets": [ - { - "name": "default", - "properties": { - "addressPrefix": "[parameters('defaultNetworkAddressPrefix')]", - "serviceEndpoints": [ - { - "service": "Microsoft.Sql", - "locations": [ - "[parameters('location')]" - ] - } - ], - "delegations": [], - "privateEndpointNetworkPolicies": "Enabled", - "privateLinkServiceNetworkPolicies": "Enabled" - } - }, - { - "name": "AzureBastionSubnet", - "properties": { - "addressPrefix": "[parameters('bastionNetworkAddressPrefix')]", - "delegations": [], - "privateEndpointNetworkPolicies": "Enabled", - "privateLinkServiceNetworkPolicies": "Enabled" - } - } - ], - "virtualNetworkPeerings": [], - "enableDdosProtection": false, - "enableVmProtection": false - } - }, - { - "name": "[variables('proxyPublicIpAddressName')]", - "type": "Microsoft.Network/publicIpAddresses", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "publicIpAllocationMethod": "[parameters('proxyPublicIpAddressType')]" - }, - "sku": { - "name": "[parameters('proxyPublicIpAddressSku')]" - } - }, - { - "name": "[variables('attesterPublicIpAddressName')]", - "type": "Microsoft.Network/publicIpAddresses", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "publicIpAllocationMethod": "[parameters('attesterPublicIpAddressType')]" - }, - "sku": { - "name": "[parameters('attesterPublicIpAddressSku')]" - } - }, - { - "name": "[variables('validatorNetworkSecurityGroupName')]", - "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "securityRules": [ - { - "name": "SSH", - "properties": { - "priority": 300, - "protocol": "TCP", - "access": "Deny", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "22" - } - } - ] - } - }, - { - "name": "[variables('proxyNetworkSecurityGroupName')]", - "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "securityRules": [ - { - "name": "SSH", - "properties": { - "priority": 300, - "protocol": "TCP", - "access": "Deny", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "22" - } - }, - { - "name": "ProxyTcpExternal", - "properties": { - "protocol": "*", - "sourcePortRange": "*", - "destinationPortRange": "30303", - "sourceAddressPrefix": "*", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 100, - "direction": "Inbound", - "sourcePortRanges": [], - "destinationPortRanges": [], - "sourceAddressPrefixes": [], - "destinationAddressPrefixes": [] - } - }, - { - "name": "ProxyTcpInternal", - "properties": { - "protocol": "Tcp", - "sourcePortRange": "*", - "destinationPortRange": "30503", - "sourceAddressPrefix": "[parameters('virtualNetworkAddressPrefix')]", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 101, - "direction": "Inbound", - "sourcePortRanges": [], - "destinationPortRanges": [], - "sourceAddressPrefixes": [], - "destinationAddressPrefixes": [] - } - } - ] - } - }, - { - "name": "[variables('attesterNetworkSecurityGroupName')]", - "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2019-02-01", - "location": "[parameters('location')]", - "properties": { - "securityRules": [ - { - "name": "SSH", - "properties": { - "priority": 300, - "protocol": "TCP", - "access": "Deny", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "22" - } - }, - { - "name": "AttesterNodeAllExternal", - "properties": { - "protocol": "*", - "sourcePortRange": "*", - "destinationPortRange": "30303", - "sourceAddressPrefix": "*", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 100, - "direction": "Inbound", - "sourcePortRanges": [], - "destinationPortRanges": [], - "sourceAddressPrefixes": [], - "destinationAddressPrefixes": [] - } - }, - { - "name": "HTTP", - "properties": { - "priority": 200, - "protocol": "TCP", - "access": "Allow", - "direction": "Inbound", - "sourceAddressPrefix": "*", - "sourcePortRange": "*", - "destinationAddressPrefix": "*", - "destinationPortRange": "80" - } - } - ] - } - }, - { - "name": "[variables('validatorNetworkInterfaceName')]", - "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('validatorNetworkSecurityGroupName')]" - ], - "properties": { - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "subnet": { - "id": "[variables('subnetId')]" - }, - "privateIPAllocationMethod": "Dynamic" - } - } - ], - "networkSecurityGroup": { - "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('validatorNetworkSecurityGroupName'))]" - } - } - }, - { - "name": "[variables('proxyNetworkInterfaceName')]", - "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[concat('Microsoft.Network/networkSecurityGroups/', variables('proxyNetworkSecurityGroupName'))]", - "[concat('Microsoft.Network/publicIpAddresses/', variables('proxyPublicIpAddressName'))]" - ], - "properties": { - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "subnet": { - "id": "[variables('subnetId')]" - }, - "privateIPAllocationMethod": "Dynamic", - "publicIpAddress": { - "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', variables('proxyPublicIpAddressName'))]" - } - } - } - ], - "networkSecurityGroup": { - "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('proxyNetworkSecurityGroupName'))]" - } - } - }, - { - "name": "[variables('attesterNetworkInterfaceName')]", - "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2019-07-01", - "location": "[parameters('location')]", - "dependsOn": [ - "[concat('Microsoft.Network/networkSecurityGroups/', variables('attesterNetworkSecurityGroupName'))]", - "[concat('Microsoft.Network/publicIpAddresses/', variables('attesterPublicIpAddressName'))]" - ], - "properties": { - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "subnet": { - "id": "[variables('subnetId')]" - }, - "privateIPAllocationMethod": "Dynamic", - "publicIpAddress": { - "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', variables('attesterPublicIpAddressName'))]" - } - } - } - ], - "networkSecurityGroup": { - "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('attesterNetworkSecurityGroupName'))]" - } - } - }, - { - "name": "[variables('attesterDBName')]", - "type": "Microsoft.DBforPostgreSQL/servers", - "apiVersion": "2017-12-01", - "location": "[parameters('location')]", - "sku": "[variables('attesterPostgreSQLSku')]", - "properties": { - "version": "[variables('attesterPostgreSQLVersion')]", - "sslEnforcement": "Disabled", - "administratorLogin": "[parameters('attesterPostgreSQLUsername')]", - "administratorLoginPassword": "[parameters('attesterPostgreSQLPassword')]", - "storageProfile": "[variables('attesterPostgreSQLStorageProfile')]" - }, - "resources": [ - { - "name": "[concat(variables('attesterDBName'), '/config')]", - "dependsOn": [ - "[variables('attesterDBName')]" - ], - "type": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules", - "apiVersion": "2017-12-01", - "properties": { - "virtualNetworkSubnetId": "[variables('subnetId')]" - } - } - ] - } - ], - "parameters": { - "proxyName": { - "type": "string", - "metadata": { - "description": "The proxy name for ethstats" - } - }, - "validatorName": { - "type": "string", - "metadata": { - "description": "The validator name for ethstats" - } - }, - "adminUsername": { - "type": "string", - "metadata": { - "description": "Admin username for SSH access" - } - }, - "adminPublicKey": { - "type": "secureString", - "metadata": { - "description": "Admin public key for SSH access" - } - }, - "attesterPostgreSQLUsername": { - "type": "string", - "metadata": { - "description": "Admin username for Attester PostgreSQL server" - } - }, - "attesterPostgreSQLPassword": { - "type": "secureString", - "metadata": { - "description": "Admin password for Attester PostgreSQL server" - } - }, - "validatorAccountAddress": { - "type": "string", - "metadata": { - "description": "Authorized validator signer etherbase account address" - } - }, - "proxyPublicKey": { - "type": "string", - "metadata": { - "description": "Proxy enode public key" - } - }, - "proxyPrivateKey": { - "type": "secureString", - "metadata": { - "description": "Proxy etherbase account private key" - } - }, - "validatorPrivateKey": { - "type": "secureString", - "metadata": { - "description": "Authorized validator signer etherbase account private key" - } - }, - "attesterAccountAddress": { - "type": "string", - "metadata": { - "description": "Attester account address" - } - }, - "attesterPrivateKey": { - "type": "secureString", - "metadata": { - "description": "Attester account private key" - } - }, - "attesterTwilioAccountSID": { - "type": "string", - "metadata": { - "description": "Attester Twilio account SID" - } - }, - "attesterTwilioAuthToken": { - "type": "secureString", - "metadata": { - "description": "Attester Twilio authentication token" - } - }, - "attesterTwilioMessageServiceSID": { - "type": "string", - "metadata": { - "description": "Attester Twilio message service SID" - } - }, - "bootnodes": { - "type": "string", - "defaultValue": "enode://5aaf10664b12431c250597e980aacd7d5373cae00f128be5b00364344bb96bce7555b50973664bddebd1cb7a6d3fb927bec81527f80e22a26fa373c375fcdefc@34.82.45.71:30301", - "metadata": { - "description": "geth --bootnodes argument" - } - }, - "gethVerbosity": { - "type": "int", - "defaultValue": 3, - "metadata": { - "description": "geth --verbosity argument" - } - }, - "celoEnv": { - "type": "string", - "defaultValue": "baklava", - "metadata": { - "description": "Celo network environment name" - } - }, - "networkId": { - "type": "string", - "defaultValue": "200110", - "metadata": { - "description": "Numeric Celo network ID" - } - }, - "gethNodeDockerImageRepository": { - "type": "string", - "defaultValue": "us.gcr.io/celo-testnet/celo-node", - "metadata": { - "description": "Celo geth Docker image repository" - } - }, - "gethNodeDockerImageTag": { - "type": "string", - "defaultValue": "[parameters('celoEnv')]", - "metadata": { - "description": "Celo geth Docker image tag" - } - }, - "gethExporterDockerImageRepository": { - "type": "string", - "defaultValue": "gcr.io/celo-testnet-production/geth-exporter", - "metadata": { - "description": "Celo geth-exporter Docker image repository" - } - }, - "gethExporterDockerImageTag": { - "type": "string", - "defaultValue": "ed7d21bd50592709173368cd697ef73c1774a261", - "metadata": { - "description": "Celo geth-exporter Docker image tag" - } - }, - "attestationServiceDockerImageRepository": { - "type": "string", - "defaultValue": "us.gcr.io/celo-testnet/celo-monorepo", - "metadata": { - "description": "Celo attestation service Docker image repository" - } - }, - "attestationServiceDockerImageTag": { - "type": "string", - "defaultValue": "[concat('attestation-service-', parameters('celoEnv'))]", - "metadata": { - "description": "Celo attestation service Docker image tag" - } - }, - "blockTime": { - "type": "int", - "defaultValue": 5, - "metadata": { - "description": "The ethereum network block time" - } - }, - "istanbulRequestTimeoutMs": { - "type": "int", - "defaultValue": 10000, - "metadata": { - "description": "The ethereum request timeout" - } - }, - "proxyMaxPeers": { - "type": "int", - "defaultValue": 120, - "metadata": { - "description": "Max number of peers to connect with" - } - }, - "ethstatsHost": { - "type": "string", - "defaultValue": "[concat(parameters('celoEnv'), '-ethstats.celo-testnet.org')]", - "metadata": { - "description": "Ethstats host to report data" - } - }, - "location": { - "type": "string", - "defaultValue": "[resourceGroup().location]", - "metadata": { - "description": "Location for all resources." - } - }, - "virtualNetworkAddressPrefix": { - "type": "string", - "defaultValue": "10.0.0.0/16", - "metadata": { - "description": "Virtual Network Address prefix" - } - }, - "defaultNetworkAddressPrefix": { - "type": "string", - "defaultValue": "10.0.1.0/24", - "metadata": { - "description": "Default Virtual Network Address prefix" - } - }, - "bastionNetworkAddressPrefix": { - "type": "string", - "defaultValue": "10.0.0.0/24", - "metadata": { - "description": "Bastion Virtual Network Address prefix" - } - }, - "validatorDiskSize": { - "type": "int", - "defaultValue": 1024, - "metadata": { - "description": "Validator data disk size in gigabytes" - } - }, - "validatorVirtualMachineSize": { - "type": "string", - "defaultValue": "Standard_D2s_v3", - "metadata": { - "description": "Validator Virtual Machine size" - } - }, - "proxyPublicIpAddressType": { - "type": "string", - "defaultValue": "Static", - "metadata": { - "description": "Public IP Address type" - } - }, - "proxyPublicIpAddressSku": { - "type": "string", - "defaultValue": "Basic", - "metadata": { - "description": "Public IP Address SKU" - } - }, - "proxyDiskSize": { - "type": "int", - "defaultValue": 1024, - "metadata": { - "description": "Validator data disk size in gigabytes" - } - }, - "proxyVirtualMachineSize": { - "type": "string", - "defaultValue": "Standard_D2s_v3", - "metadata": { - "description": "Proxy Virtual Machine size" - } - }, - "attesterPublicIpAddressType": { - "type": "string", - "defaultValue": "Static", - "metadata": { - "description": "Public IP Address type" - } - }, - "attesterPublicIpAddressSku": { - "type": "string", - "defaultValue": "Basic", - "metadata": { - "description": "Public IP Address SKU" - } - }, - "attesterVirtualMachineSize": { - "type": "string", - "defaultValue": "Standard_D2s_v3", - "metadata": { - "description": "Attester Virtual Machine size" - } - }, - "attesterDiskSize": { - "type": "int", - "defaultValue": 1024, - "metadata": { - "description": "Attester data disk size in gigabytes" - } - }, - "osDiskType": { - "type": "string", - "defaultValue": "Standard_LRS", - "metadata": { - "description": "OS Disk Type for every Virtual Machine" - } - } - }, - "variables": { - "virtualNetworkName": "[concat(deployment().name, '-', 'virtualNetwork')]", - "virtualNetworkId": "[resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]", - "subnetId": "[concat(variables('virtualNetworkId'), '/subnets/default')]", - "validatorKeyVaultName": "[concat('validator-', celo.globalName('keyvault'))]", - "validatorPrivateKeyName": "validatorPrivateKey", - "validatorDataDiskName": "validatorDataDisk", - "validatorVirtualMachineName": "validatorVirtualMachine", - "validatorNetworkInterfaceName": "validatorNetworkInterface", - "validatorNetworkSecurityGroupName": "validatorNetworkSecurityGroup", - "validatorUserAssignedIdentityName": "[concat(deployment().name, '-validatorUserAssignedIdentity')]", - "proxyKeyVaultName": "[concat('proxy-', celo.globalName('keyvault'))]", - "proxyPrivateKeyName": "proxyPrivateKey", - "proxyPublicIpAddressName": "proxyPublicIpAddress", - "proxyNetworkSecurityGroupName": "proxyNetworkSecurityGroup", - "proxyDataDiskName": "proxyDataDisk", - "proxyVirtualMachineName": "proxyVirtualMachine", - "proxyNetworkInterfaceName": "proxyNetworkInterface", - "proxyUserAssignedIdentityName": "[concat(deployment().name, '-proxyUserAssignedIdentity')]", - "attesterKeyVaultName": "[concat('attester-', celo.globalName('keyvault'))]", - "attesterPrivateKeyName": "attesterPrivateKey", - "attesterTwilioAuthTokenName": "attesterTwilioAuthToken", - "attesterPublicIpAddressName": "attesterPublicIpAddress", - "attesterNetworkSecurityGroupName": "attesterNetworkSecurityGroup", - "attesterVirtualMachineName": "attesterVirtualMachine", - "attesterNetworkInterfaceName": "attesterNetworkInterface", - "attesterUserAssignedIdentityName": "[concat(deployment().name, '-attesterUserAssignedIdentity')]", - "attesterDataDiskName": "attesterDataDisk", - "attesterDBName": "[concat('attester-', celo.globalName('postgresql'))]", - "attesterPostgreSQLVersion": "9.6", - "attesterPostgreSQLStorageProfile": { - "storageMB": 51200, - "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "storageAutoGrow": "Enabled" - }, - "attesterPostgreSQLSku": { - "name": "GP_Gen5_4", - "tier": "GeneralPurpose", - "capacity": 4, - "size": 51200, - "family": "Gen5" - }, - "imageReference": { - "publisher": "credativ", - "offer": "Debian", - "sku": "9-backports", - "version": "latest" - } - }, - "functions": [ - { - "namespace": "celo", - "members": { - "globalName": { - "parameters": [ - { - "name": "name", - "type": "string" - } - ], - "output": { - "type": "string", - "value": "[uniqueString(subscription().subscriptionId, resourceGroup().name, parameters('name'))]" - } - } - } - } - ] -} \ No newline at end of file diff --git a/packages/azure/package-lock.json b/packages/azure/package-lock.json deleted file mode 100644 index d7d7b4822a8..00000000000 --- a/packages/azure/package-lock.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "celo-azure-build", - "version": "0.0.1", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" - }, - "mustache": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.0.tgz", - "integrity": "sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==" - } - } -} diff --git a/packages/azure/package.json b/packages/azure/package.json deleted file mode 100644 index 44a3b1286ce..00000000000 --- a/packages/azure/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "celo-azure-build", - "version": "0.0.1", - "description": "", - "main": "index.js", - "scripts": { - "build-sh": "rm -rf build && mkdir -p build && ./build-sh validator && ./build-sh proxy && ./build-sh attester", - "build-json": "npm run build-sh && node build-json.js components/ > mainTemplate.json", - "build-docs": "node build-docs.js > README.md", - "build-app": "zip app.zip createUiDefinition.json mainTemplate.json", - "test": "exit 0" - }, - "keywords": [], - "author": "", - "license": "Apache-2.0", - "dependencies": { - "deepmerge": "^4.2.2", - "mustache": "^4.0.0" - } -} diff --git a/packages/azure/proxy/celo-proxy-run b/packages/azure/proxy/celo-proxy-run deleted file mode 100755 index 6e7b1ed4ce5..00000000000 --- a/packages/azure/proxy/celo-proxy-run +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -set -e - -. /etc/default/celo - -SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm) -cleanup () { - rm -rf ${SECRET_DIR} -} -trap cleanup EXIT - -get_secret $PROXY_KEY_VAULT 'proxyPrivateKey' > ${SECRET_DIR}/pkey - -set -x -/usr/bin/docker run \ - --name $1 \ - --restart=always \ - --net=host \ - -v $DATA_DIR:$DATA_DIR \ - -v $SECRET_DIR:$SECRET_DIR \ - --entrypoint /bin/sh \ - $GETH_NODE_DOCKER_IMAGE -c "\ - geth \ - --bootnodes=${BOOTNODES} \ - --rpc \ - --rpcaddr 0.0.0.0 \ - --rpcapi=eth,net,web3 \ - --rpccorsdomain='*' \ - --rpcvhosts=* \ - --ws \ - --wsaddr 0.0.0.0 \ - --wsorigins=* \ - --wsapi=eth,net,web3 \ - --nodekey=${SECRET_DIR}/pkey \ - --networkid=${NETWORK_ID} \ - --syncmode=full \ - --consoleformat=json \ - --consoleoutput=stdout \ - --verbosity=${GETH_VERBOSITY} \ - --ethstats=${PROXY_NAME}@${ETHSTATS_HOST} \ - --maxpeers=${PROXY_MAX_PEERS} \ - --nat=extip:${PROXY_EXTERNAL_IP_ADDRESS} \ - --metrics \ - --proxy.proxy \ - --proxy.proxiedvalidatoraddress ${VALIDATOR_ACCOUNT_ADDRESS} \ - --proxy.internalendpoint :30503 \ -" diff --git a/packages/azure/proxy/celo-proxy.service b/packages/azure/proxy/celo-proxy.service deleted file mode 100644 index f0950b2bf7c..00000000000 --- a/packages/azure/proxy/celo-proxy.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Docker Container %N -Requires=docker.service -After=docker.service - -[Service] -Restart=always -ExecStart=/usr/local/bin/celo-proxy-run %N -ExecStop=/usr/bin/docker rm -f %N - -[Install] -WantedBy=default.target diff --git a/packages/azure/proxy/exporter-run b/packages/azure/proxy/exporter-run deleted file mode 120000 index ae25221d3d5..00000000000 --- a/packages/azure/proxy/exporter-run +++ /dev/null @@ -1 +0,0 @@ -../scripts/exporter-run \ No newline at end of file diff --git a/packages/azure/proxy/geth-exporter.service b/packages/azure/proxy/geth-exporter.service deleted file mode 120000 index 645f11bc10f..00000000000 --- a/packages/azure/proxy/geth-exporter.service +++ /dev/null @@ -1 +0,0 @@ -../scripts/geth-exporter.service \ No newline at end of file diff --git a/packages/azure/proxy/libcelo.sh b/packages/azure/proxy/libcelo.sh deleted file mode 120000 index eab76afc76e..00000000000 --- a/packages/azure/proxy/libcelo.sh +++ /dev/null @@ -1 +0,0 @@ -../scripts/libcelo.sh \ No newline at end of file diff --git a/packages/azure/proxy/provider-init.sh b/packages/azure/proxy/provider-init.sh deleted file mode 120000 index f25ad9e735d..00000000000 --- a/packages/azure/proxy/provider-init.sh +++ /dev/null @@ -1 +0,0 @@ -../scripts/provider-init.sh \ No newline at end of file diff --git a/packages/azure/proxy/startup.sh b/packages/azure/proxy/startup.sh deleted file mode 100755 index f17270106cb..00000000000 --- a/packages/azure/proxy/startup.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -x -set -e - -. ./provider-init.sh -. /etc/default/celo - -echo "Pulling geth..." -docker pull $GETH_NODE_DOCKER_IMAGE - -# Load configuration to files -curl -o $DATA_DIR/genesis.json https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${CELO_ENV}?alt=media - -echo "Starting geth..." -docker run \ - --rm \ - --net=host \ - -v $DATA_DIR:$DATA_DIR \ - --entrypoint /bin/sh \ - -i $GETH_NODE_DOCKER_IMAGE \ - -c "geth init $DATA_DIR/genesis.json" - -cp celo-proxy-run /usr/local/bin -cp celo-proxy.service /etc/systemd/system/celo-proxy.service -systemctl daemon-reload -systemctl enable celo-proxy.service -systemctl restart celo-proxy.service - -echo "Pulling geth exporter..." -docker pull $GETH_EXPORTER_DOCKER_IMAGE - -cp exporter-run /usr/local/bin -cp geth-exporter.service /etc/systemd/system/geth-exporter.service -systemctl daemon-reload -systemctl enable geth-exporter.service -systemctl restart geth-exporter.service diff --git a/packages/azure/scripts/exporter-run b/packages/azure/scripts/exporter-run deleted file mode 100755 index 43de08f79ca..00000000000 --- a/packages/azure/scripts/exporter-run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -e - -. /etc/default/celo - -set -x - -/usr/bin/docker run \ - --name $1 \ - --restart=always \ - -v $DATA_DIR:$DATA_DIR \ - --net=host \ - $GETH_EXPORTER_DOCKER_IMAGE \ - /usr/local/bin/geth_exporter \ - -ipc $DATA_DIR/geth.ipc \ - -filter "(.*overall|percentiles_95)" diff --git a/packages/azure/scripts/geth-exporter.service b/packages/azure/scripts/geth-exporter.service deleted file mode 100644 index 987ca907419..00000000000 --- a/packages/azure/scripts/geth-exporter.service +++ /dev/null @@ -1,11 +0,0 @@ -Description=Docker Container %N -Requires=docker.service -After=docker.service - -[Service] -Restart=always -ExecStart=/usr/local/bin/exporter-run %N -ExecStop=/usr/bin/docker rm -f %N - -[Install] -WantedBy=default.target diff --git a/packages/azure/scripts/libcelo.sh b/packages/azure/scripts/libcelo.sh deleted file mode 100644 index 3240006aa08..00000000000 --- a/packages/azure/scripts/libcelo.sh +++ /dev/null @@ -1,14 +0,0 @@ -get_secret () { - local vault=$1 - local key=$2 - - local token=$(curl -s 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://vault.azure.net' -H Metadata:true) - local access_token=$(echo $token | jq -r '.access_token') - local result=$(curl -s -H "Authorization: Bearer $access_token" https://${vault}.vault.azure.net/secrets/${key}?api-version=2016-10-01) - echo $(echo $result | jq -r '.value') -} - -generate_password() { - # Generate 24 character long password using base64 characters. - dd bs=18 count=1 if=/dev/urandom status=none | base64 -} diff --git a/packages/azure/scripts/provider-init.sh b/packages/azure/scripts/provider-init.sh deleted file mode 100644 index bd0332fd109..00000000000 --- a/packages/azure/scripts/provider-init.sh +++ /dev/null @@ -1,87 +0,0 @@ -test -f startup-env.sh && source startup-env.sh -cat </etc/default/celo -DATA_DIR=/root/.celo -CELO_ENV=${celoEnv} -BOOTNODES=${bootnodes} -VALIDATOR_KEY_VAULT=${validatorKeyVaultName} -PROXY_KEY_VAULT=${proxyKeyVaultName} -ATTESTER_KEY_VAULT=${attesterKeyVaultName} -GETH_NODE_DOCKER_IMAGE=${gethNodeDockerImageRepository}:${gethNodeDockerImageTag} -GETH_EXPORTER_DOCKER_IMAGE=${gethExporterDockerImageRepository}:${gethExporterDockerImageTag} -ATTESTATION_SERVICE_DOCKER_IMAGE=${attestationServiceDockerImageRepository}:${attestationServiceDockerImageTag} -NETWORK_ID=${networkId} -GETH_VERBOSITY=${gethVerbosity} -VALIDATOR_NAME=${validatorName} -PROXY_NAME=${proxyName} -ETHSTATS_HOST=${ethstatsHost} -BLOCK_TIME=${blockTime} -ISTANBUL_REQUEST_TIMEOUT_MS=${istanbulRequestTimeoutMs} -PROXY_MAX_PEERS=${proxyMaxPeers} -VALIDATOR_MAX_PEERS=${proxyMaxPeers} -PROXY_EXTERNAL_IP_ADDRESS=${proxyExternalIpAddress} -PROXY_INTERNAL_IP_ADDRESS=${proxyInternalIpAddress} -VALIDATOR_INTERNAL_IP_ADDRESS=${validatorInternalIpAddress} -ATTESTER_ACCOUNT_ADDRESS=${attesterAccountAddress} -VALIDATOR_ACCOUNT_ADDRESS=${validatorAccountAddress} -PROXY_URL="enode://${proxyPublicKey}@${proxyInternalIpAddress}:30503;enode://${proxyPublicKey}@${proxyExternalIpAddress}:30303" -SMS_PROVIDERS=twilio -ATTESTER_TWILIO_ACCOUNT_SID=${attesterTwilioAccountSID} -ATTESTER_TWILIO_MESSAGE_SERVICE_SID=${attesterTwilioMessageServiceSID} -ATTESTER_TWILIO_VERIFY_SERVICE_SID=${attesterTwilioVerifyServiceSID} -ATTESTER_DB_USERNAME="${attesterPostgreSQLUsername}@${attesterDBName}" -ATTESTER_DB_HOSTNAME="${attesterDBName}.postgres.database.azure.com" -EOF -cat ./libcelo.sh >> /etc/default/celo - -. /etc/default/celo - -apt update -y && apt upgrade -y - -apt install -y \ - curl \ - jq - -DISK_LUN=lun0 -DISK_PATH=`readlink -f /dev/disk/azure/scsi1/${DISK_LUN}` - -echo "Setting up persistent disk at $DISK_PATH..." - -DISK_FORMAT=ext4 -CURRENT_DISK_FORMAT=`lsblk -i -n -o fstype $DISK_PATH` - -echo "Checking if disk $DISK_PATH format $CURRENT_DISK_FORMAT matches desired $DISK_FORMAT..." - -# If the disk has already been formatted previously (this will happen -# if this instance has been recreated with the same disk), we skip formatting -if [[ $CURRENT_DISK_FORMAT == $DISK_FORMAT ]]; then - echo "Disk $DISK_PATH is correctly formatted as $DISK_FORMAT" -else - echo "Disk $DISK_PATH is not formatted correctly, formatting as $DISK_FORMAT..." - mkfs.ext4 -m 0 -F -E lazy_itable_init=0,lazy_journal_init=0,discard $DISK_PATH -fi - -echo "Mounting $DISK_PATH onto $DATA_DIR" -mkdir -p $DATA_DIR -DISK_UUID=`blkid $DISK_PATH | cut -d \" -f 2` -echo "UUID=${DISK_UUID} $DATA_DIR auto discard,defaults 0 0" >> /etc/fstab -mount $DATA_DIR - -echo "Installing Docker..." -apt install -y apt-transport-https ca-certificates curl software-properties-common gnupg2 -curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - -add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" -apt update -y && apt upgrade -y -apt install -y docker-ce -systemctl start docker - -echo "Configuring Docker..." -cat <<'EOF' > '/etc/docker/daemon.json' -{ - "log-driver": "json-file", - "log-opts": { - "max-size": "10m", - "max-file": "3" - } -} -EOF -systemctl restart docker diff --git a/packages/azure/scripts/startup-prefix.sh b/packages/azure/scripts/startup-prefix.sh deleted file mode 100644 index 10df236a0ac..00000000000 --- a/packages/azure/scripts/startup-prefix.sh +++ /dev/null @@ -1,5 +0,0 @@ -archive=$(grep --text --line-number '__TARBALL__:$' $0 | cut -f1 -d:) -tail -n +$((archive + 1)) $0 | tar -xvf - > /dev/null -./startup.sh -exit 0 -__TARBALL__: diff --git a/packages/azure/validator/celo-validator-run b/packages/azure/validator/celo-validator-run deleted file mode 100755 index 1890e606176..00000000000 --- a/packages/azure/validator/celo-validator-run +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -set -e - -. /etc/default/celo - -SECRET_DIR=$(mktemp --directory --tmpdir=/dev/shm) -cleanup () { - rm -rf ${SECRET_DIR} -} -trap cleanup EXIT - -get_secret $VALIDATOR_KEY_VAULT 'validatorPrivateKey' > ${SECRET_DIR}/validatorPrivateKey -generate_password > ${SECRET_DIR}/accountPassword - -set -x - -docker run \ - --rm \ - -v $DATA_DIR:$DATA_DIR \ - -v $SECRET_DIR:$SECRET_DIR \ - $GETH_NODE_DOCKER_IMAGE \ - account import \ - --keystore=${SECRET_DIR} \ - --password=${SECRET_DIR}/accountPassword \ - ${SECRET_DIR}/validatorPrivateKey - -docker run \ - --name $1 \ - --restart=always \ - --net=host \ - -v $DATA_DIR:$DATA_DIR \ - -v $SECRET_DIR:$SECRET_DIR \ - --entrypoint /bin/sh \ - $GETH_NODE_DOCKER_IMAGE -c "\ - geth \ - --bootnodes=${BOOTNODES} \ - --keystore=${SECRET_DIR} \ - --password=${SECRET_DIR}/accountPassword \ - --unlock=$VALIDATOR_ACCOUNT_ADDRESS \ - --mine \ - --rpc \ - --rpcaddr 0.0.0.0 \ - --rpcapi=eth,net,web3 \ - --rpccorsdomain='*' \ - --rpcvhosts=* \ - --ws \ - --wsaddr 0.0.0.0 \ - --wsorigins=* \ - --wsapi=eth,net,web3 \ - --nodekey=$SECRET_DIR/validatorPrivateKey \ - --etherbase=$VALIDATOR_ACCOUNT_ADDRESS \ - --networkid=${NETWORK_ID} \ - --syncmode=full \ - --consoleformat=json \ - --consoleoutput=stdout \ - --verbosity=${GETH_VERBOSITY} \ - --ethstats=${VALIDATOR_NAME}@${ETHSTATS_HOST} \ - --maxpeers=${VALIDATOR_MAX_PEERS} \ - --nat=extip:${VALIDATOR_INTERNAL_IP_ADDRESS} \ - --metrics \ - --nodiscover \ - --proxy.proxied \ - --proxy.proxyenodeurlpair=\"$PROXY_URL\" \ -" diff --git a/packages/azure/validator/celo-validator.service b/packages/azure/validator/celo-validator.service deleted file mode 100644 index 1b05320a5db..00000000000 --- a/packages/azure/validator/celo-validator.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Docker Container %N -Requires=docker.service -After=docker.service - -[Service] -Restart=always -ExecStart=/usr/local/bin/celo-validator-run %N -ExecStop=/usr/bin/docker rm -f %N - -[Install] -WantedBy=default.target diff --git a/packages/azure/validator/exporter-run b/packages/azure/validator/exporter-run deleted file mode 120000 index ae25221d3d5..00000000000 --- a/packages/azure/validator/exporter-run +++ /dev/null @@ -1 +0,0 @@ -../scripts/exporter-run \ No newline at end of file diff --git a/packages/azure/validator/geth-exporter.service b/packages/azure/validator/geth-exporter.service deleted file mode 120000 index 645f11bc10f..00000000000 --- a/packages/azure/validator/geth-exporter.service +++ /dev/null @@ -1 +0,0 @@ -../scripts/geth-exporter.service \ No newline at end of file diff --git a/packages/azure/validator/libcelo.sh b/packages/azure/validator/libcelo.sh deleted file mode 120000 index eab76afc76e..00000000000 --- a/packages/azure/validator/libcelo.sh +++ /dev/null @@ -1 +0,0 @@ -../scripts/libcelo.sh \ No newline at end of file diff --git a/packages/azure/validator/provider-init.sh b/packages/azure/validator/provider-init.sh deleted file mode 120000 index f25ad9e735d..00000000000 --- a/packages/azure/validator/provider-init.sh +++ /dev/null @@ -1 +0,0 @@ -../scripts/provider-init.sh \ No newline at end of file diff --git a/packages/azure/validator/startup.sh b/packages/azure/validator/startup.sh deleted file mode 100755 index 2b762525875..00000000000 --- a/packages/azure/validator/startup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -set -x -set -e - -. ./provider-init.sh -. /etc/default/celo - -echo "Validator address: $VALIDATOR_ACCOUNT_ADDRESS" -echo "Proxy URL: $PROXY_URL" - -echo "Pulling geth..." -docker pull $GETH_NODE_DOCKER_IMAGE - -# Load configuration to files -curl -o $DATA_DIR/genesis.json https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${CELO_ENV}?alt=media - -echo "Starting geth..." -docker run \ - --rm \ - --net=host \ - -v $DATA_DIR:$DATA_DIR \ - --entrypoint /bin/sh \ - -i $GETH_NODE_DOCKER_IMAGE \ - -c "geth init $DATA_DIR/genesis.json" - -cp celo-validator-run /usr/local/bin -cp celo-validator.service /etc/systemd/system/celo-validator.service -systemctl daemon-reload -systemctl enable celo-validator.service -systemctl restart celo-validator.service - -echo "Pulling geth exporter..." -docker pull $GETH_EXPORTER_DOCKER_IMAGE - -cp exporter-run /usr/local/bin -cp geth-exporter.service /etc/systemd/system/geth-exporter.service -systemctl daemon-reload -systemctl enable geth-exporter.service -systemctl restart geth-exporter.service diff --git a/packages/celotool/README.md b/packages/celotool/README.md index d6b1b2c506f..2a86142903c 100644 --- a/packages/celotool/README.md +++ b/packages/celotool/README.md @@ -24,7 +24,7 @@ Running `celotooljs` should give you the output like the following that let's yo celotooljs Commands: -celotooljs account commands for inviting, fauceting, +celotooljs account commands for fauceting, looking up accounts and users celotooljs backup command for backing up a miner's persistent volume (PVC) @@ -57,11 +57,6 @@ Options: --help Show help [boolean] ``` -### How to Invite Yourself - -Run this command: -`celotooljs account invite --celo-env integration --phone +` - ### How to Faucet an Account Run this command: diff --git a/packages/celotool/ci_test_attestations.sh b/packages/celotool/ci_test_attestations.sh deleted file mode 100755 index c2a7882755c..00000000000 --- a/packages/celotool/ci_test_attestations.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# This test starts a standalone Geth node and runs transactions on it. - -# For testing a particular branch of Geth repo (usually, on Circle CI) -# Usage: ci_test_attestations.sh checkout -# For testing the local Geth dir (usually, for manual testing) -# Usage: ci_test_attestations.sh local - -export TS_NODE_FILES=true -if [ "${1}" == "checkout" ]; then - # Test master by default. - BRANCH_TO_TEST=${2:-"master"} - echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/attestations_tests.ts --branch ${BRANCH_TO_TEST} -elif [ "${1}" == "local" ]; then - export GETH_DIR="${2}" - echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/attestations_tests.ts --localgeth ${GETH_DIR} -fi diff --git a/packages/celotool/package.json b/packages/celotool/package.json index e4f7cd368ed..86bfca09267 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -6,17 +6,17 @@ "author": "Celo", "license": "Apache-2.0", "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", - "@celo/cryptographic-utils": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/cryptographic-utils": "3.2.1-dev", + "@celo/contractkit": "3.2.1-dev", "@celo/env-tests": "1.0.0", "@types/ethereumjs-util": "^5.2.0", - "@celo/explorer": "2.2.1-dev", - "@celo/governance": "2.2.1-dev", - "@celo/identity": "2.2.1-dev", - "@celo/network-utils": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/explorer": "3.2.1-dev", + "@celo/governance": "3.2.1-dev", + "@celo/identity": "3.2.1-dev", + "@celo/network-utils": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "@google-cloud/monitoring": "0.7.1", "@google-cloud/pubsub": "^0.28.1", "@google-cloud/secret-manager": "3.0.0", @@ -40,7 +40,6 @@ "sleep-promise": "^8.0.1", "string-hash": "^1.1.3", "tiny-secp256k1": "2.2.1", - "twilio": "^3.57.0", "web3": "1.3.6", "web3-eth-admin": "1.0.0-beta.55", "yargs": "14.0.0" diff --git a/packages/celotool/src/cmds/account/invite.ts b/packages/celotool/src/cmds/account/invite.ts deleted file mode 100644 index 70d1d996091..00000000000 --- a/packages/celotool/src/cmds/account/invite.ts +++ /dev/null @@ -1,117 +0,0 @@ -/* tslint:disable no-console */ -import { ContractKit, newKitFromWeb3 } from '@celo/contractkit' -import { BigNumber } from 'bignumber.js' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import { execCmd } from 'src/lib/cmd-utils' -import { convertToContractDecimals } from 'src/lib/contract-utils' -import { portForwardAnd } from 'src/lib/port_forward' -import twilio from 'twilio' -import Web3 from 'web3' -import { Argv } from 'yargs' -import { AccountArgv } from '../account' - -export const command = 'invite' - -export const describe = 'command for sending an invite code to a phone number' - -interface InviteArgv extends AccountArgv { - phone: string -} - -export const builder = (yargs: Argv) => { - return yargs.option('phone', { - type: 'string', - description: 'Phone number to send invite code,', - demand: 'Please specify phone number to send invite code', - }) -} - -export const handler = async (argv: InviteArgv) => { - await switchToClusterFromEnv(argv.celoEnv) - const phone = argv.phone - - console.log(`Sending invitation code to ${phone}`) - - // This key is only present in celo-testnet - await execCmd('gcloud config set project celo-testnet') - await execCmd( - 'gcloud kms decrypt --ciphertext-file=twilio-config.enc --plaintext-file=twilio-config.js \ - --key=github-mnemonic-key --keyring=celo-keyring --location=global' - ) - const cb = async () => { - const web3: Web3 = new Web3('http://localhost:8545') - const kit: ContractKit = newKitFromWeb3(web3) - const account = (await kit.connection.getAccounts())[0] - console.log(`Using account: ${account}`) - kit.defaultAccount = account - - // TODO(asa): This number was made up - const attestationGasAmount = new BigNumber(10000000) - // TODO: this default gas price might not be accurate - const gasPrice = 100000000000 - - const temporaryWalletAccount = web3.eth.accounts.create() - const temporaryAddress = temporaryWalletAccount.address - // Buffer.from doesn't expect a 0x for hex input - const privateKeyHex = temporaryWalletAccount.privateKey.substring(2) - const inviteCode = Buffer.from(privateKeyHex, 'hex').toString('base64') - - const [goldToken, stableToken, attestations, escrow] = await Promise.all([ - kit.contracts.getGoldToken(), - kit.contracts.getStableToken(), - kit.contracts.getAttestations(), - kit.contracts.getEscrow(), - ]) - const attestationFee = new BigNumber( - await attestations.attestationRequestFees(stableToken.address) - ) - const goldAmount = attestationGasAmount.times(gasPrice).toString() - const stableTokenInviteAmount = attestationFee.times(10).toString() - const stableTokenEscrowAmount = (await convertToContractDecimals(5, stableToken)).toString() - - const phoneHash: string = kit.connection.web3.utils.soliditySha3({ - type: 'string', - value: phone, - })! - - await stableToken.approve(escrow.address, stableTokenEscrowAmount).sendAndWaitForReceipt() - const expirySeconds = 60 * 60 * 24 * 5 // 5 days - - console.log( - `Transferring ${goldAmount} Gold, ${stableTokenInviteAmount} StableToken, and escrowing ${stableTokenEscrowAmount} StableToken` - ) - await Promise.all([ - // TODO: remove if no one is paying for gas with gold - goldToken.transfer(temporaryAddress, goldAmount).sendAndWaitForReceipt(), - stableToken.transfer(temporaryAddress, stableTokenInviteAmount).sendAndWaitForReceipt(), - escrow - .transfer( - phoneHash, - stableToken.address, - stableTokenEscrowAmount, - expirySeconds, - temporaryAddress, - 0 - ) - .sendAndWaitForReceipt(), - ]) - console.log(`Temp address: ${temporaryAddress}`) - console.log(`Invite code: ${inviteCode}`) - const messageText = `Hi! I would like to invite you to join the Celo payments network. Your invite code is: ${inviteCode}` - console.log('Sending SMS...') - const twilioConfig = require('twilio-config') - const twilioClient = twilio(twilioConfig.sid, twilioConfig.authToken) - await twilioClient.messages.create({ - body: messageText, - from: twilioConfig.phoneNumber, - to: argv.phone, - }) - } - try { - await portForwardAnd(argv.celoEnv, cb) - } catch (error) { - console.error(`Unable to send invitation code to ${argv.phone}`) - console.error(error) - process.exit(1) - } -} diff --git a/packages/celotool/src/cmds/account/verify.ts b/packages/celotool/src/cmds/account/verify.ts deleted file mode 100644 index 92883aefe0e..00000000000 --- a/packages/celotool/src/cmds/account/verify.ts +++ /dev/null @@ -1,207 +0,0 @@ -import { AccountArgv } from '@celo/celotool/src/cmds/account' -import { portForwardAnd } from '@celo/celotool/src/lib/port_forward' -import { ContractKit, newKitFromWeb3 } from '@celo/contractkit' -import { - ActionableAttestation, - AttestationsWrapper, -} from '@celo/contractkit/lib/wrappers/Attestations' -import { - getIdentifierAndPepper, - requestAttestationsFromIssuers, - requestMoreAttestations, -} from '@celo/env-tests/lib/shared/attestation' -import { base64ToHex } from '@celo/utils/lib/attestations' -import prompts from 'prompts' -import { printAndIgnoreRequestErrors } from 'src/lib/attestation' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import Web3 from 'web3' -import yargs from 'yargs' - -export const command = 'verify' -export const describe = 'command for requesting attestations for a phone number' - -interface VerifyArgv extends AccountArgv { - phone: string - num: number - salt: string - context: string -} - -export const builder = (argv: yargs.Argv) => { - return argv - .option('phone', { - type: 'string', - description: `Phone number to attest to. Should be an E.164 number matching formatted like +451234567890.`, - demand: 'Please specify phone number to attest to', - }) - .option('num', { - type: 'number', - description: 'Number of attestations to request', - default: 3, - }) - .option('salt', { - type: 'string', - description: 'The salt to use instead of getting a pepper from ODIS', - default: '', - }) - .option('context', { - type: 'string', - description: 'ODIS context', - default: 'mainnet', - }) -} - -export const handler = async (argv: VerifyArgv) => { - await switchToClusterFromEnv(argv.celoEnv, false, true) - - try { - await portForwardAnd(argv.celoEnv, verifyCmd.bind(null, argv)) - } catch (error) { - console.error(`Unable to attest ${argv.phone}`) - console.error(error) - process.exit(1) - } -} - -async function verifyCmd(argv: VerifyArgv) { - const web3: Web3 = new Web3('http://localhost:8545') - const kit: ContractKit = newKitFromWeb3(web3) - const account = (await kit.connection.getAccounts())[0] - kit.defaultAccount = account - - const attestations = await kit.contracts.getAttestations() - const accounts = await kit.contracts.getAccounts() - - const { identifier, pepper } = await getIdentifierAndPepper( - kit, - argv.context, - account, - argv.phone, - argv.salt - ) - - await printCurrentCompletedAttestations(attestations, identifier, argv.phone, account) - let attestationsToComplete = await attestations.getActionableAttestations(argv.phone, account) - - // Request more attestations - if (argv.num > attestationsToComplete.length) { - console.info( - `Requesting ${argv.num - attestationsToComplete.length} attestations from the smart contract` - ) - await requestMoreAttestations( - attestations, - argv.phone, - argv.num - attestationsToComplete.length, - account - ) - } - - // Set the wallet address if not already appropriate - const currentWalletAddress = await accounts.getWalletAddress(account) - - if (currentWalletAddress !== account) { - const setWalletAddressTx = accounts.setWalletAddress(account) - const result = await setWalletAddressTx.send() - await result.waitReceipt() - } - - attestationsToComplete = await attestations.getActionableAttestations(identifier, account) - // Find attestations we can verify - console.info(`Requesting ${attestationsToComplete.length} attestations from issuers`) - const possibleErrors = await requestAttestationsFromIssuers( - attestationsToComplete, - attestations, - argv.phone, - account, - pepper - ) - printAndIgnoreRequestErrors(possibleErrors) - await promptForCodeAndVerify(attestations, identifier, argv.phone, account) -} - -export async function printCurrentCompletedAttestations( - attestations: AttestationsWrapper, - identifier: string, - phoneNumber: string, - account: string -) { - const attestationStat = await attestations.getAttestationStat(identifier, account) - - console.info( - `Phone Number: ${phoneNumber} has completed ${attestationStat.completed} attestations out of a total of ${attestationStat.total}` - ) -} - -async function verifyCode( - attestations: AttestationsWrapper, - base64Code: string, - identifier: string, - phoneNumber: string, - account: string, - attestationsToComplete: ActionableAttestation[] -) { - const code = base64ToHex(base64Code) - const matchingIssuer = await attestations.findMatchingIssuer( - phoneNumber, - account, - code, - attestationsToComplete.map((a) => a.issuer) - ) - - if (matchingIssuer === null) { - console.warn('No matching issuer found for code') - return - } - - const isValidRequest = await attestations.validateAttestationCode( - identifier, - account, - matchingIssuer, - code - ) - if (!isValidRequest) { - console.warn('Code was not valid') - return - } - - const tx = await attestations - .complete(phoneNumber, account, matchingIssuer, code) - .then((x) => x.send()) - return tx.waitReceipt() -} - -async function promptForCodeAndVerify( - attestations: AttestationsWrapper, - identifier: string, - phoneNumber: string, - account: string -) { - while (true) { - const attestationsToComplete = await attestations.getActionableAttestations(identifier, account) - - if (attestationsToComplete.length === 0) { - console.info('No attestations left') - break - } - - const userResponse = await prompts({ - type: 'text', - name: 'code', - message: `${attestationsToComplete.length} attestations completable. Enter the code here or type exit`, - }) - - if (userResponse.code === 'exit') { - break - } - - await verifyCode( - attestations, - userResponse.code, - identifier, - phoneNumber, - account, - attestationsToComplete - ) - await printCurrentCompletedAttestations(attestations, identifier, phoneNumber, account) - } -} diff --git a/packages/celotool/src/cmds/account/weekly_faucet.ts b/packages/celotool/src/cmds/account/weekly_faucet.ts deleted file mode 100644 index 39b06623de5..00000000000 --- a/packages/celotool/src/cmds/account/weekly_faucet.ts +++ /dev/null @@ -1,48 +0,0 @@ -/* tslint:disable no-console */ -import { downloadArtifacts } from 'src/lib/artifacts' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import { execCmd } from 'src/lib/cmd-utils' -import { getBlockchainApiUrl } from 'src/lib/endpoints' -import { portForwardAnd } from 'src/lib/port_forward' -import yargs from 'yargs' -import { AccountArgv } from '../account' - -export const command = 'weekly-faucet' - -export const describe = 'command for fauceting phone numbers from a csv list' - -interface WeeklyFaucetArgv extends AccountArgv { - file: string -} - -export const builder = (argv: yargs.Argv) => { - return argv.option('file', { - type: 'string', - description: - 'File with phone numbers or account addresses and amount to faucet (optional if fauceting users on a weekly basis)', - demand: 'Please specify main csv file', - }) -} - -export const handler = async (argv: WeeklyFaucetArgv) => { - await switchToClusterFromEnv(argv.celoEnv) - - console.log(`Fauceting phone numbers in ${argv.file} on ${argv.celoEnv}`) - const cb = async () => { - const [output] = await execCmd( - `yarn --cwd ../protocol run weekly-faucet -n ${argv.celoEnv} -f ${ - argv.file - } -b ${getBlockchainApiUrl(argv.celoEnv)}` - ) - console.log(output) - } - - try { - await downloadArtifacts(argv.celoEnv) - await portForwardAnd(argv.celoEnv, cb) - } catch (error) { - console.error(`Unable to faucet phone numbers in ${argv.file} on ${argv.celoEnv}`) - console.error(error) - process.exit(1) - } -} diff --git a/packages/celotool/src/cmds/bots/auto-verify.ts b/packages/celotool/src/cmds/bots/auto-verify.ts deleted file mode 100644 index 75c894329a3..00000000000 --- a/packages/celotool/src/cmds/bots/auto-verify.ts +++ /dev/null @@ -1,225 +0,0 @@ -import { newKitFromWeb3 } from '@celo/contractkit' -import { - getIdentifierAndPepper, - pollForMessagesAndCompleteAttestations, - requestAttestationsFromIssuers, - requestMoreAttestations, -} from '@celo/env-tests/lib/shared/attestation' -import { privateKeyToAddress } from '@celo/utils/lib/address' -import { notEmpty } from '@celo/utils/lib/collections' -import BigNumber from 'bignumber.js' -import Logger, { createLogger, stdSerializers } from 'bunyan' -import { createStream } from 'bunyan-gke-stackdriver' -import { Level } from 'bunyan-gke-stackdriver/dist/types' -import sleep from 'sleep-promise' -import { getPhoneNumber } from 'src/lib/attestation' -import { envVar, fetchEnv } from 'src/lib/env-utils' -import { AccountType, generatePrivateKey } from 'src/lib/generate_utils' -import { ensure0x } from 'src/lib/utils' -import twilio from 'twilio' -import Web3 from 'web3' -import { Argv } from 'yargs' -import { BotsArgv } from '../bots' - -export const command = 'auto-verify' - -export const describe = 'command for verifying an arbitrary twilio phone number' - -interface AutoVerifyArgv extends BotsArgv { - initialWaitSeconds: number - inBetweenWaitSeconds: number - attestationMax: number - celoProvider: string - index: number - timeToPollForTextMessages: number - salt: string - context: string -} - -export const builder = (yargs: Argv) => { - return yargs - .option('initialWaitSeconds', { - type: 'number', - description: 'The range of the initial wait', - required: true, - }) - .option('inBetweenWaitSeconds', { - type: 'number', - description: 'Between each attestation how long to wait', - required: true, - }) - .option('attestationMax', { - type: 'number', - description: 'How many attestations should be requesteed at maximum', - required: true, - }) - .option('celoProvider', { - type: 'string', - description: 'The node to use', - default: 'http://localhost:8545', - }) - .option('timeToPollForTextMessages', { - type: 'number', - description: 'How long to poll for text messages in minutes', - default: 3, - }) - .option('index', { - type: 'number', - description: 'The index of the account to use', - default: 0, - }) - .option('salt', { - type: 'string', - description: 'The salt to use instead of getting a pepper from ODIS', - default: '', - }) - .option('context', { - type: 'string', - description: 'ODIS context (mainnet, alfajores, alfajoresstaging)', - default: 'mainnet', - }) -} - -export const handler = async function autoVerify(argv: AutoVerifyArgv) { - let logger: Logger = createLogger({ - name: 'attestation-bot', - serializers: stdSerializers, - streams: [createStream(Level.INFO)], - }) - - for (const useSecurityCode of [true, false]) { - try { - const kit = newKitFromWeb3(new Web3(argv.celoProvider)) - const mnemonic = fetchEnv(envVar.MNEMONIC) - // This really should be the ATTESTATION_BOT key, but somehow we can't get it to have cUSD - const clientKey = ensure0x( - generatePrivateKey(mnemonic, AccountType.ATTESTATION_BOT, argv.index) - ) - const clientAddress = privateKeyToAddress(clientKey) - logger = logger.child({ address: clientAddress }) - kit.connection.addAccount(clientKey) - - const twilioClient = twilio( - fetchEnv(envVar.TWILIO_ACCOUNT_SID), - fetchEnv(envVar.TWILIO_ACCOUNT_AUTH_TOKEN) - ) - - const attestations = await kit.contracts.getAttestations() - const stableToken = await kit.contracts.getStableToken() - const gasPriceMinimum = await kit.contracts.getGasPriceMinimum() - - const waitTime = Math.random() * argv.initialWaitSeconds - await sleep(waitTime * 1000) - logger.info({ waitTime, initialWaitSeconds: argv.initialWaitSeconds }, 'Initial Wait') - - const phoneNumber = await getPhoneNumber( - attestations, - twilioClient, - argv.attestationMax, - argv.salt, - clientAddress - ) - const { identifier, pepper } = await getIdentifierAndPepper( - kit, - argv.context, - clientAddress, - phoneNumber, - argv.salt - ) - logger.info({ identifier }, 'Using identifier') - - const nonCompliantIssuersAlreadyLogged: string[] = [] - - logger = logger.child({ phoneNumber }) - logger.info('Initialized phone number') - - let stat = await attestations.getAttestationStat(identifier, clientAddress) - - logger.info(`Starting with attestation count of ${stat.total}`) - while (stat.total < argv.attestationMax) { - logger.info({ ...stat }, 'Start Attestation') - - const gasPrice = new BigNumber( - await gasPriceMinimum.getGasPriceMinimum(stableToken.address) - ).times(5) - const txParams = { - from: clientAddress, - feeCurrency: stableToken.address, - gasPrice: gasPrice.toString(), - } - - logger.info('Request Attestation') - await requestMoreAttestations(attestations, identifier, 1, clientAddress, txParams) - - const attestationsToComplete = await attestations.getActionableAttestations( - identifier, - clientAddress - ) - - const nonCompliantIssuers = await attestations.getNonCompliantIssuers( - identifier, - clientAddress - ) - nonCompliantIssuers - .filter((_) => !nonCompliantIssuersAlreadyLogged.includes(_)) - .forEach((issuer) => { - logger.info({ issuer }, 'Did not run the attestation service') - nonCompliantIssuersAlreadyLogged.push(issuer) - }) - - logger.info({ attestationsToComplete }, 'Reveal to issuers') - - const possibleErrors = await requestAttestationsFromIssuers( - attestationsToComplete, - attestations, - phoneNumber, - clientAddress, - pepper, - useSecurityCode - ) - - logger.info( - { possibleErrors: possibleErrors.filter((_) => _ && _.known).length }, - 'Reveal errors' - ) - - possibleErrors.filter(notEmpty).forEach((error) => { - if (error.known) { - logger.info({ ...error }, 'Error while requesting from attestation service') - } else { - logger.info({ ...error }, 'Unknown error while revealing to issuer') - } - }) - - await pollForMessagesAndCompleteAttestations( - attestations, - // @ts-ignore - twilioClient, - phoneNumber, - identifier, - pepper, - clientAddress, - attestationsToComplete, - txParams, - logger, - argv.timeToPollForTextMessages - ) - - const sleepTime = Math.random() * argv.inBetweenWaitSeconds - logger.info( - { waitTime: sleepTime, inBetweenWaitSeconds: argv.inBetweenWaitSeconds }, - `InBetween Wait` - ) - - await sleep(sleepTime * 1000) - stat = await attestations.getAttestationStat(identifier, clientAddress) - } - - logger.info({ ...stat }, 'Completed attestations for phone number') - process.exit(0) - } catch (error) { - logger.error({ err: error }) - process.exit(1) - } - } -} diff --git a/packages/celotool/src/cmds/deploy/destroy/attestation-bot.ts b/packages/celotool/src/cmds/deploy/destroy/attestation-bot.ts deleted file mode 100644 index ca50612f81d..00000000000 --- a/packages/celotool/src/cmds/deploy/destroy/attestation-bot.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { removeHelmRelease } from 'src/lib/attestation-bot' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import { exitIfCelotoolHelmDryRun } from 'src/lib/helm_deploy' -import { DestroyArgv } from '../../deploy/destroy' - -export const command = 'attestation-bot' - -export const describe = 'destroy attestation-bot deployment' - -export const builder = {} - -export const handler = async (argv: DestroyArgv) => { - exitIfCelotoolHelmDryRun() - await switchToClusterFromEnv(argv.celoEnv) - await removeHelmRelease(argv.celoEnv) -} diff --git a/packages/celotool/src/cmds/deploy/destroy/attestation-service.ts b/packages/celotool/src/cmds/deploy/destroy/attestation-service.ts deleted file mode 100644 index cf16882a328..00000000000 --- a/packages/celotool/src/cmds/deploy/destroy/attestation-service.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { removeHelmRelease } from 'src/lib/attestation-service' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import { exitIfCelotoolHelmDryRun } from 'src/lib/helm_deploy' -import { DestroyArgv } from '../../deploy/destroy' - -export const command = 'attestation-service' - -export const describe = 'destroy the attestation-service deploy' - -export const builder = {} - -export const handler = async (argv: DestroyArgv) => { - exitIfCelotoolHelmDryRun() - await switchToClusterFromEnv(argv.celoEnv) - await removeHelmRelease(argv.celoEnv) -} diff --git a/packages/celotool/src/cmds/deploy/initial/attestation-bot.ts b/packages/celotool/src/cmds/deploy/initial/attestation-bot.ts deleted file mode 100644 index 8e2c02bd919..00000000000 --- a/packages/celotool/src/cmds/deploy/initial/attestation-bot.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { installHelmChart } from 'src/lib/attestation-bot' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import yargs from 'yargs' -import { InitialArgv } from '../../deploy/initial' - -export const command = 'attestation-bot' - -export const describe = 'deploy attestation-bot' - -export const builder = (argv: yargs.Argv) => { - return argv -} - -export const handler = async (argv: InitialArgv) => { - await switchToClusterFromEnv(argv.celoEnv) - await installHelmChart(argv.celoEnv) -} diff --git a/packages/celotool/src/cmds/deploy/initial/attestation-service.ts b/packages/celotool/src/cmds/deploy/initial/attestation-service.ts deleted file mode 100644 index dd22c60b299..00000000000 --- a/packages/celotool/src/cmds/deploy/initial/attestation-service.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { installHelmChart } from 'src/lib/attestation-service' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import yargs from 'yargs' -import { InitialArgv } from '../../deploy/initial' - -export const command = 'attestation-service' - -export const describe = 'deploy the attestation-service package' - -export const builder = (argv: yargs.Argv) => { - return argv -} - -export const handler = async (argv: InitialArgv) => { - await switchToClusterFromEnv(argv.celoEnv) - await installHelmChart(argv.celoEnv) -} diff --git a/packages/celotool/src/cmds/deploy/initial/contracts.ts b/packages/celotool/src/cmds/deploy/initial/contracts.ts index 0b91da2c68e..a5544537eb0 100644 --- a/packages/celotool/src/cmds/deploy/initial/contracts.ts +++ b/packages/celotool/src/cmds/deploy/initial/contracts.ts @@ -1,6 +1,5 @@ /* tslint:disable no-console */ import { ContractKit, IdentityMetadataWrapper, newKitFromWeb3 } from '@celo/contractkit' -import { createAttestationServiceURLClaim } from '@celo/contractkit/lib/identity/claims/attestation-service-url' import { createNameClaim } from '@celo/contractkit/lib/identity/claims/claim' import { concurrentMap } from '@celo/utils/lib/async' import { LocalSigner } from '@celo/utils/lib/signatureUtils' @@ -8,7 +7,6 @@ import { writeFileSync } from 'fs' import { uploadArtifacts } from 'src/lib/artifacts' import { switchToClusterFromEnv } from 'src/lib/cluster' import { execCmd } from 'src/lib/cmd-utils' -import { envVar, fetchEnv } from 'src/lib/env-utils' import { privateKeyToAddress } from 'src/lib/generate_utils' import { exitIfCelotoolHelmDryRun } from 'src/lib/helm_deploy' import { migrationOverrides, truffleOverrides, validatorKeys } from 'src/lib/migration-utils' @@ -36,21 +34,11 @@ export const builder = (argv: yargs.Argv) => { export const CLABS_VALIDATOR_METADATA_BUCKET = 'clabs_validator_metadata' -function getAttestationServiceUrl(testnet: string, index: number) { - return `https://${testnet}-attestation-service.${fetchEnv( - envVar.CLUSTER_DOMAIN_NAME - )}.org/${index}/` -} - function metadataURLForCLabsValidator(testnet: string, address: string) { return `https://storage.googleapis.com/${CLABS_VALIDATOR_METADATA_BUCKET}/${testnet}/validator-${testnet}-${address}-metadata.json` } async function makeMetadata(testnet: string, address: string, index: number, privateKey: string) { - const attestationServiceClaim = createAttestationServiceURLClaim( - getAttestationServiceUrl(testnet, index) - ) - const nameClaim = createNameClaim(`Validator ${index} on ${testnet}: ${address}`) const fileName = `validator-${testnet}-${address}-metadata.json` @@ -58,7 +46,6 @@ async function makeMetadata(testnet: string, address: string, index: number, pri const metadata = IdentityMetadataWrapper.fromEmpty(address) await metadata.addClaim(nameClaim, LocalSigner(privateKey)) - await metadata.addClaim(attestationServiceClaim, LocalSigner(privateKey)) writeFileSync(filePath, metadata.toString()) await uploadFileToGoogleStorage( diff --git a/packages/celotool/src/cmds/deploy/upgrade/all.ts b/packages/celotool/src/cmds/deploy/upgrade/all.ts index 98fa496c47b..be3d72a4a46 100644 --- a/packages/celotool/src/cmds/deploy/upgrade/all.ts +++ b/packages/celotool/src/cmds/deploy/upgrade/all.ts @@ -3,7 +3,6 @@ import { exitIfCelotoolHelmDryRun } from 'src/lib/helm_deploy' import yargs from 'yargs' import { UpgradeArgv } from '../../deploy/upgrade' import { handler as contractsHandler } from '../initial/contracts' -import { handler as attestationServiceHandler } from './attestation-service' import { handler as blockscoutHandler } from './blockscout' import { handler as celostatsHandler } from './celostats' import { handler as testnetHandler } from './testnet' @@ -64,7 +63,4 @@ export const handler = async (argv: AllArgv) => { console.info('Deploy contracts') await contractsHandler(argv) } - - console.info('Deploy attestation-service') - await attestationServiceHandler(argv) } diff --git a/packages/celotool/src/cmds/deploy/upgrade/attestation-bot.ts b/packages/celotool/src/cmds/deploy/upgrade/attestation-bot.ts deleted file mode 100644 index d93876b8917..00000000000 --- a/packages/celotool/src/cmds/deploy/upgrade/attestation-bot.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { upgradeHelmChart } from 'src/lib/attestation-bot' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import yargs from 'yargs' -import { UpgradeArgv } from '../../deploy/upgrade' - -export const command = 'attestation-bot' - -export const describe = 'deploy attestation-bot' - -export const builder = (argv: yargs.Argv) => { - return argv -} - -export const handler = async (argv: UpgradeArgv) => { - await switchToClusterFromEnv(argv.celoEnv) - await upgradeHelmChart(argv.celoEnv) -} diff --git a/packages/celotool/src/cmds/deploy/upgrade/attestation-service.ts b/packages/celotool/src/cmds/deploy/upgrade/attestation-service.ts deleted file mode 100644 index 07e607fe469..00000000000 --- a/packages/celotool/src/cmds/deploy/upgrade/attestation-service.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { upgradeHelmChart } from 'src/lib/attestation-service' -import { switchToClusterFromEnv } from 'src/lib/cluster' -import yargs from 'yargs' -import { UpgradeArgv } from '../../deploy/upgrade' - -export const command = 'attestation-service' - -export const describe = 'upgrade the attestation-service package' - -export const builder = (argv: yargs.Argv) => { - return argv -} - -export const handler = async (argv: UpgradeArgv) => { - await switchToClusterFromEnv(argv.celoEnv) - await upgradeHelmChart(argv.celoEnv) -} diff --git a/packages/celotool/src/e2e-tests/attestations_tests.ts b/packages/celotool/src/e2e-tests/attestations_tests.ts deleted file mode 100644 index 8f8e9d4fba6..00000000000 --- a/packages/celotool/src/e2e-tests/attestations_tests.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { ContractKit, newKitFromWeb3 } from '@celo/contractkit' -import { AttestationsWrapper } from '@celo/contractkit/lib/wrappers/Attestations' -import { assert } from 'chai' -import Web3 from 'web3' -import { GethRunConfig } from '../lib/interfaces/geth-run-config' -import { getContext, sleep } from './utils' - -const validatorAddress = '0x47e172f6cfb6c7d01c1574fa3e2be7cc73269d95' -const phoneNumber = '+15555555555' - -const TMP_PATH = '/tmp/e2e' - -describe('attestations tests', () => { - const gethConfig: GethRunConfig = { - runPath: TMP_PATH, - networkId: 1101, - network: 'local', - migrate: true, - genesisConfig: { - churritoBlock: 0, - donutBlock: 0, - espressoBlock: 0, - }, - instances: [ - { - name: 'validator0', - validating: true, - syncmode: 'full', - port: 30303, - rpcport: 8545, - }, - { - name: 'validator1', - validating: true, - syncmode: 'full', - port: 30305, - rpcport: 8547, - }, - { - name: 'validator2', - validating: true, - syncmode: 'full', - port: 30307, - rpcport: 8549, - }, - { - name: 'validator3', - validating: true, - syncmode: 'full', - port: 30309, - rpcport: 8551, - }, - { - name: 'validator4', - validating: true, - syncmode: 'full', - port: 30311, - rpcport: 8553, - }, - ], - } - - const context: any = getContext(gethConfig) - let contractKit: ContractKit - let Attestations: AttestationsWrapper - - before(async function (this: any) { - this.timeout(0) - await context.hooks.before() - }) - - after(async function (this: any) { - this.timeout(0) - await context.hooks.after() - }) - - const restart = async () => { - await context.hooks.restart() - contractKit = newKitFromWeb3(new Web3('http://localhost:8545')) - contractKit.defaultAccount = validatorAddress - - // TODO(mcortesi): magic sleep. without it unlockAccount sometimes fails - await sleep(2) - // Assuming empty password - await contractKit.connection.web3.eth.personal.unlockAccount(validatorAddress, '', 1000000) - Attestations = await contractKit.contracts.getAttestations() - } - - describe('Attestations', () => { - before(async function () { - this.timeout(0) - await restart() - }) - - it('requests an attestation', async function (this: any) { - this.timeout(10000) - - const approve = await Attestations.approveAttestationFee(2) - await approve.sendAndWaitForReceipt() - const request = await Attestations.request(phoneNumber, 2) - await request.sendAndWaitForReceipt() - - const selectIssuers = await Attestations.selectIssuersAfterWait(phoneNumber, validatorAddress) - await selectIssuers.sendAndWaitForReceipt() - - const stats = await Attestations.getAttestationStat(phoneNumber, validatorAddress) - assert.equal(stats.total, 2) - - const issuers = await Attestations.getAttestationIssuers(phoneNumber, validatorAddress) - assert.lengthOf(issuers, 2) - }) - }) -}) diff --git a/packages/celotool/src/lib/attestation-bot.ts b/packages/celotool/src/lib/attestation-bot.ts deleted file mode 100644 index 168007abb73..00000000000 --- a/packages/celotool/src/lib/attestation-bot.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { - installGenericHelmChart, - removeGenericHelmChart, - upgradeGenericHelmChart, -} from 'src/lib/helm_deploy' -import { envVar, fetchEnv, fetchEnvOrFallback } from './env-utils' - -const helmChartPath = '../helm-charts/attestation-bot' - -export async function installHelmChart(celoEnv: string) { - const params = await helmParameters(celoEnv) - return installGenericHelmChart({ - namespace: celoEnv, - releaseName: releaseName(celoEnv), - chartDir: helmChartPath, - parameters: params, - }) -} - -export async function upgradeHelmChart(celoEnv: string) { - await upgradeGenericHelmChart({ - namespace: celoEnv, - releaseName: releaseName(celoEnv), - chartDir: helmChartPath, - parameters: helmParameters(celoEnv), - }) -} - -export async function removeHelmRelease(celoEnv: string) { - return removeGenericHelmChart(releaseName(celoEnv), celoEnv) -} - -function helmParameters(celoEnv: string) { - return [ - `--set domain.name=${fetchEnv(envVar.CLUSTER_DOMAIN_NAME)}`, - `--set imageRepository=${fetchEnv(envVar.CELOTOOL_DOCKER_IMAGE_REPOSITORY)}`, - `--set imageTag=${fetchEnv(envVar.CELOTOOL_DOCKER_IMAGE_TAG)}`, - `--set gethImageRepository=${fetchEnv(envVar.GETH_NODE_DOCKER_IMAGE_REPOSITORY)}`, - `--set gethImageTag=${fetchEnv(envVar.GETH_NODE_DOCKER_IMAGE_TAG)}`, - `--set environment=${celoEnv}`, - `--set mnemonic="${fetchEnv(envVar.MNEMONIC)}"`, - `--set twilio.accountSid="${fetchEnv(envVar.TWILIO_ACCOUNT_SID)}"`, - `--set twilio.authToken="${fetchEnv(envVar.TWILIO_ACCOUNT_AUTH_TOKEN)}"`, - `--set initialWaitSeconds=${fetchEnv(envVar.ATTESTATION_BOT_INITIAL_WAIT_SECONDS)}`, - `--set inBetweenWaitSeconds=${fetchEnv(envVar.ATTESTATION_BOT_IN_BETWEEN_WAIT_SECONDS)}`, - `--set salt=${fetchEnvOrFallback(envVar.ATTESTATION_BOT_SKIP_ODIS_SALT, '')}`, - `--set maxAttestations=${fetchEnv(envVar.ATTESTATION_BOT_MAX_ATTESTATIONS)}`, - `--set networkID=${fetchEnv(envVar.NETWORK_ID)}`, - `--set geth.verbosity=${fetchEnv('GETH_VERBOSITY')}`, - ] -} - -function releaseName(celoEnv: string) { - return `${celoEnv}-attestation-bot` -} diff --git a/packages/celotool/src/lib/attestation-service.ts b/packages/celotool/src/lib/attestation-service.ts deleted file mode 100644 index 8f800d9ac7e..00000000000 --- a/packages/celotool/src/lib/attestation-service.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { - installGenericHelmChart, - removeGenericHelmChart, - setHelmArray, - upgradeGenericHelmChart, -} from 'src/lib/helm_deploy' -import { envVar, fetchEnv, fetchEnvOrFallback } from './env-utils' - -const helmChartPath = '../helm-charts/attestation-service' - -export async function installHelmChart(celoEnv: string) { - await installGenericHelmChart({ - namespace: celoEnv, - releaseName: releaseName(celoEnv), - chartDir: helmChartPath, - parameters: await helmParameters(celoEnv), - }) -} - -export async function removeHelmRelease(celoEnv: string) { - await removeGenericHelmChart(releaseName(celoEnv), celoEnv) -} - -export async function upgradeHelmChart(celoEnv: string) { - await upgradeGenericHelmChart({ - namespace: celoEnv, - releaseName: releaseName(celoEnv), - chartDir: helmChartPath, - parameters: await helmParameters(celoEnv), - }) -} - -async function helmParameters(celoEnv: string) { - const celoProviderBackups = fetchEnvOrFallback(envVar.CELO_PROVIDER_BACKUPS, '') - // There is no "--mainnet" flag; mainnet is the default - const gethNetworkFlag = ['alfajores', 'baklava'].includes(celoEnv) ? '--' + celoEnv : '' - - return [ - `--set domain.name=${fetchEnv(envVar.CLUSTER_DOMAIN_NAME)}`, - `--set celotool.image.repository=${fetchEnv(envVar.CELOTOOL_DOCKER_IMAGE_REPOSITORY)}`, - `--set celotool.image.tag=${fetchEnv(envVar.CELOTOOL_DOCKER_IMAGE_TAG)}`, - `--set mnemonic="${fetchEnv(envVar.MNEMONIC)}"`, - `--set attestation_service.image.repository=${fetchEnv( - envVar.ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY - )}`, - `--set attestation_service.image.tag=${fetchEnv(envVar.ATTESTATION_SERVICE_DOCKER_IMAGE_TAG)}`, - `--set attestation_service.twilio.accountSid="${fetchEnv(envVar.TWILIO_ACCOUNT_SID)}"`, - `--set attestation_service.twilio.authToken="${fetchEnv(envVar.TWILIO_ACCOUNT_AUTH_TOKEN)}"`, - `--set attestation_service.twilio.addressSid="${fetchEnv(envVar.TWILIO_ADDRESS_SID)}"`, - `--set attestation_service.twilio.verifySid="${fetchEnv(envVar.TWILIO_VERIFY_SERVICE_SID)}"`, - `--set attestation_service.nexmo.apiKey="${fetchEnv(envVar.NEXMO_KEY)}"`, - `--set attestation_service.nexmo.apiSecret="${fetchEnv(envVar.NEXMO_SECRET)}"`, - `--set attestation_service.telekom.apiKey="${fetchEnv(envVar.TELEKOM_API_KEY)}"`, - `--set attestation_service.telekom.from="${fetchEnv(envVar.TELEKOM_FROM)}"`, - `--set attestation_service.celo_provider_backups_str="${ - celoProviderBackups ? '\\,' + celoProviderBackups.split(',').join('\\,') : '' - }"`, - `--set attestation_service.sms_providers="${fetchEnv(envVar.SMS_PROVIDERS) - .split(',') - .join('\\,')}"`, - `--set attestation_service.sms_providers_randomized="${fetchEnv( - envVar.SMS_PROVIDERS_RANDOMIZED - )}"`, - ...setHelmArray( - 'attestation_service.nexmo.applications', - fetchEnvOrFallback(envVar.NEXMO_APPLICATIONS, '').split(',') - ), - `--set geth.validators="${fetchEnv(envVar.VALIDATORS)}"`, - `--set domain.name=${fetchEnv(envVar.CLUSTER_DOMAIN_NAME)}`, - `--set global.postgresql.postgresqlDatabase=AttestationService`, - // TODO(nambrot): Hardcode for now, couldn't figure out how to make it work dynamically - // DB is exposed as ClusterIP service only - `--set global.postgresql.postgresqlPassword=password`, - `--set geth.networkFlag=${gethNetworkFlag}`, - `--set geth.image.repository=${fetchEnv(envVar.GETH_NODE_DOCKER_IMAGE_REPOSITORY)}`, - `--set geth.verbosity=${fetchEnvOrFallback(envVar.GETH_VERBOSITY, '3')}`, - `--set geth.image.tag=${fetchEnv(envVar.GETH_NODE_DOCKER_IMAGE_TAG)}`, - ] -} - -function releaseName(celoEnv: string) { - return `${celoEnv}-attestation-service` -} diff --git a/packages/celotool/src/lib/attestation.ts b/packages/celotool/src/lib/attestation.ts deleted file mode 100644 index 2bd15a2fc5e..00000000000 --- a/packages/celotool/src/lib/attestation.ts +++ /dev/null @@ -1,145 +0,0 @@ -import { AttestationsWrapper } from '@celo/contractkit/lib/wrappers/Attestations' -import { RequestAttestationError } from '@celo/env-tests/lib/shared/attestation' -import { PhoneNumberUtils } from '@celo/phone-utils' -import { sample } from 'lodash' -import { Twilio } from 'twilio' - -const DUMMY_SMS_URL = 'https://enzyutth0wxme.x.pipedream.net/' - -export async function findSuitableNumber( - attestations: AttestationsWrapper, - numbers: string[], - maximumNumberOfAttestations: number, - salt: string, - clientAddress: string -) { - for (const number of numbers) { - const phoneHash = PhoneNumberUtils.getPhoneHash(number, salt) - const stats = await attestations.getAttestationStat(phoneHash, clientAddress) - if (stats.total < maximumNumberOfAttestations) { - return number - } - } - return undefined -} - -export async function createPhoneNumber( - attestations: AttestationsWrapper, - twilioClient: Twilio, - maximumNumberOfAttestations: number, - salt: string, - clientAddress: string -) { - const countryCodes = ['GB', 'US'] - let attempts = 0 - while (true) { - const countryCode = sample(countryCodes) - const context = await twilioClient.availablePhoneNumbers.get(countryCode!) - let numbers - try { - numbers = await context.mobile.list({ limit: 100 }) - } catch { - // Some geos inc US appear to have no 'mobile' subcategory. - numbers = await context.local.list({ limit: 100 }) - } - - const usableNumber = await findSuitableNumber( - attestations, - numbers.map((number) => number.phoneNumber), - maximumNumberOfAttestations, - salt, - clientAddress - ) - if (!usableNumber) { - if (attempts > 10) { - throw new Error('Could not find suitable number') - } - { - attempts += 1 - continue - } - } - - await twilioClient.incomingPhoneNumbers.create({ - phoneNumber: usableNumber, - // Just an requestbin.com endpoint to avoid errors - smsUrl: DUMMY_SMS_URL, - }) - - return usableNumber - } -} - -export function printAndIgnoreRequestErrors(possibleErrors: RequestAttestationError[]) { - for (const possibleError of possibleErrors) { - if (possibleError) { - if (possibleError.known) { - console.info( - `Error while requesting from issuer ${possibleError.issuer} ${ - possibleError.name ? `(Name: ${possibleError.name})` : '' - }. Returned status ${possibleError.status} with response: ${ - possibleError.text - }. Ignoring.` - ) - } else { - console.info( - `Unknown error while requesting from ${ - possibleError.issuer - }: ${possibleError.error.toString()}. Ignoring.` - ) - } - } - } -} - -export async function getPhoneNumber( - attestations: AttestationsWrapper, - twilioClient: Twilio, - maximumNumberOfAttestations: number, - salt: string, - clientAddress: string -) { - const phoneNumber = await chooseFromAvailablePhoneNumbers( - attestations, - twilioClient, - maximumNumberOfAttestations, - salt, - clientAddress - ) - - if (phoneNumber !== undefined) { - return phoneNumber - } - - return createPhoneNumber( - attestations, - twilioClient, - maximumNumberOfAttestations, - salt, - clientAddress - ) -} - -export async function chooseFromAvailablePhoneNumbers( - attestations: AttestationsWrapper, - twilioClient: Twilio, - maximumNumberOfAttestations: number, - salt: string, - clientAddress: string -) { - const availableNumbers = (await twilioClient.incomingPhoneNumbers.list()).filter( - (number) => number.smsUrl === DUMMY_SMS_URL - ) - if (!availableNumbers?.length) { - return undefined - } - - const usableNumber = await findSuitableNumber( - attestations, - availableNumbers.map((number) => number.phoneNumber), - maximumNumberOfAttestations, - salt, - clientAddress - ) - return usableNumber -} diff --git a/packages/celotool/src/lib/env-utils.ts b/packages/celotool/src/lib/env-utils.ts index e6ed705cdc2..d57f4c19f0a 100644 --- a/packages/celotool/src/lib/env-utils.ts +++ b/packages/celotool/src/lib/env-utils.ts @@ -9,17 +9,10 @@ export interface CeloEnvArgv extends yargs.Argv { } export enum envVar { - ATTESTATION_BOT_IN_BETWEEN_WAIT_SECONDS = 'ATTESTATION_BOT_IN_BETWEEN_WAIT_SECONDS', - ATTESTATION_BOT_INITIAL_WAIT_SECONDS = 'ATTESTATION_BOT_INITIAL_WAIT_SECONDS', - ATTESTATION_BOT_MAX_ATTESTATIONS = 'ATTESTATION_BOT_MAX_ATTESTATIONS', - ATTESTATION_BOT_SKIP_ODIS_SALT = 'ATTESTATION_BOT_SKIP_ODIS_SALT', - ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY = 'ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY', - ATTESTATION_SERVICE_DOCKER_IMAGE_TAG = 'ATTESTATION_SERVICE_DOCKER_IMAGE_TAG', BLOCK_TIME = 'BLOCK_TIME', BLOCKSCOUT_DB_SUFFIX = 'BLOCKSCOUT_DB_SUFFIX', BLOCKSCOUT_DB_NEW_SUFFIX = 'BLOCKSCOUT_DB_NEW_SUFFIX', BLOCKSCOUT_DOCKER_IMAGE_TAG = 'BLOCKSCOUT_DOCKER_IMAGE_TAG', - CELO_PROVIDER_BACKUPS = 'CELO_PROVIDER_BACKUPS', CELOCLI_STANDALONE_IMAGE_REPOSITORY = 'CELOCLI_STANDALONE_IMAGE_REPOSITORY', CELOCLI_STANDALONE_IMAGE_TAG = 'CELOCLI_STANDALONE_IMAGE_TAG', CELOSTATS_BANNED_ADDRESSES = 'CELOSTATS_BANNED_ADDRESSES', @@ -112,13 +105,13 @@ export enum envVar { MOCK_ORACLE_DOCKER_IMAGE_TAG = 'MOCK_ORACLE_DOCKER_IMAGE_TAG', MOCK_ORACLE_GENESIS_BALANCE = 'MOCK_ORACLE_GENESIS_BALANCE', NETWORK_ID = 'NETWORK_ID', - NEXMO_APPLICATIONS = 'NEXMO_APPLICATIONS', - NEXMO_KEY = 'NEXMO_KEY', - NEXMO_SECRET = 'NEXMO_SECRET', NODE_DISK_SIZE_GB = 'NODE_DISK_SIZE_GB', ODIS_SIGNER_DOCKER_IMAGE_REPOSITORY = 'ODIS_SIGNER_DOCKER_IMAGE_REPOSITORY', ODIS_SIGNER_DOCKER_IMAGE_TAG = 'ODIS_SIGNER_DOCKER_IMAGE_TAG', ODIS_SIGNER_BLOCKCHAIN_PROVIDER = 'ODIS_SIGNER_BLOCKCHAIN_PROVIDER', + ODIS_SIGNER_DOMAINS_API_ENABLED = 'ODIS_SIGNER_DOMAINS_API_ENABLED', + ODIS_SIGNER_PNP_API_ENABLED = 'ODIS_SIGNER_PNP_API_ENABLED', + ODIS_SIGNER_LEGACY_PNP_API_ENABLED = 'ODIS_SIGNER_LEGACY_PNP_API_ENABLED', ORACLE_DOCKER_IMAGE_REPOSITORY = 'ORACLE_DOCKER_IMAGE_REPOSITORY', ORACLE_DOCKER_IMAGE_TAG = 'ORACLE_DOCKER_IMAGE_TAG', ORACLE_UNUSED_ORACLE_ADDRESSES = 'ORACLE_UNUSED_ORACLE_ADDRESSES', @@ -129,13 +122,9 @@ export enum envVar { PROMETHEUS_REMOTE_WRITE_URL = 'PROMETHEUS_REMOTE_WRITE_URL', PROMETHEUS_REMOTE_WRITE_USERNAME = 'PROMETHEUS_REMOTE_WRITE_USERNAME', PROXIED_VALIDATORS = 'PROXIED_VALIDATORS', - SMS_PROVIDERS = 'SMS_PROVIDERS', - SMS_PROVIDERS_RANDOMIZED = 'SMS_PROVIDERS_RANDOMIZED', PROXY_ROLLING_UPDATE_PARTITION = 'PROXY_ROLLING_UPDATE_PARTITION', SECONDARIES_ROLLING_UPDATE_PARTITION = 'SECONDARIES_ROLLING_UPDATE_PARTITION', STATIC_IPS_FOR_GETH_NODES = 'STATIC_IPS_FOR_GETH_NODES', - TELEKOM_FROM = 'TELEKOM_FROM', - TELEKOM_API_KEY = 'TELEKOM_API_KEY', TESTNET_PROJECT_NAME = 'TESTNET_PROJECT_NAME', TIMESTAMP = 'TIMESTAMP', TRANSACTION_METRICS_EXPORTER_BLOCK_INTERVAL = 'TRANSACTION_METRICS_EXPORTER_BLOCK_INTERVAL', @@ -145,10 +134,6 @@ export enum envVar { TRANSACTION_METRICS_EXPORTER_SUFFIX = 'TRANSACTION_METRICS_EXPORTER_SUFFIX', TRANSACTION_METRICS_EXPORTER_TO_BLOCK = 'TRANSACTION_METRICS_EXPORTER_TO_BLOCK', TRANSACTION_METRICS_EXPORTER_WATCH_ADDRESS = 'TRANSACTION_METRICS_EXPORTER_WATCH_ADDRESS', - TWILIO_ACCOUNT_AUTH_TOKEN = 'TWILIO_ACCOUNT_AUTH_TOKEN', - TWILIO_ACCOUNT_SID = 'TWILIO_ACCOUNT_SID', - TWILIO_ADDRESS_SID = 'TWILIO_ADDRESS_SID', - TWILIO_VERIFY_SERVICE_SID = `TWILIO_VERIFY_SERVICE_SID`, TX_NODES = 'TX_NODES', TX_NODES_PRIVATE_ROLLING_UPDATE_PARTITION = 'TX_NODES_PRIVATE_ROLLING_UPDATE_PARTITION', TX_NODES_ROLLING_UPDATE_PARTITION = 'TX_NODES_ROLLING_UPDATE_PARTITION', @@ -176,6 +161,7 @@ export enum envVar { * Dynamic env vars are env var names that can be dynamically constructed * using templates. */ + export enum DynamicEnvVar { AWS_CLUSTER_REGION = '{{ context }}_AWS_KUBERNETES_CLUSTER_REGION', AWS_RESOURCE_GROUP_TAG = '{{ context }}_AWS_KUBERNETES_RESOURCE_GROUP', @@ -216,7 +202,13 @@ export enum DynamicEnvVar { ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT = '{{ context }}_{{ currencyPair}}_ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT', ODIS_SIGNER_BLOCKCHAIN_API_KEY = '{{ context }}_ODIS_SIGNER_BLOCKCHAIN_API_KEY', ODIS_SIGNER_AZURE_KEYVAULT_NAME = '{{ context }}_ODIS_SIGNER_AZURE_KEYVAULT_NAME', - ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME = '{{ context }}_ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME', + ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE = '{{ context }}_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE', + ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION = '{{ context }}_ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION', + ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE = '{{ context }}_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE', + ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION = '{{ context }}_ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION', + ODIS_SIGNER_DOMAINS_API_ENABLED = '{{ context }}_ODIS_SIGNER_DOMAINS_API_ENABLED', + ODIS_SIGNER_PHONE_NUMBER_PRIVACY_API_ENABLED = '{{ context }}_ODIS_SIGNER_PNP_API_ENABLED', + ODIS_SIGNER_LEGACY_PHONE_NUMBER_PRIVACY_API_ENABLED = '{{ context }}_ODIS_SIGNER_LEGACY_PNP_API_ENABLED', ODIS_SIGNER_DB_HOST = '{{ context }}_ODIS_SIGNER_DB_HOST', ODIS_SIGNER_DB_PORT = '{{ context }}_ODIS_SIGNER_DB_PORT', ODIS_SIGNER_DB_USERNAME = '{{ context }}_ODIS_SIGNER_DB_USERNAME', diff --git a/packages/celotool/src/lib/k8s-oracle/rbac.ts b/packages/celotool/src/lib/k8s-oracle/rbac.ts index 92bfcd0c663..4ad47cd5cf1 100644 --- a/packages/celotool/src/lib/k8s-oracle/rbac.ts +++ b/packages/celotool/src/lib/k8s-oracle/rbac.ts @@ -64,13 +64,16 @@ export abstract class RbacOracleDeployer extends BaseOracleDeployer { async rbacServiceAccountSecretNames() { const names = [...Array(this.replicas).keys()].map((i) => `${this.rbacReleaseName()}-${i}`) + let jsonSecretPath = '"{.items[*].secrets[0][\'name\']}"' + if (names.length === 1) { + jsonSecretPath = '"{.secrets[0][\'name\']}"' + } const [tokenName] = await execCmdWithExitOnFailure( `kubectl get serviceaccount --namespace=${this.celoEnv} ${names.join( ' ' - )} -o=jsonpath="{.items[*].secrets[0]['name']}"` + )} -o=jsonpath=${jsonSecretPath}` ) - const tokenNames = tokenName.trim().split(' ') - return tokenNames + return tokenName.trim().split(' ') } rbacReleaseName() { diff --git a/packages/celotool/src/lib/odis.ts b/packages/celotool/src/lib/odis.ts index 8438ad0d952..6bed913c055 100644 --- a/packages/celotool/src/lib/odis.ts +++ b/packages/celotool/src/lib/odis.ts @@ -18,7 +18,10 @@ const helmChartPath = '../helm-charts/odis' */ interface ODISSignerKeyVaultConfig { vaultName: string - secretName: string + pnpKeyNameBase: string + pnpKeyLatestVersion: string + domainsKeyNameBase: string + domainsKeyLatestVersion: string } /** @@ -58,7 +61,10 @@ const contextODISSignerKeyVaultConfigDynamicEnvVars: { [k in keyof ODISSignerKeyVaultConfig]: DynamicEnvVar } = { vaultName: DynamicEnvVar.ODIS_SIGNER_AZURE_KEYVAULT_NAME, - secretName: DynamicEnvVar.ODIS_SIGNER_AZURE_KEYVAULT_SECRET_NAME, + pnpKeyNameBase: DynamicEnvVar.ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_NAME_BASE, + pnpKeyLatestVersion: DynamicEnvVar.ODIS_SIGNER_AZURE_KEYVAULT_PNP_KEY_LATEST_VERSION, + domainsKeyNameBase: DynamicEnvVar.ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_NAME_BASE, + domainsKeyLatestVersion: DynamicEnvVar.ODIS_SIGNER_AZURE_KEYVAULT_DOMAINS_KEY_LATEST_VERSION, } /** @@ -158,7 +164,13 @@ async function helmParameters(celoEnv: string, context: string) { `--set db.username=${databaseConfig.username}`, `--set db.password='${databaseConfig.password}'`, `--set keystore.vaultName=${keyVaultConfig.vaultName}`, - `--set keystore.secretName=${keyVaultConfig.secretName}`, + `--set keystore.pnpKeyNameBase=${keyVaultConfig.pnpKeyNameBase}`, + `--set keystore.domainsKeyNameBase=${keyVaultConfig.domainsKeyNameBase}`, + `--set keystore.pnpKeyLatestVersion=${keyVaultConfig.pnpKeyLatestVersion}`, + `--set keystore.domainsKeyLatestVersion=${keyVaultConfig.domainsKeyLatestVersion}`, + `--set api.pnpAPIEnabled=${fetchEnv(envVar.ODIS_SIGNER_PNP_API_ENABLED)}`, + `--set api.legacyPnpAPIEnabled=${fetchEnv(envVar.ODIS_SIGNER_LEGACY_PNP_API_ENABLED)}`, + `--set api.domainsAPIEnabled=${fetchEnv(envVar.ODIS_SIGNER_DOMAINS_API_ENABLED)}`, `--set blockchainProvider=${fetchEnv(envVar.ODIS_SIGNER_BLOCKCHAIN_PROVIDER)}`, `--set blockchainApiKey=${blockchainConfig.blockchainApiKey}`, `--set log.level=${loggingConfig.level}`, diff --git a/packages/celotool/src/lib/oracle.ts b/packages/celotool/src/lib/oracle.ts index b96e58f4f14..9f563cce7f1 100644 --- a/packages/celotool/src/lib/oracle.ts +++ b/packages/celotool/src/lib/oracle.ts @@ -303,7 +303,7 @@ const mnemonicBasedOracleIdentityConfigDynamicEnvVars: { */ export function addCurrencyPairMiddleware(argv: yargs.Argv) { return argv.option('currencyPair', { - choices: ['CELOUSD', 'CELOEUR', 'CELOBRL', 'CELOBTC'], + choices: ['CELOUSD', 'CELOEUR', 'CELOBRL', 'USDCUSD'], description: 'Oracle deployment to target based on currency pair', demandOption: true, type: 'string', diff --git a/packages/celotool/twilio-config.enc b/packages/celotool/twilio-config.enc deleted file mode 100644 index 8cfa49e807f80499098799e0faf975da73a8ae4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmVW1bDgZG~zG7iO;f+X|mk`g^6D;dr!9D!<3Da zf>H7lyA6+=XuW~IR&v-9AW*8(;s&}&c5d}_5vZKFNyhB#dSekU2 diff --git a/packages/cli/.npmignore b/packages/cli/.npmignore index bb21ce7ab7b..4c9170c6257 100644 --- a/packages/cli/.npmignore +++ b/packages/cli/.npmignore @@ -1,28 +1,2 @@ -/.devchain/ -/.devchain.tar.gz -/coverage/ -/node_modules/ -/src/ -/tslint.json -/tsconfig.* -/jest.config.* -*.tgz - -/src - -/lib/**/*.test.* -/lib/test-utils - -/tmp/ -/.tmp/ - -/scripts - - -# exclude ts files and sourcemaps -*.map -*.ts - -# include the .d.ts files -!lib/**/*.d.ts \ No newline at end of file +# use the files array in package.json to include files \ No newline at end of file diff --git a/packages/cli/npm-shrinkwrap.json b/packages/cli/npm-shrinkwrap.json index 14757735ba6..87cfd323ae1 100644 --- a/packages/cli/npm-shrinkwrap.json +++ b/packages/cli/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "@celo/celocli", - "version": "1.7.3", + "version": "1.8.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -13,9 +13,9 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, @@ -29,16 +29,16 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, "@azure/core-client": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz", - "integrity": "sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz", + "integrity": "sha512-fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -58,9 +58,9 @@ } }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, @@ -85,31 +85,31 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, "@azure/core-paging": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz", - "integrity": "sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz", + "integrity": "sha512-tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw==", "requires": { "tslib": "^2.2.0" }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, "@azure/core-rest-pipeline": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.2.tgz", - "integrity": "sha512-8rXI6ircjenaLp+PkOFpo37tQ1PQfztZkfVj97BIF3RPxHAsoVSgkJtu3IK/bUEWcb7HzXSoyBe06M7ODRkRyw==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz", + "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -142,9 +142,9 @@ } }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" }, "uuid": { "version": "8.3.2", @@ -163,24 +163,25 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, "@azure/core-util": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.0.tgz", - "integrity": "sha512-+i93lNJNA3Pl3KSuC6xKP2jTL4YFeDfO6VNOaYdk0cppZcLCxt811gS878VsqsCisaltdhl9lhMzK5kbxCiF4w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz", + "integrity": "sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==", "requires": { + "@azure/abort-controller": "^1.0.0", "tslib": "^2.2.0" }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, @@ -209,9 +210,9 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" }, "uuid": { "version": "8.3.2", @@ -247,9 +248,9 @@ } }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, @@ -280,9 +281,9 @@ } }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, @@ -295,9 +296,9 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, @@ -328,9 +329,9 @@ } }, "@celo/base": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/base/-/base-2.2.0.tgz", - "integrity": "sha512-+jo52+er1TV9Qe6nCmzQ2dLt6M8J9STEJDaU+uiPyMVhMBcnYBpWzu9FJJPERmttejOC7hFuudrJI83vJulc4Q==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/base/-/base-3.1.0.tgz", + "integrity": "sha512-jgjEbavcjkW2Y/kjAG9xKhFd/YU3hjva9H/zB/UXIzpOIbwrUoJS35fc9JDQty/g7FOEZI+uqrvpBLuoOJTAXw==" }, "@celo/bls12377js": { "version": "0.1.1", @@ -342,12 +343,12 @@ } }, "@celo/connect": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/connect/-/connect-2.2.0.tgz", - "integrity": "sha512-IAT1f3+ZYMod0H6M8HorZj8bNhfgxjL7GlofdNZRceTo1Cy8iyNr+26K+x5sHeXI8QgTUKdaxLWgmCQCEU7ARw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/connect/-/connect-3.1.0.tgz", + "integrity": "sha512-zJyP+YQrKNHot4lVquDPescFciZfBddvFElrnbUwFYQ93VmfLYnAMkEsDrinO7V9mRXI1FVk4tB/gGXNxVzWgw==", "requires": { - "@celo/base": "2.2.0", - "@celo/utils": "2.2.0", + "@celo/base": "3.1.0", + "@celo/utils": "3.1.0", "@types/debug": "^4.1.5", "@types/utf8": "^2.1.6", "bignumber.js": "^9.0.0", @@ -356,14 +357,14 @@ } }, "@celo/contractkit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/contractkit/-/contractkit-2.2.0.tgz", - "integrity": "sha512-nIgCGDnOtCG5QtPJFzaDOOk12O6A8Bjk+tey46okeasvcT1uw2mQpLoelQ/PloTSbLQty3/IATNSPrQWqXShFA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/contractkit/-/contractkit-3.1.0.tgz", + "integrity": "sha512-IUuwNGWC0MTLtC5t9CL6jljjkAnuR4AHV8BYQkwSOk1PPawaQd2x//6kYMXNlu8eWFjlukG+OEkAatzQaj/VFw==", "requires": { - "@celo/base": "2.2.0", - "@celo/connect": "2.2.0", - "@celo/utils": "2.2.0", - "@celo/wallet-local": "2.2.0", + "@celo/base": "3.1.0", + "@celo/connect": "3.1.0", + "@celo/utils": "3.1.0", + "@celo/wallet-local": "3.1.0", "@types/bn.js": "^5.1.0", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", @@ -376,13 +377,13 @@ } }, "@celo/cryptographic-utils": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/cryptographic-utils/-/cryptographic-utils-2.2.0.tgz", - "integrity": "sha512-ju5WxT3qr8HNK1tsgkrVNhFOgXoiDDFpo8ixrsX8EIDYS3yZDnn/X9nMd3PKfpAbOzc2OVW2PmatQc0bJXxI9Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/cryptographic-utils/-/cryptographic-utils-3.1.0.tgz", + "integrity": "sha512-R4oRP0f+e8YQmSR2L9+vDXDNZdqQ5p05gQVqBQJpDAl/jq85D6oA0GH2gecBGLY7RyCHhqKqoNJqt7rGuPOUrg==", "requires": { - "@celo/base": "2.2.0", + "@celo/base": "3.1.0", "@celo/bls12377js": "0.1.1", - "@celo/utils": "2.2.0", + "@celo/utils": "3.1.0", "@types/bn.js": "^5.1.0", "@types/elliptic": "^6.4.9", "@types/ethereumjs-util": "^5.2.0", @@ -420,28 +421,29 @@ } }, "@celo/explorer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/explorer/-/explorer-2.2.0.tgz", - "integrity": "sha512-i4QzgMbUt0MdypVk4ymNNCkTKoi42DNcPFI03tJRNM2S12knRnqRpJUUr2DP+nXzIuInasdAHu374c2gqKkkgQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/explorer/-/explorer-3.1.0.tgz", + "integrity": "sha512-f3rUpHXZ3FvpdTsAqq0dNNSzGKFsG89AfQ2QiMTy9rcOlmOTnxx8LVrFafA+BBk5bjwZBE6n8YmTNsCBb2qcfQ==", "requires": { - "@celo/base": "2.2.0", - "@celo/connect": "2.2.0", - "@celo/contractkit": "2.2.0", - "@celo/utils": "2.2.0", + "@celo/base": "3.1.0", + "@celo/connect": "3.1.0", + "@celo/contractkit": "3.1.0", + "@celo/utils": "3.1.0", "@types/debug": "^4.1.5", + "cross-fetch": "^3.1.5", "debug": "^4.1.1" } }, "@celo/governance": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/governance/-/governance-2.2.0.tgz", - "integrity": "sha512-b1GZVbkwcWfbqEOX603TGHUgbNhqOdIhrJrHbRRi7mPAjwlgPDVa9EtRrONRMWlbe6sbuLalXqN0oX61t5o2og==", - "requires": { - "@celo/base": "2.2.0", - "@celo/connect": "2.2.0", - "@celo/contractkit": "2.2.0", - "@celo/explorer": "2.2.0", - "@celo/utils": "2.2.0", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/governance/-/governance-3.1.0.tgz", + "integrity": "sha512-k+vRGt9l4Iusx54Isa37qROzcDn5Ivsjo3GoaoTOz5+mGJ/0DZr03gft1RdjeMX7DOkyriaJpfEofccvTsdPbQ==", + "requires": { + "@celo/base": "3.1.0", + "@celo/connect": "3.1.0", + "@celo/contractkit": "3.1.0", + "@celo/explorer": "3.1.0", + "@celo/utils": "3.1.0", "@types/debug": "^4.1.5", "@types/ethereumjs-util": "^5.2.0", "@types/inquirer": "^6.5.0", @@ -451,14 +453,14 @@ } }, "@celo/identity": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/identity/-/identity-2.2.0.tgz", - "integrity": "sha512-8VrbtC51+7Hw2oiuRzVhNU/HvK8dapUuzl1yN9lWlETgfHsiiJMk8ucw4oqJc137siBRxUdHIxuHgsDXzUzsdQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/identity/-/identity-3.1.0.tgz", + "integrity": "sha512-ZAE8PoEJn2ODRX5vdcMCN+uaxUSKJmKOEjoefzuCj9cI7E4W5y7fG253UGC5vfcBNLrts9u/LLw7QqWuuHq1EA==", "requires": { - "@celo/base": "2.2.0", - "@celo/contractkit": "2.2.0", - "@celo/phone-number-privacy-common": "1.0.39", - "@celo/utils": "2.2.0", + "@celo/base": "3.1.0", + "@celo/contractkit": "3.1.0", + "@celo/phone-number-privacy-common": "^2.0.2", + "@celo/utils": "3.1.0", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", "blind-threshold-bls": "git+https://github.com/celo-org/blind-threshold-bls-wasm.git#e1e2f8a", @@ -486,138 +488,31 @@ } }, "@celo/phone-number-privacy-common": { - "version": "1.0.39", - "resolved": "https://registry.npmjs.org/@celo/phone-number-privacy-common/-/phone-number-privacy-common-1.0.39.tgz", - "integrity": "sha512-0sbeuoYCN2ZQYO1CryR0Hf9HhOQKuIDZraWFMpUlwrUKk5qKmSMlV16xobG4VL5qUpXHgIRjKPfmcaf0rkrn8A==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@celo/phone-number-privacy-common/-/phone-number-privacy-common-2.0.2.tgz", + "integrity": "sha512-bQ3ufYADU+LDnZyQPl+/zVQMTPREgwmYXFremKkm4nlTm+83Ti9G7obXeMkFtDrG//vvgC8ryMHq0ZkYh5XkFA==", "requires": { - "@celo/base": "1.5.2", - "@celo/contractkit": "1.5.2", - "@celo/utils": "1.5.2", + "@celo/base": "^3.1.0", + "@celo/contractkit": "^3.1.0", + "@celo/phone-utils": "^3.1.0", + "@celo/utils": "^3.1.0", "bignumber.js": "^9.0.0", - "blind-threshold-bls": "git+https://github.com/celo-org/blind-threshold-bls-wasm.git#e1e2f8a", - "btoa": "1.2.1", "bunyan": "1.8.12", "bunyan-debug-stream": "2.0.0", "bunyan-gke-stackdriver": "0.1.2", "dotenv": "^8.2.0", "elliptic": "^6.5.4", + "io-ts": "2.0.1", "is-base64": "^1.1.0" - }, - "dependencies": { - "@celo/base": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@celo/base/-/base-1.5.2.tgz", - "integrity": "sha512-KGf6Dl9E6D01vAfkgkjL2sG+zqAjspAogILIpWstljWdG5ifyA75jihrnDEHaMCoQS0KxHvTdP1XYS/GS6BEyQ==" - }, - "@celo/connect": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@celo/connect/-/connect-1.5.2.tgz", - "integrity": "sha512-IHsvYp1HizIPfPPeIHyvsmJytIf7HNtNWo9CqCbsqfNfmw53q6dFJu2p5X0qz/fUnR5840cUga8cEyuYZTfp+w==", - "requires": { - "@celo/utils": "1.5.2", - "@types/debug": "^4.1.5", - "@types/utf8": "^2.1.6", - "bignumber.js": "^9.0.0", - "debug": "^4.1.1", - "utf8": "3.0.0" - } - }, - "@celo/contractkit": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@celo/contractkit/-/contractkit-1.5.2.tgz", - "integrity": "sha512-b0r5TlfYDEscxze1Ai2jyJayiVElA9jvEehMD6aOSNtVhfP8oirjFIIffRe0Wzw1MSDGkw+q1c4m0Yw5sEOlvA==", - "requires": { - "@celo/base": "1.5.2", - "@celo/connect": "1.5.2", - "@celo/utils": "1.5.2", - "@celo/wallet-local": "1.5.2", - "@types/debug": "^4.1.5", - "bignumber.js": "^9.0.0", - "cross-fetch": "^3.0.6", - "debug": "^4.1.1", - "fp-ts": "2.1.1", - "io-ts": "2.0.1", - "semver": "^7.3.5", - "web3": "1.3.6" - } - }, - "@celo/utils": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@celo/utils/-/utils-1.5.2.tgz", - "integrity": "sha512-JyKjuVMbdkyFOb1TpQw6zqamPQWYg7I9hOnva3MeIcQ3ZrJIaNHx0/I+JXFjuu3YYBc1mG8nXp2uPJJTGrwzCQ==", - "requires": { - "@celo/base": "1.5.2", - "@types/country-data": "^0.0.0", - "@types/elliptic": "^6.4.9", - "@types/ethereumjs-util": "^5.2.0", - "@types/google-libphonenumber": "^7.4.17", - "@types/lodash": "^4.14.170", - "@types/node": "^10.12.18", - "@types/randombytes": "^2.0.0", - "bigi": "^1.1.0", - "bignumber.js": "^9.0.0", - "bip32": "2.0.5", - "bip39": "git+https://github.com/bitcoinjs/bip39.git#d8ea080a18b40f301d4e2219a2991cd2417e83c2", - "bls12377js": "git+https://github.com/celo-org/bls12377js.git#cb38a4cfb643c778619d79b20ca3e5283a2122a6", - "bn.js": "4.11.8", - "buffer-reverse": "^1.0.1", - "country-data": "^0.0.31", - "crypto-js": "^3.1.9-1", - "elliptic": "^6.5.4", - "ethereumjs-util": "^5.2.0", - "fp-ts": "2.1.1", - "google-libphonenumber": "^3.2.15", - "io-ts": "2.0.1", - "keccak256": "^1.0.0", - "lodash": "^4.17.21", - "numeral": "^2.0.6", - "web3-eth-abi": "1.3.6", - "web3-utils": "1.3.6" - } - }, - "@celo/wallet-base": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@celo/wallet-base/-/wallet-base-1.5.2.tgz", - "integrity": "sha512-NYJu7OtSRFpGcvSMl2Wc8zN32S6oTkAzKqhH7rXisQ0I2q4yNwCzoquzPVYB0G2UVUFKuuxgsA5V+Zda/LQCyw==", - "requires": { - "@celo/base": "1.5.2", - "@celo/connect": "1.5.2", - "@celo/utils": "1.5.2", - "@types/debug": "^4.1.5", - "@types/ethereumjs-util": "^5.2.0", - "bignumber.js": "^9.0.0", - "debug": "^4.1.1", - "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0" - } - }, - "@celo/wallet-local": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@celo/wallet-local/-/wallet-local-1.5.2.tgz", - "integrity": "sha512-Aas4SwqQc8ap0OFAOZc+jBR4cXr20V9AReHNEI8Y93R3g1+RlSEJ1Zmsu4vN+Rriz58YqgMnr+pihorw8QydFQ==", - "requires": { - "@celo/connect": "1.5.2", - "@celo/utils": "1.5.2", - "@celo/wallet-base": "1.5.2", - "@types/ethereumjs-util": "^5.2.0", - "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0" - } - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" - } } }, "@celo/phone-utils": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/phone-utils/-/phone-utils-2.2.0.tgz", - "integrity": "sha512-5XgHvoZ9zDIddaAUQFClIgSj9dv2bgjyf47vfp7I4wPRXMzECT43Aq1VWsj8cs4Z6bANUpgf7WQThTYoAjkTsA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/phone-utils/-/phone-utils-3.1.0.tgz", + "integrity": "sha512-e1zTdoHXqw3Uten/syOm0c1Ts7zADt7iPZ11WjvNzGY8sFijB4f8X9oTfaycfJpPXEXQ7KWJ32H52Wu3Ryxwkg==", "requires": { - "@celo/base": "2.2.0", - "@celo/utils": "2.2.0", + "@celo/base": "3.1.0", + "@celo/utils": "3.1.0", "@types/country-data": "^0.0.0", "@types/ethereumjs-util": "^5.2.0", "@types/google-libphonenumber": "^7.4.23", @@ -629,11 +524,11 @@ } }, "@celo/utils": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/utils/-/utils-2.2.0.tgz", - "integrity": "sha512-oCDZt44Ch30/4m+G+7gcuiKmo/WgptMpmxxSLH+h3Wmc6LUWS/F/9SFcdlTbJF0sH3LOXchczO+HUlATJ+vQNQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/utils/-/utils-3.1.0.tgz", + "integrity": "sha512-5HnkJmrH5M76hbmVT3fr5Mz8Dz0cHjBwRoeXE7So8xFS8/ffn1gxKPNnL6qGfFDco34Y72UGbvIDj/ws1YZ2tQ==", "requires": { - "@celo/base": "2.2.0", + "@celo/base": "3.1.0", "@types/bn.js": "^5.1.0", "@types/elliptic": "^6.4.9", "@types/ethereumjs-util": "^5.2.0", @@ -647,13 +542,13 @@ } }, "@celo/wallet-base": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/wallet-base/-/wallet-base-2.2.0.tgz", - "integrity": "sha512-zL05/tJzPWWvGGaQKEkcEYCLJRJwl7PLskJNWCiloGLfmPd7L1g96ulU1ZGffeO+kVIcUvwtQ9AS7ky4CbHybQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/wallet-base/-/wallet-base-3.1.0.tgz", + "integrity": "sha512-64uYFKER0rM4DBpNQww5ADqQzoEHRayItPv8F4qD9u9JyBo/kUEPOz+/z8j7h+feNprksPDhRmZ/b9Uo907IbQ==", "requires": { - "@celo/base": "2.2.0", - "@celo/connect": "2.2.0", - "@celo/utils": "2.2.0", + "@celo/base": "3.1.0", + "@celo/connect": "3.1.0", + "@celo/utils": "3.1.0", "@types/debug": "^4.1.5", "@types/ethereumjs-util": "^5.2.0", "bignumber.js": "^9.0.0", @@ -663,11 +558,11 @@ } }, "@celo/wallet-hsm": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/wallet-hsm/-/wallet-hsm-2.2.0.tgz", - "integrity": "sha512-tMNMQVdwvhjgnKRIFomDXaz6BVMDBbl7K7IJAjpbxMsX8OAuSGWccn1a0bADFvnW0YVTnrLTn8kFqbGF6QafQQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/wallet-hsm/-/wallet-hsm-3.1.0.tgz", + "integrity": "sha512-C6yIyosC6yI6dbWSaoVZN5P6N9neRxxMq74fIN3b+wEm8rO6qXzRCiAa6eRUfONHG3RYW9VAmdtR4Irpx2P0eA==", "requires": { - "@celo/base": "2.2.0", + "@celo/base": "3.1.0", "@types/asn1js": "^0.0.2", "@types/debug": "^4.1.5", "@types/secp256k1": "^4.0.0", @@ -679,18 +574,18 @@ } }, "@celo/wallet-hsm-azure": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/wallet-hsm-azure/-/wallet-hsm-azure-2.2.0.tgz", - "integrity": "sha512-RqYn9LvptCRZLHmQoBe3eq/JWosMfMpwDIxRjR7eSCjHaJk+MSSv/NNbjxEvbOFprOswnDxAhAzTELc/kdyWtA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/wallet-hsm-azure/-/wallet-hsm-azure-3.1.0.tgz", + "integrity": "sha512-rAV+phexSqFPADBdqPdnhw0C3DqYw8t3ff69UvKgy3imz2uawnXp541YJAZce+w8Kzob8WsuFOR1bx86GY2/Ug==", "requires": { "@azure/identity": "^1.1.0", "@azure/keyvault-keys": "^4.1.0", "@azure/keyvault-secrets": "^4.1.0", - "@celo/connect": "2.2.0", - "@celo/utils": "2.2.0", - "@celo/wallet-base": "2.2.0", - "@celo/wallet-hsm": "2.2.0", - "@celo/wallet-remote": "2.2.0", + "@celo/connect": "3.1.0", + "@celo/utils": "3.1.0", + "@celo/wallet-base": "3.1.0", + "@celo/wallet-hsm": "3.1.0", + "@celo/wallet-remote": "3.1.0", "@types/secp256k1": "^4.0.0", "bignumber.js": "^9.0.0", "debug": "^4.1.1", @@ -700,14 +595,14 @@ } }, "@celo/wallet-ledger": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/wallet-ledger/-/wallet-ledger-2.2.0.tgz", - "integrity": "sha512-/Z833SpQ4Wyq/Zd6rmnQi3C6WHy43Zyhq+UvsnFBYHEvbRyP+DyA13DFs6yciRcRfgGtaht9sTf8iG9bZh2Wvw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/wallet-ledger/-/wallet-ledger-3.1.0.tgz", + "integrity": "sha512-VYDx4oCK6UZY5fvP+zM64f4riYv9a+dhesLzQA8VfrPTGkPEiEtc7HZwhFBcOslTiHjztCH68YbLAVQtDe0NNg==", "requires": { - "@celo/connect": "2.2.0", - "@celo/utils": "2.2.0", - "@celo/wallet-base": "2.2.0", - "@celo/wallet-remote": "2.2.0", + "@celo/connect": "3.1.0", + "@celo/utils": "3.1.0", + "@celo/wallet-base": "3.1.0", + "@celo/wallet-remote": "3.1.0", "@ledgerhq/hw-app-eth": "~5.11.0", "@ledgerhq/hw-transport": "~5.11.0", "@types/ethereumjs-util": "^5.2.0", @@ -717,26 +612,26 @@ } }, "@celo/wallet-local": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/wallet-local/-/wallet-local-2.2.0.tgz", - "integrity": "sha512-l+RJkieGlnUT+q39/aGrRnFlhbwQsiPGsLoDebW7OuYncExRGf0Pid48ke+yrl7/0nBxNXDSRuNMW9qI0AlHSw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/wallet-local/-/wallet-local-3.1.0.tgz", + "integrity": "sha512-gpBmyRFK1sxfJWVBu8TksnO5mGnYbe6sbP4gHrIxrVUjjuwz5DaaPvpLbnI9YMLR90iw3+2nKAvDV6jR/fIe8w==", "requires": { - "@celo/connect": "2.2.0", - "@celo/utils": "2.2.0", - "@celo/wallet-base": "2.2.0", + "@celo/connect": "3.1.0", + "@celo/utils": "3.1.0", + "@celo/wallet-base": "3.1.0", "@types/ethereumjs-util": "^5.2.0", "eth-lib": "^0.2.8", "ethereumjs-util": "^5.2.0" } }, "@celo/wallet-remote": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@celo/wallet-remote/-/wallet-remote-2.2.0.tgz", - "integrity": "sha512-SEcDJfWf7NITCFOBPIAHkpJFi1dIc2gvkXvde2cqkjBlwa3a7vlp8gZdyA8sQA25jy9WAaGCseOFNrJKgGM6VQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@celo/wallet-remote/-/wallet-remote-3.1.0.tgz", + "integrity": "sha512-MYPuu8qORONw8XEvHl4ww0P8NZzIw26zxbUmXLT+20Cb0wLhvX8A4zV6DdUN4gR3qW9j21yrbu3WE6g24lCaqw==", "requires": { - "@celo/connect": "2.2.0", - "@celo/utils": "2.2.0", - "@celo/wallet-base": "2.2.0", + "@celo/connect": "3.1.0", + "@celo/utils": "3.1.0", + "@celo/wallet-base": "3.1.0", "@types/debug": "^4.1.5", "@types/ethereumjs-util": "^5.2.0", "eth-lib": "^0.2.8", @@ -2299,9 +2194,9 @@ "integrity": "sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==" }, "@opentelemetry/api": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz", - "integrity": "sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.3.0.tgz", + "integrity": "sha512-YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==" }, "@protobufjs/aspromise": { "version": "1.1.2", @@ -2483,11 +2378,6 @@ "rxjs": "^6.4.0" } }, - "@types/lodash": { - "version": "4.14.186", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz", - "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==" - }, "@types/long": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", @@ -2581,11 +2471,6 @@ "uri-js": "^4.2.2" } }, - "ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==" - }, "ansi-escapes": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", @@ -2655,11 +2540,6 @@ } } }, - "arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" - }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -2678,18 +2558,6 @@ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" }, - "array.prototype.reduce": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz", - "integrity": "sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.2", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.7" - } - }, "asn1": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", @@ -2722,11 +2590,6 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==" }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==" - }, "async": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", @@ -2773,7 +2636,8 @@ "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "optional": true }, "base-x": { "version": "3.0.9", @@ -2807,9 +2671,9 @@ "integrity": "sha512-ddkU+dFIuEIW8lE7ZwdIAf2UPoM90eaprg5m3YXAVVTmKlqV/9BX4A2M8BOK2yOq6/VgZFVhK6QAxJebhlbhzw==" }, "bignumber.js": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz", - "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==" + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz", + "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==" }, "bindings": { "version": "1.5.0", @@ -2876,31 +2740,6 @@ "version": "git+https://github.com/celo-org/blind-threshold-bls-wasm.git#e1e2f8a1ab5154c2f0b1c55cb0d61fbb1d907208", "from": "git+https://github.com/celo-org/blind-threshold-bls-wasm.git#e1e2f8a" }, - "bls12377js": { - "version": "git+https://github.com/celo-org/bls12377js.git#cb38a4cfb643c778619d79b20ca3e5283a2122a6", - "from": "git+https://github.com/celo-org/bls12377js.git#cb38a4cfb643c778619d79b20ca3e5283a2122a6", - "requires": { - "@stablelib/blake2xs": "0.10.4", - "@types/node": "^12.11.7", - "big-integer": "^1.6.44", - "chai": "^4.2.0", - "mocha": "^6.2.2", - "ts-node": "^8.4.1", - "typescript": "^3.6.4" - }, - "dependencies": { - "@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" - }, - "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==" - } - } - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -2949,6 +2788,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2967,11 +2807,6 @@ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==" - }, "browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", @@ -3063,11 +2898,6 @@ "safe-buffer": "^5.1.2" } }, - "btoa": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", - "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==" - }, "buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -3082,11 +2912,6 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, "buffer-reverse": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-reverse/-/buffer-reverse-1.0.1.tgz", @@ -3185,11 +3010,6 @@ "get-intrinsic": "^1.0.2" } }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, "cardinal": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", @@ -3204,20 +3024,6 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, - "chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", - "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", - "pathval": "^1.1.1", - "type-detect": "^4.0.5" - } - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -3269,11 +3075,6 @@ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==" - }, "chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -3506,82 +3307,6 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==" }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==" - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - } - } - }, "clone-response": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", @@ -3629,7 +3354,8 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "optional": true }, "console-control-strings": { "version": "1.1.0", @@ -3781,11 +3507,6 @@ "randomfill": "^1.0.3" } }, - "crypto-js": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz", - "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==" - }, "currency-symbol-map": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/currency-symbol-map/-/currency-symbol-map-2.2.0.tgz", @@ -3816,11 +3537,6 @@ "ms": "2.1.2" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" - }, "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", @@ -3834,14 +3550,6 @@ "mimic-response": "^1.0.0" } }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "requires": { - "type-detect": "^4.0.0" - } - }, "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -3896,11 +3604,6 @@ "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", "optional": true }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" - }, "diffie-hellman": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", @@ -4045,11 +3748,6 @@ "unbox-primitive": "^1.0.2" } }, - "es-array-method-boxes-properly": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", - "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==" - }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -4487,14 +4185,6 @@ } } }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, "firebase": { "version": "7.24.0", "resolved": "https://registry.npmjs.org/firebase/-/firebase-7.24.0.tgz", @@ -4516,14 +4206,6 @@ "@firebase/util": "0.3.2" } }, - "flat": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz", - "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==", - "requires": { - "is-buffer": "~2.0.3" - } - }, "follow-redirects": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", @@ -4595,11 +4277,6 @@ "minipass": "^2.6.0" } }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -4674,11 +4351,6 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==" - }, "get-intrinsic": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", @@ -4720,14 +4392,14 @@ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==" }, "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", + "optional": true, "requires": { - "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", + "minimatch": "2 || 3", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } @@ -4777,11 +4449,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==" - }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -4872,11 +4539,6 @@ "minimalistic-assert": "^1.0.1" } }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" - }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -5020,6 +4682,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "optional": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -5145,11 +4808,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" - }, "is-callable": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", @@ -5469,32 +5127,6 @@ "readable-stream": "^3.6.0" } }, - "keccak256": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/keccak256/-/keccak256-1.0.6.tgz", - "integrity": "sha512-8GLiM01PkdJVGUhR1e6M/AvWnSqYS0HaERI+K/QtStGDGlSTx2B1zTqZk4Zlqu5TxHJNTxWAdP9Y+WI50OApUw==", - "requires": { - "bn.js": "^5.2.0", - "buffer": "^6.0.3", - "keccak": "^3.0.2" - }, - "dependencies": { - "bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, - "buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - } - } - }, "keytar": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz", @@ -5545,15 +5177,6 @@ } } }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -5626,27 +5249,11 @@ "lodash._reinterpolate": "^3.0.0" } }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "requires": { - "chalk": "^2.0.1" - } - }, "long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "loupe": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", - "requires": { - "get-func-name": "^2.0.0" - } - }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -5660,11 +5267,6 @@ "yallist": "^4.0.0" } }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" - }, "map-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", @@ -5770,9 +5372,10 @@ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5824,83 +5427,6 @@ "mkdirp": "*" } }, - "mocha": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", - "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==", - "requires": { - "ansi-colors": "3.2.3", - "browser-stdout": "1.3.1", - "debug": "3.2.6", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "find-up": "3.0.0", - "glob": "7.1.3", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "2.2.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.4", - "ms": "2.1.1", - "node-environment-flags": "1.0.5", - "object.assign": "4.1.0", - "strip-json-comments": "2.0.1", - "supports-color": "6.0.0", - "which": "1.3.1", - "wide-align": "1.1.3", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.0" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" - }, - "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", - "requires": { - "minimist": "^1.2.5" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - } - }, - "supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "mock-fs": { "version": "4.14.0", "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz", @@ -6031,9 +5557,9 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "node-abi": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz", - "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==", + "version": "3.31.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz", + "integrity": "sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==", "optional": true, "requires": { "semver": "^7.3.5" @@ -6044,22 +5570,6 @@ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==" }, - "node-environment-flags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", - "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", - "requires": { - "object.getownpropertydescriptors": "^2.0.3", - "semver": "^5.7.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -6199,11 +5709,6 @@ } } }, - "numeral": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", - "integrity": "sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==" - }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -6240,17 +5745,6 @@ "object-keys": "^1.1.1" } }, - "object.getownpropertydescriptors": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz", - "integrity": "sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==", - "requires": { - "array.prototype.reduce": "^1.0.4", - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.1" - } - }, "oboe": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.5.tgz", @@ -6307,22 +5801,6 @@ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==" }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, "p-timeout": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", @@ -6331,11 +5809,6 @@ "p-finally": "^1.0.0" } }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, "parse-asn1": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", @@ -6407,15 +5880,11 @@ } } }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==" - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "optional": true }, "path-key": { "version": "2.0.1", @@ -6432,11 +5901,6 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, - "pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==" - }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", @@ -6761,11 +6225,6 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, "responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -6795,21 +6254,6 @@ "optional": true, "requires": { "glob": "^6.0.1" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", - "optional": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } } }, "ripemd160": { @@ -7049,20 +6493,6 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -7431,25 +6861,6 @@ "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==" }, - "ts-node": { - "version": "8.10.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", - "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", - "requires": { - "arg": "^4.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "source-map-support": "^0.5.17", - "yn": "3.1.1" - }, - "dependencies": { - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==" - } - } - }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -7473,11 +6884,6 @@ "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==" - }, "type-fest": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", @@ -8040,11 +7446,6 @@ "is-symbol": "^1.0.3" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==" - }, "which-typed-array": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz", @@ -8164,11 +7565,6 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, - "y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" - }, "yaeti": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", @@ -8179,86 +7575,10 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==" - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==" - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "yargs-unparser": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", - "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", - "requires": { - "flat": "^4.1.0", - "lodash": "^4.17.15", - "yargs": "^13.3.0" - } - }, "yarn": { "version": "1.22.19", "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.19.tgz", "integrity": "sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==" - }, - "yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==" } } } diff --git a/packages/cli/package.json b/packages/cli/package.json index a3438c7fd48..d8863ef2929 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@celo/celocli", "description": "CLI Tool for transacting with the Celo protocol", - "version": "1.7.3", + "version": "1.8.0", "author": "Celo", "license": "Apache-2.0", "repository": "celo-org/celo-monorepo", @@ -29,22 +29,22 @@ "generate:shrinkwrap": "npm install --production && npm shrinkwrap", "check:shrinkwrap": "npm install --production && npm shrinkwrap && ./scripts/check_shrinkwrap_dirty.sh", "prepack": "yarn run build && oclif-dev manifest && oclif-dev readme && yarn run check:shrinkwrap", - "test:reset": "yarn --cwd ../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../dev-utils/src/migration-override.json --upto 28 --release_gold_contracts scripts/truffle/releaseGoldExampleConfigs.json", + "test:reset": "yarn --cwd ../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../dev-utils/src/migration-override.json --upto 27 --release_gold_contracts scripts/truffle/releaseGoldExampleConfigs.json", "test:livechain": "yarn --cwd ../protocol devchain run-tar .tmp/devchain.tar.gz", "test": "TZ=UTC jest --runInBand" }, "dependencies": { "@celo/bls12377js": "0.1.1", - "@celo/contractkit": "2.2.1-dev", - "@celo/explorer": "2.2.1-dev", - "@celo/governance": "2.2.1-dev", - "@celo/identity": "2.2.1-dev", - "@celo/phone-utils": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", - "@celo/cryptographic-utils": "2.2.1-dev", - "@celo/wallet-hsm-azure": "2.2.1-dev", - "@celo/wallet-ledger": "2.2.1-dev", - "@celo/wallet-local": "2.2.1-dev", + "@celo/contractkit": "^3.2.1-dev", + "@celo/explorer": "^3.2.1-dev", + "@celo/governance": "^3.2.1-dev", + "@celo/identity": "^3.2.1-dev", + "@celo/phone-utils": "^3.2.1-dev", + "@celo/utils": "^3.2.1-dev", + "@celo/cryptographic-utils": "^3.2.1-dev", + "@celo/wallet-hsm-azure": "^3.2.1-dev", + "@celo/wallet-ledger": "^3.2.1-dev", + "@celo/wallet-local": "^3.2.1-dev", "@ledgerhq/hw-transport-node-hid": "^6.27.4", "@oclif/command": "^1.6.0", "@oclif/config": "^1.6.0", @@ -56,6 +56,7 @@ "@types/command-exists": "^1.2.0", "@oclif/plugin-plugins": "^1.9.4", "bip32": "3.1.0", + "bignumber.js": "9.0.0", "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", "chalk": "^2.4.2", "cli-table": "^0.3.1", @@ -97,6 +98,10 @@ "CHANGELOG.md", "/bin", "/lib", + "!lib/**/*.map", + "!lib/test-utils", + "!lib/**/*.test.**", + "!lib/**/*.d.ts", "/oclif.manifest.json", "/npm-shrinkwrap.json" ], @@ -165,4 +170,4 @@ "prerun": "./lib/hooks/prerun/plugin-warning" } } -} +} \ No newline at end of file diff --git a/packages/cli/releasing.md b/packages/cli/releasing.md index 0ef5fcd6e30..f4b1c962f08 100644 --- a/packages/cli/releasing.md +++ b/packages/cli/releasing.md @@ -1,19 +1,21 @@ # how to release new versions -1. change all @celo/** dependencies which are pointing to the unpublished -dev version to published versions +- change all @celo/** dependencies which are pointing to the unpublished -dev version to published versions -2. update cli version in cli/package.json to next version with a pre-release (eg -beta.x) suffix +- update cli version in cli/package.json to next version with a pre-release (eg -beta.x) suffix -3. run `yarn prepack` +- run `yarn generate:shrinkwrap` -4. *IMPORTANT* double check version in package.json is correct! +- commit the the package.json and shrinkwrap -5. commit the the package.json and shrinkwrap +- run `yarn prepack` -6. run `npm publish --otp XXXXXX --tag TAG` *you MUST run with --tag and provide alpha | beta for pre release* +- *IMPORTANT* double check version in package.json is correct! -7. add back -dev suffics to @celo/** deps it was removed from in cli package (otherwise ci build will fail) +- run `npm publish --otp XXXXXX --tag TAG` *you MUST run with --tag and provide alpha | beta for pre release* -8. run yarn +- add back -dev suffics to @celo/** deps it was removed from in cli package (otherwise ci build will fail) -9. commit \ No newline at end of file +- run yarn + +- commit diff --git a/packages/cli/src/commands/account/claim-attestation-service-url.ts b/packages/cli/src/commands/account/claim-attestation-service-url.ts deleted file mode 100644 index 2437f3fc5eb..00000000000 --- a/packages/cli/src/commands/account/claim-attestation-service-url.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { createAttestationServiceURLClaim } from '@celo/contractkit/lib/identity/claims/attestation-service-url' -import { flags } from '@oclif/command' -import { Flags } from '../../utils/command' -import { ClaimCommand } from '../../utils/identity' -export default class ClaimAttestationServiceUrl extends ClaimCommand { - static description = - 'Claim the URL of the attestation service and add the claim to a local metadata file' - static flags = { - ...ClaimCommand.flags, - url: Flags.url({ - required: true, - description: 'The URL you want to claim. Should begin http://', - }), - force: flags.boolean({ description: 'Ignore URL validity checks' }), - } - static args = ClaimCommand.args - static examples = [ - 'claim-attestation-service-url ~/metadata.json --url https://test.com/myurl --from 0x47e172F6CfB6c7D01C1574fa3E2Be7CC73269D95', - ] - self = ClaimAttestationServiceUrl - - async run() { - const res = this.parse(ClaimAttestationServiceUrl) - if (!res.flags.force && !res.flags.url.startsWith('https://')) { - this.error( - 'Attestation Service URLs should begin https:// to be accessible to all clients. Use --force to proceed anyway.' - ) - return - } - const metadata = await this.readMetadata() - await this.addClaim(metadata, createAttestationServiceURLClaim(res.flags.url)) - this.writeMetadata(metadata) - } -} diff --git a/packages/cli/src/commands/account/deauthorize.ts b/packages/cli/src/commands/account/deauthorize.ts index 32eeab92473..d8afb7da2ee 100644 --- a/packages/cli/src/commands/account/deauthorize.ts +++ b/packages/cli/src/commands/account/deauthorize.ts @@ -4,8 +4,7 @@ import { displaySendTx } from '../../utils/cli' import { Flags } from '../../utils/command' export default class Deauthorize extends BaseCommand { - static description = - 'Validators who can no longer serve Attestation Service requests should deauthorize their attestation signer. Please note that Attestation Services are important to the health of the Celo network, and validators should only use this command when troubleshooting their service is not an option.' + static description = "Remove an account's authorized attestation signer role." static flags = { ...BaseCommand.flags, diff --git a/packages/cli/src/commands/account/set-payment-delegation.ts b/packages/cli/src/commands/account/set-payment-delegation.ts index 60aade26dc7..ba3bc27675c 100644 --- a/packages/cli/src/commands/account/set-payment-delegation.ts +++ b/packages/cli/src/commands/account/set-payment-delegation.ts @@ -1,7 +1,6 @@ import { valueToFixidityString } from '@celo/contractkit/lib/wrappers/BaseWrapper' import { flags } from '@oclif/command' import { BaseCommand } from '../../base' -import { newCheckBuilder } from '../../utils/checks' import { displaySendTx } from '../../utils/cli' import { Flags } from '../../utils/command' @@ -27,7 +26,6 @@ export default class SetPaymentDelegation extends BaseCommand { this.kit.defaultAccount = res.flags.account const accounts = await this.kit.contracts.getAccounts() - await newCheckBuilder(this).isAccount(res.flags.beneficiary).runChecks() await displaySendTx( 'setPaymentDelegation', accounts.setPaymentDelegation( diff --git a/packages/cli/src/commands/governance/vote.test.ts b/packages/cli/src/commands/governance/vote.test.ts index 77e230ed594..7451a05f458 100644 --- a/packages/cli/src/commands/governance/vote.test.ts +++ b/packages/cli/src/commands/governance/vote.test.ts @@ -41,7 +41,6 @@ testWithGanache('governance:vote cmd', (web3: Web3) => { ]) await testLocally(Register, ['--from', accounts[0]]) await testLocally(Lock, ['--from', accounts[0], '--value', '100']) - await timeTravel(expConfig.approvalStageDuration, web3) }) test('can vote yes', async () => { diff --git a/packages/cli/src/commands/governance/votePartially.test.ts b/packages/cli/src/commands/governance/votePartially.test.ts new file mode 100644 index 00000000000..ea5eda62e03 --- /dev/null +++ b/packages/cli/src/commands/governance/votePartially.test.ts @@ -0,0 +1,63 @@ +import { Address } from '@celo/connect' +import { newKitFromWeb3 } from '@celo/contractkit' +import { GovernanceWrapper } from '@celo/contractkit/lib/wrappers/Governance' +import { NetworkConfig, testWithGanache, timeTravel } from '@celo/dev-utils/lib/ganache-test' +import BigNumber from 'bignumber.js' +import Web3 from 'web3' +import { testLocally } from '../../test-utils/cliUtils' +import Register from '../account/register' +import Lock from '../lockedgold/lock' +import Approve from './approve' +import Dequeue from './dequeue' +import VotePartially from './votePartially' + +process.env.NO_SYNCCHECK = 'true' + +const expConfig = NetworkConfig.governance + +testWithGanache('governance:vote-partially cmd', (web3: Web3) => { + const minDeposit = web3.utils.toWei(expConfig.minDeposit.toString(), 'ether') + const kit = newKitFromWeb3(web3) + const proposalID = new BigNumber(1) + + let accounts: Address[] = [] + let governance: GovernanceWrapper + + beforeEach(async () => { + accounts = await web3.eth.getAccounts() + kit.defaultAccount = accounts[0] + governance = await kit.contracts.getGovernance() + await governance + .propose([], 'URL') + .sendAndWaitForReceipt({ from: accounts[0], value: minDeposit }) + await timeTravel(expConfig.dequeueFrequency, web3) + await testLocally(Dequeue, ['--from', accounts[0]]) + await testLocally(Approve, [ + '--from', + accounts[0], + '--proposalID', + proposalID.toString(10), + '--useMultiSig', + ]) + await testLocally(Register, ['--from', accounts[0]]) + await testLocally(Lock, ['--from', accounts[0], '--value', '100']) + }) + + test('can vote partially yes and no', async () => { + await testLocally(VotePartially, [ + '--from', + accounts[0], + '--proposalID', + proposalID.toString(10), + '--yes', + '10', + '--no', + '20', + '--abstain', + '0', + ]) + const votes = await governance.getVotes(proposalID) + expect(votes.Yes.toNumber()).toEqual(10) + expect(votes.No.toNumber()).toEqual(20) + }) +}) diff --git a/packages/cli/src/commands/governance/votePartially.ts b/packages/cli/src/commands/governance/votePartially.ts new file mode 100644 index 00000000000..155d11dba8b --- /dev/null +++ b/packages/cli/src/commands/governance/votePartially.ts @@ -0,0 +1,57 @@ +import { flags } from '@oclif/command' +import chalk from 'chalk' +import { BaseCommand } from '../../base' +import { newCheckBuilder } from '../../utils/checks' +import { displaySendTx } from '../../utils/cli' +import { Flags } from '../../utils/command' + +export default class VotePartially extends BaseCommand { + static description = 'Vote partially on an approved governance proposal' + + static voteOptions = ['Abstain', 'No', 'Yes'] + + static flags = { + ...BaseCommand.flags, + proposalID: flags.string({ required: true, description: 'UUID of proposal to vote on' }), + yes: flags.string({ description: 'Yes votes' }), + no: flags.string({ description: 'No votes' }), + abstain: flags.string({ description: 'Abstain votes' }), + from: Flags.address({ required: true, description: "Voter's address" }), + } + + static examples = [ + 'vote-partially --proposalID 99 --yes 10 --no 20 --from 0x5409ed021d9299bf6814279a6a1411a7e866a631', + ] + + async run() { + const res = this.parse(VotePartially) + const signer = res.flags.from + const id = res.flags.proposalID + + this.kit.defaultAccount = signer + const governance = await this.kit.contracts.getGovernance() + + await newCheckBuilder(this, signer) + .isVoteSignerOrAccount() + .proposalExists(id) + .proposalInStage(id, 'Referendum') + .runChecks() + + if (res.flags.yes == null && res.flags.no == null && res.flags.abstain == null) { + console.log(chalk.red.bold('At least one vote choice needs to be > 0.')) + return + } + + await displaySendTx( + 'voteTx', + await governance.votePartially( + id, + res.flags.yes ?? 0, + res.flags.no ?? 0, + res.flags.abstain ?? 0 + ), + {}, + 'ProposalPartiallyVoted' + ) + } +} diff --git a/packages/cli/src/commands/identity/current-attestation-services.ts b/packages/cli/src/commands/identity/current-attestation-services.ts deleted file mode 100644 index 175f470cf60..00000000000 --- a/packages/cli/src/commands/identity/current-attestation-services.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { AttestationServiceStatusState } from '@celo/contractkit/lib/wrappers/Attestations' -import { concurrentMap } from '@celo/utils/lib/async' -import chalk from 'chalk' -import { cli } from 'cli-ux' -import { BaseCommand } from '../../base' - -export default class AttestationServicesCurrent extends BaseCommand { - static description = - "Outputs the set of validators currently participating in BFT and which ones are participating in Celo's lightweight identity protocol" - - static flags = { - ...BaseCommand.flags, - ...(cli.table.flags() as object), - } - - async run() { - const res = this.parse(AttestationServicesCurrent) - cli.action.start('Fetching currently elected Validators') - const election = await this.kit.contracts.getElection() - const validators = await this.kit.contracts.getValidators() - const attestations = await this.kit.contracts.getAttestations() - const signers = await election.getCurrentValidatorSigners() - const validatorList = await Promise.all( - signers.map((addr) => validators.getValidatorFromSigner(addr)) - ) - const validatorInfo = await concurrentMap( - 5, - validatorList, - attestations.getAttestationServiceStatus.bind(attestations) - ) - - cli.action.stop() - cli.table( - validatorInfo.sort((a, b) => { - if (a.affiliation === b.affiliation) { - return 0 - } else if (a.affiliation === null) { - return 1 - } else if (b.affiliation === null) { - return -1 - } - return a.affiliation.toLowerCase().localeCompare(b.affiliation.toLowerCase()) - }), - { - address: {}, - affiliation: {}, - name: {}, - state: { - get: (r) => { - switch (r.state) { - case AttestationServiceStatusState.NoMetadataURL: - case AttestationServiceStatusState.InvalidMetadata: - case AttestationServiceStatusState.UnreachableAttestationService: - case AttestationServiceStatusState.WrongAccount: - case AttestationServiceStatusState.Unhealthy: - case AttestationServiceStatusState.InvalidAttestationServiceURL: - return chalk.red(r.state) - case AttestationServiceStatusState.Valid: - return chalk.green(r.state) - case AttestationServiceStatusState.NoAttestationSigner: - return r.state - default: - return chalk.yellow(r.state) - } - }, - }, - version: {}, - attestationServiceURL: {}, - smsProviders: {}, - }, - res.flags - ) - } -} diff --git a/packages/cli/src/commands/identity/get-attestations.ts b/packages/cli/src/commands/identity/get-attestations.ts index 10240dabb24..de484940246 100644 --- a/packages/cli/src/commands/identity/get-attestations.ts +++ b/packages/cli/src/commands/identity/get-attestations.ts @@ -1,6 +1,6 @@ import { ContractKit } from '@celo/contractkit' import { OdisUtils } from '@celo/identity' -import { AuthSigner } from '@celo/identity/lib/odis/query' +import { AuthSigner, OdisContextName } from '@celo/identity/lib/odis/query' import { flags } from '@oclif/command' import { BaseCommand } from '../../base' @@ -95,7 +95,7 @@ export default class GetAttestations extends BaseCommand { phoneNumber, account, authSigner, - OdisUtils.Query.getServiceContext(network) + OdisUtils.Query.getServiceContext(network as OdisContextName) ) return ret.pepper diff --git a/packages/cli/src/commands/identity/identifier.ts b/packages/cli/src/commands/identity/identifier.ts index e17aa5daf20..5b0ee0ad13e 100644 --- a/packages/cli/src/commands/identity/identifier.ts +++ b/packages/cli/src/commands/identity/identifier.ts @@ -1,5 +1,5 @@ import { OdisUtils } from '@celo/identity' -import { AuthSigner } from '@celo/identity/lib/odis/query' +import { AuthSigner, OdisContextName } from '@celo/identity/lib/odis/query' import { flags as oFlags } from '@oclif/command' import { cli } from 'cli-ux' import { BaseCommand } from '../../base' @@ -49,7 +49,7 @@ export default class IdentifierQuery extends BaseCommand { phoneNumber, from, authSigner, - OdisUtils.Query.getServiceContext(context) + OdisUtils.Query.getServiceContext(context as OdisContextName) ) cli.action.stop() diff --git a/packages/cli/src/commands/identity/test-attestation-service.ts b/packages/cli/src/commands/identity/test-attestation-service.ts deleted file mode 100644 index da34232d38d..00000000000 --- a/packages/cli/src/commands/identity/test-attestation-service.ts +++ /dev/null @@ -1,147 +0,0 @@ -import { ClaimTypes, IdentityMetadataWrapper } from '@celo/contractkit/lib/identity' -import { sleep } from '@celo/utils/lib/async' -import { appendPath } from '@celo/utils/lib/string' -import { flags as oFlags } from '@oclif/command' -import { cli } from 'cli-ux' -import fetch from 'cross-fetch' -import { BaseCommand } from '../../base' -import { newCheckBuilder } from '../../utils/checks' -import { Flags } from '../../utils/command' -export default class TestAttestationService extends BaseCommand { - static description = - 'Tests whether the account has setup the attestation service properly by calling the test endpoint on it' - - static flags = { - ...BaseCommand.flags, - from: Flags.address({ - required: true, - description: "Your validator's signer or account address", - }), - phoneNumber: Flags.phoneNumber({ - required: true, - description: 'The phone number to send the test message to', - }), - message: oFlags.string({ required: true, description: 'The message of the SMS' }), - provider: oFlags.string({ - required: false, - description: 'Test a specific provider (try "twilio" or "nexmo")', - }), - } - - static examples = ['test-attestation-service --from 0x97f7333c51897469E8D98E7af8653aAb468050a3'] - - requireSynced = false - async run() { - const { flags } = this.parse(TestAttestationService) - const address = flags.from - const { phoneNumber, message, provider } = flags - - await newCheckBuilder(this, flags.from).isSignerOrAccount().canSign(address).runChecks() - - const accounts = await this.kit.contracts.getAccounts() - const account = await accounts.signerToAccount(address) - - const hasAuthorizedAttestationSigner = await accounts.hasAuthorizedAttestationSigner(account) - if (!hasAuthorizedAttestationSigner) { - console.info('Account has not authorized an attestation signer') - return - } - - const metadataURL = await accounts.getMetadataURL(account) - - if (!metadataURL) { - console.info('No metadata set for address') - return - } - - let metadata: IdentityMetadataWrapper - try { - metadata = await IdentityMetadataWrapper.fetchFromURL(accounts, metadataURL) - } catch (error: any) { - console.error(`Metadata could not be retrieved from ${metadataURL}: ${error.toString()}`) - return - } - - const attestationServiceUrlClaim = metadata.findClaim(ClaimTypes.ATTESTATION_SERVICE_URL) - if (!attestationServiceUrlClaim) { - console.error('No attestation service claim could be found') - return - } - - const signature = await this.kit.connection.sign(phoneNumber + message, address) - - try { - const testUrl = appendPath(attestationServiceUrlClaim.url, 'test_attestations') - cli.action.start(`Sending request to ${testUrl}`) - - console.info() - - const response = await fetch(testUrl, { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ phoneNumber, signature, message, provider }), - }) - - if (!response.ok) { - console.error('Request was not successful') - console.error(`Status: ${response.status}`) - console.error(`Response: ${await response.text()}`) - } - - cli.action.stop() - - const testRes = JSON.parse(await response.text()) - if (!testRes.success) { - console.error('Request was not successful') - cli.styledJSON(testRes) - return - } - - console.info('Request successful') - - if (testRes.salt) { - // Service supports tracking attestation delivery status. - const getUrl = appendPath(attestationServiceUrlClaim.url, 'get_attestations') - cli.action.start(`Checking for delivery status at ${getUrl}`) - let latestGet = null - for (let i = 0; i < 6; i++) { - await sleep(5 * 1000) - const getResponse = await fetch( - getUrl + - '?' + - new URLSearchParams({ - phoneNumber, - salt: testRes.salt, - issuer: testRes.issuer, - account: testRes.account, - }), - { - method: 'GET', - headers: { 'Content-Type': 'application/json' }, - } - ) - - if (!getResponse.ok) { - console.error('Request was not successful') - console.error(`Status: ${getResponse.status}`) - console.error(`Response: ${await getResponse.text()}`) - } - - latestGet = JSON.parse(await getResponse.text()) - - if (latestGet!.status === 'Delivered') { - break - } - } - - cli.action.stop() - if (latestGet) { - cli.styledJSON(latestGet) - } - } - } catch (error) { - console.error(`Something went wrong`) - console.error(error) - } - } -} diff --git a/packages/cli/src/utils/identity.ts b/packages/cli/src/utils/identity.ts index 70e1be406b1..0148d83e549 100644 --- a/packages/cli/src/utils/identity.ts +++ b/packages/cli/src/utils/identity.ts @@ -1,10 +1,7 @@ import { ContractKit } from '@celo/contractkit' import { ClaimTypes, IdentityMetadataWrapper } from '@celo/contractkit/lib/identity' -import { Claim, validateClaim } from '@celo/contractkit/lib/identity/claims/claim' -import { - VALIDATABLE_CLAIM_TYPES, - VERIFIABLE_CLAIM_TYPES, -} from '@celo/contractkit/lib/identity/claims/types' +import { Claim } from '@celo/contractkit/lib/identity/claims/claim' +import { VERIFIABLE_CLAIM_TYPES } from '@celo/contractkit/lib/identity/claims/types' import { verifyClaim } from '@celo/contractkit/lib/identity/claims/verify' import { eqAddress } from '@celo/utils/lib/address' import { concurrentMap } from '@celo/utils/lib/async' @@ -103,17 +100,9 @@ export const displayMetadata = async ( ) => { const data = await concurrentMap(5, metadata.claims, async (claim) => { const verifiable = VERIFIABLE_CLAIM_TYPES.includes(claim.type) - const validatable = VALIDATABLE_CLAIM_TYPES.includes(claim.type) - const status = verifiable - ? await verifyClaim(kit, claim, metadata.data.meta.address) - : validatable - ? await validateClaim(kit, claim, metadata.data.meta.address) - : 'N/A' + const status = verifiable ? await verifyClaim(kit, claim, metadata.data.meta.address) : 'N/A' let extra = '' switch (claim.type) { - case ClaimTypes.ATTESTATION_SERVICE_URL: - extra = `URL: ${claim.url}` - break case ClaimTypes.DOMAIN: extra = `Domain: ${claim.domain}` break @@ -133,15 +122,7 @@ export const displayMetadata = async ( return { type: claim.type, extra, - status: verifiable - ? status - ? `Could not verify: ${status}` - : 'Verified!' - : validatable - ? status - ? `Invalid: ${status}` - : `Valid!` - : 'N/A', + status: verifiable ? (status ? `Could not verify: ${status}` : 'Verified!') : 'N/A', createdAt: moment.unix(claim.timestamp).fromNow(), } }) diff --git a/packages/dev-utils/src/migration-override.json b/packages/dev-utils/src/migration-override.json index ea0d00588b6..213756a69f0 100644 --- a/packages/dev-utils/src/migration-override.json +++ b/packages/dev-utils/src/migration-override.json @@ -7,9 +7,7 @@ }, "exchange": { "frozen": false, - "minimumReports": 1, - "minSupplyForStableBucketCap": "1000000000000000000000000", - "stableBucketFractionCap": 0.04545454545 + "minimumReports": 1 }, "exchangeEUR": { "frozen": false, diff --git a/packages/docs/command-line-interface/account.md b/packages/docs/command-line-interface/account.md index 0c50195760e..528f6b7b41d 100644 --- a/packages/docs/command-line-interface/account.md +++ b/packages/docs/command-line-interface/account.md @@ -117,39 +117,6 @@ EXAMPLE _See code: [src/commands/account/claim-account.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/account/claim-account.ts)_ -## `celocli account:claim-attestation-service-url FILE` - -Claim the URL of the attestation service and add the claim to a local metadata file - -``` -Claim the URL of the attestation service and add the claim to a local metadata file - -USAGE - $ celocli account:claim-attestation-service-url FILE - -ARGUMENTS - FILE Path of the metadata file - -OPTIONS - --force Ignore URL validity checks - - --from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d (required) Address of the account - to set metadata for or an - authorized signer for the address - in the metadata - - --globalHelp View all available global flags - - --url=https://www.celo.org (required) The URL you want to - claim. Should begin http:// - -EXAMPLE - claim-attestation-service-url ~/metadata.json --url https://test.com/myurl --from - 0x47e172F6CfB6c7D01C1574fa3E2Be7CC73269D95 -``` - -_See code: [src/commands/account/claim-attestation-service-url.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/account/claim-attestation-service-url.ts)_ - ## `celocli account:claim-domain FILE` Claim a domain and add the claim to a local metadata file @@ -303,10 +270,10 @@ _See code: [src/commands/account/create-metadata.ts](https://github.com/celo-org ## `celocli account:deauthorize` -Validators who can no longer serve Attestation Service requests should deauthorize their attestation signer. Please note that Attestation Services are important to the health of the Celo network, and validators should only use this command when troubleshooting their service is not an option. +Remove an account's authorized attestation signer role. ``` -Validators who can no longer serve Attestation Service requests should deauthorize their attestation signer. Please note that Attestation Services are important to the health of the Celo network, and validators should only use this command when troubleshooting their service is not an option. +Remove an account's authorized attestation signer role. USAGE $ celocli account:deauthorize diff --git a/packages/docs/command-line-interface/governance.md b/packages/docs/command-line-interface/governance.md index 15fce3cca06..8c5e5daaca7 100644 --- a/packages/docs/command-line-interface/governance.md +++ b/packages/docs/command-line-interface/governance.md @@ -356,6 +356,34 @@ EXAMPLE _See code: [src/commands/governance/vote.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/governance/vote.ts)_ +## `celocli governance:votePartially` + +Vote partially on an approved governance proposal + +``` +Vote partially on an approved governance proposal + +USAGE + $ celocli governance:votePartially + +OPTIONS + --abstain=abstain Abstain votes + --from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d (required) Voter's address + --globalHelp View all available global flags + --no=no No votes + + --proposalID=proposalID (required) UUID of proposal to vote + on + + --yes=yes Yes votes + +EXAMPLE + vote-partially --proposalID 99 --yes 10 --no 20 --from + 0x5409ed021d9299bf6814279a6a1411a7e866a631 +``` + +_See code: [src/commands/governance/votePartially.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/governance/votePartially.ts)_ + ## `celocli governance:whitelisthotfix` Whitelist a governance hotfix diff --git a/packages/docs/command-line-interface/identity.md b/packages/docs/command-line-interface/identity.md index aac2ab18fe9..9beea527c97 100644 --- a/packages/docs/command-line-interface/identity.md +++ b/packages/docs/command-line-interface/identity.md @@ -3,30 +3,6 @@ Interact with ODIS and the attestations service -## `celocli identity:current-attestation-services` - -Outputs the set of validators currently participating in BFT and which ones are participating in Celo's lightweight identity protocol - -``` -Outputs the set of validators currently participating in BFT and which ones are participating in Celo's lightweight identity protocol - -USAGE - $ celocli identity:current-attestation-services - -OPTIONS - -x, --extended show extra columns - --columns=columns only show provided columns (comma-separated) - --csv output is csv format [alias: --output=csv] - --filter=filter filter property by partial string matching, ex: name=foo - --globalHelp View all available global flags - --no-header hide table header from output - --no-truncate do not truncate output to fit screen - --output=csv|json|yaml output in a more machine friendly format - --sort=sort property to sort by (prepend '-' for descending) -``` - -_See code: [src/commands/identity/current-attestation-services.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/identity/current-attestation-services.ts)_ - ## `celocli identity:get-attestations` Looks up attestations associated with the provided phone number. If a pepper is not provided, it uses the --from account's balance to query the pepper. @@ -95,36 +71,6 @@ EXAMPLE _See code: [src/commands/identity/identifier.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/identity/identifier.ts)_ -## `celocli identity:test-attestation-service` - -Tests whether the account has setup the attestation service properly by calling the test endpoint on it - -``` -Tests whether the account has setup the attestation service properly by calling the test endpoint on it - -USAGE - $ celocli identity:test-attestation-service - -OPTIONS - --from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d (required) Your validator's signer - or account address - - --globalHelp View all available global flags - - --message=message (required) The message of the SMS - - --phoneNumber=+14152223333 (required) The phone number to send - the test message to - - --provider=provider Test a specific provider (try - "twilio" or "nexmo") - -EXAMPLE - test-attestation-service --from 0x97f7333c51897469E8D98E7af8653aAb468050a3 -``` - -_See code: [src/commands/identity/test-attestation-service.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/identity/test-attestation-service.ts)_ - ## `celocli identity:withdraw-attestation-rewards` Withdraw accumulated attestation rewards for a given currency diff --git a/packages/env-tests/README.md b/packages/env-tests/README.md index c6f1a68860b..620e7f17715 100644 --- a/packages/env-tests/README.md +++ b/packages/env-tests/README.md @@ -2,11 +2,10 @@ The `env-tests` package is a set of tests that is designed to be run against CELO blockchains and assert that various platform interactions work as intended. It currently has tests for the following: -1. Attestations: Runs through the whole flow including registering a number on Twilio and requesting attestations from attestation services -2. Exchange: Does an exchange on Mento -3. Oracle: Reports an exchange rate -4. Reserve: Tests that reserve spenders can move funds to reserve custodians -5. Transfer: Does simple ERC20 transfers +1. Exchange: Does an exchange on Mento +2. Oracle: Reports an exchange rate +3. Reserve: Tests that reserve spenders can move funds to reserve custodians +4. Transfer: Does simple ERC20 transfers ## Setup diff --git a/packages/env-tests/package.json b/packages/env-tests/package.json index 0c4ef208e98..3d1b7573e51 100644 --- a/packages/env-tests/package.json +++ b/packages/env-tests/package.json @@ -5,20 +5,19 @@ "main": "index.js", "license": "MIT", "dependencies": { - "@celo/contractkit": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", - "@celo/base": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", - "@celo/identity": "2.2.1-dev", - "@celo/phone-utils": "2.2.1-dev", - "@celo/cryptographic-utils": "2.2.1-dev", + "@celo/contractkit": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/identity": "3.2.1-dev", + "@celo/phone-utils": "3.2.1-dev", + "@celo/cryptographic-utils": "3.2.1-dev", "bunyan": "1.8.12", "bunyan-gke-stackdriver": "0.1.2", "bunyan-debug-stream": "2.0.0", "dotenv": "8.2.0", "jest": "26.6.3", "moment": "^2.29.0", - "twilio": "^3.57.0", "web3": "1.3.6" }, "scripts": { diff --git a/packages/env-tests/src/env.ts b/packages/env-tests/src/env.ts index bba95874a28..948effaa28b 100644 --- a/packages/env-tests/src/env.ts +++ b/packages/env-tests/src/env.ts @@ -6,12 +6,6 @@ if (process.env.CONFIG) { dotenv.config({ path: process.env.CONFIG }) } -export enum envVar { - TWILIO_ACCOUNT_AUTH_TOKEN = 'TWILIO_ACCOUNT_AUTH_TOKEN', - TWILIO_ACCOUNT_SID = 'TWILIO_ACCOUNT_SID', - TWILIO_ADDRESS_SID = 'TWILIO_ADDRESS_SID', -} - export function fetchEnv(name: string): string { if (process.env[name] === undefined || process.env[name] === '') { console.error(`ENV var '${name}' was not defined`) diff --git a/packages/env-tests/src/monorepoRun.ts b/packages/env-tests/src/monorepoRun.ts index 3b1acdd313b..4cb689f5ab8 100644 --- a/packages/env-tests/src/monorepoRun.ts +++ b/packages/env-tests/src/monorepoRun.ts @@ -3,7 +3,6 @@ import Web3 from 'web3' import { loadFromEnvFile } from './env' import { rootLogger } from './logger' import { clearAllFundsToRoot, parseStableTokensList } from './scaffold' -import { runAttestationTest } from './tests/attestation' import { runExchangeTest } from './tests/exchange' import { runGrandaMentoTest } from './tests/granda-mento' import { runOracleTest } from './tests/oracle' @@ -41,7 +40,6 @@ function runTests() { runExchangeTest(context, stableTokensToTest) runOracleTest(context) runReserveTest(context) - runAttestationTest(context) runGrandaMentoTest(context, stableTokensToTest) // TODO: Governance Proposals diff --git a/packages/env-tests/src/shared/attestation.ts b/packages/env-tests/src/shared/attestation.ts deleted file mode 100644 index e7bd7b8847e..00000000000 --- a/packages/env-tests/src/shared/attestation.ts +++ /dev/null @@ -1,317 +0,0 @@ -import { notEmpty } from '@celo/base' -import { Address, CeloTransactionParams } from '@celo/connect' -import { ContractKit } from '@celo/contractkit' -import { - ActionableAttestation, - AttestationsWrapper, - getSecurityCodePrefix, -} from '@celo/contractkit/lib/wrappers/Attestations' -import { OdisUtils } from '@celo/identity' -import { AuthSigner } from '@celo/identity/lib/odis/query' -import { PhoneNumberUtils } from '@celo/phone-utils' -import { AttestationRequest } from '@celo/phone-utils/lib/io' -import { concurrentMap, sleep } from '@celo/utils/lib/async' -import { AttestationUtils } from '@celo/utils/lib/attestations' -import Logger from 'bunyan' -import { sample } from 'lodash' -import moment from 'moment' -import { Twilio } from 'twilio' - -const POLLING_WAIT = 300 - -export type RequestAttestationError = - | undefined - | { status: number; text: string; issuer: string; name: string | undefined; known: true } - | { error: any; issuer: string; known: false } - -export async function requestAttestationsFromIssuers( - attestationsToReveal: ActionableAttestation[], - attestations: AttestationsWrapper, - phoneNumber: string, - account: string, - pepper: string, - securityCode?: boolean -): Promise { - return concurrentMap(5, attestationsToReveal, async (attestation) => { - try { - const revealRequest: AttestationRequest = { - phoneNumber, - account, - issuer: attestation.issuer, - salt: pepper, - smsRetrieverAppSig: undefined, - securityCodePrefix: securityCode ? getSecurityCodePrefix(attestation.issuer) : undefined, - language: undefined, - phoneNumberSignature: undefined, - } - - const response = await attestations.revealPhoneNumberToIssuer( - attestation.attestationServiceURL, - revealRequest - ) - if (!response.ok) { - return { - status: response.status, - text: await response.text(), - issuer: attestation.issuer, - name: attestation.name, - known: true, - } - } - - return - } catch (error) { - return { error, issuer: attestation.issuer, known: false } - } - }) -} - -export async function reportErrors(possibleErrors: RequestAttestationError[], logger: Logger) { - logger.info( - { possibleErrors: possibleErrors.filter((_) => _ && _.known).length }, - 'Reveal errors' - ) - - possibleErrors.filter(notEmpty).forEach((error) => { - if (error.known) { - logger.info({ ...error }, 'Error while requesting from attestation service') - } else { - logger.info({ ...error }, 'Unknown error while revealing to issuer') - } - }) -} - -// Inefficient, but should be fine for now -// Could mark already checked messages in the future -async function findValidCode( - attestations: AttestationsWrapper, - messages: string[], - identifier: string, - pepper: string, - phoneNumber: string, - attestationsToComplete: ActionableAttestation[], - account: string -) { - for (const message of messages) { - try { - let attestationCode: string | null - - const securityCode = AttestationUtils.extractSecurityCodeWithPrefix(message) - if (securityCode) { - // optimisation code implemented to reduce possibility - // of hitting wrong service - const possibleIssuers = attestationsToComplete.filter( - (a) => getSecurityCodePrefix(a.issuer) === securityCode[0] - ) - - const attestationCodeDeepLink = ( - await Promise.all( - possibleIssuers.map((a) => - attestations - .getAttestationForSecurityCode( - a.attestationServiceURL, - { - account, - issuer: a.issuer, - phoneNumber, - salt: pepper, - securityCode: securityCode.slice(1), - }, - account - ) - // hit the wrong service - .catch(() => null) - ) - ) - ).find(Boolean) - if (!attestationCodeDeepLink) { - continue - } - attestationCode = - AttestationUtils.extractAttestationCodeFromMessage(attestationCodeDeepLink) - } else { - attestationCode = AttestationUtils.extractAttestationCodeFromMessage(message) - } - - if (!attestationCode) { - continue - } - - const issuer = await attestations.findMatchingIssuer( - identifier, - account, - attestationCode, - attestationsToComplete.map((_) => _.issuer) - ) - - if (!issuer) { - continue - } - - const isValid = await attestations.validateAttestationCode( - identifier, - account, - issuer, - attestationCode - ) - if (!isValid) { - continue - } - - return { code: attestationCode, issuer } - } catch { - continue - } - } - - return -} - -export async function pollForMessagesAndCompleteAttestations( - attestations: AttestationsWrapper, - client: Twilio, - phoneNumber: string, - identifier: string, - pepper: string, - account: Address, - attestationsToComplete: ActionableAttestation[], - txParams: CeloTransactionParams = {}, - logger: Logger, - timeToPollForTextMessages: number -) { - const startDate = moment() - logger.info({ pollingWait: POLLING_WAIT }, 'Poll for the attestation code') - while ( - moment.duration(moment().diff(startDate)).asMinutes() < timeToPollForTextMessages && - attestationsToComplete.length > 0 - ) { - const messages = await fetchLatestMessagesFromToday(client, phoneNumber, 100) - const res = await findValidCode( - attestations, - messages.map((_) => _.body), - identifier, - pepper, - phoneNumber, - attestationsToComplete, - account - ) - - if (!res) { - await sleep(POLLING_WAIT) - continue - } - - logger.info( - { waitingTime: moment.duration(moment().diff(startDate)).asSeconds() }, - 'Received valid code' - ) - - const completeTx = await attestations.complete(identifier, account, res.issuer, res.code) - - await completeTx.sendAndWaitForReceipt(txParams) - - logger.info({ issuer: res.issuer, identifier, account }, 'Completed attestation') - attestationsToComplete = await attestations.getActionableAttestations(identifier, account) - } -} - -// Use the supplied pepper, or if none supplied, go to ODIS and retrieve a pepper -export async function getIdentifierAndPepper( - kit: ContractKit, - context: string, - account: string, - phoneNumber: string, - pepper: string | null -) { - if (pepper) { - return { - pepper, - identifier: PhoneNumberUtils.getPhoneHash(phoneNumber, pepper), - } - } else { - const authSigner: AuthSigner = { - authenticationMethod: OdisUtils.Query.AuthenticationMethod.WALLET_KEY, - contractKit: kit, - } - - const ret = await OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( - phoneNumber, - account, - authSigner, - OdisUtils.Query.getServiceContext(context) - ) - - return { - pepper: ret.pepper, - identifier: ret.phoneHash, - } - } -} - -export async function requestMoreAttestations( - attestations: AttestationsWrapper, - phoneNumber: string, - attestationsRequested: number, - account: Address, - txParams: CeloTransactionParams = {} -) { - const unselectedRequest = await attestations.getUnselectedRequest(phoneNumber, account) - if ( - unselectedRequest.blockNumber === 0 || - (await attestations.isAttestationExpired(unselectedRequest.blockNumber)) - ) { - await attestations - .approveAttestationFee(attestationsRequested) - .then((txo) => txo.sendAndWaitForReceipt(txParams)) - await attestations - .request(phoneNumber, attestationsRequested) - .then((txo) => txo.sendAndWaitForReceipt(txParams)) - } - - const selectIssuers = await attestations.selectIssuersAfterWait(phoneNumber, account) - await selectIssuers.sendAndWaitForReceipt(txParams) -} - -export async function getPhoneNumber(twilioClient: Twilio, addressSid: string) { - const phoneNumber = await chooseFromAvailablePhoneNumbers(twilioClient) - - if (phoneNumber !== undefined) { - return phoneNumber - } - return createPhoneNumber(twilioClient, addressSid) -} - -async function chooseFromAvailablePhoneNumbers(twilioClient: Twilio) { - const availableNumbers = await twilioClient.incomingPhoneNumbers.list() - const usableNumber = availableNumbers[0] - return usableNumber -} - -async function createPhoneNumber(twilioClient: Twilio, addressSid: string) { - const countryCodes = ['GB', 'US'] - const countryCode = sample(countryCodes) - const context = twilioClient.availablePhoneNumbers.get(countryCode!) - const numbers = await context.mobile.list({ limit: 10 }) - const usableNumber = numbers[0] - await twilioClient.incomingPhoneNumbers.create({ - phoneNumber: usableNumber!.phoneNumber, - addressSid, - // Just an requestbin.com endpoint to avoid errors - smsUrl: 'https://enzyutth0wxme.x.pipedream.net/', - }) - - return usableNumber -} - -export async function fetchLatestMessagesFromToday( - client: Twilio, - phoneNumber: string, - count: number -) { - return client.messages.list({ - to: phoneNumber, - pageSize: count, - // Twilio keeps track of dates in UTC so it could be yesterday too - dateSentAfter: moment().subtract(2, 'day').toDate(), - }) -} diff --git a/packages/env-tests/src/tests/attestation.ts b/packages/env-tests/src/tests/attestation.ts deleted file mode 100644 index 9715607d261..00000000000 --- a/packages/env-tests/src/tests/attestation.ts +++ /dev/null @@ -1,213 +0,0 @@ -import { AttestationsWrapper } from '@celo/contractkit/lib/wrappers/Attestations' -import { StableTokenWrapper } from '@celo/contractkit/lib/wrappers/StableTokenWrapper' -import { generateKeys, generateMnemonic } from '@celo/cryptographic-utils/lib/account' -import { Address, privateKeyToAddress } from '@celo/utils/lib/address' -import { sleep } from '@celo/utils/lib/async' -import { describe, test } from '@jest/globals' -import BigNumber from 'bignumber.js' -import Logger from 'bunyan' -import twilio from 'twilio' -import { MobileInstance } from 'twilio/lib/rest/api/v2010/account/availablePhoneNumber/mobile' -import { IncomingPhoneNumberInstance } from 'twilio/lib/rest/api/v2010/account/incomingPhoneNumber' -import { EnvTestContext } from '../context' -import { envVar, fetchEnv } from '../env' -import { getKey, ONE, TestAccounts } from '../scaffold' -import { - getIdentifierAndPepper, - getPhoneNumber, - pollForMessagesAndCompleteAttestations, - reportErrors, - requestAttestationsFromIssuers, - requestMoreAttestations, -} from '../shared/attestation' - -async function fundAttestationAccount( - context: EnvTestContext, - root: string, - attestationAccount: string, - logger: Logger -) { - const stableToken = await context.kit.contracts.getStableToken() - context.kit.defaultFeeCurrency = stableToken.address - - const rootTransfer = stableToken.transfer(attestationAccount, ONE.toString()) - const rootTransferReceipt = await rootTransfer.sendAndWaitForReceipt({ from: root }) - - logger.debug( - { - receipt: rootTransferReceipt, - account: attestationAccount, - }, - 'funded attestation account' - ) -} - -export function runAttestationTest( - context: EnvTestContext, - attestationsToRequest = 3, - configuredPepper = 'HARDCODED_PEPPER', - odisContext = 'mainnet' -) { - describe('Attestation Test', () => { - const logger = context.logger.child({ test: 'attestation' }) - // TODO: Check for TWILIO ENV vars - const twilioClient = twilio( - fetchEnv(envVar.TWILIO_ACCOUNT_SID), - fetchEnv(envVar.TWILIO_ACCOUNT_AUTH_TOKEN) - ) - - let attestationAccountAddress: Address - let root: { address: Address; privateKey: string; publicKey: string } - let identifier: string - let pepper: string - let phoneNumber: MobileInstance | IncomingPhoneNumberInstance - - let stableToken: StableTokenWrapper - let attestations: AttestationsWrapper - - beforeEach(async () => { - root = await getKey(context.mnemonic, TestAccounts.Root) - context.kit.connection.addAccount(root.privateKey) - - const mnemonic = await generateMnemonic() - const attestationAccount = await generateKeys(mnemonic) - attestationAccountAddress = privateKeyToAddress(attestationAccount.privateKey) - context.kit.connection.addAccount(attestationAccount.privateKey) - context.kit.defaultAccount = attestationAccountAddress - - await fundAttestationAccount(context, root.address, attestationAccountAddress, logger) - - phoneNumber = await getPhoneNumber(twilioClient, fetchEnv(envVar.TWILIO_ADDRESS_SID)) - ;({ identifier, pepper } = await getIdentifierAndPepper( - context.kit, - odisContext, - attestationAccountAddress, - phoneNumber.phoneNumber, - configuredPepper - )) - logger.debug({ phoneNumber: phoneNumber.phoneNumber, identifier, pepper }, 'got phone number') - - stableToken = await context.kit.contracts.getStableToken() - attestations = await context.kit.contracts.getAttestations() - }) - - test('receive attestations for a phone number', async () => { - await requestMoreAttestations( - attestations, - identifier, - attestationsToRequest, - attestationAccountAddress, - {} - ) - - const attestationsToComplete = await attestations.getActionableAttestations( - identifier, - attestationAccountAddress - ) - - logger.info({ attestationsToComplete }, 'Reveal to issuers') - - // Wait for attestation services to sync - // TODO: Change this to request from issuers with back-off - await sleep(5000) - - const possibleErrors = await requestAttestationsFromIssuers( - attestationsToComplete, - attestations, - phoneNumber.phoneNumber, - attestationAccountAddress, - pepper - ) - - await reportErrors(possibleErrors, logger) - - await pollForMessagesAndCompleteAttestations( - attestations, - // @ts-ignore - twilioClient, - phoneNumber.phoneNumber, - identifier, - pepper, - attestationAccountAddress, - attestationsToComplete, - {}, - logger, - attestationsToRequest - ) - - const attestationStat = await attestations.getAttestationStat( - identifier, - attestationAccountAddress - ) - - expect(attestationStat.total).toEqual(attestationsToRequest) - expect(attestationStat.completed).toEqual(attestationsToRequest) - }, 120000) - - test('receives attestations using security code flow', async () => { - await requestMoreAttestations( - attestations, - identifier, - attestationsToRequest, - attestationAccountAddress, - {} - ) - - const attestationsToComplete = await attestations.getActionableAttestations( - identifier, - attestationAccountAddress - ) - - logger.info({ attestationsToComplete }, 'Reveal to issuers') - - // Wait for attestation services to sync - // TODO: Change this to request from issuers with back-off - await sleep(5000) - - const possibleErrors = await requestAttestationsFromIssuers( - attestationsToComplete, - attestations, - phoneNumber.phoneNumber, - attestationAccountAddress, - pepper, - true - ) - - await reportErrors(possibleErrors, logger) - - await pollForMessagesAndCompleteAttestations( - attestations, - // @ts-ignore - twilioClient, - phoneNumber.phoneNumber, - identifier, - pepper, - attestationAccountAddress, - attestationsToComplete, - {}, - logger, - attestationsToRequest - ) - - const attestationStat = await attestations.getAttestationStat( - identifier, - attestationAccountAddress - ) - - expect(attestationStat.total).toEqual(attestationsToRequest) - expect(attestationStat.completed).toEqual(attestationsToRequest) - }, 120000) - - afterEach(async () => { - // move back funds to root - const stableBalanceRoot = await stableToken.balanceOf(attestationAccountAddress) - const transferBackTx = stableToken.transfer( - root.address, - stableBalanceRoot.times(0.95).integerValue(BigNumber.ROUND_DOWN).toString() - ) - const transferBackTxReceipt = await transferBackTx.sendAndWaitForReceipt() - - logger.debug({ receipt: transferBackTxReceipt }, 'transferred remainder of cUSD back') - }) - }) -} diff --git a/packages/flake-tracker/src/jest/tracker.js b/packages/flake-tracker/src/jest/tracker.js index ad9746d5e98..14d8de0d286 100644 --- a/packages/flake-tracker/src/jest/tracker.js +++ b/packages/flake-tracker/src/jest/tracker.js @@ -26,9 +26,12 @@ class JestFlakeTracker { // to call `makeRunResult`. This converts our `TestEntry` objects into `TestResults` // which have formatted errors const describeBlock = buildFlakeyDescribe(clone(state.rootDescribeBlock), this.flakes) - makeRunResult(describeBlock, state.unhandledErrors) - .testResults.filter((tr) => tr.status === 'flakey') - .forEach((tr) => db.writeErrors(getTestIDFromTestPath(tr.testPath), tr.errors)) + try { + makeRunResult(describeBlock, state.unhandledErrors) + .testResults.filter((tr) => tr.status === 'flakey') + .forEach((tr) => db.writeErrors(getTestIDFromTestPath(tr.testPath), tr.errors)) + } catch {} // ignoring weird behavior: "TypeError: Cannot read property 'replace' of undefined" that sometimes throws here + // The alternative to using the db would be to send results to github at the // end of each describe block. Instead, we use the db and only message github // on global.setup and global.teardown. diff --git a/packages/helm-charts/attestation-bot/Chart.yaml b/packages/helm-charts/attestation-bot/Chart.yaml deleted file mode 100644 index 04d52a7bfa6..00000000000 --- a/packages/helm-charts/attestation-bot/Chart.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: attestation-bot -version: 0.0.1 -description: Chart which is used to run attestations -keywords: -- ethereum -- blockchain -- attestation -appVersion: v1.7.3 diff --git a/packages/helm-charts/attestation-bot/templates/configmap.yaml b/packages/helm-charts/attestation-bot/templates/configmap.yaml deleted file mode 100644 index fd770f459fe..00000000000 --- a/packages/helm-charts/attestation-bot/templates/configmap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Values.environment }}-attestation-bot-config - labels: - app: attestation-bot - chart: attestation-bot - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: attestation-bot -data: - envname: {{ .Values.environment }} diff --git a/packages/helm-charts/attestation-bot/templates/secret.yaml b/packages/helm-charts/attestation-bot/templates/secret.yaml deleted file mode 100644 index bcb5ea72d61..00000000000 --- a/packages/helm-charts/attestation-bot/templates/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ .Values.environment }}-attestation-bot-secrets - labels: - app: attestation-bot - chart: attestation-bot - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: attestation-bot -type: Opaque -data: - mnemonic: {{ .Values.mnemonic | b64enc }} - twilioAccountSid: {{ .Values.twilio.accountSid | b64enc }} - twilioAuthToken: {{ .Values.twilio.authToken | b64enc }} diff --git a/packages/helm-charts/attestation-bot/templates/statefulset.yaml b/packages/helm-charts/attestation-bot/templates/statefulset.yaml deleted file mode 100644 index d6e02ac8d30..00000000000 --- a/packages/helm-charts/attestation-bot/templates/statefulset.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ .Values.environment }}-attestation-bot - labels: - app: attestation-bot - chart: attestation-bot - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: attestation-bot -spec: - serviceName: attestation-bot - podManagementPolicy: Parallel - replicas: 1 - selector: - matchLabels: - app: attestation-bot - release: {{ .Release.Name }} - component: attestation-bot - template: - metadata: - labels: - app: attestation-bot - release: {{ .Release.Name }} - component: attestation-bot - spec: - containers: - - name: attestation-bot - image: {{ .Values.imageRepository }}:{{ .Values.imageTag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: - - bash - - "-c" - - | - [[ $REPLICA_NAME =~ -([0-9]+)$ ]] || exit 1 - RID=${BASH_REMATCH[1]} - CELOTOOL="/celo-monorepo/packages/celotool/bin/celotooljs.sh"; - - exec $CELOTOOL bots auto-verify --initialWaitSeconds {{ .Values.initialWaitSeconds }} --inBetweenWaitSeconds {{ .Values.inBetweenWaitSeconds }} --attestationMax {{ .Values.maxAttestations }} --celoProvider https://{{ .Release.Namespace }}-forno.{{ .Values.domain.name }}.org --index $RID --context {{ .Release.Namespace }} {{ if ne .Values.salt "" }} --salt {{ .Values.salt -}}-$RID{{ end }} - resources: - requests: - memory: 256Mi - cpu: 200m - env: - - name: REPLICA_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: MNEMONIC - valueFrom: - secretKeyRef: - name: {{ .Values.environment }}-attestation-bot-secrets - key: mnemonic - - name: TWILIO_ACCOUNT_SID - valueFrom: - secretKeyRef: - name: {{ .Values.environment }}-attestation-bot-secrets - key: twilioAccountSid - - name: TWILIO_ACCOUNT_AUTH_TOKEN - valueFrom: - secretKeyRef: - name: {{ .Values.environment }}-attestation-bot-secrets - key: twilioAuthToken - volumes: - - name: data - emptyDir: {} diff --git a/packages/helm-charts/attestation-bot/values.yaml b/packages/helm-charts/attestation-bot/values.yaml deleted file mode 100644 index d4289f1a1f2..00000000000 --- a/packages/helm-charts/attestation-bot/values.yaml +++ /dev/null @@ -1 +0,0 @@ -imagePullPolicy: IfNotPresent diff --git a/packages/helm-charts/attestation-service/Chart.yaml b/packages/helm-charts/attestation-service/Chart.yaml deleted file mode 100644 index d811d4fbb19..00000000000 --- a/packages/helm-charts/attestation-service/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: attestation-service -version: 0.0.1 -description: Chart which is used to deploy an attestation service for a celo testnet -keywords: -- ethereum -- blockchain -appVersion: v1.7.3 - -dependencies: - - name: postgresql - version: 6.3.10 - repository: "@stable" diff --git a/packages/helm-charts/attestation-service/README.md b/packages/helm-charts/attestation-service/README.md deleted file mode 100644 index 65349d65502..00000000000 --- a/packages/helm-charts/attestation-service/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# attestation-service - -Deploys the attestation service for all the StatefulSet validators: - -`celotool deploy initial attestation-service -e MY_ENV` diff --git a/packages/helm-charts/attestation-service/charts/postgresql-6.3.10.tgz b/packages/helm-charts/attestation-service/charts/postgresql-6.3.10.tgz deleted file mode 100644 index af1e207a65cd1a094fac3f8f041fd2b210717002..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22539 zcmV)rK$*WEiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0POvHciT9UFb>b(`V{rZz1wldlq~1gt!Fdu~wm}Gt;q1T&fC%szRYq$hcG!LFMmp|M`>% z)tiwd{>x^c-QC^YCyyTCzq`A;^?wJ0hY#G}=KbKo-lHdffenMv{Nz#*@t57*>$X!z z?i+bX#(t(kGM*0Me9$3TR{R_cdXIX$orua%uuS1Q$PX7DV4v-Z1=$|xH zfuJ$bB}ohsQDj6Ug@mMJLKB)QkTa=h(gC>l_W0o0>yvG`U}~!C(Eo8W9o6Amm9FGm?h1*P-czrE~}ruCll@5b_of9)Cf?5g3j~9~?x(@vNiRz$osV>O z!9^s8odC*$-j7aD5Tg@-`6g%7(0YTM6Bd(ET$E@5 zc4*!l(+QJG7~O$yj`BD@p`oBkBh)di3_IY-y&-)5(%Ay2HZg=`=Kg*|5?Yq~hni&|1~K_>KhOr+G!o_N1I8e1#KJ=JOvv=UX95p-PYFD;Xe{6*0$3gPU{ zYDFfpuW`nvG|Hkt&DLcc-)3Ag#r6C7W;y_hOq@*+M0CVR8vGcD2M;>{TU&6F(U6U2 zKuY2q@tB1(^Z9^|NggYy2mAZ|_=3#j_rS&$KSd_MBzzweMWy(<{>OYoMM@QwJ;wVH4`n}>R0NZpMYN9{$o^I)XprS`%+g6<-eF6c z0}4=w;CE$udYc(@CZ2(GD5gM!AT!|OIZo(VYM5V;m&Evv!UTVX(V9=u~Kl zZ%T;8ISVQ5hoP1h*9W+KFHO?{F-`Y7_J!@L0=1Fp$Sj(odXC^g3reCH&`(S%Eq84T zV4Lh|jfNl4jzx15A|`dC66XoY71vrUtXDM?it!XRwpmbjI^Jr&5xg7;s7rm&e`>3P zNO{3UWZ$}64)F1K2Lw&Hq8~_> z#k1nqgOvv(g2d#2k)JoYQ<6jB@S}Z++eAG_} zimc-o`vxnh6o8DGdbYDsUXBEvhjSQUxMUJ7qgsCRANVb$|<={(9h|%q<%` za+9tNRLG?sIZtkAg`^9+S4Kq*-534oHOd9AHS-OK1Oj6gQ(&o7lth||bx+tudd>t- z(JOjR1k(bev!#dE0r?Y)sc*DCM@u23B`s=>kmPIc#VbdO|3vO zD|g&xQrihI_;If{c>F_ex3}Bhdk9JN$Y>Jm{WZzV?%Sg2Z7itMd2eqE$D^4!k78%5 z+H?WIa0x(d6Q=l}tJYex(%tM@N}mg~_|eO2fs1KdK+mud)dCEN0@QRc;#{pV>aL0U zh}(%mQzd5TNC^y3y{IzhIu6(q(~j{YC$kUw?FZ9%Pfmw$X&ub4^?&*!miFb;y`bTg zL-&A#7XK0+HinmTE(er;%9^W;}wF(g@K}R3r>N2@^p= ziax!SoChIKLz*es*U)P@Df<~W|LJeJRvAwNKGy4FX_&2*5zsB7k8DGHq!c&fQ-gQRdRqlOMf7J!l_u?N=Sk)wr70tB86#`O4GM=(@V%yTn#<)uEXcpej$Sf8**{G*?r7anit=q_3u(J>d)?P;J! z8&MeXJdI3Cr&DUh6O%yoU)TUHRNNNK4oJR(;){MFNfy(c!i|no-fU`X;`EN~J`fks z!!W6mE1mNI(QwmBcb^e8#Rh9o;tq_41y@VxTDq9h)UKQ&rk6*>7G-_A*ow~%m}ZWM znl`SEJvd}OD(n)sDP%!X+%yA<7qBpm__^=Hu=2pfYEd})8EIB{z?@VnAd~sXz}4*{ z7`4suZqU^t6leWw9#Okx5Wq1d(R;xZeVgL6m+W732tT}J4H8$gXP!kw(Gw+zqLW!I za1BlrQ5qpFmN8U7N#h=r{-=2#!D@2#Q=>3AiFVKjcZ4<1V%}baCUf_+{d!Odm!kB{ae4g}q0QUo(6YX1V^kn{+zX2)BFv2J07S z2NnB>THU_!ixtR}+OoEvSn6$CBjFK^wWh|6zaG5Twt}?b=3nHN_^2H~!!m(Cnl}n8CpJ%p1E+A&-G}VY{b`g|B z41Z;UkLXHjf7Ly0*HKV(5|~c+v)yrpkM!@xz?zgPM&bh+lbP=Y0LZGIfq{Of zSVDQOikFW%0As@9T+q|0pmNINXb6wdD#Ky+-VQpQ0^;?+d2}<-R0cGmdU+^;e$uRf z8>1cjt~pAeoLg3+c`lJAzem-m>=>6@CeYPJb7TV<3ZkoZH8Hx4MU1DU`{Uq;C#FDs zon653nx{+)Z7ekhK6s9aim-N(2pHKjgv7LBCZqm_>;7{+D<16HP$MvKpPJFoV(N0Q zfa!`d6MMe8s0Wx6y7O{wfuw7ebRD(2ewx#u8 z!Z4>)&<+mMi}W1j*w;P^@o)L~Ck3p}OZMNqJ$-S~Q=imk`dD)Q^U34EUhVwP!zWL6 z@6P|+#&iF^J>8?VWkwXP0xqU3Heuo+p7&%DM%13+iTR91aQ}X%kslg?AaE3X6xPf7yIa7^cE+b&z}QeW9a>CPRM!jd_60N;memb zU_y$X9Z+xR^LQCF*SOIKsW!O`23)0f9DPCgv% zpPamZdwlTpyL(!jhbqRdY?NCN6t)z!Vbn?%Sr|H&83GRflswIdnm+A*?nOiqFEFQw z^83<-OBfMJA3ua3h-khv3uIeU5%7_ic2IYxfX)J4gv%LWb*eIf&hbAR%;i6 zcSunS`FwCHeECwFyYr!o*iO{kj#tKqI$J@mbvmCv-w6HRa7Bl3!qSk|97jw#vvAJe zWBfW-87;RZg-$C~nP3<^Ux~>wGRv1s3+E&Xc%Cci&X3v_fPSK3u4wawmBWsc$VJph z*98)E3p&~*bq}}IH6)&Fd-L|-#fQVAnnXkY@QTy5DyNvDiTq{vx1Ll)<+4YjNN7!n z@9d8+-R(ILj@}-h)_}N5_j-wptcU%%$c8W7V&84Wk>7SYjE&)*Ik{V7Z!3Rw@oj)F zUpyJqZ5Be75&X&hoh3g60g~dof)-zALK}9%V_+4Y@}o2s@>OxpAR#kQY$19j_|HgR<1;&swDjJf?V$r4juEZch15vmQ%zTM~A+aU^^CKXx>`U))SvnUSx` z$0dmzE3aVh{-IdBaCR<{n{NCy9>JK43nHS`m_VL~{S_HuIq`-o(Dy%YW$XugPkOt( z-QM7jZi7@gz!@YZ2RI*Y$pC0-_DVmmwNLIb&@rVc>>~ zf3tC7=pyQMY`MTj=T#(zJUy7vaC% z@g1Tye7gFecyJa<#I#b;|0S%Iw`&8K36`ocbpJyJ{~^1z)=ax(40ub(qL+@2Y%bnB|zNTo{)k$uhw+!H^k> ze2Td0v(B8%ICB;Y$*SL{Xs03?Bu&n#c+Qhdb5ZwiPY1n+!R`+H*P!<#*zH2^Imrkn zPGnT}Gy~dJdM}xBfa&(SHpwDSW&eCIqKXWXDc^S8s}5|8fdg-rLaUFd#Tk@ed6 zL~{uh^Xa`bq6-nQ&fj8=3NIm5Os(w(%d47xsFCU5Gf9 z>G#TY22AaM7L;S=i8h;{uGkN1_}Hr^sk230@sd6J{~?FSp^IwQ2Nwq} z@VYM~;o?rJOtrjKe-8UST&wk!L~c`xiAA%gT<QxBT=m4k` zt@p94MZb<9X|x|_Q}QNHV6b~7YF6@;tU_5|jju^%uj+baZmQTu=O*|XDcxG|#%S%f zUl-E1+@oESb3NbFTAW+dYsGzmpKBo*R^hpoXyOmmn)LCiYM|HVH>|XjGIap2CfK-8 zi-j8ZO`3&hTZb+lvt0>gzrs>7nxb4wONF=E422E@VuyN&4{Aja#>y} z+CE?ATU=$0VQt6KV8p%HGM}S8t(TP<85h!VE`Q_7HfBrBwXDweHkR6u%b zt6Qeci#&HqVa3IsExvR@7T%d|5ujfVNTrdr=4QQS>x?YAH;Gi+`o5c(cN6pLP0W|| zm`D?GxY%FhMk{{LL*vpW71x~&D3Zpwy2*)t+v%|+%WgH>9^MqhBjL`agn0t ziWrbnOdVdPY*_5O!!ibiE04yC#B8JvqOm%oRrBAKNtn#G!9q+c39?={BHNrqtI^MW zPi674df#m?-E^tc+zfv>QZ?uHT8n0W7O-WsYs?t7oOI3AR-l}#c#|ZwXMWhf4C!3L zt#wFPO_kM5y5@9R%W2nAZw2D%nt?^>z&kG4{iOo| zpUapaUvY6!+l=u}lD631O(ohE(AoM}HC9}TPqmG9fY)zpMbws4yl$x8QU7aEzfpwO zPVc&N0ZZJ*{u$cmriPJ&0bIK2-l%9wpJUG+fXOBwm^4=mnCQ=@YW@MMOZYwK$_w*c z-jQEr>W7=I6!=-N?)BllV&~<6RsxQfhnpIZe}P~OeV(btJFSwe-zyY3jo`P{mL$GP zt!DLGxE%CSlYPUQbAi4K7P=mM{O7y^deYF}G5%pewe3p1`oeQQA>yyyU%TD8zDkB( zwVj4#_d;wO*DQ2|_|E?_#bJBH3yIa%!aT*UMz_V(TbG7w;_H*MmBfp@LhF+H+C;v6 zwpgm@?&TO#B2~E}&l4b4flx>(aa8n{wdubb#SQNL{2oC2?QhCN07MxPS z6q(dYy8F1i!UlUM5?2~o6d|jX?d@BS4qO6DBW-o;wfS1x*uWU4)s~0W8aIoJ?>^Gm z4t!^fC~wm#Vxd~Cc{~cHn}JJ^Dfvi469w>8zc%eQuR%&{X*s_ypqpQAEt<_ujl!09 z4H{A{s!??Fa1OJtd+g}$`GY)-`oHG74z6hrEYbgiy@$2)UwebSy}SHBxAJ`U4u!TD z0QR<^`|Zlzzp1CDz#F$uwr@~n`TR=zJ(HiZ^2O)eZ!1F*XdW(6hP z+l=PDQ&6|?G|K<#9@%xp|5Ew?@X79+{NH_YC;xBbSwa4{UuM<6-}@}5JM#Bf|Gzi+ z*B4JcRJJ^8TA_Jk_(qp?{*LmutPK|FfrTSwMhLaTh^0i#4hp?u#dt>4bO*j0%@mcM z9RK_oQ>~fr@Z}4F_?_#XD*NFQMvouTG^_(VFVUAPv{hK{%UX&qsA{_EjbWx8#s8Ni zG46gWXy#9*l^W&0-4+bwdAJD=;8OWtxBmx^A3l0?C;xBbsd?GmhOn2`vQZ#g!E|+T zY&-gvC2=h|yeC0w#B@hw{JZ3;o*9|Zu)Ouh^Xb%^a7meh0|9aTI(UUGORXvqPu=#KaTkYuoSOG^zY=s??EZG z%b)Eqd0{}_hWv{8ZA(nXf+v2LHAu@}5797I&M|2C@b?rC@$^}n>Y>TD$XWBK}TFxZ{T|M%$eo&LX#XHnp5 z_3Txz-92ZD{97t>vtoOjk>7LLambet6gL(O+rn=BY_v@-w7EdI*4rn%UcEBQA!yFx zvIv@nXzj1f$9K=wo)-C!d``lU=c&538dxI#cON}|P+$M;J-CzqxAJ^$xFy66|Gpjm z=4&cyg-i~}CGJ97xS}Y&S;@bqjw|Kn*BN6nMrJYzJCaM#xo*10SE-GWu2cURw*{*>}E+~q?* zU%TdaSrv@RZM$XV+9kZp0cvTd0#(7U4cL;#kwye9+vL;iky)Uztu~nznTu2(e?qxh`G_y*>>4#;pZAC--Uc5;GMO(~Ddk1K! zSoUtPcw{)GQ65v_2UBR%#(QlfL0gUPycL6eG?@SMnQT13AGca%h9oJE3Y(}b>c4G@ z;%TT`CDm$%p=pMU$1G*a%i!nUw0B+9xq7#X$5hlg!F$=>xnJ`t{VOUGmSO`h1qtbq ze-*t4%c5cxVYp(0OX)(xTrf3z&QnD{sro(6TB=qGlu~FcUkaXQ6`<;^*)r>Z)8umV zq4B>L+NHRlW!X}Bdy(I6DU`lvc;(rS*j5xd>_F%qc#WGiI<`QB3aUX(*lm z1coQOyH~3|W@)raO$ZW=eWs?c z3qe9YnZE}Rq+CH@?)2%&lw@+sRk!jw=2HE2%=0wr!X^A#=^x+|5fcgFlwYI}950%P zB2V|FP4+%qXTmNJ002d+6(KOsLW`g&nlsg2Yr=W9j++rR>KF7Kt}+5%MVXHlR&M-a`rofU{QUOSyVoy192_3c_t#y4N4tv} zKYDw7`r*yH*Uw(Gw7w(;t=l$|OJ__0%*%uQ)BQ$LHmCMKV4{g~4I@~`_rvjvqgRK| z_fHSszWMO_?ZJx%l#7M(3QfE_X`*E}z}iTeOX@CS`H95~*`)%WyI}XjPlvCX zP;E>8WrLIYOTrzhLtoF)vl3)=pnmd#63t^^`3IdH)A6vTq!!CYKgaZ3bRfV-IvXwv z=va%lp1*o`a{A)1uOXtMj7TP}c0a(2p`Ze9POY7OdO+VMwJsoeCf(*=p@v zgWGB?t;uf9Ywh)IfJF+gvPfTM1FSJO7P{5`01g8@cGHZ)MiL7xxshS?Yol?&)>d&eR$f! zscolH=lWbhzH7l=>Di9eVj1Xno94+$*>iC!_KM-xHxVMcO22E(=bM|ucj2s83}?Mc zT<09_2hSQ=V4aZ7CKzk{fP1Vj(sSnr%wo7#Gh1DeZTN1n^A7GJdG8{5?;?5cB6%Ap z>0Ko6T_o>Ui{!n*i_FTvug1?!IzG&$;z|7iGWYn=l?wn|W9n4^GCNu;f)yC+Xnp8v z_12D${S!t4-$j#O%R_t@WPP0=YrDa^Zj^OvwdG;fbpYn?5v$Uon#*yi-`=&ilK;LT zjpCdee}382g27F=<=fhBaL+Gu&g<{rIm;i0Pcep(2^vB7Fa<6mDnM~CP&=x_jOUP2 z8tG3mqahp5fI!jAy=IRoe&eD*V-oWbiF*}Gy|al#||G-6U?jS#f#W80<0_O?gFjkr~O_>cBaPHx?+ zQU~B0bE-7*L7Stj5h#Drc@xfrsZ!a?>cJ0y%t-L+yN2You)+$$Nr{cES(_WY+Iph7 ztt&4pnwz`E>Y};9ueYYXHE!A5y0fLl>+#E`)}bx!ZGdC`jZT=hxNql~ujacgF6o42 zK@cTTTY@20JgN6BnEZ1#?%nyfKgRjDZ|9ijAHs9Bir?xABUlAyy^&k!(ptlzb+tik z=zT5d=aK~}%nWmLP@+OLnAUB=#>>AXAB3E$407R~2B&%@&E+6E4Q zF1i0{usf*V|8{r&^R}Kv*R@^wLQntT<2Qfs)11qE9_LyqA0BnI+OmHS;SEn|$6H9X zM8K?dXSO0@LX}x*RobZ@%Up+;D^cfbv*O+J6`of4FDQvNbOH1-`TzJ~UH(6MviImt z{@=#4T5S8xXbH_?-?E07v(@eS$9X$_`SIw7HJh=jeJV$KOdn-BfQGf7D-?4QJtHwm zL#?hVA>);Hy05%~UAvO0R&E5M)_ws_VVJL`7_Y4v+s?e=@oHV(wcvg?VpA`?ASc4c zl`k}04|E&Lhc@}Ysk{IGvcmnZ4<05GN!h6Pjp4OU|UC3EX>oeDLh`$+j`yND4H` zrbIFcJOzyJkZivXoZ;Plo1JvjcqozB_WS;$k# zW7_!+wEhB?N=4#W*B!;wixARfvF>521dsAiL)__{PMI{T4j6H+q!J{PK%kKn6Q-v5 zs2B322)VNV1~x>a>~9+)n#FvEB;cuT@*nw#ij*oUO_RfZ|6}p0$N0805+Ro?oq(EB z_~q|3PD%(gjy*ZuhKz(C$;8oF^g5kq1`>megpi~#qL51(8H!`~B+F#k+DH2aG1`VP z7e3H>6ue>NW6-d`bJIRc9kj9s9u=oV!idro6qU+^m|t-5(ZKNL<>8zEfx}djNbW#L zg$gVNJ1~xOnyLujYD#nD4#hLwJ<{XZKaP&87-WJ+J;wXnhBuA`#UOae6qTJ$ z043RB&>QUjwG+V6&yWdz&h)~U3XplG&18*}?juhlD&mU|@pY-*DlukyP$~RUdH37Bt;+9hkQC<;#7ruQjb%iTgle_`H6_aNp{qwDh;m^_ zi)fn8I-S44{rjgZyMKQOub5PzDPZxIc0QaTd30B1CcjHr(^%-i$la%YL}RKbe)cKv zF?!=5*lJ~sc~T3S@N+7`4Z2TYo@6|wsggjXrlvN#ij?*|nNdCW^5?H|w}g=Ms)weOTqWgac~Atu!Cp;-fn@ zuwSWm=MsW-9$2&d#-8hSjEJ7uqdIsD>X=TLRAP44PS}@N91c*Y!J)1N!dAP^kS!Y% zI7?aF3fHpQ9-<4+B%PK0c@v{N{lw3y5G;kk{=*{b z!tP8c=2^8rbPDk?xI#9}(L^AT`vNBv-8bMgyZrfPSRq~Dk%F~^x3MTb~}jH z^Jq7>SywNGVzCUYg^xCy^b(N>K{lpwF5&E#-_GD(#HqwsViHB>^e|+(UNRb}^$aq` zA&ns8k=&j`)Q|UEf}|}9p)PAySTns$3(EzFp1f;ga*ZJ~sF)+sVwo}EI`n4Yt=R(x zQ?s(}F}^;&6+|;Gnc_=OZ9o)t<&8g=a5jI6Yh{c*L=~B=Qmp||Mb_oRt2~!*_W5-G zC8pT>vi6XAh?b}M*Bw!u?U_jgaC6TkoE?teaCIc8r0JYuTUNV@=t7C=`a7{l`48u1 z+D$%A8eL7WdWd3b;N^5G5oKdA>4eSd737rXaReg@l3s0DxC~KDX?!)oi->Ar^42Qz zrOjNzi9%P2;(Af97>VNIFGuILb+W9+eB z=S=YKN3Equx`?xSn^7+d(%v_jMm9VayrO9D^|Xc^=P@c+5}lJYq)|mUOR5x0Cs*U~ zOE^nrAG}W2!Wt1>u*cBU-&LLQ*L*gxd|9w-)YPAc1&I=NTRO%A^a|M45S`mhY3gqd z(c4ll9|TDwp1@!i_v%TA6DZE6B+U~lSZJ5KADU`c5uMxcZ0fIR3-lJAjk2!2&u6iB ztcEB=Ou(4O(GBzOC7dd1~j;JfN0ONZk%S;)?At5XUE}A3QR^Jre1fp~4;ucC>bUT=!%53s$k)Q60 z5UdU=A`15+j(&P`b2xYj^0pVsP>pDF^1Id%Ez^z_(QkeRcy6sAxk zFq-uZl;1YNi$=II2~__@3crT)ANMvf@QrEl+FER+hihR8VOGVdrQ>TOT1kVptffmh zU?_lzm}w@ripb_=yCN7Xfx2Ntuf*XsZ09+;O3Rhm^(GNrw$jn-b6nFPmNg7bq_1(1 zf~2Wrik)jZjJZe*4_hM4g{8NWn~N*cX?@xtJ^ZtsD{Rhr@xJaLF`f#&;pY<0iesl& zbhTB&rk3|tkHEU6=Mv5yJ$$ftMHa6h>W-x@ah^7eXmOzR2A>T~<%U!0i>C6vcbL8A zoUkoj8JUHk!sjp7sO=+KJ*D0%oNI^K*|@+Drz(?h=ATr*x_hkN@y159?Oc0pUwJ=@ z1eI126G4Gkhv~(XrXbHljjNC9rV#z*w`_Tvu{it2EW ztEqE^+6BSpLP9sOM3~Ply26%~SIZuQIr{nemC;xMR5(*2zv7Nn1EPM8)Moelk>KYn zqIe|G`A^S|no`Z4?clIq(FUGJbdw`mIBnW(f4t&IuUd6cg9+jW-LZmwEX3-oUQ=Sw*2cCQx|TS0VLl{A^mM_qrRTjcUiEgH=@TTckpc>dkJSh zykwgj(Pd`fya|Y&nH$wCw&SzU>xcaowKbwPKf1QePi#h+MZ)Nf=2w%C3K7k?Ru_^@ zQasjtuM~+kZ_H+lhRq>L#$&w>UJ|2!3H!F(EhD=*L=}&zShje9OE@jc-72c~{K!>n zdx&N{+F!mIGZg(2{fm ztZNWmO}nhGUN(j7#t>aiyIe)RYzEa0s279iYTD&W>SZICZfrzX(=O|(m(9)6jUl?4 zcDaUnxhBpVle(*Emn*544YBUE5mi(qEXC>eQjm}y`S&R{1;v`H5iL%5Z7<^L+MzJf z&6s0T8+$h3VJNQSS?xIL^P_kD*EHc`R$Sy$T;9`Be`}HsIH-BRZBZ1vj*rdps~b<2l6aBLz~u?^^4b5e0V>$OfMcNTZah3obsIbBfC`wY>YruXP;^Rt0qf zXT~dt;=b;SPl}3^G_cAg9Pspeg{qSY3SrFjas^Fa6i^{gQwOz{iTFm|T44)-YWxcfVz^ zTSIiQ-2IltZVl1Ja`#&nyEQ}?%iV8T>?TwR7Ru!Ta;Co%h3SknDlT6*{giRBYWCu* zf_i?4(qp_YLqRe+gswIvx;wS6=6b2_kAokcbibT6qq;B}yD17= z(1^(b&l`%#-u#%p<|$KLv`8nD!a_|MI_Rxornoz1cT#D?M3s5h9As1w{r+l*Zde>S zL`lJ<{!UwkdEKs>m+T);_efsH7#)Hm3K5ebKSy0Nn)x(X1<`8iKd;13O%^8 zwu2p_D{aJl%NsDwh_*NczhzHgGomdH!Ef0U*o2Zcmh}2i20T` zU|JAu7Q0_j>TYa~uCx#HXOOxp?Zf;Tr0z=lFn_;2$1Lj#o6g^RbC^}hw`sE!K z2WiXS{7TeyeD+z*&^dq1@uE`$NOvXdFFPH#yrd+YmN$cX7Yv^TfussP(%DlSf?sxu zKYu$baz>&<+rORmtOq}F0rV3|vY76ycaQC_9RSnqd{)+{X5s15t?taHGku!Of+AI^ zZVDD%j7vuRyu7njQhQ^n=U?zr%ewH+BH61(y9&@*&vSmqGhi-_o@UkpERAu57tXp@ zXT45mKgO^{BT4Ix+TOjr|I2d(Etj-%ukbHkGr!&Qer$I-TXS1eVhLRUkDkusb4a=D6QRhkZT3o?sYA>hGS~|xIu6dFX!DK0} z1fAqD5e@{?Z*Oh7_WI2zv=KRIxWHhjKSgXj?gY?q8^RFK?a}#b^G9v8y0%+0%(rz> z$t^yFL9LV8=RMcYf&}laJ=N33524G)<8HmjrebM#9>FyeuD5~JoaB87yEVAl$_)yV zw8t;_eb=HQ%CVjMP>$;9)s9&1-(#_iX z`)w<{xSnqUv+%|?sWNV+q-$PqzTVXM4nF218midhCKXY1oX1+RBs1?W{s1`=g1`;` z(+7q|TKfEA6)XIF0*6VGV>h74#Jeaz;-TzWXFpz+U-FC4q! zl%$jT2@Gbk@?a8bMJBkXg_cF+Zq?GPM}=<5c(Oa4XNCY~+PEPjkkSh)qp=0N+g-`h z?J0F``RsZ)y~?qKn=3YoK-YsABO8ENZ9x68ddc?#g2KJtjH%^RkQTDU`L z1O5?UXBX6R{ZTP*m^kGrt?}5JnAX#&o<-T3ueY>6(X@|PsCI0{kR&vIP9)s{+MD#? zb5~A@pwY8jbD``Gq5Eie_w}>xmtLoHn1TyTu!N8lIPTQT5_&V7RGGwL=Dix27n;^mYeau zlkyr2vq;opT92x*EGEHAdFNYPXElyH>vRssNSFvuhg=Y2(pwACWABAIh>^$eM3>`? zkP6KCS~7x1e>W+L1jlCv7z=wjKlIyP)L%3&I;T@Esja#0%!neEPWqbk7h00oA#6+< z?(?xVIX^^9oLNxVxgAkFh9fsOK<$%o9X2*g@%5RxC5iPqyj7e7Wl-&J34Zm}#oSEaNOy zfk|)Ni_SoD)1+P5X@e!%QhG&JDE9tu{qF4*!8xgAok?pNMruQYx*p?9b z+L9HF3=}P3ElFT4^KgoiM$m|+y1rgWmY4aI6msj|<^lIZXK2R-fn0vNyP=7bC=-dDH@)Nn2|tCO3UV4lNnJ{XZ015 zx!38GX+FWEeE>}KX-I%3jN^c-&O3%{u_~~QHFOYY&0@2#!byK z2O&;a%Jh<<*EykPh<>S9D8Jp?s@)(V%~44-2JIJGq{`zcA0j5}iCWD7y*6tzGdM;d z@T~9~;jFc*zqxo{ZMXeWt_jOwtc2#;eCS2(G(xcg_b^NMkAokcY`cThx@ApGYa}x4 zi-za}nc9(a?P$`6JdVw0)McJz`}l)&!P!>4NCXN0VhM{0iWH;l^voKeWHi*ajwnCI z&c@b-)p2NG+Y)vE&r!@reUmy$3s`hkVjF$imtQ*gSVYnHW=XtlXJA2gt31lMPAg6w zWsnwSNG#~-@Ow@L(+bwH)N?)3-^;3t$lP?6I!~ONKT_KQmNEtgEfYN~8Yyuhcur+X z<6??^aMibrtrMj5BCt>g=Zpj-Fa!>?D%v)IC|u|vQiR3E=&YWNMhAj%D}X(L?3~`! ze3(1Mdj1#UN@`}v;(UVRPV@>gi>bMLNMq|AW~iRW)@rOo*&8j!aSh&AM1GWgypc=K zH4#`=>_;?=iJ*Z6ATXeAnQhWw#`9oACoJ7Ifb2D_=CxBW2aTo zRNdR++#|LJuVi6}c2lZ)BdSQRO6@8gpML(e%Tmp0^4IQA|ByUJkbmtCf9-mB{o4KV z#roaeYfGR?51rgqQyf~C24E802?R)Rcc&pp#yf;0qc z2+#y)IA?0AzM7h=**{>{zE~G)SH16}uurNQ`WjncVewJCFe`l$;Zafx74p3`nZ^@yP{smR3Day-0Tvk?C?Kd1A4puB_uTbklF_YAzo z_gMQ`GcINb>8w`z9<9je_F~HwNU@`^d+oB+xwJ7C8= zdb}S1)Otb2vb1rP-GzV%pV&FpmN}HbDpys;&bH!a&R=@Q0Sw(O>6R6Eg^=brLn9Ch8o>bty_rAyytZSer+eYQ1KugBjEy6q{PBzYqUKtXOBrqV|-3hmCx7D z?f&u>G!f}V&z|5lS%5s-OD^+3Pk+8mM(*8!wM~*w27G7?dc3rFK6`ljj2t;GdsUKw z{7~`WOatZ<->Uw;3K5)b8Sg5%j$yrJc)8g7$4WOVn`hCzBb4uCNZ7xW`@_%FgezHK;yh2)c+-QgXLg zmo;%_7FrOz&xvI)O3e7G_^FKE%iLzrIBfE2`9M7b<{dhA9E8ZB-GC}`XK&t<5xeGi zy4TEf9il!R0+4-x_rYWhc`!uFNUy4r=yAI+f2qjNj0@X7Ehd7rVC z;m6*E`Y~uXVG^HyJay)+(KL{$-oMa}dk-b9H-%QQO$C)V>OUs1|7vX7^!+ zAArWd8j75218RRO7|Mc)NSi!Kdcrt%V$W2hzEnee8Q#5%(Gf&l&Wf^7^uU-j*QUS5 zFnO!@)A@j(Y+AgiUH~w!yV;(Kthfn7vR2FUxzExfZ1U{E?$hV^=00q8&C&QiU`+dv z@M?r<(t%1=^3S=9Z&nx+F09w^DU%Jl-BBc-AiPCGgpq`iD%p+qG6H>i=%eyL9f^pk zJF4V}cFjJPYDHRdQtHt%stPkt4@{M~1+5Md5)ukGb!J{qL>*Qa%%QK6KVIyO1lj@` zRK3?%HWlpS7}dIXG1E*6w2zAQOxIbvCq%kjh@YC}J4jEqJD!6Ka#zsZ2XCi1!Ib1r z^D)vA0K;j?XB`cpJW;2w%kG5=@=8+#_@U_bLRxZl5rt(zQ}pSZGLp)I=eBX&byjD- zRl(@U9)~pK9|_AgF{DiL#00X35Y;Gsc^h`6m+R;|iPF1xm{{{-N83dg(z2mByn^(4 zkr3V+b46RgEB3)~zFR8(EW++kHqY;WHLo9Bq4I+C_dMrU$r|vRCgkJBz&0b=v!a>R zh(OGyaymh5>PsMOr{BomhLOfks3Fqqs$nT2HtJMMetG1R%YZKX6IC@BZ!;`oOve1J zqFtMP5n0VLkYS+$nM&`JeWbju}mKI=x#=HNX^4?39g7JiOoEV-EC<=dpHF_6RXEoLhM%>Ah?^s`9XH z(|AZkbhVS)V`$#GQb~jxVc)7LTkGcPC)}j6lr2r#KTAC&8RHMgknB98Vst*}c4kEsB*5=TKS#k+*0&TWb!WS7g&}kv3uyZF8t9PLy98=E6M)SPt zTp`Zo$rUQP5;tR_&3VCC zpUnP3I~d2!3XVM&KP~={A9*^9Iy^qMjrR$QW43%2VYV{Lx(#!fTZJYoDuXN^qrFEK zbkG{1qWxx+7+B(NSWKd zutPHFEF}@j(TwC>UI~I7pFLo+8}EPUf7@>&r3R7W2sU zTq}5Vcs*{i38O=>lUV#JJ%BrI$kfm&f2HZuZQKbqUn+5t2Z6P(3y}uf|tOXT*?JI&#z=R@5&fa?36_rwp`*rB5^M`6&xLTGJS4kv8z!B z+s_0gvT8T{(Os};D_ypNgyBc{ftX5h;GOF6x$Yf0{)+Uy@P~b)sFEY_;2r#g-)E7E zq0NziT4hr{t&8&O3}r-36|U=~QciqlYjq-auK>GXU@(`&+Dc26M7PW9=4MfhakzbR zgVinTA-$2GnycgfrvmM_NKhU}Z+PkN@#ny+n`@AqNtQcyWf!aUZ0hW)t?SFL#q*Zia57#j7*; zx1cP=$P$XIH_1dtg`ywdve%mF0MxCM1y0-5P|AOCQzM*D3bp(b8?=6)zxlCU*pOV? z@R`A9i8-n_QHDe+e@WTS$96pj;t?b_l zRrXz?WZH%9fT`k^M)Gfi$xjOC(t^rFyThE$;89AZ<+l6?%dk_@b`TmN{BA2nCUqxS zjOX$5XYMbDXQr(zF3dz{WKJ1i%IH4M?WQ-;v`3Rg7fSnnY3ABvE-VPco()j~o=DNu zq7gBpXnD!CJE?S~8;=qb5Z-i+YEyc%@^x-{9pJ~9x%rlfZ>g{=-7o5%8{{e-6u3ZU z$|~^f%RS^&(V)+Qtt$ARE#^?6a1R?H(N=emO^ozzAjs4E-s%NL31ucAc?>AaiUw;g z;j-bK=7K!L|CBm%$7TD+4%$|M*lY12i;KB889j&k{=kf6RCVFNrl5;^DfVdI<#Fii zNs&ps*nZ`w?gx6p`jA1}w}BVGCQSaaH}azp0K1IP9xc88cAqVLdyvjQ1m=VYaxfp{ zy3oYm8vsa3-69uLqg6jC7|Y5o^`szd&vAcxIaAA3iV3m2dYKs6Tzd>^eYoA(e0)uK zgEUN+h0qAJL5f!)9FFnxUED@2PZg+=4X8vdMdHPke9KZVNfq5jB|`-XKJO5=yKCUB zmJH9p(y;x|=qn?(xWj{>2g)+$AK|Ze??8>dJfCBFl4C;;UL1ih>p-zHWi1#6E+OO{ z4K@5m6;EGz>-auZ)MUw+l@IT(0Y81JpnU&WZRf6s$rjXH^g=XTaJ%CS#QL}Y2E~7K zJm+QFmXH@bzI*o~s`9t{Ip}f!&%e*MM>oo*pdy}k;D*asUwJi=!i`?#r;NPr+Rs}} zx_%c79fTR(8qhQ;$U8*6F>Vn5BB{uyhZ3V)umxqK#MQwHgnyjR=;@$xYItLH?Ko5W zE9nIRP~!HntOZfk(F|o`>gnk#O)JX|5C3QfT*&8Jau2J1f;I<_sjE!csvMy|f#xP?#_-Og?p5(;j6J2O%ns(WI9%(`RexEG%^rVT2eWzcoQpA*kF=IC|WtSvHv^{#gS&TMLofX zu6G@t)l2rgXi5P^AvS=#BeE3T=_I-x@wxw~ajB%MBA{$b(Hs`9;{b+eU$hu_o2drz z9?~UD!sAPLJK?_B;f3#Zty8mt&ts}+nEJyA+F7CHCto}1|MK@L-V3gpzp^%y#7xz% z<^O3dO%D>;E?iBj8NiTSnR$t@Ay<gZf+qzGz(>gJ#){ zY#a4)In10zx^N;c89=&-v)oa?KTu0@AemI~U8-uUW`_d@f?f-p{q51Zn#h;#Nbm60?{!rH*rl^DI+ssy5355M|a z@alj{r4UT6xeZNyW~U9647J;<_Syk%RgIVmLHO~cH@>(Lnjzokl~)teQNBMw$b2z> zg_aGFbuzdfVz*(ei?%77so2?k`IkNtd!>&QFGJOfaNX+$K03oz${=my${s3?)?Wnm zeZ5JOUW;M(bSGE7fO94A;&)z;j4mev^##(qtddIfyZ$#6JQ(iQ`;p+*>qXTMC+m>G zc7^|~9Q}Hi76Y>jsLcdUQ;^antRV z+0^kH8^=13aG3H-hgAC<63sX1(R(Ob4gf#D>x!@eAACCg2JYgmD0 zm+bX>#5kuigMH!916_7>*;MT6mT;3doXf*Ecj|EW<=H$pSkX7EbPK&XibGae&|gbH zov5_%8!YJm`b1||S<6XZE0re+jiiTtqydb2vi0QvE#;o}X8N_ksxI3pbj#nV_MoEJ z+>Rl=Hg$!p+1Ny#QST(BXJINWwvZoin_+YaiT@W&wA+@PHLBAxl<3ztv`79=o&0%A zLbg~&Iz^Kk#+tn~7AlbU7uN358!eG9(bR%CJ)s_{0B4uO0nV(SYqcut5i*CkhY*PP zy0W@3o>_*HsNn@x_dZo?N%zS%>k$9BVO^NaJ>fHP3>4jyQnn($UdJx~lb?&VGuNGA zdh&8D!*cec%1>;BF%tTQU851!tpqT9v%1t&Kd2MgCGBrcUbjHMF;5kr`GKkjBXv59 zu*3f1NNmuldR-#c&_!7Cj-Z(gYNa~wZ`Uy6Jf_XM09_Idl#Na@0MvXcZQq{1-fbN zzbvhENVGKa@2abq40L8&`Zn1)5i_y{j9WUnetf`bFdGlREBcyQSfjBCH>gFN`1>8< zWPNR(>7MbiBXF=j7dzD8C!rC}ydffaYS-aL&vUvHC-}l9Sb@GX%*Ccir1>2?P2Szz z)1%+&wCyND!XW8@t!iF|36p&W8+V>lW9mC zf5mFdfZ{in+aZJ9*e?W1p)qcGtAhV@h5QB7dlZnZa-8hZvBqa~n>1GExNB}-E{&h2 z(>rD$PGHCCxwGz)`UrHUY};67K!{GVE0EKC?Y}`GpKmhjdeBv;Ibebp1;pL3Na5oL zvo{C*CoYp+wTB~YzGcP8F3!nkZ&Z|UwR*RMqfp{P;4Uu7=?0h{D<+&uWpCekiS_1M zD6w(Y87Z)T5m)Cb`d1PfjB8w?K7IG{`|vPgV7;p=mf#HLEp^F&r@*`GLzI=S-Q{M7 zoYEH8hwd?%BJ4Yv!EfO^?nxMh{@e69^MA~saAvv z@r~PB%UsNy(fNlom)>pZn$F(&790d1)G&HF&Y_T%oNxDJlnz)1qn%2b#Z4;XPni~l zF%t%M8H!+sEFbXM&}x^M6WnV5ut)6qrO0U20FY5=3y~eGQ8a zK?*OQ*Wgog99K;Vk^pG3)jGen9NNhvnwaP->U(f#|^h0|KoRxc(m?kl75?=M^0KIa0!BeV3w-FVh@F+e_kP zEL@E?<{O!1M%tu6wXDYMYoqP}@=KZ@uGs5D-JOnlk6b@B%CSpQaI;NLhqp?`8$R}< zwivu@C<)}rTbT(Gp7J<35vtX!+kM?HZV`Xgu>=+R9PMddyO(3iYO5C}xMqMg#n$O1f{O+5qWHc%JEJ_lu>&rM zb!Sub;(V5&Nv0KaF(e|&PGRz_47JS=rz-jHs$P~B8|O@rA3lP7&Mwp<<#E*L)XvG$ zQ0}auyW~s&Ek^n6yj;+anmFfn!8E@<;t{)p^9X5nI8kjF2F7*Iao&i8_rjY><5|J* zaho))^JdcF!uhH#uO2SGL?@)|$>1e+CDD`dUV8)ARE-~KfLZFf{hP|QRNhb4kmrd0 zt{xK@DbgMpvn}S@C5DR3w8}3Yr#e=n@>LzbHBDGP^1V zcA8%dRAP{OcxS$Eb-CCfNnpqK`gW%4t0RE;-iPS-^vU#v5VG7~M0Qm$H`/root/.celo/replica_id - echo "Generating keys for rid=$RID" - celotooljs.sh generate bip32 --mnemonic "$MNEMONIC" --accountType validator --index $RID > /root/.celo/pkey - celotooljs.sh generate bip32 --mnemonic "$MNEMONIC" --accountType attestation --index $RID > /root/.celo/attestationSignerKey - celotooljs.sh generate account-address --private-key `cat /root/.celo/pkey` > /root/.celo/address - celotooljs.sh generate account-address --private-key `cat /root/.celo/attestationSignerKey` > /root/.celo/attestationSignerAddress - echo password > /root/.celo/password - env: - - name: MNEMONIC - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: MNEMONIC - - name: REPLICA_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - volumeMounts: - - name: data - mountPath: /root/.celo - - name: import-geth-account - image: {{ .Values.geth.image.repository }}:{{ .Values.geth.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: - - "-c" - - | - geth account import --password /root/.celo/password /root/.celo/attestationSignerKey || true - volumeMounts: - - name: data - mountPath: /root/.celo - containers: - - name: light-client - image: {{ .Values.geth.image.repository }}:{{ .Values.geth.image.tag }} - imagePullPolicy: IfNotPresent - command: ["/bin/sh"] - args: - - "-c" - - |- - set -euo pipefail - ATTESTATION_SIGNER_ADDRESS=`cat /root/.celo/attestationSignerAddress` - exec geth {{ .Values.geth.networkFlag }} \ - --ws \ - --ws.addr 0.0.0.0 \ - --ws.origins=* \ - --ws.api=eth,net,web3,debug \ - --syncmode=lightest \ - --consoleformat=json \ - --consoleoutput=stdout \ - --verbosity={{ .Values.geth.verbosity }} \ - --metrics - ports: - - name: discovery-udp - containerPort: 30303 - protocol: UDP - - name: discovery-tcp - containerPort: 30303 - - name: ws - containerPort: 8546 - volumeMounts: - - name: data - mountPath: /root/.celo - - name: attestation-service - image: {{ .Values.attestation_service.image.repository }}:{{ .Values.attestation_service.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: - - "-c" - - | - RID=`cat /root/.celo/replica_id` - export DATABASE_URL=$DATABASE_URL_PREFIX$DATABASE_NAME - yarn sequelize db:create $DATABASE_NAME - yarn db:migrate - sleep 5 - NEXMO_APPLICATIONS={{- range $index, $application := .Values.attestation_service.nexmo.applications -}}{{ $application }},{{- end }} - NEXMO_APPLICATION=`echo -n $NEXMO_APPLICATIONS | cut -d ',' -f $((RID + 1))` ATTESTATION_SIGNER_ADDRESS=`cat /root/.celo/attestationSignerAddress` CELO_VALIDATOR_ADDRESS=`cat /root/.celo/address` ATTESTATION_SIGNER_KEYSTORE_PASSPHRASE=`cat /root/.celo/password` exec yarn start - ports: - - name: http - containerPort: 3000 - resources: - requests: - cpu: 50m - memory: 150Mi - env: - - name: DATABASE_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: DATABASE_URL_PREFIX - value: postgres://postgres:password@{{ .Release.Namespace }}-attestation-service-postgresql:5432/ - - name: NODE_ENV - value: production - - name: CELO_PROVIDERS - value: ws://localhost:8546{{ .Values.attestation_service.celo_provider_backups_str }} - - name: ATTESTATION_SIGNER_KEYSTORE_DIRPATH - value: /root/.celo - - name: LOG_FORMAT - value: stackdriver - - name: NETWORK - value: alfajores - - name: NEXMO_KEY - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: NEXMO_KEY - - name: NEXMO_SECRET - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: NEXMO_SECRET - - name: SMS_PROVIDERS - value: '{{ .Values.attestation_service.sms_providers }}' - - name: SMS_PROVIDERS_RANDOMIZED - value: '{{ .Values.attestation_service.sms_providers_randomized }}' - - name: TELEKOM_API_KEY - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: TELEKOM_API_KEY - - name: TELEKOM_FROM - value: '{{ .Values.attestation_service.telekom.from }}' - - name: TWILIO_ACCOUNT_SID - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: TWILIO_ACCOUNT_SID - - name: TWILIO_MESSAGING_SERVICE_SID - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: TWILIO_MESSAGING_SERVICE_SID - - name: TWILIO_VERIFY_SERVICE_SID - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: TWILIO_VERIFY_SERVICE_SID - - name: TWILIO_AUTH_TOKEN - valueFrom: - secretKeyRef: - name: {{ .Release.Name }} - key: TWILIO_AUTH_TOKEN - volumeMounts: - - name: data - mountPath: /root/.celo - - volumes: - - name: data - emptyDir: {} - {{- with .Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} diff --git a/packages/helm-charts/attestation-service/values.yaml b/packages/helm-charts/attestation-service/values.yaml deleted file mode 100644 index 0cd382317de..00000000000 --- a/packages/helm-charts/attestation-service/values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -imagePullPolicy: IfNotPresent - -# Node labels for pod assignment -# ref: https://kubernetes.io/docs/user-guide/node-selection/ -nodeSelector: {} - -ingressClassName: nginx diff --git a/packages/helm-charts/blockscout/templates/_helpers.tpl b/packages/helm-charts/blockscout/templates/_helpers.tpl index d80f34d432f..f2f9dc9f1af 100644 --- a/packages/helm-charts/blockscout/templates/_helpers.tpl +++ b/packages/helm-charts/blockscout/templates/_helpers.tpl @@ -26,7 +26,11 @@ the `volumes` section. */ -}} {{- define "celo.blockscout.container.db-terminating-sidecar" -}} - name: cloudsql-proxy - image: gcr.io/cloudsql-docker/gce-proxy:1.11 + image: gcr.io/cloudsql-docker/gce-proxy:1.19.1-alpine + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "until nc -z {{ .Database.proxy.host }}:{{ .Database.proxy.port }}; do sleep 1; done"] command: - /bin/sh args: @@ -95,7 +99,11 @@ the `volumes` section. */ -}} {{- define "celo.blockscout.container.db-sidecar" -}} - name: cloudsql-proxy - image: gcr.io/cloudsql-docker/gce-proxy:1.19.1 + image: gcr.io/cloudsql-docker/gce-proxy:1.19.1-alpine + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "until nc -z {{ .Database.proxy.host }}:{{ .Database.proxy.port }}; do sleep 1; done"] command: ["/cloud_sql_proxy", "-instances={{ .Database.connectionName }}=tcp:{{ .Database.port }}", "-credential_file=/secrets/cloudsql/credentials.json", diff --git a/packages/helm-charts/blockscout/templates/blockscout-api.deployment.yaml b/packages/helm-charts/blockscout/templates/blockscout-api.deployment.yaml index 010a21daf20..94f76642be5 100644 --- a/packages/helm-charts/blockscout/templates/blockscout-api.deployment.yaml +++ b/packages/helm-charts/blockscout/templates/blockscout-api.deployment.yaml @@ -22,7 +22,7 @@ spec: metadata: {{- if .Values.blockscout.metrics.enabled}} annotations: - prometheus.io/path: /metrics/web + prometheus.io/path: /metrics prometheus.io/port: "4000" prometheus.io/scrape: "true" {{- end}} @@ -36,6 +36,8 @@ spec: initContainers: {{ include "celo.blockscout.initContainer.secrets-init" . | indent 6 }} containers: +{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.api.db }} +{{ include "celo.blockscout.container.db-sidecar" $data | indent 6 }} - name: blockscout-api image: {{ .Values.blockscout.image.repository }}:api-{{ .Values.blockscout.image.tag }} imagePullPolicy: {{ .Values.blockscout.image.pullPolicy }} @@ -47,7 +49,7 @@ spec: - /bin/sh - -c - | - exec mix cmd --app block_scout_web "iex --cookie $ERLANG_COOKIE --name {{ .Values.blockscout.erlangNodeName}}@$(POD_IP) -e 'IEx.configure(default_prompt: \"\", alive_prompt: \"\")' -S mix do deps.loadpaths --no-deps-check, phx.server --no-compile" + exec mix cmd --app block_scout_web "iex --cookie $ERLANG_COOKIE --name {{ .Values.blockscout.erlangNodeName}}@$(POD_IP) -e 'IEx.configure(default_prompt: \"\", alive_prompt: \"\")' -S mix do deps.loadpaths --no-deps-check --no-validate-compile-env, phx.server --no-compile" volumeMounts: - mountPath: /secrets name: temporary-dir @@ -106,6 +108,12 @@ spec: value: {{ .Values.blockscout.web.sourcify.repoUrl | quote }} - name: CHAIN_ID value: {{ .Values.blockscout.chain.networkID | quote }} + - name: MY_REGION + value: {{ .Values.blockscout.api.rpcRegion | quote }} + - name: FLY_REGION + value: {{ .Values.blockscout.api.rpcRegion | quote }} + - name: PRIMARY_REGION + value: {{ .Values.blockscout.api.primaryRpcRegion | quote }} {{- if .Values.blockscout.api.suffix.enabled }} - name: NETWORK_PATH value: /{{ .Values.blockscout.api.suffix.path }} @@ -113,10 +121,10 @@ spec: value: /{{ .Values.blockscout.api.suffix.path }} - name: API_URL value: /{{ .Values.blockscout.api.suffix.path }} + - name: ACCOUNT_POOL_SIZE + value: {{ .Values.blockscout.web.accountPoolSize | quote }} {{- end }} -{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.api.db }} {{ include "celo.blockscout.env-vars" $data | indent 8 }} -{{ include "celo.blockscout.container.db-sidecar" $data | indent 6 }} volumes: {{ include "celo.blockscout.volume.cloudsql-credentials" . | indent 8 }} {{ include "celo.blockscout.volume.temporary-dir" . | indent 8 }} diff --git a/packages/helm-charts/blockscout/templates/blockscout-data-migration.job.yaml b/packages/helm-charts/blockscout/templates/blockscout-data-migration.job.yaml index 0df365c4b03..cef51a2655b 100644 --- a/packages/helm-charts/blockscout/templates/blockscout-data-migration.job.yaml +++ b/packages/helm-charts/blockscout/templates/blockscout-data-migration.job.yaml @@ -24,6 +24,8 @@ spec: initContainers: {{ include "celo.blockscout.initContainer.secrets-init" . | nindent 12 }} containers: +{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.indexer.db }} +{{ include "celo.blockscout.container.db-terminating-sidecar" $data | indent 10 }} - name: blockscout-data-migration image: {{ .Values.blockscout.image.repository }}:{{ .Values.blockscout.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} @@ -50,9 +52,7 @@ spec: secretKeyRef: name: blockscout-data-migration-secret-key-ref key: initial-value -{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.indexer.db }} {{ include "celo.blockscout.env-vars" $data | indent 14 }} -{{ include "celo.blockscout.container.db-terminating-sidecar" $data | indent 10 }} volumes: {{ include "celo.blockscout.volume.cloudsql-credentials" . | nindent 12 }} {{ include "celo.blockscout.volume.temporary-dir" . | nindent 12 }} diff --git a/packages/helm-charts/blockscout/templates/blockscout-event-stream.deployment.yaml b/packages/helm-charts/blockscout/templates/blockscout-event-stream.deployment.yaml new file mode 100644 index 00000000000..2bf654f9646 --- /dev/null +++ b/packages/helm-charts/blockscout/templates/blockscout-event-stream.deployment.yaml @@ -0,0 +1,108 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-event-stream + labels: + {{- include "celo.blockscout.labels" . | nindent 4 }} + component: blockscout-event-stream + annotations: + {{- include "celo.blockscout.annotations" . | nindent 4 }} +spec: + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: {{ .Values.blockscout.eventStream.strategy.rollingUpdate.maxSurge }} + maxUnavailable: {{ .Values.blockscout.eventStream.strategy.rollingUpdate.maxUnavailable }} + replicas: {{ .Values.blockscout.eventStream.replicas }} + selector: + matchLabels: + app: blockscout + release: {{ .Release.Name }} + component: blockscout-event-stream + template: + metadata: + {{- if .Values.blockscout.metrics.enabled }} + annotations: + prometheus.io/path: /metrics + prometheus.io/port: "{{ .Values.blockscout.eventStream.port }}" + prometheus.io/scrape: "true" + {{- end }} + labels: + app: blockscout + release: {{ .Release.Name }} + component: blockscout-event-stream + {{- include "celo.blockscout.elixir.labels" . | nindent 8 }} + spec: + serviceAccountName: {{ .Release.Name }}-rbac + terminationGracePeriodSeconds: {{ .Values.blockscout.eventStream.terminationGracePeriodSeconds }} + initContainers: +{{ include "celo.blockscout.initContainer.secrets-init" . | indent 6 }} + containers: + - name: blockscout-event-stream + image: {{ .Values.blockscout.image.repository }}:{{ .Values.blockscout.image.tag }} + imagePullPolicy: {{ .Values.blockscout.image.pullPolicy }} + command: + - /secrets/secrets-init + args: + - --provider + - google + - /bin/sh + - -c + - | + exec mix cmd --app event_stream "elixir --cookie $ERLANG_COOKIE --name {{ .Values.blockscout.erlangNodeName}}@$(POD_IP) -S mix phx.server --no-compile" + volumeMounts: + - mountPath: /secrets + name: temporary-dir + readOnly: true + ports: + - name: health + containerPort: {{ .Values.blockscout.eventStream.port }} + {{- if .Values.blockscout.eventStream.readinessProbe.enabled }} + readinessProbe: + httpGet: + path: /health/readiness + port: health + initialDelaySeconds: {{ .Values.blockscout.eventStream.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.blockscout.eventStream.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.blockscout.eventStream.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.blockscout.eventStream.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.blockscout.eventStream.readinessProbe.failureThreshold }} + {{- end }} + {{- if .Values.blockscout.eventStream.livenessProbe.enabled }} + livenessProbe: + httpGet: + path: /health/liveness + port: health + initialDelaySeconds: {{ .Values.blockscout.eventStream.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.blockscout.eventStream.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.blockscout.eventStream.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.blockscout.eventStream.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.blockscout.eventStream.livenessProbe.failureThreshold }} + {{- end }} + resources: + requests: + memory: {{ .Values.blockscout.eventStream.resources.requests.memory }} + cpu: {{ .Values.blockscout.eventStream.resources.requests.cpu }} + env: + - name: METRICS_ENABLED + value: "{{.Values.blockscout.metrics.enabled}}" + - name: ENABLE_EVENT_STREAM + value: {{ .Values.blockscout.eventStream.enableEventStream | quote }} + - name: BEANSTALKD_PORT + value: {{ .Values.blockscout.eventStream.beanstalkdPort | quote }} + - name: BEANSTALKD_HOST + value: {{ .Values.blockscout.eventStream.beanstalkdHost | quote }} + - name: ERLANG_COOKIE + value: {{ .Values.blockscout.secrets.erlang.cookie }} + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: EPMD_SERVICE_NAME + value: {{ .Release.Name }}-epmd-service + volumes: +{{ include "celo.blockscout.volume.temporary-dir" . | indent 8 }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/packages/helm-charts/blockscout/templates/blockscout-indexer.deployment.yaml b/packages/helm-charts/blockscout/templates/blockscout-indexer.deployment.yaml index fd4c6fd6de9..e642543a7df 100644 --- a/packages/helm-charts/blockscout/templates/blockscout-indexer.deployment.yaml +++ b/packages/helm-charts/blockscout/templates/blockscout-indexer.deployment.yaml @@ -23,7 +23,7 @@ spec: metadata: {{- if .Values.blockscout.metrics.enabled}} annotations: - prometheus.io/path: /metrics/indexer + prometheus.io/path: /metrics prometheus.io/port: "4001" prometheus.io/scrape: "true" {{- end}} @@ -38,6 +38,8 @@ spec: initContainers: {{ include "celo.blockscout.initContainer.secrets-init" . | indent 6 }} containers: +{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.indexer.db }} +{{ include "celo.blockscout.container.db-sidecar" $data | indent 6 }} - name: blockscout-indexer image: {{ .Values.blockscout.image.repository }}:{{ .Values.blockscout.image.tag }} imagePullPolicy: {{ .Values.blockscout.image.pullPolicy }} @@ -98,9 +100,15 @@ spec: value: "false" - name: DISPLAY_REWARDS value: "{{.Values.blockscout.epochRewards.enabled}}" -{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.indexer.db }} + - name: MY_REGION + value: {{ .Values.blockscout.indexer.rpcRegion | quote }} + - name: FLY_REGION + value: {{ .Values.blockscout.indexer.rpcRegion | quote }} + - name: PRIMARY_REGION + value: {{ .Values.blockscout.indexer.primaryRpcRegion | quote }} + - name: INDEXER_DISABLE_BLOCK_REWARD_FETCHER + value: {{ not .Values.blockscout.indexer.fetchers.blockRewards.enabled | quote }} {{ include "celo.blockscout.env-vars" $data | indent 8 }} -{{ include "celo.blockscout.container.db-sidecar" $data | indent 6 }} volumes: {{ include "celo.blockscout.volume.cloudsql-credentials" . | indent 8 }} {{ include "celo.blockscout.volume.temporary-dir" . | indent 8 }} diff --git a/packages/helm-charts/blockscout/templates/blockscout-metadata-crawler.cronjob.yaml b/packages/helm-charts/blockscout/templates/blockscout-metadata-crawler.cronjob.yaml index c8c424c767d..4fc54a33303 100644 --- a/packages/helm-charts/blockscout/templates/blockscout-metadata-crawler.cronjob.yaml +++ b/packages/helm-charts/blockscout/templates/blockscout-metadata-crawler.cronjob.yaml @@ -21,6 +21,8 @@ spec: initContainers: {{ include "celo.blockscout.initContainer.secrets-init" . | indent 10 }} containers: +{{- $data := dict "Values" .Values "Database" .Values.blockscout.indexer.db }} +{{ include "celo.blockscout.container.db-terminating-sidecar" $data | indent 10 }} - name: metadata-crawler image: {{ .Values.blockscout.metadataCrawler.image.repository }}:{{ .Values.blockscout.metadataCrawler.image.tag }} imagePullPolicy: IfNotPresent @@ -56,8 +58,6 @@ spec: volumeMounts: - mountPath: /tmp/pod name: temporary-dir -{{- $data := dict "Values" .Values "Database" .Values.blockscout.indexer.db }} -{{ include "celo.blockscout.container.db-terminating-sidecar" $data | indent 10 }} volumes: {{ include "celo.blockscout.volume.cloudsql-credentials" . | indent 12 }} {{ include "celo.blockscout.volume.temporary-dir" . | indent 12 }} diff --git a/packages/helm-charts/blockscout/templates/blockscout-migration.hook.yaml b/packages/helm-charts/blockscout/templates/blockscout-migration.hook.yaml index 149aa280e5c..0aa840a79a2 100644 --- a/packages/helm-charts/blockscout/templates/blockscout-migration.hook.yaml +++ b/packages/helm-charts/blockscout/templates/blockscout-migration.hook.yaml @@ -19,6 +19,8 @@ spec: initContainers: {{ include "celo.blockscout.initContainer.secrets-init" . | indent 6 }} containers: +{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.indexer.db }} +{{ include "celo.blockscout.container.db-terminating-sidecar" $data | indent 6 }} - name: blockscout-migration image: {{ .Values.blockscout.image.repository }}:{{ .Values.blockscout.image.tag }} imagePullPolicy: {{ .Values.blockscout.image.pullPolicy }} @@ -43,9 +45,7 @@ spec: env: - name: DROP_DB value: "{{ default "false" .Values.blockscout.db.drop }}" -{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.indexer.db }} {{ include "celo.blockscout.env-vars" $data | indent 8 }} -{{ include "celo.blockscout.container.db-terminating-sidecar" $data | indent 6 }} volumes: {{ include "celo.blockscout.volume.cloudsql-credentials" . | indent 8 }} {{ include "celo.blockscout.volume.temporary-dir" . | indent 8 }} diff --git a/packages/helm-charts/blockscout/templates/blockscout-web.deployment.yaml b/packages/helm-charts/blockscout/templates/blockscout-web.deployment.yaml index f198d651a48..beaf3adc438 100644 --- a/packages/helm-charts/blockscout/templates/blockscout-web.deployment.yaml +++ b/packages/helm-charts/blockscout/templates/blockscout-web.deployment.yaml @@ -22,7 +22,7 @@ spec: metadata: {{- if .Values.blockscout.metrics.enabled}} annotations: - prometheus.io/path: /metrics/web + prometheus.io/path: /metrics prometheus.io/port: "4000" prometheus.io/scrape: "true" {{- end}} @@ -36,6 +36,8 @@ spec: initContainers: {{ include "celo.blockscout.initContainer.secrets-init" . | indent 6 }} containers: +{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.web.db }} +{{ include "celo.blockscout.container.db-sidecar" $data | indent 6 }} - name: blockscout-web image: {{ .Values.blockscout.image.repository }}:{{ .Values.blockscout.image.tag }} imagePullPolicy: {{ .Values.blockscout.image.pullPolicy }} @@ -47,7 +49,7 @@ spec: - /bin/sh - -c - | - exec mix cmd --app block_scout_web "iex --cookie $ERLANG_COOKIE --name {{ .Values.blockscout.erlangNodeName}}@$(POD_IP) -e 'IEx.configure(default_prompt: \"\", alive_prompt: \"\")' -S mix do deps.loadpaths --no-deps-check, phx.server --no-compile" + exec mix cmd --app block_scout_web "iex --cookie $ERLANG_COOKIE --name {{ .Values.blockscout.erlangNodeName}}@$(POD_IP) -e 'IEx.configure(default_prompt: \"\", alive_prompt: \"\")' -S mix do deps.loadpaths --no-deps-check --no-validate-compile-env, phx.server --no-compile" volumeMounts: - mountPath: /secrets name: temporary-dir @@ -90,8 +92,6 @@ spec: value: {{ .Values.blockscout.web.poolSize | quote }} - name: POOL_SIZE_API value: {{ .Values.blockscout.web.poolSizeReplica | quote }} - - name: DISPLAY_TOKEN_ICONS - value: "true" - name: BLOCKSCOUT_HOST value: {{ .Values.blockscout.web.host | quote }} - name: ENABLE_SOURCIFY_INTEGRATION @@ -132,20 +132,34 @@ spec: value: {{ .Values.blockscout.web.appsMenu.learningList | quote }} - name: DISPLAY_REWARDS value: "{{.Values.blockscout.epochRewards.enabled}}" + - name: SHOW_PRICE_CHART + value: {{.Values.blockscout.web.homepage.showPrice | quote }} + - name: SHOW_TXS_CHART + value: {{.Values.blockscout.web.homepage.showTxs | quote }} - name: DISABLE_WRITE_API value: "false" + - name: MY_REGION + value: {{ .Values.blockscout.web.rpcRegion | quote }} + - name: FLY_REGION + value: {{ .Values.blockscout.web.rpcRegion | quote }} + - name: PRIMARY_REGION + value: {{ .Values.blockscout.web.primaryRpcRegion | quote }} - name: RE_CAPTCHA_PROJECT_ID value: {{ .Values.blockscout.secrets.recaptcha.projectId }} - name: RE_CAPTCHA_SITE_KEY value: {{ .Values.blockscout.secrets.recaptcha.siteKey }} - name: RE_CAPTCHA_API_KEY value: {{ .Values.blockscout.secrets.recaptcha.apiKey }} + - name: RE_CAPTCHA_SECRET_KEY + value: {{ .Values.blockscout.secrets.recaptcha.secretKey }} - name: SEGMENT_KEY value: {{ .Values.blockscout.secrets.segmentKey }} - name: CAMPAIGN_BANNER_BACKEND_URL value: {{ .Values.blockscout.secrets.campaignBannerApiUrl }} - name: CAMPAIGN_BANNER_REFRESH_INTERVAL value: "{{.Values.blockscout.campaignBanner.refreshInterval}}" + - name: DISABLE_LIVE_UPDATES + value: {{ .Values.blockscout.web.liveUpdates.disabled | quote }} {{- if .Values.blockscout.web.suffix.enabled }} - name: NETWORK_PATH value: /{{ .Values.blockscout.web.suffix.path }} @@ -153,10 +167,12 @@ spec: value: /{{ .Values.blockscout.web.suffix.path }} - name: API_URL value: /{{ .Values.blockscout.web.suffix.path }} + - name: ACCOUNT_POOL_SIZE + value: {{ .Values.blockscout.web.accountPoolSize | quote }} + - name: DISPLAY_TOKEN_ICONS + value: {{ .Values.blockscout.web.tokenIcons.enabled | quote }} {{- end }} -{{- $data := dict "Release" .Release "Values" .Values "Database" .Values.blockscout.web.db }} {{ include "celo.blockscout.env-vars" $data | indent 8 }} -{{ include "celo.blockscout.container.db-sidecar" $data | indent 6 }} volumes: {{ include "celo.blockscout.volume.cloudsql-credentials" . | indent 8 }} {{ include "celo.blockscout.volume.temporary-dir" . | indent 8 }} diff --git a/packages/helm-charts/blockscout/templates/blockscout-web.ingress.yaml b/packages/helm-charts/blockscout/templates/blockscout-web.ingress.yaml index 4b2f4b6f513..ff8ca7f45c3 100644 --- a/packages/helm-charts/blockscout/templates/blockscout-web.ingress.yaml +++ b/packages/helm-charts/blockscout/templates/blockscout-web.ingress.yaml @@ -30,6 +30,11 @@ metadata: location ~ /address/(.*)/coin_balances { return 301 /address/$1/coin-balances; } + {{- if .Values.blockscout.web.basicAuth.enabled }} + nginx.ingress.kubernetes.io/auth-type: basic + nginx.ingress.kubernetes.io/auth-secret: {{ .Release.Name }}-web-basic-auth + nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required' + {{- end }} spec: ingressClassName: {{ default "nginx" .Values.ingressClassName }} tls: diff --git a/packages/helm-charts/blockscout/values-alfajores-blockscout2.yaml b/packages/helm-charts/blockscout/values-alfajores-blockscout2.yaml index 637f5ad654a..aac04c956ed 100644 --- a/packages/helm-charts/blockscout/values-alfajores-blockscout2.yaml +++ b/packages/helm-charts/blockscout/values-alfajores-blockscout2.yaml @@ -1,3 +1,4 @@ +--- blockscout: indexer: db: @@ -5,31 +6,40 @@ blockscout: proxy: resources: requests: - memory: 250Mi - cpu: 200m - poolSize: 20 + memory: 20M + cpu: 10m + limits: + memory: 200Mi + cpu: 100m + poolSize: 200 resources: requests: - memory: 700Mi - cpu: 1500m + memory: 700M + cpu: 0.5 + limits: + memory: 1400M + cpu: 1 api: autoscaling: - maxReplicas: 6 - minReplicas: 3 - target: - cpu: 70 + maxReplicas: 6 + minReplicas: 3 + target: + cpu: 70 db: connectionName: celo-testnet-production:us-west1:alfajores2-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m + memory: 20M + cpu: 10m poolSize: 25 resources: requests: - memory: 250Mi - cpu: 500m + memory: 600M + cpu: 0.5 + limits: + memory: 1200M + cpu: 1.2 web: host: explorer.celo.org suffix: @@ -41,20 +51,23 @@ blockscout: target: cpu: 70 db: - connectionName: celo-testnet-production:us-west1:alfajores2 + connectionName: celo-testnet-production:us-west1:alfajores2-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m - poolSize: 10 + memory: 20M + cpu: 10m + poolSize: 20 resources: requests: - memory: 250M - cpu: 500m + memory: 800M + cpu: 400m + limits: + memory: 1400M + cpu: 1 metadataCrawler: enabled: true - schedule: "*/30 * * * *" # every 30 minutes + schedule: "*/30 * * * *" # every 30 minutes metrics: enabled: true fullNodes: @@ -68,6 +81,7 @@ blockscout: projectId: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout2-erlangCookie campaignBannerApiUrl: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-campaignBannerApiUrl diff --git a/packages/helm-charts/blockscout/values-alfajores-blockscout3.yaml b/packages/helm-charts/blockscout/values-alfajores-blockscout3.yaml index 428368f65d7..2ece1dc67b2 100644 --- a/packages/helm-charts/blockscout/values-alfajores-blockscout3.yaml +++ b/packages/helm-charts/blockscout/values-alfajores-blockscout3.yaml @@ -1,3 +1,4 @@ +--- blockscout: indexer: db: @@ -5,31 +6,40 @@ blockscout: proxy: resources: requests: - memory: 250Mi - cpu: 200m - poolSize: 20 + memory: 20M + cpu: 10m + limits: + memory: 200M + cpu: 100 + poolSize: 200 resources: requests: - memory: 700Mi - cpu: 1500m + memory: 700M + cpu: 0.5 + limits: + memory: 1400M + cpu: 1 api: autoscaling: - maxReplicas: 3 - minReplicas: 2 - target: - cpu: 70 + maxReplicas: 3 + minReplicas: 2 + target: + cpu: 70 db: connectionName: celo-testnet-production:us-west1:alfajores3-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m + memory: 20M + cpu: 10m poolSize: 10 resources: requests: - memory: 250Mi - cpu: 500m + memory: 600M + cpu: 0.5 + limits: + memory: 1200M + cpu: 1 web: host: explorer.celo.org suffix: @@ -41,20 +51,23 @@ blockscout: target: cpu: 70 db: - connectionName: celo-testnet-production:us-west1:alfajores3 + connectionName: celo-testnet-production:us-west1:alfajores3-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m - poolSize: 10 + memory: 20M + cpu: 10m + poolSize: 20 resources: requests: - memory: 250M - cpu: 500m + memory: 800M + cpu: 400m + limits: + memory: 1400M + cpu: 1 metadataCrawler: enabled: true - schedule: "*/30 * * * *" # every 30 minutes + schedule: "*/30 * * * *" # every 30 minutes metrics: enabled: true fullNodes: @@ -68,6 +81,7 @@ blockscout: projectId: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout3-erlangCookie campaignBannerApiUrl: gcp:secretmanager:projects/365081401101/secrets/alfajores-blockscout-campaignBannerApiUrl diff --git a/packages/helm-charts/blockscout/values-baklava-blockscout2.yaml b/packages/helm-charts/blockscout/values-baklava-blockscout2.yaml index 6b97a1047c3..fbac90b7367 100644 --- a/packages/helm-charts/blockscout/values-baklava-blockscout2.yaml +++ b/packages/helm-charts/blockscout/values-baklava-blockscout2.yaml @@ -1,3 +1,4 @@ +--- blockscout: indexer: db: @@ -5,32 +6,38 @@ blockscout: proxy: resources: requests: - memory: 250Mi - cpu: 200m - poolSize: 30 + memory: 20M + cpu: 10m + poolSize: 200 resources: requests: - memory: 1000Mi - cpu: 2 + memory: 700M + cpu: 0.5 + limits: + memory: 1400M + cpu: 1 metrics: enabled: true api: autoscaling: - maxReplicas: 3 - minReplicas: 2 - target: - cpu: 70 + maxReplicas: 3 + minReplicas: 2 + target: + cpu: 70 db: connectionName: celo-testnet-production:us-west1:baklava2-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m + memory: 20M + cpu: 10m poolSize: 10 resources: requests: - memory: 250Mi + memory: 750M + cpu: 100m + limits: + memory: 1500M cpu: 500m web: host: explorer.celo.org @@ -43,20 +50,23 @@ blockscout: target: cpu: 70 db: - connectionName: celo-testnet-production:us-west1:baklava2 + connectionName: celo-testnet-production:us-west1:baklava2-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m - poolSize: 10 + memory: 20M + cpu: 10m + poolSize: 20 resources: requests: - memory: 250M - cpu: 500m + memory: 750M + cpu: 0.5 + limits: + memory: 1500M + cpu: 1 metadataCrawler: enabled: true - schedule: "*/30 * * * *" # every 30 minutes + schedule: "*/30 * * * *" # every 30 minutes discordClusterName: Baklava metrics: enabled: true @@ -71,6 +81,7 @@ blockscout: projectId: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout2-erlangCookie campaignBannerApiUrl: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-campaignBannerApiUrl diff --git a/packages/helm-charts/blockscout/values-baklava-blockscout3.yaml b/packages/helm-charts/blockscout/values-baklava-blockscout3.yaml index 4d5abc1fe00..bbb15dfb411 100644 --- a/packages/helm-charts/blockscout/values-baklava-blockscout3.yaml +++ b/packages/helm-charts/blockscout/values-baklava-blockscout3.yaml @@ -5,32 +5,38 @@ blockscout: proxy: resources: requests: - memory: 250Mi - cpu: 200m - poolSize: 30 + memory: 20M + cpu: 10m + poolSize: 150 resources: requests: - memory: 1000Mi - cpu: 2 + memory: 700M + cpu: 0.5 + limits: + memory: 1400M + cpu: 1 metrics: enabled: true api: autoscaling: - maxReplicas: 3 - minReplicas: 2 - target: - cpu: 70 + maxReplicas: 3 + minReplicas: 2 + target: + cpu: 70 db: connectionName: celo-testnet-production:us-west1:baklava3-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m + memory: 20M + cpu: 10m poolSize: 10 resources: requests: - memory: 250Mi + memory: 750M + cpu: 100m + limits: + memory: 1500M cpu: 500m web: host: explorer.celo.org @@ -43,20 +49,23 @@ blockscout: target: cpu: 70 db: - connectionName: celo-testnet-production:us-west1:baklava3 + connectionName: celo-testnet-production:us-west1:baklava3-replica proxy: resources: requests: - memory: 250Mi - cpu: 200m + memory: 20M + cpu: 10m poolSize: 10 resources: requests: - memory: 250M - cpu: 500m + memory: 750M + cpu: 0.5 + limits: + memory: 1500M + cpu: 1 metadataCrawler: enabled: true - schedule: "*/30 * * * *" # every 30 minutes + schedule: "*/30 * * * *" # every 30 minutes discordClusterName: Baklava metrics: enabled: true @@ -71,6 +80,7 @@ blockscout: projectId: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout3-erlangCookie campaignBannerApiUrl: gcp:secretmanager:projects/365081401101/secrets/baklava-blockscout-campaignBannerApiUrl diff --git a/packages/helm-charts/blockscout/values-blockscoutstagingrc1-blockscout1.yaml b/packages/helm-charts/blockscout/values-blockscoutstagingrc1-blockscout1.yaml index f25086282b9..5bf7c4f02b0 100644 --- a/packages/helm-charts/blockscout/values-blockscoutstagingrc1-blockscout1.yaml +++ b/packages/helm-charts/blockscout/values-blockscoutstagingrc1-blockscout1.yaml @@ -71,6 +71,7 @@ blockscout: projectId: gcp:secretmanager:projects/253914576835/secrets/blockscoutstagingrc1-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/253914576835/secrets/blockscoutstagingrc1-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/253914576835/secrets/blockscoutstagingrc1-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/253914576835/secrets/blockscoutstagingrc1-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/253914576835/secrets/blockscoutstagingrc1-blockscout1-erlangCookie chain: diff --git a/packages/helm-charts/blockscout/values-rc1-blockscout1.yaml b/packages/helm-charts/blockscout/values-rc1-blockscout1.yaml index a3d1f6129eb..0a8426336cd 100644 --- a/packages/helm-charts/blockscout/values-rc1-blockscout1.yaml +++ b/packages/helm-charts/blockscout/values-rc1-blockscout1.yaml @@ -7,7 +7,7 @@ blockscout: requests: memory: 4Gi cpu: 500m - poolSize: 100 + poolSize: 200 resources: requests: memory: 12Gi @@ -44,7 +44,7 @@ blockscout: target: cpu: 70 db: - connectionName: celo-testnet-production:us-west1:rc11 + connectionName: celo-testnet-production:us-west1:rc11-replica proxy: resources: requests: @@ -57,7 +57,7 @@ blockscout: cpu: 1500m stats: enabled: true - reportUrl: '{"overview": "https://datastudio.google.com/embed/reporting/60bea1af-3e82-4eb0-a313-158582baa710/page/hDehC?hl=en", "addresses":"https://datastudio.google.com/embed/reporting/1e334bed-f7c9-4ee6-ac77-2c4cc3dae04c/page/hDehC?hl=en", "cStables":"https://datastudio.google.com/embed/reporting/28a3620e-e12d-41ea-b361-d44b82cbfeda/page/hDehC?hl=en", "transactions":"https://datastudio.google.com/embed/reporting/c5ecbd9b-d277-488f-8caf-4c8b64305e55/page/hDehC?hl=en", "reserve": "https://datastudio.google.com/embed/reporting/965b3c9f-6d36-4d45-818d-34d4f59d89dd/page/hDehC?hl=en"}' + reportUrl: '{"overview": "https://datastudio.google.com/embed/reporting/dbe0c03a-47a7-4b51-8236-0b9023c22017/page/hDehC?hl=en", "addresses":"https://datastudio.google.com/embed/reporting/7336873f-23dc-4ce3-b556-eaeae323f480/page/hDehC?hl=en", "cStables":"https://datastudio.google.com/embed/reporting/7e6f4ff4-6e47-461f-a1b7-d0c1457f7807/page/hDehC?hl=en", "transactions":"https://datastudio.google.com/embed/reporting/4ec9cd78-9013-4ab1-8cf1-923997b32919/page/hDehC?hl=en", "reserve": "https://datastudio.google.com/embed/reporting/33907f50-c872-47db-984f-ea4fa200bc0f/page/hDehC?hl=en", "epoch": "https://datastudio.google.com/embed/reporting/221a435f-c4b3-4de6-9047-e472e336d88f/page/VEuZC"}' makerdojo: '{"attestations": "https://makerdojo.io/public/dashboards/DjNVIYqQiyxIEcTx3Io4IwQg7U56lqQPyrSYdnXl?embed=clabs","uniswap":"https://makerdojo.io/public/dashboards/1qUlHeb7W9jnPVuXv6yeRatEYxSXPDsFQUODR1bp?embed=clabs","moola":"https://makerdojo.io/public/dashboards/tWnDs1CsMQyaSLHFHj0MUoNz20WbxjGv72fCTxgq?embed=clabs"}' metadataCrawler: enabled: true @@ -79,6 +79,7 @@ blockscout: projectId: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout1-erlangCookie campaignBannerApiUrl: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-campaignBannerApiUrl diff --git a/packages/helm-charts/blockscout/values-rc1-blockscout3.yaml b/packages/helm-charts/blockscout/values-rc1-blockscout3.yaml index 63a89929b95..bbcb5544274 100644 --- a/packages/helm-charts/blockscout/values-rc1-blockscout3.yaml +++ b/packages/helm-charts/blockscout/values-rc1-blockscout3.yaml @@ -7,7 +7,7 @@ blockscout: requests: memory: 4Gi cpu: 500m - poolSize: 100 + poolSize: 200 resources: requests: memory: 12Gi @@ -44,7 +44,7 @@ blockscout: target: cpu: 70 db: - connectionName: celo-testnet-production:us-west1:rc13 + connectionName: celo-testnet-production:us-west1:rc13-replica proxy: resources: requests: @@ -57,7 +57,7 @@ blockscout: cpu: 1500m stats: enabled: true - reportUrl: '{"overview": "https://datastudio.google.com/embed/reporting/60bea1af-3e82-4eb0-a313-158582baa710/page/hDehC?hl=en", "addresses":"https://datastudio.google.com/embed/reporting/1e334bed-f7c9-4ee6-ac77-2c4cc3dae04c/page/hDehC?hl=en", "cStables":"https://datastudio.google.com/embed/reporting/28a3620e-e12d-41ea-b361-d44b82cbfeda/page/hDehC?hl=en", "transactions":"https://datastudio.google.com/embed/reporting/c5ecbd9b-d277-488f-8caf-4c8b64305e55/page/hDehC?hl=en", "reserve": "https://datastudio.google.com/embed/reporting/965b3c9f-6d36-4d45-818d-34d4f59d89dd/page/hDehC?hl=en"}' + reportUrl: '{"overview": "https://datastudio.google.com/embed/reporting/dbe0c03a-47a7-4b51-8236-0b9023c22017/page/hDehC?hl=en", "addresses":"https://datastudio.google.com/embed/reporting/7336873f-23dc-4ce3-b556-eaeae323f480/page/hDehC?hl=en", "cStables":"https://datastudio.google.com/embed/reporting/7e6f4ff4-6e47-461f-a1b7-d0c1457f7807/page/hDehC?hl=en", "transactions":"https://datastudio.google.com/embed/reporting/4ec9cd78-9013-4ab1-8cf1-923997b32919/page/hDehC?hl=en", "reserve": "https://datastudio.google.com/embed/reporting/33907f50-c872-47db-984f-ea4fa200bc0f/page/hDehC?hl=en", "epoch": "https://datastudio.google.com/embed/reporting/221a435f-c4b3-4de6-9047-e472e336d88f/page/VEuZC"}' makerdojo: '{"attestations": "https://makerdojo.io/public/dashboards/DjNVIYqQiyxIEcTx3Io4IwQg7U56lqQPyrSYdnXl?embed=clabs","uniswap":"https://makerdojo.io/public/dashboards/1qUlHeb7W9jnPVuXv6yeRatEYxSXPDsFQUODR1bp?embed=clabs","moola":"https://makerdojo.io/public/dashboards/tWnDs1CsMQyaSLHFHj0MUoNz20WbxjGv72fCTxgq?embed=clabs"}' metadataCrawler: enabled: true @@ -79,6 +79,7 @@ blockscout: projectId: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout3-erlangCookie campaignBannerApiUrl: gcp:secretmanager:projects/365081401101/secrets/rc1-blockscout-campaignBannerApiUrl diff --git a/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml b/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml index 06adf9dc9a2..538653d2039 100644 --- a/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml +++ b/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml @@ -1,4 +1,6 @@ blockscout: + eventStream: + replicas: 1 indexer: db: connectionName: celo-testnet-production:us-west1:rc1staging @@ -7,11 +9,14 @@ blockscout: requests: memory: 4Gi cpu: 500m - poolSize: 100 + poolSize: 200 resources: requests: memory: 12Gi cpu: 5 + enableEventStream: true + beanstalkdPort: "11300" + beanstalkdHost: "rc1staging-governance-notifications-beanstalkd.event-notifications.svc.cluster.local" api: autoscaling: maxReplicas: 2 @@ -41,7 +46,7 @@ blockscout: target: cpu: 70 db: - connectionName: celo-testnet-production:us-west1:rc1staging + connectionName: celo-testnet-production:us-west1:rc1staging-replica proxy: resources: requests: @@ -54,8 +59,10 @@ blockscout: cpu: 500m stats: enabled: true - reportUrl: '{"overview": "https://datastudio.google.com/embed/reporting/60bea1af-3e82-4eb0-a313-158582baa710/page/hDehC?hl=en", "addresses":"https://datastudio.google.com/embed/reporting/1e334bed-f7c9-4ee6-ac77-2c4cc3dae04c/page/hDehC?hl=en", "cStables":"https://datastudio.google.com/embed/reporting/28a3620e-e12d-41ea-b361-d44b82cbfeda/page/hDehC?hl=en", "transactions":"https://datastudio.google.com/embed/reporting/c5ecbd9b-d277-488f-8caf-4c8b64305e55/page/hDehC?hl=en", "reserve": "https://datastudio.google.com/embed/reporting/965b3c9f-6d36-4d45-818d-34d4f59d89dd/page/hDehC?hl=en"}' + reportUrl: '{"overview": "https://datastudio.google.com/embed/reporting/dbe0c03a-47a7-4b51-8236-0b9023c22017/page/hDehC?hl=en", "addresses":"https://datastudio.google.com/embed/reporting/7336873f-23dc-4ce3-b556-eaeae323f480/page/hDehC?hl=en", "cStables":"https://datastudio.google.com/embed/reporting/7e6f4ff4-6e47-461f-a1b7-d0c1457f7807/page/hDehC?hl=en", "transactions":"https://datastudio.google.com/embed/reporting/4ec9cd78-9013-4ab1-8cf1-923997b32919/page/hDehC?hl=en", "reserve": "https://datastudio.google.com/embed/reporting/33907f50-c872-47db-984f-ea4fa200bc0f/page/hDehC?hl=en", "epoch": "https://datastudio.google.com/embed/reporting/221a435f-c4b3-4de6-9047-e472e336d88f/page/VEuZC"}' makerdojo: '{"attestations": "https://makerdojo.io/public/dashboards/DjNVIYqQiyxIEcTx3Io4IwQg7U56lqQPyrSYdnXl?embed=clabs","uniswap":"https://makerdojo.io/public/dashboards/1qUlHeb7W9jnPVuXv6yeRatEYxSXPDsFQUODR1bp?embed=clabs","moola":"https://makerdojo.io/public/dashboards/tWnDs1CsMQyaSLHFHj0MUoNz20WbxjGv72fCTxgq?embed=clabs"}' + basicAuth: + enabled: false metadataCrawler: enabled: true archiveNodes: @@ -76,6 +83,7 @@ blockscout: projectId: gcp:secretmanager:projects/365081401101/secrets/rc1staging-blockscout-recaptchaProjectId siteKey: gcp:secretmanager:projects/365081401101/secrets/rc1staging-blockscout-recaptchaSiteKey apiKey: gcp:secretmanager:projects/365081401101/secrets/rc1staging-blockscout-recaptchaApiKey + secretKey: gcp:secretmanager:projects/365081401101/secrets/rc1staging-blockscout-recaptchaSecretKey erlang: cookie: gcp:secretmanager:projects/365081401101/secrets/rc1staging-blockscout-erlangCookie campaignBannerApiUrl: gcp:secretmanager:projects/365081401101/secrets/rc1staging-blockscout-campaignBannerApiUrl diff --git a/packages/helm-charts/blockscout/values.yaml b/packages/helm-charts/blockscout/values.yaml index fd34416e525..8573ce5a515 100644 --- a/packages/helm-charts/blockscout/values.yaml +++ b/packages/helm-charts/blockscout/values.yaml @@ -1,5 +1,33 @@ ingressClassName: nginx blockscout: + eventStream: + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + port: 4000 + resources: + requests: + memory: 1000Mi + cpu: 2 + enableEventStream: false + beanstalkdPort: "" + beanstalkdHost: "" + replicas: 0 + readinessProbe: + enabled: false + initialDelaySeconds: 30 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + livenessProbe: + enabled: false + initialDelaySeconds: 30 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 indexer: terminationGracePeriodSeconds: 60 port: 4001 @@ -35,18 +63,18 @@ blockscout: requests: memory: 500Mi cpu: 700m - poolSize: 30 + poolSize: 200 poolSizeReplica: 5 readinessProbe: enabled: true - initialDelaySeconds: 10 + initialDelaySeconds: 30 periodSeconds: 5 timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 livenessProbe: enabled: false - initialDelaySeconds: 10 + initialDelaySeconds: 30 periodSeconds: 5 timeoutSeconds: 5 successThreshold: 1 @@ -55,6 +83,11 @@ blockscout: requests: memory: 1000Mi cpu: 2 + rpcRegion: "indexer" + primaryRpcRegion: "indexer" + fetchers: + blockRewards: + enabled: false api: suffix: enabled: false @@ -69,6 +102,8 @@ blockscout: minReplicas: 2 target: cpu: 70 + rpcRegion: "api" + primaryRpcRegion: "indexer" db: name: blockscout connectionName: project:region:db-name @@ -102,14 +137,14 @@ blockscout: rateLimit: "1000000" readinessProbe: enabled: true - initialDelaySeconds: 10 + initialDelaySeconds: 30 periodSeconds: 5 timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 livenessProbe: enabled: true - initialDelaySeconds: 10 + initialDelaySeconds: 30 periodSeconds: 5 timeoutSeconds: 5 successThreshold: 1 @@ -179,14 +214,14 @@ blockscout: poolSizeReplica: 5 readinessProbe: enabled: true - initialDelaySeconds: 10 + initialDelaySeconds: 30 periodSeconds: 5 timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 livenessProbe: enabled: true - initialDelaySeconds: 10 + initialDelaySeconds: 30 periodSeconds: 5 timeoutSeconds: 5 successThreshold: 1 @@ -215,6 +250,18 @@ blockscout: enabled: false reportUrl: "" makerdojo: "" + rpcRegion: "web" + primaryRpcRegion: "indexer" + liveUpdates: + disabled: true + homepage: + showPrice: true + showTxs: false + accountPoolSize: 1 + tokenIcons: + enabled: false + basicAuth: + enabled: false metadataCrawler: enabled: false schedule: "0 */2 * * *" # every 2 hours @@ -238,7 +285,7 @@ blockscout: db: drop: "false" epochRewards: - enabled: false + enabled: true campaignBanner: refreshInterval: "60" grafanaUrl: https://clabs.grafana.net @@ -257,6 +304,7 @@ blockscout: projectId: "" siteKey: "" apiKey: "" + secretKey: "" erlang: cookie: "" campaignBannerApiUrl: "" diff --git a/packages/helm-charts/odis/templates/signer-deployment.yaml b/packages/helm-charts/odis/templates/signer-deployment.yaml index b17fc9bf650..a49fb358279 100644 --- a/packages/helm-charts/odis/templates/signer-deployment.yaml +++ b/packages/helm-charts/odis/templates/signer-deployment.yaml @@ -46,7 +46,13 @@ spec: {{ include "common.env-var" (dict "name" "DB_PORT" "dict" .Values.db "value_name" "port") | indent 12 }} {{ include "common.env-var" (dict "name" "DB_USERNAME" "dict" .Values.db "value_name" "username") | indent 12 }} {{ include "common.env-var" (dict "name" "KEYSTORE_AZURE_VAULT_NAME" "dict" .Values.keystore "value_name" "vaultName") | indent 12 }} -{{ include "common.env-var" (dict "name" "KEYSTORE_AZURE_SECRET_NAME" "dict" .Values.keystore "value_name" "secretName") | indent 12 }} +{{ include "common.env-var" (dict "name" "PHONE_NUMBER_PRIVACY_KEY_NAME_BASE" "dict" .Values.keystore "value_name" "pnpKeyNameBase") | indent 12 }} +{{ include "common.env-var" (dict "name" "DOMAINS_KEY_NAME_BASE" "dict" .Values.keystore "value_name" "domainsKeyNameBase") | indent 12 }} +{{ include "common.env-var" (dict "name" "PHONE_NUMBER_PRIVACY_LATEST_KEY_VERSION" "dict" .Values.keystore "value_name" "pnpKeyLatestVersion") | indent 12 }} +{{ include "common.env-var" (dict "name" "DOMAINS_LATEST_KEY_VERSION" "dict" .Values.keystore "value_name" "domainsKeyLatestVersion") | indent 12 }} +{{ include "common.env-var" (dict "name" "DOMAINS_API_ENABLED" "dict" .Values.api "value_name" "domainsAPIEnabled") | indent 12 }} +{{ include "common.env-var" (dict "name" "PHONE_NUMBER_PRIVACY_API_ENABLED" "dict" .Values.api "value_name" "pnpAPIEnabled") | indent 12 }} +{{ include "common.env-var" (dict "name" "LEGACY_PHONE_NUMBER_PRIVACY_API_ENABLED" "dict" .Values.api "value_name" "legacyPnpAPIEnabled") | indent 12 }} - name: DB_PASSWORD valueFrom: secretKeyRef: diff --git a/packages/helm-charts/oracle/CELOBRL.yaml b/packages/helm-charts/oracle/CELOBRL.yaml index a83d192f04b..21d64348f50 100644 --- a/packages/helm-charts/oracle/CELOBRL.yaml +++ b/packages/helm-charts/oracle/CELOBRL.yaml @@ -10,22 +10,44 @@ oracle: prometheusPort: 9090 apiRequestTimeoutMs: 5000 circuitBreakerPriceChangeThreshold: 0.25 + gasPriceMultiplier: 1.5 priceSources: "[ - [ - { exchange: 'BINANCE', symbol: 'CELOBUSD', toInvert: false }, - { exchange: 'BINANCE', symbol: 'BUSDBRL', toInvert: false } - ], - [ - { exchange: 'COINBASE', symbol: 'CELOBTC', toInvert: false}, - { exchange: 'BITSO', symbol: 'BTCBRL', toInvert: false } - ], - [ - { exchange: 'BITTREX', symbol: 'CELOBTC', toInvert: false }, - { exchange: 'NOVADAX', symbol: 'BTCBRL', toInvert: false } - ] + [ + { exchange: 'BINANCE', symbol: 'CELOBUSD', toInvert: false }, + { exchange: 'BINANCE', symbol: 'BUSDBRL', toInvert: false } + ], + [ + { exchange: 'BINANCE', symbol: 'CELOUSDT', toInvert: false }, + { exchange: 'BINANCE', symbol: 'USDTBRL', toInvert: false } + ], + [ + { exchange: 'BINANCE', symbol: 'CELOBTC', toInvert: false }, + { exchange: 'MERCADO', symbol: 'BTCBRL', toInvert: false } + ], + [ + { exchange: 'BINANCEUS', symbol: 'CELOUSD', toInvert: false }, + { exchange: 'BITSO', symbol: 'USDBRL', toInvert: false } + ], + [ + { exchange: 'COINBASE', symbol: 'CELOUSD', toInvert: false}, + { exchange: 'BITSO', symbol: 'USDBRL', toInvert: false } + ], + [ + { exchange: 'COINBASE', symbol: 'CELOBTC', toInvert: false }, + { exchange: 'NOVADAX', symbol: 'BTCBRL', toInvert: false } + ], + [ + { exchange: 'OKX', symbol: 'CELOUSDT', toInvert: false }, + { exchange: 'OKX', symbol: 'BTCUSDT', toInvert: true }, + { exchange: 'NOVADAX', symbol: 'BTCBRL', toInvert: false } + ], + [ + {exchange: 'KUCOIN', symbol: 'CELOUSDT', toInvert: false}, + { exchange: 'BITSO', symbol: 'USDTBRL', toInvert: false } + ] ]" minPriceSourceCount: 2 reportStrategy: BLOCK_BASED reporter: blockBased: - minReportPriceChangeThreshold: 0.005 # 0.5% + minReportPriceChangeThreshold: 0.005 diff --git a/packages/helm-charts/oracle/CELOBTC.yaml b/packages/helm-charts/oracle/CELOBTC.yaml deleted file mode 100644 index 9ef9a2c9ad7..00000000000 --- a/packages/helm-charts/oracle/CELOBTC.yaml +++ /dev/null @@ -1,19 +0,0 @@ -oracle: - currencyPair: CELOBTC - aggregation: - mid: - maxExchangeVolumeShare: 1 - maxPercentageDeviation: 0.05 - maxPercentageBidAskSpread: 0.025 - # minReportPriceChangeThreshold - metrics: - enabled: true - prometheusPort: 9090 - apiRequestTimeoutMs: 5000 - circuitBreakerPriceChangeThreshold: 0.25 - priceSources: "[[{exchange: 'BITTREX', symbol: 'CELOBTC', toInvert: false}],[{exchange: 'COINBASE', symbol: 'CELOBTC', toInvert: false}]]" - minPriceSourceCount: 2 - reportStrategy: BLOCK_BASED - reporter: - blockBased: - minReportPriceChangeThreshold: 0.005 # 0.5% diff --git a/packages/helm-charts/oracle/CELOEUR.yaml b/packages/helm-charts/oracle/CELOEUR.yaml index 7246cfe6f94..ec0ac1b9e85 100644 --- a/packages/helm-charts/oracle/CELOEUR.yaml +++ b/packages/helm-charts/oracle/CELOEUR.yaml @@ -3,29 +3,45 @@ oracle: aggregation: mid: maxExchangeVolumeShare: 1 - maxPercentageDeviation: 0.05 - maxPercentageBidAskSpread: 0.025 - # minReportPriceChangeThreshold + maxPercentageDeviation: 0.025 + maxPercentageBidAskSpread: 0.015 metrics: enabled: true prometheusPort: 9090 apiRequestTimeoutMs: 5000 circuitBreakerPriceChangeThreshold: 0.25 + gasPriceMultiplier: 1.5 priceSources: "[ - [{exchange: 'BITTREX', symbol: 'CELOEUR', toInvert: false}], - [{exchange: 'COINBASE', symbol: 'CELOEUR', toInvert: false}], - [ - {exchange: 'COINBASE', symbol: 'CELOUSD', toInvert: false}, - {exchange: 'COINBASE', symbol: 'USDTUSD', toInvert: true}, - {exchange: 'COINBASE', symbol: 'USDTEUR', toInvert: false} - ], - [ - {exchange: 'BINANCE', symbol: 'CELOUSDT', toInvert: false}, - {exchange: 'BINANCE', symbol: 'EURUSDT', toInvert: true} - ] - ]" + [ + {exchange: 'COINBASE', symbol: 'CELOEUR', toInvert: false}], + [ + {exchange: 'COINBASE', symbol: 'CELOUSD', toInvert: false}, + {exchange: 'COINBASE', symbol: 'USDTUSD', toInvert: true}, + {exchange: 'COINBASE', symbol: 'USDTEUR', toInvert: false} + ], + [ + {exchange: 'COINBASE', symbol: 'CELOBTC', toInvert: false}, + {exchange: 'COINBASE', symbol: 'BTCEUR', toInvert: false} + ], + [ + {exchange: 'BINANCE', symbol: 'CELOUSDT', toInvert: false}, + {exchange: 'BINANCE', symbol: 'EURUSDT', toInvert: true} + ], + [ + {exchange: 'BINANCE', symbol: 'CELOBTC', toInvert: false}, + {exchange: 'BINANCE', symbol: 'BTCEUR', toInvert: false} + ], + [ + {exchange: 'OKX', symbol: 'CELOUSDT', toInvert: false}, + {exchange: 'COINBASE', symbol: 'USDTEUR', toInvert: false} + ], + [ + {exchange: 'KUCOIN', symbol: 'CELOUSDT', toInvert: false}, + {exchange: 'KRAKEN', symbol: 'USDTEUR', toInvert: false} + ], + ]" minPriceSourceCount: 2 reportStrategy: BLOCK_BASED reporter: blockBased: - minReportPriceChangeThreshold: 0.005 # 0.5% + minReportPriceChangeThreshold: 0.005 diff --git a/packages/helm-charts/oracle/CELOUSD.yaml b/packages/helm-charts/oracle/CELOUSD.yaml index 83c59431c3f..c57e8bb17f7 100644 --- a/packages/helm-charts/oracle/CELOUSD.yaml +++ b/packages/helm-charts/oracle/CELOUSD.yaml @@ -3,31 +3,44 @@ oracle: aggregation: mid: maxExchangeVolumeShare: 1 - maxPercentageDeviation: 0.05 - maxPercentageBidAskSpread: 0.025 - # minReportPriceChangeThreshold + maxPercentageDeviation: 0.025 + maxPercentageBidAskSpread: 0.015 metrics: enabled: true prometheusPort: 9090 apiRequestTimeoutMs: 5000 circuitBreakerPriceChangeThreshold: 0.25 - priceSources: "[ - [ - {exchange: 'BITTREX', symbol: 'CELOUSD', toInvert: false} - ], - [ - {exchange: 'COINBASE', symbol: 'CELOUSD', toInvert: false} - ], - [ - {exchange: 'OKCOIN', symbol: 'CELOUSD', toInvert: false} - ], - [ - {exchange: 'BINANCE', symbol: 'CELOBUSD', toInvert: false}, - {exchange: 'COINBASE', symbol: 'BUSDUSD', toInvert: false} - ] + gasPriceMultiplier: 1.5 + priceSources: "[ + [ + {exchange: 'COINBASE', symbol: 'CELOUSD', toInvert: false} + ], + [ + {exchange: 'COINBASE', symbol: 'CELOBTC', toInvert: false}, + {exchange: 'COINBASE', symbol: 'BTCUSD', toInvert: false} + ], + [ + {exchange: 'BINANCE', symbol: 'CELOBUSD', toInvert: false}, + {exchange: 'COINBASE', symbol: 'BUSDUSD', toInvert: false} + ], + [ + {exchange: 'BINANCE', symbol: 'CELOUSDT', toInvert: false}, + {exchange: 'KRAKEN', symbol: 'USDTUSD', toInvert: false} + ], + [ + {exchange: 'BINANCEUS', symbol: 'CELOUSD', toInvert: false } + ], + [ + {exchange: 'OKX', symbol: 'CELOUSDT', toInvert: false}, + {exchange: 'COINBASE', symbol: 'USDTUSD', toInvert: false} + ], + [ + {exchange: 'KUCOIN', symbol: 'CELOUSDT', toInvert: false}, + {exchange: 'KRAKEN', symbol: 'USDTUSD', toInvert: false} + ], ]" minPriceSourceCount: 2 reportStrategy: BLOCK_BASED reporter: blockBased: - minReportPriceChangeThreshold: 0.005 # 0.5% + minReportPriceChangeThreshold: 0.005 diff --git a/packages/helm-charts/oracle/USDCEUR.yaml b/packages/helm-charts/oracle/USDCEUR.yaml new file mode 100644 index 00000000000..431971a2418 --- /dev/null +++ b/packages/helm-charts/oracle/USDCEUR.yaml @@ -0,0 +1,39 @@ +oracle: + currencyPair: USDCEUR + aggregation: + mid: + maxExchangeVolumeShare: 1 + maxPercentageDeviation: 0.01 + maxPercentageBidAskSpread: 0.005 + metrics: + enabled: true + prometheusPort: 9090 + apiRequestTimeoutMs: 5000 + circuitBreakerPriceChangeThreshold: 0.25 + gasPriceMultiplier: 1.5 + priceSources: "[ + [ + {exchange: 'KRAKEN', symbol: 'USDCEUR', toInvert: false} + ], + [ + {exchange: 'COINBASE', symbol: 'USDTUSDC', toInvert: true}, + {exchange: 'COINBASE', symbol: 'USDTEUR', toInvert: false} + ], + [ + {exchange: 'WHITEBIT', symbol: 'USDCUSDT', toInvert: false}, + {exchange: 'COINBASE', symbol: 'USDTEUR', toInvert: false} + ], + [ + {exchange: 'KRAKEN', symbol: 'USDCUSD', toInvert: false}, + {exchange: 'KRAKEN', symbol: 'EURUSD', toInvert: true} + ], + [ + {exchange: 'BINANCEUS', symbol: 'USDCUSD', toInvert: false}, + {exchange: 'KRAKEN', symbol: 'EURUSD', toInvert: true} + ], + ]" + minPriceSourceCount: 2 + reportStrategy: BLOCK_BASED + reporter: + blockBased: + minReportPriceChangeThreshold: 0.0005 # 0.05% diff --git a/packages/helm-charts/oracle/USDCUSD.yaml b/packages/helm-charts/oracle/USDCUSD.yaml new file mode 100644 index 00000000000..5a747b4b684 --- /dev/null +++ b/packages/helm-charts/oracle/USDCUSD.yaml @@ -0,0 +1,34 @@ +oracle: + currencyPair: USDCUSD + aggregation: + mid: + maxExchangeVolumeShare: 1 + maxPercentageDeviation: 0.01 + maxPercentageBidAskSpread: 0.005 + metrics: + enabled: true + prometheusPort: 9090 + apiRequestTimeoutMs: 5000 + circuitBreakerPriceChangeThreshold: 0.25 + gasPriceMultiplier: 1.5 + priceSources: "[ + [ + {exchange: 'KRAKEN', symbol: 'USDCUSD', toInvert: false} + ], + [ + {exchange: 'BINANCEUS', symbol: 'USDCUSD', toInvert: false} + ], + [ + {exchange: 'COINBASE', symbol: 'USDTUSDC', toInvert: true}, + {exchange: 'COINBASE', symbol: 'USDTUSD', toInvert: false} + ], + [ + {exchange: 'WHITEBIT', symbol: 'USDCUSDT', toInvert: false}, + {exchange: 'COINBASE', symbol: 'USDTUSD', toInvert: false} + ] + ]" + minPriceSourceCount: 2 + reportStrategy: BLOCK_BASED + reporter: + blockBased: + minReportPriceChangeThreshold: 0.0005 # 0.05% diff --git a/packages/helm-charts/testnet/Chart.yaml b/packages/helm-charts/testnet/Chart.yaml index 006274c23d1..530e1567823 100644 --- a/packages/helm-charts/testnet/Chart.yaml +++ b/packages/helm-charts/testnet/Chart.yaml @@ -1,19 +1,22 @@ +--- name: testnet +apiVersion: v1 version: 0.2.1 description: private Ethereum network Helm chart for Kubernetes keywords: -- celo -- ethereum -- blockchain + - celo + - ethereum + - blockchain home: https://www.celo.org/ sources: -- https://github.com/celo-org/celo-monorepo + - https://github.com/celo-org/celo-monorepo maintainers: -- name: celo - email: contact@celo.org + - name: celo + email: contact@celo.org icon: https://avatars1.githubusercontent.com/u/37552875?s=200&v=4 appVersion: v1.0.0 dependencies: - name: common repository: oci://us-west1-docker.pkg.dev/devopsre/clabs-public-oci - version: 0.2.0 \ No newline at end of file + version: 0.2.7 + diff --git a/packages/helm-charts/testnet/templates/_helpers.tpl b/packages/helm-charts/testnet/templates/_helpers.tpl index b6d4ab227ce..05be9706058 100644 --- a/packages/helm-charts/testnet/templates/_helpers.tpl +++ b/packages/helm-charts/testnet/templates/_helpers.tpl @@ -29,7 +29,7 @@ apiVersion: v1 metadata: name: {{ template "common.fullname" $ }}-{{ .svc_name | default .node_name }}-{{ .index }}{{ .svc_name_suffix | default "" }} labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} component: {{ .component_label }} spec: selector: @@ -47,26 +47,26 @@ kind: Service metadata: name: {{ .name }} labels: -{{- if .proxy | default false }} -{{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} + {{- if .proxy | default false -}} + {{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} validator-proxied: "{{ $validatorProxied }}" -{{- end }} + {{- end }} component: {{ .component_label }} spec: sessionAffinity: None ports: - port: 8545 name: rpc -{{- $wsPort := ((.ws_port | default .Values.geth.ws_port) | int) -}} -{{- if ne $wsPort 8545 }} + {{- $wsPort := ((.ws_port | default .Values.geth.ws_port) | int) -}} + {{- if ne $wsPort 8545 }} - port: {{ $wsPort }} name: ws -{{- end }} + {{- end }} selector: -{{- if .proxy | default false }} -{{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} + {{- if .proxy | default false -}} + {{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} validator-proxied: "{{ $validatorProxied }}" -{{- end }} + {{- end }} component: {{ .component_label }} --- apiVersion: v1 @@ -74,10 +74,10 @@ kind: Service metadata: name: {{ .name }}-headless labels: -{{- if .proxy | default false }} -{{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} + {{- if .proxy | default false -}} + {{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} validator-proxied: "{{ $validatorProxied }}" -{{- end }} + {{- end }} component: {{ .component_label }} spec: type: ClusterIP @@ -85,15 +85,15 @@ spec: ports: - port: 8545 name: rpc -{{- if ne $wsPort 8545 }} + {{- if ne $wsPort 8545 }} - port: {{ .ws_port | default .Values.geth.ws_port }} name: ws -{{- end }} + {{- end }} selector: -{{- if .proxy | default false }} -{{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} + {{- if .proxy | default false }} + {{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} validator-proxied: "{{ $validatorProxied }}" -{{- end }} + {{- end }} component: {{ .component_label }} --- apiVersion: apps/v1 @@ -101,22 +101,26 @@ kind: StatefulSet metadata: name: {{ template "common.fullname" . }}-{{ .name }} labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} component: {{ .component_label }} -{{- if .proxy | default false }} -{{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} + {{- if .proxy | default false -}} + {{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} validator-proxied: "{{ $validatorProxied }}" -{{- end }} + {{- end }} spec: -{{- $updateStrategy := index $.Values.updateStrategy $.component_label }} + {{- $updateStrategy := index $.Values.updateStrategy $.component_label }} updateStrategy: -{{ toYaml $updateStrategy | indent 4 }} + {{- toYaml $updateStrategy | nindent 4 }} {{- if .Values.geth.ssd_disks }} volumeClaimTemplates: - metadata: name: data + {{- if .pvc_annotations }} + annotations: + {{- toYaml .pvc_annotations | nindent 8 }} + {{- end }} spec: - storageClassName: ssd + storageClassName: {{ $.Values.geth.storageClass }} accessModes: [ "ReadWriteOnce" ] resources: requests: @@ -128,12 +132,12 @@ spec: serviceName: {{ .name }} selector: matchLabels: -{{ include "common.standard.labels" . | indent 6 }} + {{- include "common.standard.labels" . | nindent 6 }} component: {{ .component_label }} -{{- if .proxy | default false }} -{{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} + {{- if .proxy | default false -}} + {{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} validator-proxied: "{{ $validatorProxied }}" -{{- end }} + {{- end }} template: metadata: labels: @@ -146,27 +150,27 @@ spec: {{- $validatorProxied := printf "%s-validators-%d" .Release.Namespace .validator_index }} validator-proxied: "{{ $validatorProxied }}" {{- end }} -{{ if .Values.metrics | default false }} + {{- if .Values.metrics | default false }} annotations: -{{ include "common.prometheus-annotations" . | indent 8 }} -{{- end }} + {{- include "common.prometheus-annotations" . | nindent 8 }} + {{- end }} spec: initContainers: -{{ include "common.conditional-init-genesis-container" . | indent 6 }} -{{ include "common.celotool-full-node-statefulset-container" (dict "Values" .Values "Release" .Release "Chart" .Chart "proxy" .proxy "mnemonic_account_type" .mnemonic_account_type "service_ip_env_var_prefix" .service_ip_env_var_prefix "ip_addresses" .ip_addresses "validator_index" .validator_index) | indent 6 }} -{{ if .unlock | default false }} -{{ include "common.import-geth-account-container" . | indent 6 }} -{{ end }} + {{- include "common.conditional-init-genesis-container" . | nindent 6 }} + {{- include "common.celotool-full-node-statefulset-container" (dict "Values" .Values "Release" .Release "Chart" .Chart "proxy" .proxy "mnemonic_account_type" .mnemonic_account_type "service_ip_env_var_prefix" .service_ip_env_var_prefix "ip_addresses" .ip_addresses "validator_index" .validator_index) | nindent 6 }} + {{- if .unlock | default false }} + {{- include "common.import-geth-account-container" . | nindent 6 }} + {{- end }} containers: -{{ include "common.full-node-container" (dict "Values" .Values "Release" .Release "Chart" .Chart "proxy" .proxy "proxy_allow_private_ip_flag" .proxy_allow_private_ip_flag "unlock" .unlock "rpc_apis" .rpc_apis "expose" .expose "syncmode" .syncmode "gcmode" .gcmode "ws_port" (default .Values.geth.ws_port .ws_port) "pprof" (or (.Values.metrics) (.Values.pprof.enabled)) "pprof_port" (.Values.pprof.port) "light_serve" .Values.geth.light.serve "light_maxpeers" .Values.geth.light.maxpeers "maxpeers" .Values.geth.maxpeers "metrics" .Values.metrics "public_ips" .public_ips "ethstats" (printf "%s-ethstats.%s" (include "common.fullname" .) .Release.Namespace) "extra_setup" .extra_setup) | indent 6 }} + {{- include "common.full-node-container" (dict "Values" .Values "Release" .Release "Chart" .Chart "proxy" .proxy "proxy_allow_private_ip_flag" .proxy_allow_private_ip_flag "unlock" .unlock "rpc_apis" .rpc_apis "expose" .expose "syncmode" .syncmode "gcmode" .gcmode "resources" .resources "ws_port" (default .Values.geth.ws_port .ws_port) "pprof" (or (.Values.metrics) (.Values.pprof.enabled)) "pprof_port" (.Values.pprof.port) "light_serve" .Values.geth.light.serve "light_maxpeers" .Values.geth.light.maxpeers "maxpeers" .Values.geth.maxpeers "metrics" .Values.metrics "public_ips" .public_ips "ethstats" (printf "%s-ethstats.%s" (include "common.fullname" .) .Release.Namespace) "extra_setup" .extra_setup) | nindent 6 }} terminationGracePeriodSeconds: {{ .Values.geth.terminationGracePeriodSeconds | default 300 }} - {{- if .node_selector }} + {{- with .node_selector }} nodeSelector: -{{ toYaml .node_selector | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} - {{- if .tolerations }} + {{- with .tolerations }} tolerations: -{{ toYaml .tolerations | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} volumes: - name: data diff --git a/packages/helm-charts/testnet/templates/bootnode.deployment.yaml b/packages/helm-charts/testnet/templates/bootnode.deployment.yaml index bc2cec284f8..ab9aca5506d 100644 --- a/packages/helm-charts/testnet/templates/bootnode.deployment.yaml +++ b/packages/helm-charts/testnet/templates/bootnode.deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: {{ template "common.fullname" . }}-bootnode labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} component: bootnode spec: strategy: @@ -11,12 +11,12 @@ spec: replicas: 1 selector: matchLabels: -{{ include "common.standard.labels" . | indent 6 }} + {{- include "common.standard.labels" . | nindent 6 }} component: bootnode template: metadata: labels: -{{ include "common.standard.labels" . | indent 8 }} + {{- include "common.standard.labels" . | nindent 8 }} component: bootnode spec: containers: @@ -97,5 +97,5 @@ spec: {{- end }} {{- with .Values.nodeSelector }} nodeSelector: -{{ toYaml . | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} diff --git a/packages/helm-charts/testnet/templates/bootnode.service.yaml b/packages/helm-charts/testnet/templates/bootnode.service.yaml index 07460569d3f..e8b60f0329d 100644 --- a/packages/helm-charts/testnet/templates/bootnode.service.yaml +++ b/packages/helm-charts/testnet/templates/bootnode.service.yaml @@ -3,13 +3,13 @@ kind: Service metadata: name: {{ template "common.fullname" . }}-bootnode labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} component: bootnode spec: - {{ if $.Values.geth.static_ips }} + {{- if $.Values.geth.static_ips }} type: LoadBalancer loadBalancerIP: {{ .Values.geth.bootnodeIpAddress }} - {{ end }} + {{- end }} selector: app: {{ template "common.name" . }} release: {{ .Release.Name }} diff --git a/packages/helm-charts/testnet/templates/forno.ingress.yaml b/packages/helm-charts/testnet/templates/forno.ingress.yaml index b0044c10964..b16d44e088c 100644 --- a/packages/helm-charts/testnet/templates/forno.ingress.yaml +++ b/packages/helm-charts/testnet/templates/forno.ingress.yaml @@ -3,7 +3,7 @@ kind: Ingress metadata: name: {{ .Release.Namespace }}-forno-ingress labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} component: forno annotations: kubernetes.io/tls-acme: "true" diff --git a/packages/helm-charts/testnet/templates/geth-account.secret.yaml b/packages/helm-charts/testnet/templates/geth-account.secret.yaml index a3e5b8275ab..06189239035 100644 --- a/packages/helm-charts/testnet/templates/geth-account.secret.yaml +++ b/packages/helm-charts/testnet/templates/geth-account.secret.yaml @@ -3,11 +3,11 @@ kind: Secret metadata: name: {{ template "common.fullname" . }}-geth-account labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} type: Opaque data: accountSecret: {{ .Values.geth.account.secret | b64enc }} mnemonic: {{ .Values.mnemonic | b64enc }} -{{- if .Values.geth.overwriteBootnodePrivateKey }} + {{- if .Values.geth.overwriteBootnodePrivateKey }} bootnodePrivateKey: {{ .Values.geth.bootnodePrivateKey | b64enc }} -{{- end }} + {{- end }} diff --git a/packages/helm-charts/testnet/templates/geth.configmap.yaml b/packages/helm-charts/testnet/templates/geth.configmap.yaml index 7ba9a7dc027..40be96e952f 100644 --- a/packages/helm-charts/testnet/templates/geth.configmap.yaml +++ b/packages/helm-charts/testnet/templates/geth.configmap.yaml @@ -1 +1 @@ -{{ include "common.geth-configmap" . }} +{{- include "common.geth-configmap" . }} diff --git a/packages/helm-charts/testnet/templates/proxy.service.yaml b/packages/helm-charts/testnet/templates/proxy.service.yaml index c7e4aa3b15f..eb3f788be5a 100644 --- a/packages/helm-charts/testnet/templates/proxy.service.yaml +++ b/packages/helm-charts/testnet/templates/proxy.service.yaml @@ -1,6 +1,6 @@ -{{ range $validatorIndex, $proxyCount := .Values.geth.proxiesPerValidator }} -{{ range $index, $e := until ($proxyCount | int) }} -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "ClusterIP" "svc_name" (print "validators-" $validatorIndex "-proxy-internal") "node_name" (print "validators-" $validatorIndex "-proxy") "name_suffix" "" "component_label" "proxy" "load_balancer_ip" "" ) }} +{{- range $validatorIndex, $proxyCount := .Values.geth.proxiesPerValidator }} +{{- range $index, $e := until ($proxyCount | int) }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "ClusterIP" "svc_name" (print "validators-" $validatorIndex "-proxy-internal") "node_name" (print "validators-" $validatorIndex "-proxy") "name_suffix" "" "component_label" "proxy" "load_balancer_ip" "" ) }} ports: - name: internal-tcp port: 30503 @@ -8,30 +8,30 @@ - name: internal-udp port: 30503 protocol: UDP -{{ if not $.Values.geth.static_ips }} + {{- if not $.Values.geth.static_ips }} - name: external-tcp port: 30303 protocol: TCP - name: external-udp port: 30303 protocol: UDP -{{ end }} + {{- end }} --- -{{ if $.Values.geth.static_ips }} -{{ $proxyIpAddresses := (splitList "/" (index $.Values.geth.proxyIPAddressesPerValidatorArray $validatorIndex)) }} -{{ $loadBalancerIP := index $proxyIpAddresses $index }} -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" (print "validators-" $validatorIndex "-proxy") "component_label" "proxy" "load_balancer_ip" $loadBalancerIP ) }} +{{- if $.Values.geth.static_ips }} +{{- $proxyIpAddresses := (splitList "/" (index $.Values.geth.proxyIPAddressesPerValidatorArray $validatorIndex)) }} +{{- $loadBalancerIP := index $proxyIpAddresses $index }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" (print "validators-" $validatorIndex "-proxy") "component_label" "proxy" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: discovery port: 30303 protocol: UDP --- -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" (print "validators-" $validatorIndex "-proxy") "svc_name_suffix" "-tcp" "component_label" "proxy" "load_balancer_ip" $loadBalancerIP ) }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" (print "validators-" $validatorIndex "-proxy") "svc_name_suffix" "-tcp" "component_label" "proxy" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: celo port: 30303 protocol: TCP --- -{{ end }} -{{ end }} -{{ end }} +{{- end }} +{{- end }} +{{- end }} diff --git a/packages/helm-charts/testnet/templates/proxy.statefulset.yaml b/packages/helm-charts/testnet/templates/proxy.statefulset.yaml index ac5401a8bfc..375c02d7a93 100644 --- a/packages/helm-charts/testnet/templates/proxy.statefulset.yaml +++ b/packages/helm-charts/testnet/templates/proxy.statefulset.yaml @@ -1,4 +1,4 @@ -{{- range $validatorIndex, $proxyCount := .Values.geth.proxiesPerValidator -}} -{{ include "celo.full-node-statefulset" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "name" (print "validators-" $validatorIndex "-proxy") "component_label" "proxy" "mnemonic_account_type" "proxy" "replicas" $proxyCount "proxy" true "proxy_allow_private_ip_flag" true "unlock" true "expose" false "rpc_apis" "eth,net,web3" "syncmode" "full" "gcmode" "full" "service_ip_env_var_prefix" (printf "%s%s%d%s" ($.Release.Namespace | upper) "_VALIDATORS_" $validatorIndex "_PROXY_INTERNAL_") "validator_index" $validatorIndex "ip_addresses" (include "celo.proxyipaddresses" (dict "Values" $.Values "validatorIndex" $validatorIndex) ) "extra_setup" $.Values.geth.proxyExtraSnippet "node_selector" $.Values.geth.proxyNodeSelector "tolerations" $.Values.geth.proxyTolerations "extraPodLabels" $.Values.extraPodLabels.proxy) }} +{{- range $validatorIndex, $proxyCount := .Values.geth.proxiesPerValidator }} +{{- include "celo.full-node-statefulset" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "name" (print "validators-" $validatorIndex "-proxy") "component_label" "proxy" "mnemonic_account_type" "proxy" "replicas" $proxyCount "proxy" true "proxy_allow_private_ip_flag" true "unlock" true "expose" false "rpc_apis" "eth,net,web3" "syncmode" "full" "gcmode" "full" "resources" (default $.Values.geth.resources $.Values.geth.proxyResources) "service_ip_env_var_prefix" (printf "%s%s%d%s" ($.Release.Namespace | upper) "_VALIDATORS_" $validatorIndex "_PROXY_INTERNAL_") "validator_index" $validatorIndex "ip_addresses" (include "celo.proxyipaddresses" (dict "Values" $.Values "validatorIndex" $validatorIndex) ) "extra_setup" $.Values.geth.proxyExtraSnippet "node_selector" $.Values.geth.proxyNodeSelector "tolerations" $.Values.geth.proxyTolerations "extraPodLabels" $.Values.extraPodLabels.proxy "pvc_annotations" $.Values.pvcAnnotations.proxy) }} --- {{- end }} diff --git a/packages/helm-charts/testnet/templates/secondaries.service.yaml b/packages/helm-charts/testnet/templates/secondaries.service.yaml index bf1a96c3d99..7c0e102c3e4 100644 --- a/packages/helm-charts/testnet/templates/secondaries.service.yaml +++ b/packages/helm-charts/testnet/templates/secondaries.service.yaml @@ -1,23 +1,19 @@ -{{ if .Values.geth.static_ips }} - -{{ range $index, $e := until (.Values.geth.secondaries | int) }} - -{{ if (ge $index (len $.Values.geth.proxiesPerValidator)) }} - -{{ $loadBalancerIP := index $.Values.geth.validatorsIPAddressArray $index }} - -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} +{{- if .Values.geth.static_ips }} +{{- range $index, $e := until (.Values.geth.secondaries | int) }} +{{- if (ge $index (len $.Values.geth.proxiesPerValidator)) }} +{{- $loadBalancerIP := index $.Values.geth.validatorsIPAddressArray $index }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: discovery port: 30303 protocol: UDP --- -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "svc_name_suffix" "-tcp" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "svc_name_suffix" "-tcp" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: celo port: 30303 protocol: TCP --- -{{ end }} -{{ end }} -{{ end }} +{{- end }} +{{- end }} +{{- end }} diff --git a/packages/helm-charts/testnet/templates/secondaries.statefulset.yaml b/packages/helm-charts/testnet/templates/secondaries.statefulset.yaml index 28186d69ca9..6db3c3f0d8d 100644 --- a/packages/helm-charts/testnet/templates/secondaries.statefulset.yaml +++ b/packages/helm-charts/testnet/templates/secondaries.statefulset.yaml @@ -17,42 +17,48 @@ kind: StatefulSet metadata: name: {{ template "common.fullname" . }}-secondaries labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} component: secondaries spec: + {{- if .Values.geth.ssd_disks }} volumeClaimTemplates: - metadata: name: data + {{- if .Values.pvcAnnotations.secondary }} + annotations: + {{- toYaml .Values.pvcAnnotations.secondary | nindent 8 }} + {{- end }} spec: - {{ if .Values.geth.ssd_disks }}storageClassName: ssd{{ end }} + storageClassName: {{ .Values.geth.storageClass }} accessModes: [ "ReadWriteOnce" ] resources: requests: storage: {{ .Values.geth.diskSizeGB }}Gi + {{- end }} podManagementPolicy: Parallel updateStrategy: -{{ toYaml .Values.updateStrategy.secondaries | indent 4 }} + {{- toYaml .Values.updateStrategy.secondaries | nindent 4 }} replicas: {{ .Values.geth.secondaries }} serviceName: secondaries selector: matchLabels: -{{ include "common.standard.labels" . | indent 6 }} + {{- include "common.standard.labels" . | nindent 6 }} component: secondaries template: metadata: labels: - {{- include "common.standard.labels" . | nindent 8 }} + {{- include "common.standard.labels" . | nindent 8 }} component: secondaries {{- if .Values.extraPodLabels.secondaries }} {{- toYaml .Values.extraPodLabels.secondaries | nindent 8 }} {{- end }} -{{ if .Values.metrics | default false }} + {{- if .Values.metrics | default false }} annotations: -{{ include "common.prometheus-annotations" . | indent 8 }} -{{- end }} + {{- include "common.prometheus-annotations" . | nindent 8 }} + {{- end }} spec: initContainers: -{{ include "common.conditional-init-genesis-container" . | indent 6 }} + {{- include "common.conditional-init-genesis-container" . | nindent 6 }} - name: get-account image: {{ .Values.celotool.image.repository }}:{{ .Values.celotool.image.tag }} imagePullPolicy: Always @@ -143,11 +149,11 @@ spec: - name: IP_ADDRESSES value: {{ join "/" .Values.geth.validatorsIPAddressArray }} - name: BOOTNODE_IP_ADDRESS - value: "{{ default "none" .Values.geth.bootnodeIpAddress }}" + value: "{{ default "none" .Values.geth.bootnodeIpAddress }}" volumeMounts: - name: data mountPath: /root/.celo -{{ include "common.import-geth-account-container" . | indent 6 }} + {{- include "common.import-geth-account-container" . | nindent 6 }} containers: - name: geth image: {{ .Values.geth.image.repository }}:{{ .Values.geth.image.tag }} @@ -184,13 +190,13 @@ spec: [[ "$IN_MEMORY_DISCOVERY_TABLE" == "true" ]] && ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} --use-in-memory-discovery-table" -{{ include "common.bootnode-flag-script" . | indent 10 }} + {{- include "common.bootnode-flag-script" . | nindent 10 }} -{{ include "common.geth-add-metrics-pprof-config" . | indent 10 }} + {{- include "common.geth-add-metrics-pprof-config" . | nindent 10 }} -{{ include "common.geth-http-ws-flags" (dict "Values" $.Values "rpc_apis" "eth,net,web3,debug" "ws_port" "8545" "listen_address" "0.0.0.0") | indent 10 }} + {{- include "common.geth-http-ws-flags" (dict "Values" $.Values "rpc_apis" "eth,net,web3,debug" "ws_port" "8545" "listen_address" "0.0.0.0") | nindent 10 }} -{{ .Values.geth.secondayExtraSnippet | indent 10 }} + {{- .Values.geth.secondayExtraSnippet | nindent 10 }} exec geth \ $BOOTNODE_FLAG \ @@ -248,21 +254,24 @@ spec: - name: metrics containerPort: 6060 {{- end }} + {{- $resources := default .Values.geth.resources .Values.geth.secondaryResources -}} + {{- with $resources }} resources: -{{ toYaml .Values.geth.resources | indent 10 }} + {{- toYaml . | nindent 10 }} + {{- end }} volumeMounts: - name: data mountPath: /root/.celo - name: account mountPath: /root/.celo/account readOnly: true - {{- if .Values.secondayNodeSelector }} + {{- with .Values.secondayNodeSelector }} nodeSelector: -{{ toYaml .Values.secondayNodeSelector | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.secondaryTolerations }} + {{- with .Values.secondaryTolerations }} tolerations: -{{ toYaml .Values.secondaryTolerations | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} volumes: - name: data diff --git a/packages/helm-charts/testnet/templates/txnode-private.service.yaml b/packages/helm-charts/testnet/templates/txnode-private.service.yaml index f90c030f725..9d00ba22a6d 100644 --- a/packages/helm-charts/testnet/templates/txnode-private.service.yaml +++ b/packages/helm-charts/testnet/templates/txnode-private.service.yaml @@ -1,19 +1,17 @@ -{{ if .Values.geth.static_ips }} -{{ range $index, $e := until (.Values.geth.private_tx_nodes | int) }} - -{{ $loadBalancerIP := default "" (index $.Values.geth (print "private_tx_nodes_" $index "IpAddress")) }} - -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "svc_name" "tx-nodes-private" "node_name" "tx-nodes-private" "component_label" "tx_nodes_private" "load_balancer_ip" $loadBalancerIP ) }} +{{- if .Values.geth.static_ips }} +{{- range $index, $e := until (.Values.geth.private_tx_nodes | int) }} +{{- $loadBalancerIP := default "" (index $.Values.geth (print "private_tx_nodes_" $index "IpAddress")) }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "svc_name" "tx-nodes-private" "node_name" "tx-nodes-private" "component_label" "tx_nodes_private" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: discovery port: 30303 protocol: UDP --- -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "svc_name" "tx-nodes-private" "node_name" "tx-nodes-private" "svc_name_suffix" "-tcp" "component_label" "tx_nodes_private" "load_balancer_ip" $loadBalancerIP ) }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "svc_name" "tx-nodes-private" "node_name" "tx-nodes-private" "svc_name_suffix" "-tcp" "component_label" "tx_nodes_private" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: celo port: 30303 protocol: TCP --- -{{ end }} -{{ end }} +{{- end }} +{{- end }} diff --git a/packages/helm-charts/testnet/templates/txnode-private.statefulset.yaml b/packages/helm-charts/testnet/templates/txnode-private.statefulset.yaml index 8d1ca8e174c..07eb2fdbd3f 100644 --- a/packages/helm-charts/testnet/templates/txnode-private.statefulset.yaml +++ b/packages/helm-charts/testnet/templates/txnode-private.statefulset.yaml @@ -1 +1 @@ -{{ include "celo.full-node-statefulset" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "name" "tx-nodes-private" "component_label" "tx_nodes_private" "replicas" .Values.geth.private_tx_nodes "mnemonic_account_type" "tx_node_private" "expose" true "syncmode" "full" "gcmode" "archive" "rpc_apis" "eth,net,web3,debug,txpool" "ws_port" "8545" "ip_addresses" (join "/" .Values.geth.private_tx_node_ip_addresses) "extra_setup" $.Values.geth.txNodePrivateExtraSnippet "node_selector" $.Values.geth.txNodePrivateNodeSelector "tolerations" $.Values.geth.txNodePrivateTolerations "extraPodLabels" $.Values.extraPodLabels.txnode_private) }} +{{- include "celo.full-node-statefulset" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "name" "tx-nodes-private" "component_label" "tx_nodes_private" "replicas" .Values.geth.private_tx_nodes "mnemonic_account_type" "tx_node_private" "expose" true "syncmode" "full" "gcmode" "archive" "rpc_apis" "eth,net,web3,debug,txpool" "ws_port" "8545" "resources" (default $.Values.geth.resources $.Values.geth.txNodePrivateResources) "ip_addresses" (join "/" .Values.geth.private_tx_node_ip_addresses) "extra_setup" $.Values.geth.txNodePrivateExtraSnippet "node_selector" $.Values.geth.txNodePrivateNodeSelector "tolerations" $.Values.geth.txNodePrivateTolerations "extraPodLabels" $.Values.extraPodLabels.txnode_private "pvc_annotations" $.Values.pvcAnnotations.txnode_private) }} diff --git a/packages/helm-charts/testnet/templates/txnode.service.yaml b/packages/helm-charts/testnet/templates/txnode.service.yaml index b59e2972a96..888388c2b9a 100644 --- a/packages/helm-charts/testnet/templates/txnode.service.yaml +++ b/packages/helm-charts/testnet/templates/txnode.service.yaml @@ -1,6 +1,6 @@ -{{ range $index, $e := until (.Values.geth.tx_nodes | int) }} -{{ $loadBalancerIP := (index $.Values.geth.txNodesIPAddressArray $index) }} -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "svc_name" "service" "node_name" "tx-nodes" "component_label" "tx_nodes" "load_balancer_ip" $loadBalancerIP ) }} +{{- range $index, $e := until (.Values.geth.tx_nodes | int) }} +{{- $loadBalancerIP := (index $.Values.geth.txNodesIPAddressArray $index) }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "svc_name" "service" "node_name" "tx-nodes" "component_label" "tx_nodes" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: discovery port: 30303 @@ -18,4 +18,4 @@ port: 8546 protocol: TCP --- -{{ end }} +{{- end }} diff --git a/packages/helm-charts/testnet/templates/txnode.statefulset.yaml b/packages/helm-charts/testnet/templates/txnode.statefulset.yaml index a927c18b6b4..0553d6da947 100644 --- a/packages/helm-charts/testnet/templates/txnode.statefulset.yaml +++ b/packages/helm-charts/testnet/templates/txnode.statefulset.yaml @@ -1 +1 @@ -{{ include "celo.full-node-statefulset" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "name" "tx-nodes" "component_label" "tx_nodes" "replicas" .Values.geth.tx_nodes "mnemonic_account_type" "tx_node" "expose" true "syncmode" "full" "gcmode" "full" "rpc_apis" "eth,net,web3" "ws_port" "8545" "ip_addresses" (join "/" .Values.geth.txNodesIPAddressArray) "extra_setup" $.Values.geth.txNodeExtraSnippet "node_selector" $.Values.geth.txNodeNodeSelector "tolerations" $.Values.geth.txNodeTolerations "extraPodLabels" $.Values.extraPodLabels.txnode) }} +{{- include "celo.full-node-statefulset" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "name" "tx-nodes" "component_label" "tx_nodes" "replicas" .Values.geth.tx_nodes "mnemonic_account_type" "tx_node" "expose" true "syncmode" "full" "gcmode" "full" "rpc_apis" "eth,net,web3" "ws_port" "8545" "resources" $.Values.geth.txNodeResources "ip_addresses" (join "/" .Values.geth.txNodesIPAddressArray) "extra_setup" $.Values.geth.txNodeExtraSnippet "node_selector" $.Values.geth.txNodeNodeSelector "tolerations" $.Values.geth.txNodeTolerations "extraPodLabels" $.Values.extraPodLabels.txnode "pvc_annotations" $.Values.pvcAnnotations.txnode) }} diff --git a/packages/helm-charts/testnet/templates/validators.service.yaml b/packages/helm-charts/testnet/templates/validators.service.yaml index 476b08ea89a..dc2098d98f6 100644 --- a/packages/helm-charts/testnet/templates/validators.service.yaml +++ b/packages/helm-charts/testnet/templates/validators.service.yaml @@ -1,23 +1,19 @@ -{{ if .Values.geth.static_ips }} - -{{ range $index, $e := until (.Values.geth.validators | int) }} - -{{ if (eq (index $.Values.geth.proxiesPerValidator $index | int) 0) }} - -{{ $loadBalancerIP := index $.Values.geth.validatorsIPAddressArray $index }} - -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} +{{- if .Values.geth.static_ips }} +{{- range $index, $e := until (.Values.geth.validators | int) }} +{{- if (eq (index $.Values.geth.proxiesPerValidator $index | int) 0) }} +{{- $loadBalancerIP := index $.Values.geth.validatorsIPAddressArray $index }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: discovery port: 30303 protocol: UDP --- -{{ template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "svc_name_suffix" "-tcp" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} +{{- template "celo.node-service" (dict "Values" $.Values "Release" $.Release "Chart" $.Chart "index" $index "service_type" "LoadBalancer" "node_name" "validators" "svc_name_suffix" "-tcp" "component_label" "validators" "load_balancer_ip" $loadBalancerIP ) }} ports: - name: celo port: 30303 protocol: TCP --- -{{ end }} -{{ end }} -{{ end }} +{{- end }} +{{- end }} +{{- end }} diff --git a/packages/helm-charts/testnet/templates/validators.statefulset.yaml b/packages/helm-charts/testnet/templates/validators.statefulset.yaml index dd7a36729a7..92da752bdb2 100644 --- a/packages/helm-charts/testnet/templates/validators.statefulset.yaml +++ b/packages/helm-charts/testnet/templates/validators.statefulset.yaml @@ -17,42 +17,50 @@ kind: StatefulSet metadata: name: {{ template "common.fullname" . }}-validators labels: -{{ include "common.standard.labels" . | indent 4 }} + {{- include "common.standard.labels" . | nindent 4 }} component: validators spec: + {{- if .Values.geth.ssd_disks }} volumeClaimTemplates: - metadata: name: data + {{- if .Values.pvcAnnotations.validator }} + annotations: + {{- toYaml .Values.pvcAnnotations.validator | nindent 8 }} + {{- end }} spec: - {{ if .Values.geth.ssd_disks }}storageClassName: ssd{{ end }} + storageClassName: {{ .Values.geth.storageClass }} accessModes: [ "ReadWriteOnce" ] resources: requests: storage: {{ .Values.geth.diskSizeGB }}Gi + {{- end }} podManagementPolicy: Parallel + {{- with .Values.updateStrategy.validators }} updateStrategy: -{{ toYaml .Values.updateStrategy.validators | indent 4 }} + {{- toYaml . | nindent 4 }} + {{- end }} replicas: {{ .Values.geth.validators }} serviceName: validators selector: matchLabels: -{{ include "common.standard.labels" . | indent 6 }} + {{- include "common.standard.labels" . | nindent 6 }} component: validators template: metadata: labels: - {{- include "common.standard.labels" . | nindent 8 }} + {{- include "common.standard.labels" . | nindent 8 }} component: validators {{- if .Values.extraPodLabels.validators }} {{- toYaml .Values.extraPodLabels.validators | nindent 8 }} {{- end }} -{{ if .Values.metrics | default false }} + {{- if .Values.metrics | default false }} annotations: -{{ include "common.prometheus-annotations" . | indent 8 }} -{{- end }} + {{- include "common.prometheus-annotations" . | nindent 8 }} + {{- end }} spec: initContainers: -{{ include "common.conditional-init-genesis-container" . | indent 6 }} + {{- include "common.conditional-init-genesis-container" . | nindent 6 }} - name: get-account image: {{ .Values.celotool.image.repository }}:{{ .Values.celotool.image.tag }} imagePullPolicy: Always @@ -111,9 +119,7 @@ spec: # ALL_VALIDATOR_PROXY_IPS would have the form X.X.X.X/X.X.X.X,X.X.X.X ALL_VALIDATOR_PROXY_IPS='{{ join "," .Values.geth.proxyIPAddressesPerValidatorArray }}' [[ $ALL_VALIDATOR_PROXY_IPS = '' ]] && ALL_VALIDATOR_PROXY_IPS='' - PROXY_IPS=`echo -n $ALL_VALIDATOR_PROXY_IPS | cut -d ',' -f $((RID + 1))` - # Clear the proxy enode file because it's persisted rm -f /root/.celo/proxyEnodeUrlPairs # Generate all proxy enode urls and put them into /root/.celo/proxyEnodeUrlPairs @@ -122,11 +128,9 @@ spec: if [ "$PROXY_INDEX" -gt 0 ]; then echo -n "," >> /root/.celo/proxyEnodeUrlPairs fi - # gives us PROXY_ENODE_URL_PAIR {{- include "celo.proxyenodeurlpair" . | indent 14 }} echo -n $PROXY_ENODE_URL_PAIR >> /root/.celo/proxyEnodeUrlPairs - PROXY_INDEX=$(( $PROXY_INDEX + 1 )) done fi @@ -148,11 +152,11 @@ spec: - name: IP_ADDRESSES value: {{ join "/" .Values.geth.validatorsIPAddressArray }} - name: BOOTNODE_IP_ADDRESS - value: "{{ default "none" .Values.geth.bootnodeIpAddress }}" + value: "{{ default "none" .Values.geth.bootnodeIpAddress }}" volumeMounts: - name: data mountPath: /root/.celo -{{ include "common.import-geth-account-container" . | indent 6 }} + {{- include "common.import-geth-account-container" . | nindent 6 }} containers: - name: geth image: {{ .Values.geth.image.repository }}:{{ .Values.geth.image.tag }} @@ -202,12 +206,11 @@ spec: ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} --etherbase=${ACCOUNT_ADDRESS}" fi -{{ include "common.bootnode-flag-script" . | indent 10 }} + {{- include "common.bootnode-flag-script" . | nindent 10 }} + {{- include "common.geth-add-metrics-pprof-config" . | nindent 10 }} + {{- include "common.geth-http-ws-flags" (dict "Values" $.Values "rpc_apis" "eth,net,web3,debug" "ws_port" "8545" "listen_address" "0.0.0.0") | nindent 10 }} -{{ include "common.geth-add-metrics-pprof-config" . | indent 10 }} -{{ include "common.geth-http-ws-flags" (dict "Values" $.Values "rpc_apis" "eth,net,web3,debug" "ws_port" "8545" "listen_address" "0.0.0.0") | indent 10 }} - -{{ .Values.geth.validatorExtraSnippet | indent 10 }} + {{- .Values.geth.validatorExtraSnippet | nindent 10 }} exec geth \ $BOOTNODE_FLAG \ @@ -262,8 +265,11 @@ spec: - name: metrics containerPort: 6060 {{- end }} + {{- $resources := default .Values.geth.resources .Values.geth.validatorResources -}} + {{- with $resources }} resources: -{{ toYaml .Values.geth.resources | indent 10 }} + {{- toYaml . | nindent 10 }} + {{- end }} volumeMounts: - name: data mountPath: /root/.celo @@ -271,13 +277,13 @@ spec: mountPath: /root/.celo/account readOnly: true terminationGracePeriodSeconds: {{ .Values.geth.terminationGracePeriodSeconds | default 300 }} - {{- if .Values.geth.validatorNodeSelector }} + {{- with .Values.geth.validatorNodeSelector }} nodeSelector: -{{ toYaml .Values.geth.validatorNodeSelector | indent 8 }} + {{ toYaml . | nindent 8 }} {{- end }} - {{- if .Values.geth.validatorTolerations }} + {{- with .Values.geth.validatorTolerations }} tolerations: -{{ toYaml .Values.geth.validatorTolerations | indent 8 }} + {{ toYaml . | nindent 8 }} {{- end }} volumes: - name: data diff --git a/packages/helm-charts/testnet/values-alfajores.yaml b/packages/helm-charts/testnet/values-alfajores.yaml new file mode 100644 index 00000000000..e2570811ebc --- /dev/null +++ b/packages/helm-charts/testnet/values-alfajores.yaml @@ -0,0 +1,19 @@ +--- +geth: + resources: + requests: + cpu: 400m + memory: 3Gi + validatorResources: + requests: + cpu: 0.5 + memory: 3000M + txNodeResources: + requests: + cpu: 0.5 + memory: 9G + txNodePrivateResources: + requests: + cpu: 2 + memory: 8Gi + diff --git a/packages/helm-charts/testnet/values.yaml b/packages/helm-charts/testnet/values.yaml index c767455561f..c24eb007a0b 100644 --- a/packages/helm-charts/testnet/values.yaml +++ b/packages/helm-charts/testnet/values.yaml @@ -36,6 +36,11 @@ geth: # limits: # memory: "4Gi" # cpu: "4" + validatorResources: {} + secondaryResources: {} + proxyResources: {} + txNodeResources: {} + txNodePrivateResources: {} ws_port: 8546 rpc_gascap: 10000000 validatorExtraSnippet: | @@ -59,6 +64,7 @@ geth: txNodeTolerations: [] txNodePrivateNodeSelector: {} txNodePrivateTolerations: [] + storageClass: ssd maxpeers: 1150 light: maxpeers: 1000 @@ -121,3 +127,10 @@ extraPodLabels: txnode_private: stack: blockscout mode: archive + +pvcAnnotations: + validator: {} + secondary: {} + proxy: {} + txnode: {} + txnode_private: {} diff --git a/packages/metadata-crawler/package.json b/packages/metadata-crawler/package.json index d7442c3cd21..95f45bc1786 100644 --- a/packages/metadata-crawler/package.json +++ b/packages/metadata-crawler/package.json @@ -9,9 +9,9 @@ "homepage": "https://github.com/celo-org/celo-monorepo/tree/master/packages/metadata-crawler", "repository": "https://github.com/celo-org/celo-monorepo/tree/master/packages/metadata-crawler", "dependencies": { - "@celo/connect": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/contractkit": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "@types/pg": "^7.14.3", "bunyan": "1.8.12", "bunyan-gke-stackdriver": "0.1.2", diff --git a/packages/metadata-crawler/src/crawler.ts b/packages/metadata-crawler/src/crawler.ts index 16626a57c55..21f78c49123 100644 --- a/packages/metadata-crawler/src/crawler.ts +++ b/packages/metadata-crawler/src/crawler.ts @@ -5,15 +5,9 @@ import { verifyAccountClaim, verifyDomainRecord, } from '@celo/contractkit/lib/identity/claims/verify' -import { - AttestationServiceStatusState, - AttestationsWrapper, -} from '@celo/contractkit/lib/wrappers/Attestations' -import { Validator } from '@celo/contractkit/lib/wrappers/Validators' import { normalizeAddressWith0x, trimLeading0x } from '@celo/utils/lib/address' import { concurrentMap } from '@celo/utils/lib/async' import Logger from 'bunyan' -import fetch from 'cross-fetch' import { Client } from 'pg' import Web3 from 'web3' import { dataLogger, logger, operationalLogger } from './logger' @@ -37,11 +31,6 @@ const client = new Client({ const kit = newKitFromWeb3(new Web3(PROVIDER_URL)) -const discordWebhook = process.env['DISCORD_WEBHOOK_URL'] -const clusterName = process.env['CLUSTER_NAME'] - ? process.env['CLUSTER_NAME'][0].toUpperCase() + process.env['CLUSTER_NAME'].substring(1) - : undefined - async function jsonQuery(query: string) { let res = await client.query(`SELECT json_agg(t) FROM (${query}) t`) return res.rows[0].json_agg @@ -173,113 +162,6 @@ async function processDomainClaims() { }) } -async function processAttestationServiceStatusForValidator( - electedValidators: Set
, - attestationsWrapper: AttestationsWrapper, - validator: Validator -) { - const status = await attestationsWrapper.getAttestationServiceStatus(validator) - const { - name, - smsProviders, - address, - affiliation, - attestationServiceURL, - metadataURL, - attestationSigner, - blacklistedRegionCodes, - rightAccount, - error, - state, - version, - ageOfLatestBlock, - smsProvidersRandomized, - maxDeliveryAttempts, - maxRerequestMins, - twilioVerifySidProvided, - } = status - const isElected = electedValidators.has(validator.address) - dataLogger.info( - { - name, - isElected, - smsProviders, - address, - group: affiliation, - attestationServiceURL, - metadataURL, - attestationSigner, - blacklistedRegionCodes, - rightAccount, - err: error, - state, - version, - ageOfLatestBlock, - smsProvidersRandomized, - maxDeliveryAttempts, - maxRerequestMins, - twilioVerifySidProvided, - }, - 'checked_attestation_service_status' - ) - - // Consider pushing a state change to Discord for elected validators. - if (discordWebhook && isElected) { - const currentValid = - status.state === AttestationServiceStatusState.NoAttestationSigner || - status.state === AttestationServiceStatusState.UnreachableHealthz || - status.state === AttestationServiceStatusState.Valid - - if (!currentValid) { - const content = - `:no_mobile_phones: **Problem with Attestation Service!** ${status.name} \n` + - `For validator \`${validator.address}\` in group \`${validator.affiliation}\`\n` + - `\`${status.state}\` ${status.attestationServiceURL ?? ''}${ - status.error ? '\n`' + (status.error.message ?? status.error) + '`' : '' - }` - await postToDiscord(content) - } - } -} - -async function postToDiscord(content: string) { - if (discordWebhook) { - try { - await fetch(discordWebhook, { - method: 'POST', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ username: `${clusterName} Metadata Crawler`, content }), - }) - } catch {} - } -} - -async function processAttestationServices() { - operationalLogger.debug('processAttestationServices start') - const validatorsWrapper = await kit.contracts.getValidators() - const electionsWrapper = await kit.contracts.getElection() - const attestationsWrapper = await kit.contracts.getAttestations() - const validators = await validatorsWrapper.getRegisteredValidators() - - const currentEpoch = await kit.getEpochNumberOfBlock(await kit.connection.getBlockNumber()) - const electedValidators = await electionsWrapper.getElectedValidators(currentEpoch) - const electedValidatorsSet: Set
= new Set() - electedValidators.forEach((validator) => electedValidatorsSet.add(validator.address)) - - await concurrentMap(CONCURRENCY, validators, (validator) => - processAttestationServiceStatusForValidator( - electedValidatorsSet, - attestationsWrapper, - validator - ) - ) - operationalLogger.debug('processAttestationServices finish') - return -} - async function main() { operationalLogger.info({ host: PGHOST }, 'Connecting DB') await client.connect() @@ -290,7 +172,6 @@ async function main() { }) await processDomainClaims() - await processAttestationServices() client.end() process.exit(0) diff --git a/packages/phone-number-privacy/combiner/.env b/packages/phone-number-privacy/combiner/.env index f5aefea58cc..14bedd678cf 100644 --- a/packages/phone-number-privacy/combiner/.env +++ b/packages/phone-number-privacy/combiner/.env @@ -4,6 +4,5 @@ LOG_FORMAT=stackdriver LOG_LEVEL=trace SERVICE_NAME='odis-combiner' # For e2e Tests -ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer0.azurefd.net -ODIS_COMBINER_SERVICE_URL=https://us-central1-celo-phone-number-privacy-stg.cloudfunctions.net -ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org \ No newline at end of file +ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org +CONTEXT_NAME='alfajores' diff --git a/packages/phone-number-privacy/combiner/README.md b/packages/phone-number-privacy/combiner/README.md index 9ef3e53d213..5c9909368f4 100644 --- a/packages/phone-number-privacy/combiner/README.md +++ b/packages/phone-number-privacy/combiner/README.md @@ -25,5 +25,3 @@ Note: When you fill in the `host` field you may need to use the database's publi Always run migrations in staging first and ensure all e2e tests pass before migrating in alfajores and mainnet. Run `yarn db:migrate:` - -TODO: Figure out how to make migrations run automatically on deployment diff --git a/packages/phone-number-privacy/combiner/jest.config.js b/packages/phone-number-privacy/combiner/jest.config.js index 6036c030963..60af40428ce 100644 --- a/packages/phone-number-privacy/combiner/jest.config.js +++ b/packages/phone-number-privacy/combiner/jest.config.js @@ -4,4 +4,11 @@ module.exports = { preset: 'ts-jest', ...nodeFlakeTracking, setupFilesAfterEnv: ['/jest_setup.ts', ...nodeFlakeTracking.setupFilesAfterEnv], + coverageReporters: [['lcov', { projectRoot: '../../../' }], 'text'], + collectCoverageFrom: ['./src/**'], + coverageThreshold: { + global: { + lines: 80, + }, + }, } diff --git a/packages/phone-number-privacy/combiner/migrations/20200330212224_create-accounts-table.ts b/packages/phone-number-privacy/combiner/migrations/20200330212224_create-accounts-table.ts deleted file mode 100644 index 7d7e3b44523..00000000000 --- a/packages/phone-number-privacy/combiner/migrations/20200330212224_create-accounts-table.ts +++ /dev/null @@ -1,14 +0,0 @@ -import * as Knex from 'knex' -import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../src/database/models/account' - -export async function up(knex: Knex): Promise { - return knex.schema.createTable(ACCOUNTS_TABLE, (t) => { - t.string(ACCOUNTS_COLUMNS.address).notNullable().primary() - t.dateTime(ACCOUNTS_COLUMNS.createdAt).notNullable() - t.dateTime(ACCOUNTS_COLUMNS.didMatchmaking) - }) -} - -export async function down(knex: Knex): Promise { - return knex.schema.dropTable(ACCOUNTS_TABLE) -} diff --git a/packages/phone-number-privacy/combiner/migrations/20200330212301_create-number-pairs-table.ts b/packages/phone-number-privacy/combiner/migrations/20200330212301_create-number-pairs-table.ts deleted file mode 100644 index 8dfe8918d33..00000000000 --- a/packages/phone-number-privacy/combiner/migrations/20200330212301_create-number-pairs-table.ts +++ /dev/null @@ -1,14 +0,0 @@ -import * as Knex from 'knex' -import { NUMBER_PAIRS_COLUMN, NUMBER_PAIRS_TABLE } from '../src/database/models/numberPair' - -export async function up(knex: Knex): Promise { - return knex.schema.createTable(NUMBER_PAIRS_TABLE, (t) => { - t.string(NUMBER_PAIRS_COLUMN.userPhoneHash).notNullable() - t.string(NUMBER_PAIRS_COLUMN.contactPhoneHash).notNullable() - t.unique([NUMBER_PAIRS_COLUMN.userPhoneHash, NUMBER_PAIRS_COLUMN.contactPhoneHash]) - }) -} - -export async function down(knex: Knex): Promise { - return knex.schema.dropTable(NUMBER_PAIRS_TABLE) -} diff --git a/packages/phone-number-privacy/combiner/migrations/20210421212301_create-indices.ts b/packages/phone-number-privacy/combiner/migrations/20210421212301_create-indices.ts deleted file mode 100644 index 4c2a191e28e..00000000000 --- a/packages/phone-number-privacy/combiner/migrations/20210421212301_create-indices.ts +++ /dev/null @@ -1,27 +0,0 @@ -import * as Knex from 'knex' -import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../src/database/models/account' -import { NUMBER_PAIRS_COLUMN, NUMBER_PAIRS_TABLE } from '../src/database/models/numberPair' - -export async function up(knex: Knex): Promise { - if (!(await knex.schema.hasTable(NUMBER_PAIRS_TABLE))) { - throw new Error('Unexpected error: Could not find NUMBER_PAIRS_TABLE') - } - if (!(await knex.schema.hasTable(ACCOUNTS_TABLE))) { - throw new Error('Unexpected error: Could not find ACCOUNTS_TABLE') - } - await knex.schema.alterTable(NUMBER_PAIRS_TABLE, (t) => { - t.index(NUMBER_PAIRS_COLUMN.contactPhoneHash) - }) - return knex.schema.alterTable(ACCOUNTS_TABLE, (t) => { - t.index(ACCOUNTS_COLUMNS.address) - }) -} - -export async function down(knex: Knex): Promise { - await knex.schema.alterTable(NUMBER_PAIRS_TABLE, (t) => { - t.dropIndex(NUMBER_PAIRS_COLUMN.contactPhoneHash) - }) - return knex.schema.alterTable(ACCOUNTS_TABLE, (t) => { - t.dropIndex(ACCOUNTS_COLUMNS.address) - }) -} diff --git a/packages/phone-number-privacy/combiner/migrations/20210813105139_add_dekSigner_signedUserPhoneNumber_columns_to_accounts_table.ts b/packages/phone-number-privacy/combiner/migrations/20210813105139_add_dekSigner_signedUserPhoneNumber_columns_to_accounts_table.ts deleted file mode 100644 index d8a28af69d2..00000000000 --- a/packages/phone-number-privacy/combiner/migrations/20210813105139_add_dekSigner_signedUserPhoneNumber_columns_to_accounts_table.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as Knex from 'knex' -import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../src/database/models/account' - -export async function up(knex: Knex): Promise { - if (!(await knex.schema.hasTable(ACCOUNTS_TABLE))) { - throw new Error('Unexpected error: Could not find ACCOUNTS_TABLE') - } - return knex.schema.alterTable(ACCOUNTS_TABLE, (t) => { - t.string(ACCOUNTS_COLUMNS.signedUserPhoneNumber) - t.string(ACCOUNTS_COLUMNS.dekSigner) - }) -} - -export async function down(knex: Knex): Promise { - return knex.schema.alterTable(ACCOUNTS_TABLE, (t) => { - t.dropColumn(ACCOUNTS_COLUMNS.signedUserPhoneNumber) - t.dropColumn(ACCOUNTS_COLUMNS.dekSigner) - }) -} diff --git a/packages/phone-number-privacy/combiner/package.json b/packages/phone-number-privacy/combiner/package.json index 9559dc0228d..2f0ddfe11fa 100644 --- a/packages/phone-number-privacy/combiner/package.json +++ b/packages/phone-number-privacy/combiner/package.json @@ -1,15 +1,16 @@ { "name": "@celo/phone-number-privacy-combiner", - "version": "1.1.6", + "version": "3.0.0-dev", "description": "Orchestrates and combines threshold signatures for use in ODIS", "author": "Celo", "license": "Apache-2.0", "main": "dist/index.js", "scripts": { "dev": "yarn build && firebase serve --only functions", - "deploy:staging": "yarn build && firebase deploy --only functions --project celo-phone-number-privacy-stg", - "deploy:alfajores": "yarn build && firebase deploy --only functions --project celo-phone-number-privacy", - "deploy:mainnet": "yarn build && firebase deploy --only functions --project celo-pgpnp-mainnet", + "deploy": "yarn build && firebase deploy --only functions:combiner", + "deploy:staging": "yarn deploy --project celo-phone-number-privacy-stg", + "deploy:alfajores": "yarn deploy --project celo-phone-number-privacy", + "deploy:mainnet": "yarn deploy --project celo-pgpnp-mainnet", "config:get:staging": "firebase functions:config:get --project celo-phone-number-privacy-stg", "config:get:alfajores": "firebase functions:config:get --project celo-phone-number-privacy", "config:get:mainnet": "firebase functions:config:get --project celo-pgpnp-mainnet", @@ -20,37 +21,41 @@ "build": "tsc -b .", "lint": "tslint --project .", "test": "jest --runInBand --testPathIgnorePatterns test/end-to-end", - "test:e2e": "jest test/end-to-end --verbose", - "test:e2e:staging": "ODIS_COMBINER_SERVICE_URL=https://us-central1-celo-phone-number-privacy-stg.cloudfunctions.net yarn test:e2e", - "test:e2e:alfajores": "ODIS_COMBINER_SERVICE_URL=https://us-central1-celo-phone-number-privacy.cloudfunctions.net yarn test:e2e", - "db:migrate": "NODE_ENV=dev FIREBASE_CONFIG=./firebase.json ts-node ./scripts/run-migrations.ts", - "db:migrate:staging": "GCLOUD_PROJECT=celo-phone-number-privacy-stg yarn db:migrate", - "db:migrate:alfajores": "GCLOUD_PROJECT=celo-phone-number-privacy yarn db:migrate", - "db:migrate:mainnet": "GCLOUD_PROJECT=celo-pgpnp-mainnet yarn db:migrate", - "db:migrate:make": "knex --migrations-directory ./migrations migrate:make -x ts" + "test:coverage": "yarn test --coverage", + "test:integration": "jest --runInBand test/integration", + "test:e2e": "FLAKEY=true jest test/end-to-end --verbose", + "test:e2e:staging": "FLAKEY=true CONTEXT_NAME=staging yarn test:e2e", + "test:e2e:alfajores": "FLAKEY=true CONTEXT_NAME=alfajores yarn test:e2e" }, "dependencies": { - "@celo/contractkit": "2.2.1-dev", - "@celo/identity": "2.2.1-dev", - "@celo/phone-number-privacy-common": "1.0.39", - "@celo/utils": "2.2.1-dev", + "@celo/contractkit": "^3.2.1-dev", + "@celo/phone-number-privacy-common": "^3.0.0-dev", + "@celo/identity": "^3.2.1-dev", + "@celo/encrypted-backup": "^3.2.1-dev", + "@celo/identity-prev": "npm:@celo/identity@1.2.0", + "@celo/poprf": "^0.1.9", "@types/bunyan": "^1.8.8", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", + "dotenv": "^8.2.0", + "express": "^4.17.1", "firebase-admin": "^9.12.0", "firebase-functions": "^3.15.7", - "knex": "^0.21.1", + "knex": "^2.1.0", "node-fetch": "^2.6.1", "pg": "^8.2.1", "uuid": "^7.0.3" }, "devDependencies": { - "@types/btoa": "^1.2.3", + "@celo/utils": "^3.2.1-dev", + "@celo/phone-utils": "^3.2.1-dev", + "@types/express": "^4.17.6", + "@types/supertest": "^2.0.12", "@types/uuid": "^7.0.3", - "dotenv": "^8.2.0", "firebase-functions-test": "^0.3.3", "firebase-tools": "9.20.0" }, "peerDependencies": { + "@celo/phone-number-privacy-signer": "^2.0.2", "@celo/flake-tracker": "0.0.1-dev" }, "engines": { diff --git a/packages/phone-number-privacy/combiner/scripts/run-migrations.ts b/packages/phone-number-privacy/combiner/scripts/run-migrations.ts deleted file mode 100644 index 90c34969525..00000000000 --- a/packages/phone-number-privacy/combiner/scripts/run-migrations.ts +++ /dev/null @@ -1,25 +0,0 @@ -// tslint:disable: no-console -// TODO de-dupe with signer script -import knex from 'knex' -import config from '../src/config' - -async function start() { - console.info('Running migrations') - await knex({ - client: 'pg', - connection: config.db, - }).migrate.latest({ - directory: './migrations', - extension: 'ts', - }) -} - -start() - .then(() => { - console.info('Migrations complete') - process.exit(0) - }) - .catch((e) => { - console.error('Migration failed', e) - process.exit(1) - }) diff --git a/packages/phone-number-privacy/combiner/src/common/action.ts b/packages/phone-number-privacy/combiner/src/common/action.ts new file mode 100644 index 00000000000..2bf519cb861 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/action.ts @@ -0,0 +1,8 @@ +import { OdisRequest } from '@celo/phone-number-privacy-common' +import { IO } from './io' +import { Session } from './session' + +export interface Action { + readonly io: IO + perform(session: Session): Promise +} diff --git a/packages/phone-number-privacy/combiner/src/common/combine.ts b/packages/phone-number-privacy/combiner/src/common/combine.ts new file mode 100644 index 00000000000..d2fd2d8754f --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/combine.ts @@ -0,0 +1,175 @@ +import { + ErrorMessage, + OdisRequest, + OdisResponse, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Response as FetchResponse } from 'node-fetch' +import { PerformanceObserver } from 'perf_hooks' +import { OdisConfig } from '../config' +import { Action } from './action' +import { IO } from './io' +import { Session } from './session' + +export interface Signer { + url: string + fallbackUrl?: string +} + +export abstract class CombineAction implements Action { + readonly signers: Signer[] + public constructor(readonly config: OdisConfig, readonly io: IO) { + this.signers = JSON.parse(config.odisServices.signers) + } + + abstract combine(session: Session): void + + async perform(session: Session) { + await this.distribute(session) + this.combine(session) + } + + async distribute(session: Session): Promise { + const obs = new PerformanceObserver((list) => { + // Possible race condition here: if multiple signers take exactly the same + // amount of time, the PerformanceObserver callback may be called twice with + // both entries present. Node 12 doesn't allow for entries to be deleted by name, + // and eliminating the race condition requires a more significant redesign of + // the measurement code. + // This is only used for monitoring purposes, so a rare + // duplicate latency measure for the signer should have minimal impact. + list.getEntries().forEach((entry) => { + session.logger.info( + { latency: entry, signer: entry.name }, + 'Signer response latency measured' + ) + }) + }) + obs.observe({ entryTypes: ['measure'], buffered: false }) + + const timeout = setTimeout(() => { + session.timedOut = true + session.abort.abort() + }, this.config.odisServices.timeoutMilliSeconds) + + // Forward request to signers + // An unexpected error in handling the result for one signer should not + // block a threshold of correct responses, but should be logged. + await Promise.all( + this.signers.map(async (signer) => { + try { + await this.forwardToSigner(signer, session) + } catch (err) { + session.logger.error({ + signer: signer.url, + message: 'Unexpected error caught while distributing request to signer', + err, + }) + } + }) + ) + // TODO Resolve race condition where a session can both receive a successful + // response in time and be aborted + + clearTimeout(timeout) + // DO NOT call performance.clearMarks() as this also deletes marks used to + // measure e2e combiner latency. + obs.disconnect() + } + + protected async forwardToSigner(signer: Signer, session: Session): Promise { + let signerFetchResult: FetchResponse | undefined + try { + signerFetchResult = await this.io.fetchSignerResponseWithFallback(signer, session) + session.logger.info({ + message: 'Received signerFetchResult', + signer: signer.url, + status: signerFetchResult.status, + }) + } catch (err) { + session.logger.debug({ err, signer: signer.url, message: 'signer request failure' }) + if (err instanceof Error && err.name === 'AbortError' && session.abort.signal.aborted) { + if (session.timedOut) { + session.logger.error({ signer }, ErrorMessage.TIMEOUT_FROM_SIGNER) + } else { + session.logger.info({ signer }, WarningMessage.CANCELLED_REQUEST_TO_SIGNER) + } + } else { + // Logging the err & message simultaneously fails to log the message in some cases + session.logger.error({ signer }, ErrorMessage.SIGNER_REQUEST_ERROR) + session.logger.error({ signer, err }) + } + } + return this.handleFetchResult(signer, session, signerFetchResult) + } + + protected async handleFetchResult( + signer: Signer, + session: Session, + signerFetchResult?: FetchResponse + ): Promise { + if (signerFetchResult?.ok) { + try { + // Throws if response is not actually successful + await this.receiveSuccess(signerFetchResult, signer.url, session) + return + } catch (err) { + session.logger.error(err) + } + } + if (signerFetchResult) { + session.logger.info({ + message: 'Received signerFetchResult on unsuccessful signer response', + res: await signerFetchResult.text(), + status: signerFetchResult.status, + signer: signer.url, + }) + } + return this.addFailureToSession(signer, signerFetchResult?.status, session) + } + + protected async receiveSuccess( + signerFetchResult: FetchResponse, + url: string, + session: Session + ): Promise> { + if (!signerFetchResult.ok) { + throw new Error(`Implementation Error: receiveSuccess should only receive 'OK' responses`) + } + const { status } = signerFetchResult + const data: string = await signerFetchResult.text() + session.logger.info({ signer: url, res: data, status }, `received 'OK' response from signer`) + const signerResponse: OdisResponse = this.io.validateSignerResponse( + data, + url, + session.logger + ) + if (!signerResponse.success) { + session.logger.error( + { err: signerResponse.error, signer: url, status }, + `Signer request to ${url + this.io.signerEndpoint} failed with 'OK' status` + ) + throw new Error(ErrorMessage.SIGNER_RESPONSE_FAILED_WITH_OK_STATUS) + } + session.logger.info({ signer: url }, `Signer request successful`) + session.responses.push({ url, res: signerResponse, status }) + return signerResponse + } + + private addFailureToSession(signer: Signer, errorCode: number | undefined, session: Session) { + session.logger.warn( + `Received failure from ${session.failedSigners.size}/${this.signers.length} signers` + ) + // Tracking failed request count via signer url prevents + // double counting the same failed request by mistake + session.failedSigners.add(signer.url) + if (errorCode) { + session.incrementErrorCodeCount(errorCode) + } + const { threshold } = session.keyVersionInfo + if (this.signers.length - session.failedSigners.size < threshold) { + session.logger.warn('Not possible to reach a threshold of signer responses. Failing fast') + session.abort.abort() + } + } +} diff --git a/packages/phone-number-privacy/combiner/src/common/controller.ts b/packages/phone-number-privacy/combiner/src/common/controller.ts new file mode 100644 index 00000000000..7726bebad2a --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/controller.ts @@ -0,0 +1,25 @@ +import { ErrorMessage, OdisRequest, OdisResponse } from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import { Action } from './action' + +export class Controller { + constructor(readonly action: Action) {} + + public async handle( + request: Request<{}, {}, unknown>, + response: Response> + ): Promise { + try { + const session = await this.action.io.init(request, response) + if (session) { + await this.action.perform(session) + } + } catch (err) { + response.locals.logger.error( + { error: err }, + `Unknown error in handler for ${this.action.io.endpoint}` + ) + this.action.io.sendFailure(ErrorMessage.UNKNOWN_ERROR, 500, response) + } + } +} diff --git a/packages/phone-number-privacy/combiner/src/bls/bls-cryptography-client.ts b/packages/phone-number-privacy/combiner/src/common/crypto-clients/bls-crypto-client.ts similarity index 65% rename from packages/phone-number-privacy/combiner/src/bls/bls-cryptography-client.ts rename to packages/phone-number-privacy/combiner/src/common/crypto-clients/bls-crypto-client.ts index 0b8935b3ea8..40a2d8798aa 100644 --- a/packages/phone-number-privacy/combiner/src/bls/bls-cryptography-client.ts +++ b/packages/phone-number-privacy/combiner/src/common/crypto-clients/bls-crypto-client.ts @@ -1,65 +1,36 @@ -import { ErrorMessage, rootLogger } from '@celo/phone-number-privacy-common' +import { ErrorMessage } from '@celo/phone-number-privacy-common' import threshold_bls from 'blind-threshold-bls' import Logger from 'bunyan' -import config from '../config' - -export interface ServicePartialSignature { - url: string - signature: string -} +import { CryptoClient, ServicePartialSignature } from './crypto-client' function flattenSigsArray(sigs: Uint8Array[]) { return Uint8Array.from(sigs.reduce((a, b) => a.concat(Array.from(b)), [] as any)) } -export class BLSCryptographyClient { - private unverifiedSignatures: ServicePartialSignature[] = [] +export class BLSCryptographyClient extends CryptoClient { + // Signatures can be verified server-side without knowledge of the blinding factor private verifiedSignatures: ServicePartialSignature[] = [] - private get allSignaturesLength(): number { + + protected get allSignaturesLength(): number { return this.unverifiedSignatures.length + this.verifiedSignatures.length } + private get allSignatures(): Uint8Array { const allSigs = this.verifiedSignatures.concat(this.unverifiedSignatures) const sigBuffers = allSigs.map((response) => Buffer.from(response.signature, 'base64')) return flattenSigsArray(sigBuffers) } - public addSignature(serviceResponse: ServicePartialSignature) { - this.unverifiedSignatures.push(serviceResponse) - } - - /** - * Returns true if the number of valid signatures is enough to perform a combination - */ - public hasSufficientSignatures(): boolean { - const threshold = config.thresholdSignature.threshold - return this.allSignaturesLength >= threshold - } - /* * Computes the BLS signature for the blinded phone number. - * Throws an exception if not enough valid signatures - * and drops the invalid signature for future requests using this instance + * On error, logs and throws exception for not enough signatures, + * and drops the invalid signature for future requests using this instance. */ - public async combinePartialBlindedSignatures( - blindedMessage: string, - logger?: Logger - ): Promise { - logger = logger ?? rootLogger() - const threshold = config.thresholdSignature.threshold - if (!this.hasSufficientSignatures()) { - logger.error( - { signatures: this.allSignaturesLength, required: threshold }, - ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES - ) - throw new Error( - `${ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES} ${this.allSignaturesLength}/${threshold}` - ) - } + protected _combineBlindedSignatureShares(blindedMessage: string, logger: Logger): string { // Optimistically attempt to combine unverified signatures // If combination or verification fails, iterate through each signature and remove invalid ones // We do this since partial signature verification incurs higher latencies try { - const result = threshold_bls.combine(threshold, this.allSignatures) + const result = threshold_bls.combine(this.keyVersionInfo.threshold, this.allSignatures) this.verifyCombinedSignature(blindedMessage, result, logger) return Buffer.from(result).toString('base64') } catch (error) { @@ -67,7 +38,7 @@ export class BLSCryptographyClient { // Verify each signature and remove invalid ones // This logging will help us troubleshoot which signers are having issues this.unverifiedSignatures.forEach((unverifiedSignature) => { - this.verifyPartialSignature(blindedMessage, unverifiedSignature, logger!) + this.verifyPartialSignature(blindedMessage, unverifiedSignature, logger) }) this.clearUnverifiedSignatures() throw new Error(ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES) @@ -84,7 +55,7 @@ export class BLSCryptographyClient { // Documentation should not specify that verifyBlindSignature verifies the // signature after it has been unblinded. threshold_bls.verifyBlindSignature( - Buffer.from(config.thresholdSignature.pubKey, 'base64'), + Buffer.from(this.keyVersionInfo.pubKey, 'base64'), Buffer.from(blindedMessage, 'base64'), combinedSignature ) @@ -113,10 +84,9 @@ export class BLSCryptographyClient { } private isValidPartialSignature(signature: Buffer, blindedMessage: string) { - const polynomial = config.thresholdSignature.polynomial try { threshold_bls.partialVerifyBlindSignature( - Buffer.from(polynomial, 'hex'), + Buffer.from(this.keyVersionInfo.polynomial, 'hex'), Buffer.from(blindedMessage, 'base64'), signature ) diff --git a/packages/phone-number-privacy/combiner/src/common/crypto-clients/crypto-client.ts b/packages/phone-number-privacy/combiner/src/common/crypto-clients/crypto-client.ts new file mode 100644 index 00000000000..2fd8580420a --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/crypto-clients/crypto-client.ts @@ -0,0 +1,54 @@ +import { ErrorMessage, KeyVersionInfo } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' + +export interface ServicePartialSignature { + url: string + signature: string +} + +export abstract class CryptoClient { + protected unverifiedSignatures: ServicePartialSignature[] = [] + + constructor(protected readonly keyVersionInfo: KeyVersionInfo) {} + + /** + * Returns true if the number of valid signatures is enough to perform a combination + */ + public hasSufficientSignatures(): boolean { + return this.allSignaturesLength >= this.keyVersionInfo.threshold + } + + public addSignature(serviceResponse: ServicePartialSignature): void { + this.unverifiedSignatures.push(serviceResponse) + } + + /* + * Computes the signature for the blinded phone number using subclass-specific + * logic defined in _combineBlindedSignatureShares. + * Throws an exception if not enough valid signatures or on aggregation failure. + */ + public combineBlindedSignatureShares(blindedMessage: string, logger: Logger): string { + if (!this.hasSufficientSignatures()) { + const { threshold } = this.keyVersionInfo + logger.error( + { signatures: this.allSignaturesLength, required: threshold }, + ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES + ) + throw new Error( + `${ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES} ${this.allSignaturesLength}/${threshold}` + ) + } + return this._combineBlindedSignatureShares(blindedMessage, logger) + } + + /* + * Computes the signature for the blinded phone number. + * Must be implemented by subclass. + */ + protected abstract _combineBlindedSignatureShares(blindedMessage: string, logger: Logger): string + + /** + * Returns total number of signatures received; must be implemented by subclass. + */ + protected abstract get allSignaturesLength(): number +} diff --git a/packages/phone-number-privacy/combiner/src/common/crypto-clients/domain-crypto-client.ts b/packages/phone-number-privacy/combiner/src/common/crypto-clients/domain-crypto-client.ts new file mode 100644 index 00000000000..22a1256d35e --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/crypto-clients/domain-crypto-client.ts @@ -0,0 +1,40 @@ +import { ErrorMessage, KeyVersionInfo, PoprfCombiner } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { CryptoClient } from './crypto-client' + +export class DomainCryptoClient extends CryptoClient { + private poprfCombiner: PoprfCombiner + + constructor(protected readonly keyVersionInfo: KeyVersionInfo) { + super(keyVersionInfo) + this.poprfCombiner = new PoprfCombiner(keyVersionInfo.threshold) + } + + protected get allSignaturesLength(): number { + // No way of verifying signatures on the server-side + return this.unverifiedSignatures.length + } + + private get allSigsAsArray(): Uint8Array[] { + return this.unverifiedSignatures.map((response) => Buffer.from(response.signature, 'base64')) + } + + /* + * Aggregates blind partial signatures into a blind aggregated POPRF evaluation. + * On error, logs and throws exception for not enough signatures. + * Verification of partial signatures is not possible server-side + * (i.e. without the client's blinding factor). + */ + protected _combineBlindedSignatureShares(_blindedMessage: string, logger: Logger): string { + try { + const result = this.poprfCombiner.blindAggregate(this.allSigsAsArray) + if (result !== undefined) { + return result.toString('base64') + } + } catch (error) { + logger.error(ErrorMessage.SIGNATURE_AGGREGATION_FAILURE) + logger.error(error) + } + throw new Error(ErrorMessage.SIGNATURE_AGGREGATION_FAILURE) + } +} diff --git a/packages/phone-number-privacy/combiner/src/common/crypto-session.ts b/packages/phone-number-privacy/combiner/src/common/crypto-session.ts new file mode 100644 index 00000000000..f1a0d7d6f98 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/crypto-session.ts @@ -0,0 +1,16 @@ +import { KeyVersionInfo, OdisResponse } from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import { CryptoClient } from './crypto-clients/crypto-client' +import { Session } from './session' +import { OdisSignatureRequest } from './sign' + +export class CryptoSession extends Session { + public constructor( + readonly request: Request<{}, {}, R>, + readonly response: Response>, + readonly keyVersionInfo: KeyVersionInfo, + readonly crypto: CryptoClient + ) { + super(request, response, keyVersionInfo) + } +} diff --git a/packages/phone-number-privacy/combiner/src/common/error-utils.ts b/packages/phone-number-privacy/combiner/src/common/error-utils.ts deleted file mode 100644 index db97024a3e8..00000000000 --- a/packages/phone-number-privacy/combiner/src/common/error-utils.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ErrorMessage, WarningMessage } from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { Response } from 'firebase-functions' -import { VERSION } from '../config' - -export type ErrorType = ErrorMessage | WarningMessage - -export function respondWithError( - res: Response, - statusCode: number, - error: ErrorType, - logger: Logger -) { - if (error in WarningMessage) { - logger.warn({ error, statusCode }, 'Responding with warning') - } else { - logger.error({ error, statusCode }, 'Responding with error') - } - res.status(statusCode).json({ success: false, error, version: VERSION }) -} diff --git a/packages/phone-number-privacy/combiner/src/common/io.ts b/packages/phone-number-privacy/combiner/src/common/io.ts new file mode 100644 index 00000000000..db175e48a84 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/io.ts @@ -0,0 +1,167 @@ +import { + CombinerEndpoint, + ErrorMessage, + ErrorType, + FailureResponse, + getRequestKeyVersion, + KEY_VERSION_HEADER, + KeyVersionInfo, + OdisRequest, + OdisResponse, + requestHasValidKeyVersion, + SignerEndpoint, + SuccessResponse, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import * as t from 'io-ts' +import fetch, { Response as FetchResponse } from 'node-fetch' +import { performance } from 'perf_hooks' +import { OdisConfig } from '../config' +import { Signer } from './combine' +import { Session } from './session' + +// tslint:disable-next-line: interface-over-type-literal +export type SignerResponse = { + url: string + res: OdisResponse + status: number +} + +export abstract class IO { + abstract readonly endpoint: CombinerEndpoint + abstract readonly signerEndpoint: SignerEndpoint + abstract readonly requestSchema: t.Type + abstract readonly responseSchema: t.Type, OdisResponse, unknown> + + constructor(readonly config: OdisConfig) {} + + abstract init( + request: Request<{}, {}, unknown>, + response: Response> + ): Promise | null> + + abstract authenticate(request: Request<{}, {}, R>, logger?: Logger): Promise + + abstract sendFailure( + error: ErrorType, + status: number, + response: Response>, + ...args: unknown[] + ): void + + abstract sendSuccess( + status: number, + response: Response>, + ...args: unknown[] + ): void + + validateClientRequest(request: Request<{}, {}, unknown>): request is Request<{}, {}, R> { + return this.requestSchema.is(request.body) + } + + getKeyVersionInfo(request: Request<{}, {}, OdisRequest>, logger: Logger): KeyVersionInfo { + // If an invalid key version is present, we don't want this function to throw but + // to instead replace the key version with the default + // If a valid but unsupported key version is present, we want this function to throw + let requestKeyVersion: number | undefined + if (requestHasValidKeyVersion(request, logger)) { + requestKeyVersion = getRequestKeyVersion(request, logger) + } + const keyVersion = requestKeyVersion ?? this.config.keys.currentVersion + const supportedVersions: KeyVersionInfo[] = JSON.parse(this.config.keys.versions) // TODO add io-ts checks for this and signer array + const filteredSupportedVersions: KeyVersionInfo[] = supportedVersions.filter( + (v) => v.keyVersion === keyVersion + ) + if (!filteredSupportedVersions.length) { + throw new Error(`key version ${keyVersion} not supported`) + } + return filteredSupportedVersions[0] + } + + requestHasSupportedKeyVersion(request: Request<{}, {}, OdisRequest>, logger: Logger): boolean { + try { + this.getKeyVersionInfo(request, logger) + return true + } catch (err) { + logger.debug('Error caught in requestHasSupportedKeyVersion') + logger.debug(err) + return false + } + } + + validateSignerResponse(data: string, url: string, logger: Logger): OdisResponse { + const res: unknown = JSON.parse(data) + if (!this.responseSchema.is(res)) { + logger.error( + { data, signer: url }, + `Signer request to ${url + this.signerEndpoint} returned malformed response` + ) + throw new Error(ErrorMessage.INVALID_SIGNER_RESPONSE) + } + return res + } + + async fetchSignerResponseWithFallback( + signer: Signer, + session: Session + ): Promise { + const start = `Start ${signer.url + this.signerEndpoint}` + const end = `End ${signer.url + this.signerEndpoint}` + performance.mark(start) + + return this.fetchSignerResponse(signer.url, session) + .catch((err) => { + session.logger.error({ url: signer.url, error: err }, `Signer failed with primary url`) + if (signer.fallbackUrl) { + session.logger.warn({ url: signer.fallbackUrl }, `Using fallback url to call signer`) + return this.fetchSignerResponse(signer.fallbackUrl, session) + } + throw err + }) + .finally(() => { + performance.mark(end) + performance.measure(signer.url, start, end) + }) + } + + protected async fetchSignerResponse( + signerUrl: string, + session: Session + ): Promise { + const { request, logger, abort } = session + const url = signerUrl + this.signerEndpoint + logger.debug({ url }, `Sending signer request`) + // prettier-ignore + return fetch(url, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + // Pnp requests provide authorization in the request header + ...(request.headers.authorization ? { Authorization: request.headers.authorization } : {}), + // Forward requested keyVersion if provided by client, otherwise use default keyVersion. + // This will be ignored for non-signing requests. + [KEY_VERSION_HEADER]: session.keyVersionInfo.keyVersion.toString() + }, + body: JSON.stringify(request.body), + signal: abort.signal, + }) + } + + protected inputChecks( + request: Request<{}, {}, unknown>, + response: Response> + ): request is Request<{}, {}, R> { + if (!this.config.enabled) { + this.sendFailure(WarningMessage.API_UNAVAILABLE, 503, response) + return false + } + if (!this.validateClientRequest(request)) { + this.sendFailure(WarningMessage.INVALID_INPUT, 400, response) + return false + } + return true + } +} diff --git a/packages/phone-number-privacy/combiner/src/common/session.ts b/packages/phone-number-privacy/combiner/src/common/session.ts new file mode 100644 index 00000000000..bfa3ae24b29 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/session.ts @@ -0,0 +1,54 @@ +import { + ErrorMessage, + KeyVersionInfo, + OdisRequest, + OdisResponse, +} from '@celo/phone-number-privacy-common' +import AbortController from 'abort-controller' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import { SignerResponse } from './io' + +export class Session { + public timedOut: boolean = false + readonly logger: Logger + readonly abort: AbortController = new AbortController() + readonly failedSigners: Set = new Set() + readonly errorCodes: Map = new Map() + readonly responses: Array> = new Array>() + readonly warnings: string[] = [] + + public constructor( + readonly request: Request<{}, {}, R>, + readonly response: Response>, + readonly keyVersionInfo: KeyVersionInfo + ) { + this.logger = response.locals.logger + } + + incrementErrorCodeCount(errorCode: number) { + this.errorCodes.set(errorCode, (this.errorCodes.get(errorCode) ?? 0) + 1) + } + + getMajorityErrorCode(): number | null { + const uniqueErrorCount = Array.from(this.errorCodes.keys()).length + if (uniqueErrorCount > 1) { + this.logger.error( + { errorCodes: JSON.stringify([...this.errorCodes]) }, + ErrorMessage.INCONSISTENT_SIGNER_RESPONSES + ) + } + + let maxErrorCode = -1 + let maxCount = -1 + this.errorCodes.forEach((count, errorCode) => { + // This gives priority to the lower status codes in the event of a tie + // because 400s are more helpful than 500s for user feedback + if (count > maxCount || (count === maxCount && errorCode < maxErrorCode)) { + maxCount = count + maxErrorCode = errorCode + } + }) + return maxErrorCode > 0 ? maxErrorCode : null + } +} diff --git a/packages/phone-number-privacy/combiner/src/common/sign.ts b/packages/phone-number-privacy/combiner/src/common/sign.ts new file mode 100644 index 00000000000..49b766bb57a --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/common/sign.ts @@ -0,0 +1,95 @@ +import { + DomainRestrictedSignatureRequest, + ErrorMessage, + ErrorType, + LegacySignMessageRequest, + OdisResponse, + responseHasExpectedKeyVersion, + SignMessageRequest, +} from '@celo/phone-number-privacy-common' +import { Response as FetchResponse } from 'node-fetch' +import { OdisConfig } from '../config' +import { DomainThresholdStateService } from '../domain/services/threshold-state' +import { PnpThresholdStateService } from '../pnp/services/threshold-state' +import { CombineAction } from './combine' +import { CryptoSession } from './crypto-session' +import { IO } from './io' + +// prettier-ignore +export type OdisSignatureRequest = + | SignMessageRequest + | LegacySignMessageRequest + | DomainRestrictedSignatureRequest +export type ThresholdStateService = R extends SignMessageRequest + ? PnpThresholdStateService + : never | R extends DomainRestrictedSignatureRequest + ? DomainThresholdStateService + : never + +// tslint:disable-next-line: max-classes-per-file +export abstract class SignAction extends CombineAction { + constructor( + readonly config: OdisConfig, + readonly thresholdStateService: ThresholdStateService, + readonly io: IO + ) { + super(config, io) + } + + // Throws if response is not actually successful + protected async receiveSuccess( + signerResponse: FetchResponse, + url: string, + session: CryptoSession + ): Promise> { + const { keyVersion } = session.keyVersionInfo + + // TODO(2.0.0, deployment) consider this while doing deployment. Signers should be updated before the combiner is + if (!responseHasExpectedKeyVersion(signerResponse, keyVersion, session.logger)) { + throw new Error(ErrorMessage.INVALID_KEY_VERSION_RESPONSE) + } + + const res = await super.receiveSuccess(signerResponse, url, session) + + if (res.success) { + const signatureAdditionStart = Date.now() + session.crypto.addSignature({ url, signature: res.signature }) + session.logger.info( + { + signer: url, + hasSufficientSignatures: session.crypto.hasSufficientSignatures(), + additionLatency: Date.now() - signatureAdditionStart, + }, + 'Added signature' + ) + // Send response immediately once we cross threshold + // BLS threshold signatures can be combined without all partial signatures + if (session.crypto.hasSufficientSignatures()) { + try { + session.crypto.combineBlindedSignatureShares( + this.parseBlindedMessage(session.request.body), + session.logger + ) + // Close outstanding requests + session.abort.abort() + } catch (err) { + // One or more signatures failed verification and were discarded. + session.logger.info('Error caught in receiveSuccess') + session.logger.info(err) + // Continue to collect signatures. + } + } + } + return res + } + + protected handleMissingSignatures(session: CryptoSession) { + const errorCode = session.getMajorityErrorCode() ?? 500 + const error = this.errorCodeToError(errorCode) + this.io.sendFailure(error, errorCode, session.response) + } + + protected abstract errorCodeToError(errorCode: number): ErrorType + + protected abstract parseBlindedMessage(req: OdisSignatureRequest): string +} diff --git a/packages/phone-number-privacy/combiner/src/config.ts b/packages/phone-number-privacy/combiner/src/config.ts index 46224db790d..da962d4ca15 100644 --- a/packages/phone-number-privacy/combiner/src/config.ts +++ b/packages/phone-number-privacy/combiner/src/config.ts @@ -1,97 +1,170 @@ -import { OdisUtils } from '@celo/identity' -import { rootLogger as logger, toBool } from '@celo/phone-number-privacy-common' +import { BlockchainConfig, rootLogger, TestUtils, toBool } from '@celo/phone-number-privacy-common' import * as functions from 'firebase-functions' -export const VERSION = process.env.npm_package_version +export function getCombinerVersion(): string { + return process.env.npm_package_version ?? require('../package.json').version ?? '0.0.0' +} export const DEV_MODE = process.env.NODE_ENV !== 'production' || process.env.FUNCTIONS_EMULATOR === 'true' -export const DEV_PUBLIC_KEY = - '1f33136ac029a702eb041096bd9ef09dc9c368dde52a972866bdeaff0896f8596b74ab7adfd7318bba38527599768400df44bcab66bcf3843c17a2ce838bcd5a8ba1634c18314ff0565a7c769905b8a8fba27a86bf4c6cb22df89e1badfe2b81' -export const DEV_PRIVATE_KEY = - '00000000dd0005bf4de5f2f052174f5cf58dae1af1d556c7f7f85d6fb3656e1d0f10720f' -export const DEV_POLYNOMIAL = - '01000000000000001f33136ac029a702eb041096bd9ef09dc9c368dde52a972866bdeaff0896f8596b74ab7adfd7318bba38527599768400df44bcab66bcf3843c17a2ce838bcd5a8ba1634c18314ff0565a7c769905b8a8fba27a86bf4c6cb22df89e1badfe2b81' - export const FORNO_ALFAJORES = 'https://alfajores-forno.celo-testnet.org' // combiner always thinks these accounts/phoneNumbersa are verified to enable e2e testing export const E2E_TEST_PHONE_NUMBERS_RAW: string[] = ['+14155550123', '+15555555555', '+14444444444'] -export const E2E_TEST_PHONE_NUMBERS: string[] = E2E_TEST_PHONE_NUMBERS_RAW.map((num) => - OdisUtils.Matchmaking.obfuscateNumberForMatchmaking(num) -) + export const E2E_TEST_ACCOUNTS: string[] = ['0x1be31a94361a391bbafb2a4ccd704f57dc04d4bb'] -interface Config { - blockchain: { - provider: string - apiKey?: string - } - db: { - user: string - password: string - database: string - host: string - ssl: boolean - } +export const MAX_BLOCK_DISCREPANCY_THRESHOLD = 3 +export const MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD = 5 +export const MAX_QUERY_COUNT_DISCREPANCY_THRESHOLD = 5 + +export interface OdisConfig { + serviceName: string + enabled: boolean + shouldFailOpen: boolean // TODO (https://github.com/celo-org/celo-monorepo/issues/9862) consider refactoring config, this isn't relevant to domains endpoints odisServices: { signers: string timeoutMilliSeconds: number } - thresholdSignature: { - threshold: number - polynomial: string - pubKey: string + keys: { + currentVersion: number + versions: string // parse as KeyVersionInfo[] } } -let config: Config +export interface CombinerConfig { + serviceName: string + blockchain: BlockchainConfig + phoneNumberPrivacy: OdisConfig + domains: OdisConfig +} + +let config: CombinerConfig + +const defaultServiceName = 'odis-combiner' if (DEV_MODE) { - logger().debug('Running in dev mode') + rootLogger(defaultServiceName).debug('Running in dev mode') + const devSignersString = JSON.stringify([ + { + url: 'http://localhost:3001', + fallbackUrl: 'http://localhost:3001/fallback', + }, + { + url: 'http://localhost:3002', + fallbackUrl: 'http://localhost:3002/fallback', + }, + { + url: 'http://localhost:3003', + fallbackUrl: 'http://localhost:3003/fallback', + }, + ]) config = { + serviceName: defaultServiceName, blockchain: { provider: FORNO_ALFAJORES, }, - db: { - user: 'postgres', - password: 'fakePass', - database: 'phoneNumberPrivacy', - host: 'fakeHost', - ssl: false, - }, - odisServices: { - signers: - '[{"url": "http://localhost:3000", "fallbackUrl": "http://localhost:3000/fallback"}]', - timeoutMilliSeconds: 5 * 1000, + phoneNumberPrivacy: { + serviceName: defaultServiceName, + enabled: true, + shouldFailOpen: false, + odisServices: { + signers: devSignersString, + timeoutMilliSeconds: 5 * 1000, + }, + keys: { + currentVersion: 1, + versions: JSON.stringify([ + { + keyVersion: 1, + threshold: 2, + polynomial: TestUtils.Values.PNP_THRESHOLD_DEV_POLYNOMIAL_V1, + pubKey: TestUtils.Values.PNP_THRESHOLD_DEV_PUBKEY_V1, + }, + { + keyVersion: 2, + threshold: 2, + polynomial: TestUtils.Values.PNP_THRESHOLD_DEV_POLYNOMIAL_V2, + pubKey: TestUtils.Values.PNP_THRESHOLD_DEV_PUBKEY_V2, + }, + { + keyVersion: 3, + threshold: 2, + polynomial: TestUtils.Values.PNP_THRESHOLD_DEV_POLYNOMIAL_V3, + pubKey: TestUtils.Values.PNP_THRESHOLD_DEV_PUBKEY_V3, + }, + ]), + }, }, - thresholdSignature: { - threshold: 1, - polynomial: DEV_POLYNOMIAL, - pubKey: DEV_PUBLIC_KEY, + domains: { + serviceName: defaultServiceName, + enabled: true, + shouldFailOpen: false, + odisServices: { + signers: devSignersString, + timeoutMilliSeconds: 5 * 1000, + }, + keys: { + currentVersion: 1, + versions: JSON.stringify([ + { + keyVersion: 1, + threshold: 2, + polynomial: TestUtils.Values.DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V1, + pubKey: TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEY_V1, + }, + { + keyVersion: 2, + threshold: 2, + polynomial: TestUtils.Values.DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V2, + pubKey: TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEY_V2, + }, + { + keyVersion: 3, + threshold: 2, + polynomial: TestUtils.Values.DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V3, + pubKey: TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEY_V3, + }, + ]), + }, }, } } else { const functionConfig = functions.config() config = { + serviceName: functionConfig.service.name ?? defaultServiceName, blockchain: { provider: functionConfig.blockchain.provider, apiKey: functionConfig.blockchain.api_key, }, - db: { - user: functionConfig.db.username, - password: functionConfig.db.pass, - database: functionConfig.db.name, - host: `/cloudsql/${functionConfig.db.host}`, - ssl: toBool(functionConfig.db.ssl, true), - }, - odisServices: { - signers: functionConfig.odisservices.signers, - timeoutMilliSeconds: functionConfig.odisservices.timeoutMilliSeconds || 5 * 1000, + phoneNumberPrivacy: { + serviceName: functionConfig.pnp.service_name ?? defaultServiceName, + enabled: toBool(functionConfig.pnp.enabled, false), + shouldFailOpen: toBool(functionConfig.pnp.should_fail_open, false), + odisServices: { + signers: functionConfig.pnp.odisservices, + timeoutMilliSeconds: functionConfig.pnp.timeout_ms + ? Number(functionConfig.pnp.timeout_ms) + : 5 * 1000, + }, + keys: { + currentVersion: Number(functionConfig.pnp_keys.current_version), + versions: functionConfig.pnp_keys.versions, + }, }, - thresholdSignature: { - threshold: functionConfig.threshold_signature.threshold_signature_threshold, - polynomial: functionConfig.threshold_signature.threshold_polynomial, - pubKey: functionConfig.threshold_signature.public_key, + domains: { + serviceName: functionConfig.domains.service_name ?? defaultServiceName, + enabled: toBool(functionConfig.domains.enabled, false), + shouldFailOpen: toBool(functionConfig.domains.auth_should_fail_open, false), + odisServices: { + signers: functionConfig.domains.odisservices, + timeoutMilliSeconds: functionConfig.domains.timeout_ms + ? Number(functionConfig.domains.timeout_ms) + : 5 * 1000, + }, + keys: { + currentVersion: Number(functionConfig.domains_keys.current_version), + versions: functionConfig.domains_keys.versions, + }, }, } } diff --git a/packages/phone-number-privacy/combiner/src/database/database.ts b/packages/phone-number-privacy/combiner/src/database/database.ts deleted file mode 100644 index 09189512344..00000000000 --- a/packages/phone-number-privacy/combiner/src/database/database.ts +++ /dev/null @@ -1,16 +0,0 @@ -import knex from 'knex' -import config, { DEV_MODE } from '../config' - -const db = knex({ - client: 'pg', - connection: config.db, - debug: DEV_MODE, -}) - -export function getDatabase() { - return db -} - -export function getTransaction() { - return db.transaction() -} diff --git a/packages/phone-number-privacy/combiner/src/database/models/account.ts b/packages/phone-number-privacy/combiner/src/database/models/account.ts deleted file mode 100644 index 88f6968c6b3..00000000000 --- a/packages/phone-number-privacy/combiner/src/database/models/account.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { VerifiedPhoneNumberDekSignature } from '../../match-making/get-contact-matches' - -export const ACCOUNTS_TABLE = 'accounts' -export enum ACCOUNTS_COLUMNS { - address = 'address', - signedUserPhoneNumber = 'signedUserPhoneNumber', - dekSigner = 'dekSigner', - createdAt = 'created_at', - numLookups = 'num_lookups', - didMatchmaking = 'did_matchmaking', -} -export class Account { - [ACCOUNTS_COLUMNS.address]: string | undefined; - [ACCOUNTS_COLUMNS.signedUserPhoneNumber]: string | undefined; - [ACCOUNTS_COLUMNS.dekSigner]: string | undefined; - [ACCOUNTS_COLUMNS.createdAt]: Date = new Date(); - [ACCOUNTS_COLUMNS.didMatchmaking]: Date | null = null - - constructor(address: string, verifiedPhoneNumberDekSig?: VerifiedPhoneNumberDekSignature) { - this.address = address - if (verifiedPhoneNumberDekSig) { - this.signedUserPhoneNumber = verifiedPhoneNumberDekSig.signedUserPhoneNumber - this.dekSigner = verifiedPhoneNumberDekSig.dekSigner - } - } -} diff --git a/packages/phone-number-privacy/combiner/src/database/models/numberPair.ts b/packages/phone-number-privacy/combiner/src/database/models/numberPair.ts deleted file mode 100644 index fdd0154d4ea..00000000000 --- a/packages/phone-number-privacy/combiner/src/database/models/numberPair.ts +++ /dev/null @@ -1,21 +0,0 @@ -export const NUMBER_PAIRS_TABLE = 'number_pairs' -export enum NUMBER_PAIRS_COLUMN { - userPhoneHash = 'user_phone_hash', - contactPhoneHash = 'contact_phone_hash', -} - -// This is to deal with a Typescript bug. -// https://github.com/microsoft/TypeScript/issues/49594 -// Should revert to using the enum directly when this is fixed. -const userPhoneHashField = NUMBER_PAIRS_COLUMN.userPhoneHash -const contactPhoneHashField = NUMBER_PAIRS_COLUMN.contactPhoneHash - -export class NumberPair { - [userPhoneHashField]: string; - [contactPhoneHashField]: string - - constructor(userPhoneHash: string, contactPhoneHash: string) { - this[userPhoneHashField] = userPhoneHash - this[contactPhoneHashField] = contactPhoneHash - } -} diff --git a/packages/phone-number-privacy/combiner/src/database/wrappers/account.ts b/packages/phone-number-privacy/combiner/src/database/wrappers/account.ts deleted file mode 100644 index b27adc2a311..00000000000 --- a/packages/phone-number-privacy/combiner/src/database/wrappers/account.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { VerifiedPhoneNumberDekSignature } from '../../match-making/get-contact-matches' -import { getDatabase, getTransaction } from '../database' -import { Account, ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../models/account' - -function accounts() { - return getDatabase()(ACCOUNTS_TABLE) -} - -export async function getAccountSignedUserPhoneNumberRecord( - account: string, - logger: Logger -): Promise { - try { - const signedUserPhoneNumberRecord = await accounts() - .where(ACCOUNTS_COLUMNS.address, account) - .select(ACCOUNTS_COLUMNS.signedUserPhoneNumber) - .first() - .timeout(DB_TIMEOUT) - return signedUserPhoneNumberRecord - ? signedUserPhoneNumberRecord[ACCOUNTS_COLUMNS.signedUserPhoneNumber] - : undefined - } catch (err) { - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - throw err - } -} - -export async function getDekSignerRecord( - account: string, - logger: Logger -): Promise { - try { - const dekSignerRecord = await accounts() - .where(ACCOUNTS_COLUMNS.address, account) - .select(ACCOUNTS_COLUMNS.dekSigner) - .first() - .timeout(DB_TIMEOUT) - return dekSignerRecord ? dekSignerRecord[ACCOUNTS_COLUMNS.dekSigner] : undefined - } catch (err) { - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - return undefined - } -} - -/* - * Returns whether account has already performed matchmaking - */ -export async function getDidMatchmaking(account: string, logger: Logger): Promise { - try { - const didMatchmaking = await accounts() - .where(ACCOUNTS_COLUMNS.address, account) - .select(ACCOUNTS_COLUMNS.didMatchmaking) - .first() - .timeout(DB_TIMEOUT) - return !!didMatchmaking && !!didMatchmaking[ACCOUNTS_COLUMNS.didMatchmaking] - } catch (err) { - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - throw err - } -} - -/* - * Set did matchmaking to true in database. If record doesn't exist, create one. - */ -export async function setDidMatchmaking( - account: string, - logger: Logger, - verifiedPhoneNumberDekSig?: VerifiedPhoneNumberDekSignature -) { - logger.debug({ account }, 'Setting did matchmaking') - const trx = await getTransaction() - const accountTrxBase = () => - accounts().transacting(trx).timeout(DB_TIMEOUT).where(ACCOUNTS_COLUMNS.address, account) - return accountTrxBase() - .then(async (res) => { - if (res.length) { - // If account exists in db - await accountTrxBase() - .update(ACCOUNTS_COLUMNS.didMatchmaking, new Date()) - .then(async () => { - if (verifiedPhoneNumberDekSig) { - await accountTrxBase() - .having(ACCOUNTS_COLUMNS.signedUserPhoneNumber, 'is', null) // prevents overwriting - .update( - ACCOUNTS_COLUMNS.signedUserPhoneNumber, - verifiedPhoneNumberDekSig.signedUserPhoneNumber - ) - await accountTrxBase() - .having(ACCOUNTS_COLUMNS.dekSigner, 'is', null) - .update(ACCOUNTS_COLUMNS.dekSigner, verifiedPhoneNumberDekSig.dekSigner) - } - }) - } else { - const newAccount = new Account(account, verifiedPhoneNumberDekSig) - newAccount[ACCOUNTS_COLUMNS.didMatchmaking] = new Date() - await accounts().transacting(trx).timeout(DB_TIMEOUT).insert(newAccount) - } - trx.commit() - }) - .catch((err) => { - logger.error(ErrorMessage.DATABASE_UPDATE_FAILURE) - logger.error(err) - trx.rollback() - }) -} diff --git a/packages/phone-number-privacy/combiner/src/database/wrappers/number-pairs.ts b/packages/phone-number-privacy/combiner/src/database/wrappers/number-pairs.ts deleted file mode 100644 index 49f3c01730d..00000000000 --- a/packages/phone-number-privacy/combiner/src/database/wrappers/number-pairs.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { getDatabase } from '../database' -import { NUMBER_PAIRS_COLUMN, NUMBER_PAIRS_TABLE, NumberPair } from '../models/numberPair' - -function numberPairs() { - return getDatabase()(NUMBER_PAIRS_TABLE) -} - -/* - * Returns contacts who have already matched with the user (a contact-->user mapping exists). - */ -export async function getNumberPairContacts( - userPhone: string, - contactPhones: string[], - logger: Logger -): Promise { - try { - const contentPairs = await numberPairs() - .select(NUMBER_PAIRS_COLUMN.userPhoneHash) - .where(NUMBER_PAIRS_COLUMN.contactPhoneHash, userPhone) - .timeout(DB_TIMEOUT) - const contactPhonesSet = new Set(contactPhones) - return contentPairs - .map((contactPair) => contactPair[NUMBER_PAIRS_COLUMN.userPhoneHash]) - .filter((number) => contactPhonesSet.has(number)) - } catch (err) { - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - return [] - } -} - -/* - * Add record for user-->contact mapping, - */ -export async function setNumberPairContacts( - userPhone: string, - contactPhones: string[], - logger: Logger -): Promise { - const rows: any = [] - for (const contactPhone of contactPhones) { - const data = new NumberPair(userPhone, contactPhone) - rows.push(data) - } - try { - await getDatabase().batchInsert(NUMBER_PAIRS_TABLE, rows) - } catch (err: any) { - // ignore duplicate insertion error (23505) - if (err.code !== '23505') { - logger.error(ErrorMessage.DATABASE_INSERT_FAILURE) - logger.error(err) - } - } -} diff --git a/packages/phone-number-privacy/combiner/src/domain/endpoints/disable/action.ts b/packages/phone-number-privacy/combiner/src/domain/endpoints/disable/action.ts new file mode 100644 index 00000000000..21ab840ee9f --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/endpoints/disable/action.ts @@ -0,0 +1,39 @@ +import { DisableDomainRequest, ErrorMessage } from '@celo/phone-number-privacy-common' +import { CombineAction } from '../../../common/combine' +import { IO } from '../../../common/io' +import { Session } from '../../../common/session' +import { OdisConfig } from '../../../config' +import { DomainSignerResponseLogger } from '../../services/log-responses' +import { DomainThresholdStateService } from '../../services/threshold-state' + +export class DomainDisableAction extends CombineAction { + readonly responseLogger: DomainSignerResponseLogger = new DomainSignerResponseLogger() + + constructor( + readonly config: OdisConfig, + readonly thresholdStateService: DomainThresholdStateService, + readonly io: IO + ) { + super(config, io) + } + + combine(session: Session): void { + this.responseLogger.logResponseDiscrepancies(session) + try { + const disableDomainStatus = this.thresholdStateService.findThresholdDomainState(session) + if (disableDomainStatus.disabled) { + this.io.sendSuccess(200, session.response, disableDomainStatus) + return + } + } catch (err) { + session.logger.error({ err }, 'Error combining signer disable domain status responses') + } + + this.io.sendFailure( + ErrorMessage.THRESHOLD_DISABLE_DOMAIN_FAILURE, + session.getMajorityErrorCode() ?? 500, + session.response, + session.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/domain/endpoints/disable/io.ts b/packages/phone-number-privacy/combiner/src/domain/endpoints/disable/io.ts new file mode 100644 index 00000000000..21b8e81f501 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/endpoints/disable/io.ts @@ -0,0 +1,80 @@ +import { + CombinerEndpoint, + DisableDomainRequest, + disableDomainRequestSchema, + DisableDomainResponse, + DisableDomainResponseFailure, + disableDomainResponseSchema, + DisableDomainResponseSuccess, + DomainSchema, + DomainState, + ErrorType, + getSignerEndpoint, + send, + SequentialDelayDomainStateSchema, + SignerEndpoint, + verifyDisableDomainRequestAuthenticity, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import * as t from 'io-ts' +import { IO } from '../../../common/io' +import { Session } from '../../../common/session' +import { getCombinerVersion } from '../../../config' + +export class DomainDisableIO extends IO { + readonly endpoint: CombinerEndpoint = CombinerEndpoint.DISABLE_DOMAIN + readonly signerEndpoint: SignerEndpoint = getSignerEndpoint(this.endpoint) + readonly requestSchema: t.Type = + disableDomainRequestSchema(DomainSchema) + readonly responseSchema: t.Type = + disableDomainResponseSchema(SequentialDelayDomainStateSchema) + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!(await this.authenticate(request))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + return new Session(request, response, this.getKeyVersionInfo(request, response.locals.logger)) + } + + authenticate(request: Request<{}, {}, DisableDomainRequest>): Promise { + return Promise.resolve(verifyDisableDomainRequestAuthenticity(request.body)) + } + + sendSuccess( + status: number, + response: Response, + domainState: DomainState + ) { + send( + response, + { + success: true, + version: getCombinerVersion(), + status: domainState, + }, + status, + response.locals.logger + ) + } + + sendFailure(error: ErrorType, status: number, response: Response) { + send( + response, + { + success: false, + version: getCombinerVersion(), + error, + }, + status, + response.locals.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/domain/endpoints/quota/action.ts b/packages/phone-number-privacy/combiner/src/domain/endpoints/quota/action.ts new file mode 100644 index 00000000000..4ba6032fc05 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/endpoints/quota/action.ts @@ -0,0 +1,39 @@ +import { DomainQuotaStatusRequest, ErrorMessage } from '@celo/phone-number-privacy-common' +import { CombineAction } from '../../../common/combine' +import { IO } from '../../../common/io' +import { Session } from '../../../common/session' +import { OdisConfig } from '../../../config' +import { DomainSignerResponseLogger } from '../../services/log-responses' +import { DomainThresholdStateService } from '../../services/threshold-state' + +export class DomainQuotaAction extends CombineAction { + readonly responseLogger = new DomainSignerResponseLogger() + + constructor( + readonly config: OdisConfig, + readonly thresholdStateService: DomainThresholdStateService, + readonly io: IO + ) { + super(config, io) + } + + combine(session: Session): void { + this.responseLogger.logResponseDiscrepancies(session) + const { threshold } = session.keyVersionInfo + if (session.responses.length >= threshold) { + try { + const domainQuotaStatus = this.thresholdStateService.findThresholdDomainState(session) + this.io.sendSuccess(200, session.response, domainQuotaStatus) + return + } catch (err) { + session.logger.error(err, 'Error combining signer quota status responses') + } + } + this.io.sendFailure( + ErrorMessage.THRESHOLD_DOMAIN_QUOTA_STATUS_FAILURE, + session.getMajorityErrorCode() ?? 500, + session.response, + session.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/domain/endpoints/quota/io.ts b/packages/phone-number-privacy/combiner/src/domain/endpoints/quota/io.ts new file mode 100644 index 00000000000..3469fc2938d --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/endpoints/quota/io.ts @@ -0,0 +1,86 @@ +import { + CombinerEndpoint, + DomainQuotaStatusRequest, + domainQuotaStatusRequestSchema, + DomainQuotaStatusResponse, + DomainQuotaStatusResponseFailure, + domainQuotaStatusResponseSchema, + DomainQuotaStatusResponseSuccess, + DomainSchema, + DomainState, + ErrorType, + getSignerEndpoint, + OdisResponse, + send, + SequentialDelayDomainStateSchema, + SignerEndpoint, + verifyDomainQuotaStatusRequestAuthenticity, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import * as t from 'io-ts' +import { IO } from '../../../common/io' +import { Session } from '../../../common/session' +import { getCombinerVersion } from '../../../config' + +export class DomainQuotaIO extends IO { + readonly endpoint: CombinerEndpoint = CombinerEndpoint.DOMAIN_QUOTA_STATUS + readonly signerEndpoint: SignerEndpoint = getSignerEndpoint(this.endpoint) + readonly requestSchema: t.Type = + domainQuotaStatusRequestSchema(DomainSchema) + readonly responseSchema: t.Type = + domainQuotaStatusResponseSchema(SequentialDelayDomainStateSchema) + + async init( + request: Request<{}, {}, unknown>, + response: Response> + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!(await this.authenticate(request))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const keyVersionInfo = this.getKeyVersionInfo(request, response.locals.logger) + return new Session(request, response, keyVersionInfo) + } + + authenticate(request: Request<{}, {}, DomainQuotaStatusRequest>): Promise { + return Promise.resolve(verifyDomainQuotaStatusRequestAuthenticity(request.body)) + } + + sendSuccess( + status: number, + response: Response, + domainState: DomainState + ) { + send( + response, + { + success: true, + version: getCombinerVersion(), + status: domainState, + }, + status, + response.locals.logger + ) + } + + sendFailure( + error: ErrorType, + status: number, + response: Response + ) { + send( + response, + { + success: false, + version: getCombinerVersion(), + error, + }, + status, + response.locals.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/domain/endpoints/sign/action.ts b/packages/phone-number-privacy/combiner/src/domain/endpoints/sign/action.ts new file mode 100644 index 00000000000..e7f74b36d21 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/endpoints/sign/action.ts @@ -0,0 +1,56 @@ +import { + DomainRestrictedSignatureRequest, + ErrorMessage, + ErrorType, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { CryptoSession } from '../../../common/crypto-session' +import { SignAction } from '../../../common/sign' +import { DomainSignerResponseLogger } from '../../services/log-responses' + +export class DomainSignAction extends SignAction { + readonly responseLogger = new DomainSignerResponseLogger() + + combine(session: CryptoSession): void { + this.responseLogger.logResponseDiscrepancies(session) + + if (session.crypto.hasSufficientSignatures()) { + try { + const combinedSignature = session.crypto.combineBlindedSignatureShares( + this.parseBlindedMessage(session.request.body), + session.logger + ) + + return this.io.sendSuccess( + 200, + session.response, + combinedSignature, + this.thresholdStateService.findThresholdDomainState(session) + ) + } catch (err) { + // May fail upon combining signatures if too many sigs are invalid + session.logger.error('Combining signatures failed in combine') + session.logger.error(err) + // Fallback to handleMissingSignatures + } + } + + this.handleMissingSignatures(session) + } + + protected parseBlindedMessage(req: DomainRestrictedSignatureRequest): string { + return req.blindedMessage + } + + protected errorCodeToError(errorCode: number): ErrorType { + switch (errorCode) { + case 429: + return WarningMessage.EXCEEDED_QUOTA + case 401: + // Authentication is checked in the combiner, but invalid nonces are passed through + return WarningMessage.INVALID_NONCE + default: + return ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES + } + } +} diff --git a/packages/phone-number-privacy/combiner/src/domain/endpoints/sign/io.ts b/packages/phone-number-privacy/combiner/src/domain/endpoints/sign/io.ts new file mode 100644 index 00000000000..291564b4468 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/endpoints/sign/io.ts @@ -0,0 +1,105 @@ +import { + CombinerEndpoint, + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestSchema, + DomainRestrictedSignatureResponse, + DomainRestrictedSignatureResponseFailure, + domainRestrictedSignatureResponseSchema, + DomainRestrictedSignatureResponseSuccess, + DomainSchema, + DomainState, + ErrorType, + getSignerEndpoint, + send, + SequentialDelayDomainStateSchema, + verifyDomainRestrictedSignatureRequestAuthenticity, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import * as t from 'io-ts' +import { DomainCryptoClient } from '../../../common/crypto-clients/domain-crypto-client' +import { CryptoSession } from '../../../common/crypto-session' +import { IO } from '../../../common/io' +import { getCombinerVersion } from '../../../config' + +export class DomainSignIO extends IO { + readonly endpoint = CombinerEndpoint.DOMAIN_SIGN + readonly signerEndpoint = getSignerEndpoint(this.endpoint) + readonly requestSchema: t.Type< + DomainRestrictedSignatureRequest, + DomainRestrictedSignatureRequest, + unknown + > = domainRestrictedSignatureRequestSchema(DomainSchema) + readonly responseSchema: t.Type< + DomainRestrictedSignatureResponse, + DomainRestrictedSignatureResponse, + unknown + > = domainRestrictedSignatureResponseSchema(SequentialDelayDomainStateSchema) + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!this.requestHasSupportedKeyVersion(request, response.locals.logger)) { + this.sendFailure(WarningMessage.INVALID_KEY_VERSION_REQUEST, 400, response) + return null + } + if (!(await this.authenticate(request))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const keyVersionInfo = this.getKeyVersionInfo(request, response.locals.logger) + return new CryptoSession( + request, + response, + keyVersionInfo, + new DomainCryptoClient(keyVersionInfo) + ) + } + + authenticate(request: Request<{}, {}, DomainRestrictedSignatureRequest>): Promise { + // Note that signing requests may include a nonce for replay protection that will be checked by + // the signer, but is not checked here. As a result, requests that pass the authentication check + // here may still fail when sent to the signer. + return Promise.resolve(verifyDomainRestrictedSignatureRequestAuthenticity(request.body)) + } + + sendSuccess( + status: number, + response: Response, + signature: string, + domainState: DomainState + ) { + send( + response, + { + success: true, + version: getCombinerVersion(), + signature, + status: domainState, + }, + status, + response.locals.logger + ) + } + + sendFailure( + error: ErrorType, + status: number, + response: Response + ) { + send( + response, + { + success: false, + version: getCombinerVersion(), + error, + }, + status, + response.locals.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/domain/services/log-responses.ts b/packages/phone-number-privacy/combiner/src/domain/services/log-responses.ts new file mode 100644 index 00000000000..4e78834751a --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/services/log-responses.ts @@ -0,0 +1,59 @@ +import { + DomainRequest, + DomainRestrictedSignatureRequest, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { CryptoSession } from '../../common/crypto-session' +import { Session } from '../../common/session' + +export class DomainSignerResponseLogger { + logResponseDiscrepancies( + session: Session | CryptoSession + ): void { + const parsedResponses: Array<{ + signerUrl: string + values: { + version: string + counter: number + disabled: boolean + timer: number + } + }> = [] + session.responses.forEach((response) => { + if (response.res.success) { + const { version, status } = response.res + parsedResponses.push({ + signerUrl: response.url, + values: { + version, + counter: status.counter, + disabled: status.disabled, + timer: status.timer, + }, + }) + } + }) + if (parsedResponses.length === 0) { + session.logger.warn('No successful signer responses found!') + return + } + + // log all responses if we notice any discrepancies to aid with debugging + const first = JSON.stringify(parsedResponses[0].values) + for (let i = 1; i < parsedResponses.length; i++) { + if (JSON.stringify(parsedResponses[i].values) !== first) { + session.logger.warn({ parsedResponses }, WarningMessage.SIGNER_RESPONSE_DISCREPANCIES) + break + } + } + + // disabled + const numDisabled = parsedResponses.filter((res) => res.values.disabled).length + if (numDisabled > 0 && numDisabled < parsedResponses.length) { + session.logger.error( + { parsedResponses }, + WarningMessage.INCONSISTENT_SIGNER_DOMAIN_DISABLED_STATES + ) + } + } +} diff --git a/packages/phone-number-privacy/combiner/src/domain/services/threshold-state.ts b/packages/phone-number-privacy/combiner/src/domain/services/threshold-state.ts new file mode 100644 index 00000000000..38cdf62e8e8 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/domain/services/threshold-state.ts @@ -0,0 +1,78 @@ +import { DomainRequest, DomainState } from '@celo/phone-number-privacy-common' +import { Session } from '../../common/session' +import { OdisConfig } from '../../config' + +export class DomainThresholdStateService { + constructor(readonly config: OdisConfig) {} + + findThresholdDomainState(session: Session): DomainState { + // Get the domain status from the responses, filtering out responses that don't have the status. + const domainStates = session.responses + .map((signerResponse) => ('status' in signerResponse.res ? signerResponse.res.status : null)) + .filter((state: DomainState | null | undefined): state is DomainState => !!state) + + const { threshold } = session.keyVersionInfo + + // Note: when the threshold > # total signers - threshold, it's possible that we + // throw an error here when the domain is disabled. While the domain is technically disabled, + // the hope is to increase the "safety margin" of the number of signers that have + // also disabled this domain.This can be changed in the future (if we think that + // the safety margin is no longer needed) by simply checking if the domain is disabled + // before checking if the threshold of enabled responses has been met. + if (domainStates.length < threshold) { + throw new Error('Insufficient number of signer responses') + } + + // Check whether the domain is disabled, either by all signers or by some. + const domainStatesEnabled = domainStates.filter((ds) => !ds.disabled) + const numDisabled = domainStates.length - domainStatesEnabled.length + + const signersLength = JSON.parse(this.config.odisServices.signers).length + if (signersLength - numDisabled < threshold) { + return { timer: 0, counter: 0, disabled: true, now: 0 } + } + + // Ideally users will resubmit the request in this case. + if (domainStatesEnabled.length < threshold) { + throw new Error('Insufficient number of signer responses. Domain may be disabled') + } + + // Set n to last signer index in a quorum of signers are sorted from least to most restrictive. + const n = threshold - 1 + + const domainStatesAscendingByCounter = domainStatesEnabled.sort((a, b) => a.counter - b.counter) + const nthLeastRestrictiveByCounter = domainStatesAscendingByCounter[n] + const thresholdCounter = nthLeastRestrictiveByCounter.counter + + // Client should submit requests with nonce === thresholdCounter + + const domainStatesWithThresholdCounter = domainStatesEnabled.filter( + (ds) => ds.counter <= thresholdCounter + ) + + const domainStatesAscendingByTimestampRestrictiveness = domainStatesWithThresholdCounter.sort( + (a, b) => a.timer - a.now - (b.timer - b.now) + /** + * Please see '@celo/phone-number-privacy-common/src/domains/sequential-delay.ts' + * and https://github.com/celo-org/celo-proposals/blob/master/CIPs/CIP-0040/sequentialDelayDomain.md + * + * For a given DomainState, it is always the case that 'now' >= 'timer'. This ordering ensures + * that we take the 'timer' and 'date' from the same DomainState while still returning a reasonable + * definition of the "nth least restrictive" values. For simplicity, we do not take into consideration + * the 'delay' until the next request will be accepted as that would require calculating this value for + * each DomainState with the checkSequentialDelayDomainState algorithm in sequential-delay.ts. + * This would add complexity because DomainStates may have different values for 'counter' that dramatically + * alter this 'delay' and we want to protect the user's quota by returning the lowest possible + * threshold 'counter'. Feel free to implement a more exact solution if you're up for a coding challenge :) + */ + ) + const nthLeastRestrictiveByTimestamps = domainStatesAscendingByTimestampRestrictiveness[n] + + return { + timer: nthLeastRestrictiveByTimestamps.timer, + counter: thresholdCounter, + disabled: false, + now: nthLeastRestrictiveByTimestamps.now, + } + } +} diff --git a/packages/phone-number-privacy/combiner/src/index.ts b/packages/phone-number-privacy/combiner/src/index.ts index 545cc30877c..4d4e7822dfc 100644 --- a/packages/phone-number-privacy/combiner/src/index.ts +++ b/packages/phone-number-privacy/combiner/src/index.ts @@ -1,86 +1,16 @@ -import { ErrorMessage, loggerMiddleware } from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' +import { getContractKit } from '@celo/phone-number-privacy-common' import * as functions from 'firebase-functions' -import { performance, PerformanceObserver } from 'perf_hooks' -import config, { FORNO_ALFAJORES } from './config' -import { handleGetContactMatches } from './match-making/get-contact-matches' -import { handleGetBlindedMessageSig } from './signing/get-threshold-signature' +import config from './config' +import { startCombiner } from './server' require('dotenv').config() -async function meterResponse( - handler: (req: functions.Request, res: functions.Response) => Promise, - req: functions.Request, - res: functions.Response, - endpoint?: string -) { - if (!res.locals) { - res.locals = {} - } - const logger: Logger = loggerMiddleware(req, res) - logger.fields.endpoint = endpoint - logger.info({ req: req.body }, 'Request received') - const eventLoopLagMeasurementStart = Date.now() - setTimeout(() => { - const eventLoopLag = Date.now() - eventLoopLagMeasurementStart - logger.info({ eventLoopLag }, 'Measure event loop lag') - }) - const startMark = `Begin ${handler.name}` - const endMark = `End ${handler.name}` - const entryName = `${handler.name} latency` - - const obs = new PerformanceObserver((list) => { - const entry = list.getEntriesByName(entryName)[0] - if (entry) { - logger.info({ latency: entry }, 'e2e response latency measured') - } - }) - obs.observe({ entryTypes: ['measure'], buffered: true }) - - performance.mark(startMark) - await handler(req, res) - .then(() => { - logger.info({ res }, 'Response sent') - }) - .catch((err) => { - logger.error(ErrorMessage.UNKNOWN_ERROR) - logger.error(err) - }) - performance.mark(endMark) - performance.measure(entryName, startMark, endMark) - performance.clearMarks() - obs.disconnect() -} - -// EG. curl -v "http://localhost:5000/celo-phone-number-privacy/us-central1/getBlindedMessageSig" -H "Authorization: 0xfc2ee61c4d18b93374fdd525c9de09d01398f7d153d17340b9ae156f94a1eb3237207d9aacb42e7f2f4ee0cf2621ab6d5a0837211665a99e16e3367f5209a56b1b" -d '{"blindedQueryPhoneNumber":"+Dzuylsdcv1ZxbRcQwhQ29O0UJynTNYufjWc4jpw2Zr9FLu5gSU8bvvDJ3r/Nj+B","account":"0xdd18d08f1c2619ede729c26cc46da19af0a2aa7f", "hashedPhoneNumber":"0x8fb77f2aff2ef0343706535dc702fc99f61a5d1b8e46d7c144c80fd156826a77"}' -H 'Content-Type: application/json' -export const getBlindedMessageSig = functions - .region('us-central1', 'europe-west3') +export const combiner = functions + .region('us-central1') .runWith({ - // Keep instances warm for this latency-critical function - // @ts-ignore https://firebase.google.com/docs/functions/manage-functions#reduce_the_number_of_cold_starts - minInstances: config.blockchain.provider === FORNO_ALFAJORES ? 0 : 3, + // Keep instances warm for mainnet functions + // Defined check required for running tests vs. deployment + minInstances: functions.config().service ? functions.config().service.min_instances : undefined, }) - .https.onRequest(async (req: functions.Request, res: functions.Response) => - meterResponse(handleGetBlindedMessageSig, req, res, '/getBlindedMessageSig') - ) - -// EG. curl -v "http://localhost:5000/celo-phone-number-privacy/us-central1/getContactMatches" -H "Authorization: " -d '{"userPhoneNumber": "+99999999999", "contactPhoneNumbers": ["+5555555555", "+3333333333"], "account": "0x117ea45d497ab022b85494ba3ab6f52969bf6812"}' -H 'Content-Type: application/json' -export const getContactMatches = functions - .region('us-central1', 'europe-west3') - .runWith({ - // Keep instances warm for this latency-critical function - // @ts-ignore https://firebase.google.com/docs/functions/manage-functions#reduce_the_number_of_cold_starts - minInstances: config.blockchain.provider === FORNO_ALFAJORES ? 0 : 3, - }) - .https.onRequest(async (req: functions.Request, res: functions.Response) => - meterResponse(handleGetContactMatches, req, res, '/getContactMatches') - ) - -// TODO: Fix status cloud function. It currenly just returns an empty object. -// export const status = functions -// .region('us-central1', 'europe-west3') -// .https.onRequest(async (_req: functions.Request, res: functions.Response) => { -// await Promise.resolve(res.status(200).json({ -// version: VERSION, -// })) -// }) + .https.onRequest(startCombiner(config, getContractKit(config.blockchain))) +export * from './config' diff --git a/packages/phone-number-privacy/combiner/src/match-making/get-contact-matches.ts b/packages/phone-number-privacy/combiner/src/match-making/get-contact-matches.ts deleted file mode 100644 index b3eb7776c84..00000000000 --- a/packages/phone-number-privacy/combiner/src/match-making/get-contact-matches.ts +++ /dev/null @@ -1,278 +0,0 @@ -import { - authenticateUser, - ErrorMessage, - GetContactMatchesRequest, - getDataEncryptionKey, - hasValidAccountParam, - hasValidContactPhoneNumbersParam, - hasValidIdentifier, - hasValidUserPhoneNumberParam, - isVerified, - verifyDEKSignature, - WarningMessage, -} from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { Request, Response } from 'firebase-functions' -import { respondWithError } from '../common/error-utils' -import config, { - E2E_TEST_ACCOUNTS, - E2E_TEST_PHONE_NUMBERS, - FORNO_ALFAJORES, - VERSION, -} from '../config' -import { - getAccountSignedUserPhoneNumberRecord, - getDekSignerRecord, - getDidMatchmaking, - setDidMatchmaking, -} from '../database/wrappers/account' -import { getNumberPairContacts, setNumberPairContacts } from '../database/wrappers/number-pairs' -import { getContractKit } from '../web3/contracts' - -interface ContactMatch { - phoneNumber: string -} -export interface VerifiedPhoneNumberDekSignature { - signedUserPhoneNumber: string - dekSigner: string -} - -export async function handleGetContactMatches(request: Request, response: Response) { - const logger: Logger = response.locals.logger - try { - if (!isValidGetContactMatchesInput(request.body)) { - respondWithError(response, 400, WarningMessage.INVALID_INPUT, logger) - return - } - - // TODO: this error handling shouldn't be necessary here but there is a bug in the common package's - // error handling. Remove this or refactor once that bug is resolved. - let isAuthenticated = true // We assume user is authenticated on Forno errors - try { - isAuthenticated = await authenticateUser(request, getContractKit(), logger) - } catch { - logger.error('Forno error caught in handleGetContactMatches line 57') // Temporary for debugging - logger.error(ErrorMessage.CONTRACT_GET_FAILURE) - } - if (!isAuthenticated) { - respondWithError(response, 401, WarningMessage.UNAUTHENTICATED_USER, logger) - return - } - - const { - account, - userPhoneNumber, - contactPhoneNumbers, - hashedPhoneNumber, - signedUserPhoneNumber, - } = request.body - - if (!shouldBypassVerificationForE2ETesting(userPhoneNumber, account)) { - // TODO: this error handling shouldn't be necessary here but there is a bug in the common package's - // error handling. Remove this or refactor once that bug is resolved. - let _isVerified = true // We assume user is authenticated on Forno errors - try { - _isVerified = await isVerified(account, hashedPhoneNumber, getContractKit(), logger) - } catch { - logger.error('Forno error caught in handleGetContactMatches line 80') // Temporary for debugging - logger.error(ErrorMessage.CONTRACT_GET_FAILURE) - } - if (!_isVerified) { - respondWithError(response, 403, WarningMessage.UNVERIFIED_USER_ATTEMPT_TO_MATCHMAKE, logger) - return - } - } else { - logger.warn( - { account, userPhoneNumber }, - 'Allowing request to bypass verification for e2e testing' - ) - } - - // If we are unsure whether a phone number signature is valid but we don't want to block the user, - // we just set verifiedPhoneNumberDekSig to undefined so that it is not stored in the database - // and fulfill the request as usual. - let verifiedPhoneNumberDekSig: VerifiedPhoneNumberDekSignature | undefined - if (signedUserPhoneNumber) { - // TODO: this error handling shouldn't be necessary here but there is a bug in the common package's - // error handling. Remove this or refactor once that bug is resolved. - let dekSigner = '' - try { - dekSigner = await getDataEncryptionKey(account, getContractKit(), logger) - } catch { - logger.error(ErrorMessage.CONTRACT_GET_FAILURE) - logger.warn( - 'Failed to retrieve DEK to verify signedUserPhoneNumber. Request wont be recorded.' - ) - logger.error('Forno error caught in handleGetContactMatches line 109') // Temporary for debugging - } - if (dekSigner) { - if ( - !verifyDEKSignature(userPhoneNumber, signedUserPhoneNumber, dekSigner, logger, { - insecureAllowIncorrectlyGeneratedSignature: true, - }) - ) { - respondWithError( - response, - 403, - WarningMessage.INVALID_USER_PHONE_NUMBER_SIGNATURE, - logger - ) - return - } - verifiedPhoneNumberDekSig = { dekSigner, signedUserPhoneNumber } - } - } - - const invalidReplay = await isInvalidReplay( - account, - userPhoneNumber, - logger, - signedUserPhoneNumber - ).catch(() => { - logger.warn( - 'Failed to determine that user is not requerying matches for a new number. Fullfilling request without recording signature.' - ) - verifiedPhoneNumberDekSig = undefined - }) - if (invalidReplay) { - respondWithError(response, 403, WarningMessage.DUPLICATE_REQUEST_TO_MATCHMAKE, logger) - return - } - - await finishMatchmaking( - account, - userPhoneNumber, - contactPhoneNumbers, - response, - logger, - verifiedPhoneNumberDekSig - ) - } catch (err) { - logger.error('Failed to getContactMatches') - logger.error(err) - respondWithError(response, 500, ErrorMessage.UNKNOWN_ERROR, logger) - } -} - -async function finishMatchmaking( - account: string, - userPhoneNumber: string, - contactPhoneNumbers: string[], - response: Response, - logger: Logger, - verifiedPhoneNumberDekSig?: VerifiedPhoneNumberDekSignature -) { - const matchedContacts: ContactMatch[] = ( - await getNumberPairContacts(userPhoneNumber, contactPhoneNumbers, logger) - ).map((numberPair) => ({ phoneNumber: numberPair })) - logger.info( - { - percentageOfContactsCoveredByMatchmaking: matchedContacts.length / contactPhoneNumbers.length, - }, - 'measured percentage of contacts covered by matchmaking' - ) - await setNumberPairContacts(userPhoneNumber, contactPhoneNumbers, logger) - await setDidMatchmaking(account, logger, verifiedPhoneNumberDekSig) - response.json({ success: true, matchedContacts, version: VERSION }) -} - -async function isReplay(account: string, logger: Logger): Promise { - return getDidMatchmaking(account, logger).catch((err) => { - logger.warn('Failed to determine if user has performed matchmaking.') - throw err - }) -} - -async function isInvalidReplay( - account: string, - userPhoneNumber: string, - logger: Logger, - signedUserPhoneNumber?: string -) { - if (!(await isReplay(account, logger))) { - return false - } - if (!signedUserPhoneNumber) { - // If the account has performed matchmaking before and does not provide their signed phone number in the request, - // we return an error bc they could be querying matches for a new number that isn't theirs. - logger.info( - { account }, - 'Blocking account from requerying matches without providing a phone number signature.' - ) - return true - } - const signedUserPhoneNumberRecord = await getAccountSignedUserPhoneNumberRecord( - account, - logger - ).catch((err) => { - logger.warn( - { account }, - 'Allowing account to perform matchmaking due to db error finding phone number record. We will not record their phone number this time.' - ) - throw err - }) - if (!signedUserPhoneNumberRecord) { - logger.info( - { account }, - 'Allowing account to perform matchmaking since we have no record of the phone number it used before.' - ) - return false - } - if (signedUserPhoneNumberRecord !== signedUserPhoneNumber) { - if (await userHasNewDek(account, userPhoneNumber, signedUserPhoneNumberRecord, logger)) { - logger.info({ account }, 'Allowing account to requery matches after key rotation.') - return false - } - logger.info( - { account }, - 'Blocking account from querying matches for a different phone number than before.' - ) - return true - } - logger.info( - { account }, - 'Allowing account to requery matches for the same phone number as before.' - ) - return false -} - -async function userHasNewDek( - account: string, - userPhoneNumber: string, - signedUserPhoneNumberRecord: string, - logger: Logger -): Promise { - const dekSignerRecord = await getDekSignerRecord(account, logger) - const isKeyRotation = - !!dekSignerRecord && - verifyDEKSignature(userPhoneNumber, signedUserPhoneNumberRecord, dekSignerRecord, logger, { - insecureAllowIncorrectlyGeneratedSignature: true, - }) - if (isKeyRotation) { - logger.info( - { - account, - dekSignerRecord, - }, - 'User has rotated their dek since first requesting matches.' - ) - } - return isKeyRotation -} - -function isValidGetContactMatchesInput(requestBody: GetContactMatchesRequest): boolean { - return ( - hasValidAccountParam(requestBody) && - hasValidUserPhoneNumberParam(requestBody) && - hasValidContactPhoneNumbersParam(requestBody) && - hasValidIdentifier(requestBody) - ) -} - -function shouldBypassVerificationForE2ETesting(userPhoneNumber: string, account: string): boolean { - return ( - config.blockchain.provider === FORNO_ALFAJORES && - E2E_TEST_PHONE_NUMBERS.includes(userPhoneNumber) && - E2E_TEST_ACCOUNTS.includes(account) - ) -} diff --git a/packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/action.ts b/packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/action.ts new file mode 100644 index 00000000000..e8f607965f1 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/action.ts @@ -0,0 +1,42 @@ +import { ErrorMessage, PnpQuotaRequest } from '@celo/phone-number-privacy-common' +import { CombineAction } from '../../../common/combine' +import { IO } from '../../../common/io' +import { Session } from '../../../common/session' +import { OdisConfig } from '../../../config' +import { PnpSignerResponseLogger } from '../../services/log-responses' +import { PnpThresholdStateService } from '../../services/threshold-state' + +export class PnpQuotaAction extends CombineAction { + readonly responseLogger: PnpSignerResponseLogger = new PnpSignerResponseLogger() + + constructor( + readonly config: OdisConfig, + readonly thresholdStateService: PnpThresholdStateService, + readonly io: IO + ) { + super(config, io) + } + + async combine(session: Session): Promise { + this.responseLogger.logResponseDiscrepancies(session) + this.responseLogger.logFailOpenResponses(session) + + const { threshold } = session.keyVersionInfo + + if (session.responses.length >= threshold) { + try { + const quotaStatus = this.thresholdStateService.findCombinerQuotaState(session) + this.io.sendSuccess(200, session.response, quotaStatus, session.warnings) + return + } catch (err) { + session.logger.error(err, 'Error combining signer quota status responses') + } + } + this.io.sendFailure( + ErrorMessage.THRESHOLD_PNP_QUOTA_STATUS_FAILURE, + session.getMajorityErrorCode() ?? 500, + session.response, + session.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/io.ts b/packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/io.ts new file mode 100644 index 00000000000..3a01dcba7b8 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/io.ts @@ -0,0 +1,100 @@ +import { ContractKit } from '@celo/contractkit' +import { + authenticateUser, + CombinerEndpoint, + ErrorType, + getSignerEndpoint, + hasValidAccountParam, + identifierIsValidIfExists, + isBodyReasonablySized, + PnpQuotaRequest, + PnpQuotaRequestSchema, + PnpQuotaResponse, + PnpQuotaResponseFailure, + PnpQuotaResponseSchema, + PnpQuotaResponseSuccess, + PnpQuotaStatus, + send, + SignerEndpoint, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import * as t from 'io-ts' +import { IO } from '../../../common/io' +import { Session } from '../../../common/session' +import { getCombinerVersion, OdisConfig } from '../../../config' + +export class PnpQuotaIO extends IO { + readonly endpoint: CombinerEndpoint = CombinerEndpoint.PNP_QUOTA + readonly signerEndpoint: SignerEndpoint = getSignerEndpoint(this.endpoint) + readonly requestSchema: t.Type = PnpQuotaRequestSchema + readonly responseSchema: t.Type = + PnpQuotaResponseSchema + + constructor(readonly config: OdisConfig, readonly kit: ContractKit) { + super(config) + } + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!(await this.authenticate(request, response.locals.logger))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const keyVersionInfo = this.getKeyVersionInfo(request, response.locals.logger) + return new Session(request, response, keyVersionInfo) + } + + validateClientRequest( + request: Request<{}, {}, unknown> + ): request is Request<{}, {}, PnpQuotaRequest> { + return ( + super.validateClientRequest(request) && + hasValidAccountParam(request.body) && + identifierIsValidIfExists(request.body) && + isBodyReasonablySized(request.body) + ) + } + + async authenticate(request: Request<{}, {}, PnpQuotaRequest>, logger: Logger): Promise { + return authenticateUser(request, this.kit, logger, this.config.shouldFailOpen) + } + + sendSuccess( + status: number, + response: Response, + quotaStatus: PnpQuotaStatus, + warnings: string[] + ) { + send( + response, + { + success: true, + version: getCombinerVersion(), + ...quotaStatus, + warnings, + }, + status, + response.locals.logger + ) + } + + sendFailure(error: ErrorType, status: number, response: Response) { + send( + response, + { + success: false, + version: getCombinerVersion(), + error, + }, + status, + response.locals.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/action.ts b/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/action.ts new file mode 100644 index 00000000000..ed011827808 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/action.ts @@ -0,0 +1,56 @@ +import { + ErrorMessage, + ErrorType, + LegacySignMessageRequest, + SignMessageRequest, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { CryptoSession } from '../../../common/crypto-session' +import { SignAction } from '../../../common/sign' +import { PnpSignerResponseLogger } from '../../services/log-responses' + +export class PnpSignAction extends SignAction { + readonly responseLogger: PnpSignerResponseLogger = new PnpSignerResponseLogger() + + combine(session: CryptoSession): void { + this.responseLogger.logResponseDiscrepancies(session) + this.responseLogger.logFailOpenResponses(session) + + if (session.crypto.hasSufficientSignatures()) { + try { + const combinedSignature = session.crypto.combineBlindedSignatureShares( + this.parseBlindedMessage(session.request.body), + session.logger + ) + + const quotaStatus = this.thresholdStateService.findCombinerQuotaState(session) + return this.io.sendSuccess( + 200, + session.response, + combinedSignature, + quotaStatus, + session.warnings + ) + } catch (error) { + // May fail upon combining signatures if too many sigs are invalid + // Fallback to handleMissingSignatures + session.logger.error(error) + } + } + + this.handleMissingSignatures(session) + } + + protected parseBlindedMessage(req: SignMessageRequest | LegacySignMessageRequest): string { + return req.blindedQueryPhoneNumber + } + + protected errorCodeToError(errorCode: number): ErrorType { + switch (errorCode) { + case 403: + return WarningMessage.EXCEEDED_QUOTA + default: + return ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES + } + } +} diff --git a/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.legacy.ts b/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.legacy.ts new file mode 100644 index 00000000000..c87738b1046 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.legacy.ts @@ -0,0 +1,118 @@ +import { ContractKit } from '@celo/contractkit' +import { + authenticateUser, + CombinerEndpoint, + ErrorType, + getSignerEndpoint, + hasValidAccountParam, + hasValidBlindedPhoneNumberParam, + identifierIsValidIfExists, + isBodyReasonablySized, + LegacySignMessageRequest, + LegacySignMessageRequestSchema, + PnpQuotaStatus, + send, + SignerEndpoint, + SignMessageResponse, + SignMessageResponseFailure, + SignMessageResponseSchema, + SignMessageResponseSuccess, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import * as t from 'io-ts' +import { BLSCryptographyClient } from '../../../common/crypto-clients/bls-crypto-client' +import { CryptoSession } from '../../../common/crypto-session' +import { IO } from '../../../common/io' +import { getCombinerVersion, OdisConfig } from '../../../config' + +export class LegacyPnpSignIO extends IO { + readonly endpoint: CombinerEndpoint = CombinerEndpoint.LEGACY_PNP_SIGN + readonly signerEndpoint: SignerEndpoint = getSignerEndpoint(this.endpoint) + readonly requestSchema: t.Type = + LegacySignMessageRequestSchema + readonly responseSchema: t.Type = + SignMessageResponseSchema + + constructor(readonly config: OdisConfig, readonly kit: ContractKit) { + super(config) + } + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!this.requestHasSupportedKeyVersion(request, response.locals.logger)) { + this.sendFailure(WarningMessage.INVALID_KEY_VERSION_REQUEST, 400, response) + return null + } + if (!(await this.authenticate(request, response.locals.logger))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const keyVersionInfo = this.getKeyVersionInfo(request, response.locals.logger) + return new CryptoSession( + request, + response, + keyVersionInfo, + new BLSCryptographyClient(keyVersionInfo) + ) + } + + validateClientRequest( + request: Request<{}, {}, unknown> + ): request is Request<{}, {}, LegacySignMessageRequest> { + return ( + super.validateClientRequest(request) && + hasValidAccountParam(request.body) && + hasValidBlindedPhoneNumberParam(request.body) && + identifierIsValidIfExists(request.body) && + isBodyReasonablySized(request.body) + ) + } + + async authenticate( + request: Request<{}, {}, LegacySignMessageRequest>, + logger: Logger + ): Promise { + return authenticateUser(request, this.kit, logger, this.config.shouldFailOpen) + } + + sendSuccess( + status: number, + response: Response, + signature: string, + quotaStatus: PnpQuotaStatus, + warnings: string[] + ) { + send( + response, + { + success: true, + version: getCombinerVersion(), + signature, + ...quotaStatus, + warnings, + }, + status, + response.locals.logger + ) + } + + sendFailure(error: ErrorType, status: number, response: Response) { + send( + response, + { + success: false, + version: getCombinerVersion(), + error, + }, + status, + response.locals.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.ts b/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.ts new file mode 100644 index 00000000000..00c452706a8 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/io.ts @@ -0,0 +1,117 @@ +import { ContractKit } from '@celo/contractkit' +import { + authenticateUser, + CombinerEndpoint, + ErrorType, + getSignerEndpoint, + hasValidAccountParam, + hasValidBlindedPhoneNumberParam, + isBodyReasonablySized, + PnpQuotaStatus, + send, + SignerEndpoint, + SignMessageRequest, + SignMessageRequestSchema, + SignMessageResponse, + SignMessageResponseFailure, + SignMessageResponseSchema, + SignMessageResponseSuccess, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import * as t from 'io-ts' +import { BLSCryptographyClient } from '../../../common/crypto-clients/bls-crypto-client' +import { CryptoSession } from '../../../common/crypto-session' +import { IO } from '../../../common/io' +import { Session } from '../../../common/session' +import { getCombinerVersion, OdisConfig } from '../../../config' + +export class PnpSignIO extends IO { + readonly endpoint: CombinerEndpoint = CombinerEndpoint.PNP_SIGN + readonly signerEndpoint: SignerEndpoint = getSignerEndpoint(this.endpoint) + readonly requestSchema: t.Type = + SignMessageRequestSchema + readonly responseSchema: t.Type = + SignMessageResponseSchema + + constructor(readonly config: OdisConfig, readonly kit: ContractKit) { + super(config) + } + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!this.requestHasSupportedKeyVersion(request, response.locals.logger)) { + this.sendFailure(WarningMessage.INVALID_KEY_VERSION_REQUEST, 400, response) + return null + } + if (!(await this.authenticate(request, response.locals.logger))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const keyVersionInfo = this.getKeyVersionInfo(request, response.locals.logger) + return new CryptoSession( + request, + response, + keyVersionInfo, + new BLSCryptographyClient(keyVersionInfo) + ) + } + + validateClientRequest( + request: Request<{}, {}, unknown> + ): request is Request<{}, {}, SignMessageRequest> { + return ( + super.validateClientRequest(request) && + hasValidAccountParam(request.body) && + hasValidBlindedPhoneNumberParam(request.body) && + isBodyReasonablySized(request.body) + ) + } + + async authenticate( + request: Request<{}, {}, SignMessageRequest>, + logger: Logger + ): Promise { + return authenticateUser(request, this.kit, logger, this.config.shouldFailOpen) + } + + sendSuccess( + status: number, + response: Response, + signature: string, + quotaStatus: PnpQuotaStatus, + warnings: string[] + ) { + send( + response, + { + success: true, + version: getCombinerVersion(), + signature, + ...quotaStatus, + warnings, + }, + status, + response.locals.logger + ) + } + + sendFailure(error: ErrorType, status: number, response: Response) { + send( + response, + { + success: false, + version: getCombinerVersion(), + error, + }, + status, + response.locals.logger + ) + } +} diff --git a/packages/phone-number-privacy/combiner/src/pnp/services/log-responses.ts b/packages/phone-number-privacy/combiner/src/pnp/services/log-responses.ts new file mode 100644 index 00000000000..7fdc2b6b6e4 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/pnp/services/log-responses.ts @@ -0,0 +1,133 @@ +import { + ErrorMessage, + PnpQuotaRequest, + SignMessageRequest, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Session } from '../../common/session' +import { + MAX_BLOCK_DISCREPANCY_THRESHOLD, + MAX_QUERY_COUNT_DISCREPANCY_THRESHOLD, + MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD, +} from '../../config' + +export class PnpSignerResponseLogger { + logResponseDiscrepancies(session: Session | Session): void { + // TODO responses should all already be successes due to CombineAction receiveSuccess + // https://github.com/celo-org/celo-monorepo/issues/9826 + + const parsedResponses: Array<{ + signerUrl: string + values: { + version: string + performedQueryCount: number + totalQuota: number + blockNumber?: number + warnings?: string[] + } + }> = [] + session.responses.forEach((response) => { + if (response.res.success) { + const { version, performedQueryCount, totalQuota, blockNumber, warnings } = response.res + parsedResponses.push({ + signerUrl: response.url, + values: { version, performedQueryCount, totalQuota, blockNumber, warnings }, + }) + } + }) + if (parsedResponses.length === 0) { + session.logger.warn('No successful signer responses found!') + return + } + + // log all responses if we notice any discrepancies to aid with debugging + const first = JSON.stringify(parsedResponses[0].values) + for (let i = 1; i < parsedResponses.length; i++) { + if (JSON.stringify(parsedResponses[i].values) !== first) { + session.logger.warn({ parsedResponses }, WarningMessage.SIGNER_RESPONSE_DISCREPANCIES) + session.warnings.push(WarningMessage.SIGNER_RESPONSE_DISCREPANCIES) + break + } + } + + // blockNumber + parsedResponses.forEach((res) => { + if (res.values.blockNumber === undefined) { + session.logger.warn( + { signerUrl: res.signerUrl }, + 'Signer responded with undefined blockNumber' + ) + } + }) + const sortedByBlockNumber = parsedResponses + .filter((res) => !!res.values.blockNumber) + .sort((a, b) => a.values.blockNumber! - b.values.blockNumber!) + if ( + sortedByBlockNumber.length && + sortedByBlockNumber[sortedByBlockNumber.length - 1].values.blockNumber! - + sortedByBlockNumber[0].values.blockNumber! >= + MAX_BLOCK_DISCREPANCY_THRESHOLD + ) { + session.logger.error( + { sortedByBlockNumber }, + WarningMessage.INCONSISTENT_SIGNER_BLOCK_NUMBERS + ) + session.warnings.push(WarningMessage.INCONSISTENT_SIGNER_BLOCK_NUMBERS) + } + + // totalQuota + const sortedByTotalQuota = parsedResponses.sort( + (a, b) => a.values.totalQuota - b.values.totalQuota + ) + if ( + sortedByTotalQuota[sortedByTotalQuota.length - 1].values.totalQuota - + sortedByTotalQuota[0].values.totalQuota >= + MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD + ) { + session.logger.error( + { sortedByTotalQuota }, + WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS + ) + session.warnings.push(WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS) + } + + // performedQueryCount + const sortedByQueryCount = parsedResponses.sort( + (a, b) => a.values.performedQueryCount - b.values.performedQueryCount + ) + if ( + sortedByQueryCount[sortedByQueryCount.length - 1].values.performedQueryCount - + sortedByQueryCount[0].values.performedQueryCount >= + MAX_QUERY_COUNT_DISCREPANCY_THRESHOLD + ) { + session.logger.error( + { sortedByQueryCount }, + WarningMessage.INCONSISTENT_SIGNER_QUERY_MEASUREMENTS + ) + session.warnings.push(WarningMessage.INCONSISTENT_SIGNER_QUERY_MEASUREMENTS) + } + } + + logFailOpenResponses(session: Session | Session): void { + session.responses.forEach((response) => { + if (response.res.success) { + const { warnings } = response.res + if (warnings) { + warnings.forEach((warning) => { + switch (warning) { + case ErrorMessage.FAILING_OPEN: + case ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA: + case ErrorMessage.FAILURE_TO_GET_DEK: + session.logger.error( + { signerWarning: warning, service: response.url }, + WarningMessage.SIGNER_FAILED_OPEN + ) + default: + break + } + }) + } + } + }) + } +} diff --git a/packages/phone-number-privacy/combiner/src/pnp/services/threshold-state.ts b/packages/phone-number-privacy/combiner/src/pnp/services/threshold-state.ts new file mode 100644 index 00000000000..ee46bab51d4 --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/pnp/services/threshold-state.ts @@ -0,0 +1,49 @@ +import { + PnpQuotaRequest, + PnpQuotaStatus, + SignMessageRequest, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Session } from '../../common/session' +import { MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD } from '../../config' +export class PnpThresholdStateService { + findCombinerQuotaState(session: Session): PnpQuotaStatus { + const { threshold } = session.keyVersionInfo + const signerResponses = session.responses + .map((signerResponse) => signerResponse.res) + .filter((res) => res.success) as PnpQuotaStatus[] + const sortedResponses = signerResponses.sort( + (a, b) => b.totalQuota - b.performedQueryCount - (a.totalQuota - a.performedQueryCount) + ) + + const totalQuotaAvg = + sortedResponses.map((r) => r.totalQuota).reduce((a, b) => a + b) / sortedResponses.length + const totalQuotaStDev = Math.sqrt( + sortedResponses.map((r) => (r.totalQuota - totalQuotaAvg) ** 2).reduce((a, b) => a + b) / + sortedResponses.length + ) + if (totalQuotaStDev > MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD) { + // TODO(2.0.0): add alerting for this + throw new Error(WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS) + } else if (totalQuotaStDev > 0) { + session.warnings.push( + WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS + + ', using threshold signer as best guess' + ) + } + + // TODO(2.0.0) currently this check is not needed, as checking for sufficient number of responses and + // filtering for successes is already done in the action. Consider adding back in based on the + // result of https://github.com/celo-org/celo-monorepo/issues/9826 + // if (signerResponses.length < threshold) { + // throw new Error('Insufficient number of successful signer responses') + // } + + const thresholdSigner = sortedResponses[threshold - 1] + return { + performedQueryCount: thresholdSigner.performedQueryCount, + totalQuota: thresholdSigner.totalQuota, + blockNumber: thresholdSigner.blockNumber, + } + } +} diff --git a/packages/phone-number-privacy/combiner/src/server.ts b/packages/phone-number-privacy/combiner/src/server.ts new file mode 100644 index 00000000000..a56b7a476ef --- /dev/null +++ b/packages/phone-number-privacy/combiner/src/server.ts @@ -0,0 +1,210 @@ +import { ContractKit } from '@celo/contractkit' +import { + CombinerEndpoint, + Endpoint, + ErrorMessage, + KEY_VERSION_HEADER, + loggerMiddleware, + rootLogger, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import express, { Request, Response } from 'express' +import { performance, PerformanceObserver } from 'perf_hooks' +import { Controller } from './common/controller' +import { CombinerConfig, getCombinerVersion } from './config' +import { DomainDisableAction } from './domain/endpoints/disable/action' +import { DomainDisableIO } from './domain/endpoints/disable/io' +import { DomainQuotaAction } from './domain/endpoints/quota/action' +import { DomainQuotaIO } from './domain/endpoints/quota/io' +import { DomainSignAction } from './domain/endpoints/sign/action' +import { DomainSignIO } from './domain/endpoints/sign/io' +import { DomainThresholdStateService } from './domain/services/threshold-state' +import { PnpQuotaAction } from './pnp/endpoints/quota/action' +import { PnpQuotaIO } from './pnp/endpoints/quota/io' +import { PnpSignAction } from './pnp/endpoints/sign/action' +import { PnpSignIO } from './pnp/endpoints/sign/io' +import { LegacyPnpSignIO } from './pnp/endpoints/sign/io.legacy' +import { PnpThresholdStateService } from './pnp/services/threshold-state' + +require('events').EventEmitter.defaultMaxListeners = 15 + +export function startCombiner(config: CombinerConfig, kit: ContractKit) { + const logger = rootLogger(config.serviceName) + + logger.info('Creating combiner express server') + const app = express() + // TODO get logger to show accurate serviceName + // (https://github.com/celo-org/celo-monorepo/issues/9809) + app.use(express.json({ limit: '0.2mb' }), loggerMiddleware(config.serviceName)) + + // Enable cross origin resource sharing from any domain so ODIS can be interacted with from web apps + // + // Security note: Allowing unrestricted cross-origin requests is acceptable here because any authenticated actions + // must include a signature in the request body. In particular, ODIS _does not_ use cookies to transmit authentication + // data. If ODIS is altered to use cookies for authentication data, this CORS policy should be reconsidered. + app.use((_, res, next) => { + res.header('Access-Control-Allow-Origin', '*') + res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS') + res.header( + 'Access-Control-Allow-Headers', + `Origin, X-Requested-With, Content-Type, Accept, Authorization, ${KEY_VERSION_HEADER}` + ) + next() + }) + + app.get(CombinerEndpoint.STATUS, (_req, res) => { + res.status(200).json({ + version: getCombinerVersion(), + }) + }) + + const pnpThresholdStateService = new PnpThresholdStateService() + + const legacyPnpSign = new Controller( + new PnpSignAction( + config.phoneNumberPrivacy, + pnpThresholdStateService, + new LegacyPnpSignIO(config.phoneNumberPrivacy, kit) + ) + ) + app.post(CombinerEndpoint.LEGACY_PNP_SIGN, (req, res) => + meterResponse( + legacyPnpSign.handle.bind(legacyPnpSign), + req, + res, + CombinerEndpoint.LEGACY_PNP_SIGN, + config + ) + ) + + const pnpQuota = new Controller( + new PnpQuotaAction( + config.phoneNumberPrivacy, + pnpThresholdStateService, + new PnpQuotaIO(config.phoneNumberPrivacy, kit) + ) + ) + app.post(CombinerEndpoint.PNP_QUOTA, (req, res) => + meterResponse(pnpQuota.handle.bind(pnpQuota), req, res, CombinerEndpoint.PNP_QUOTA, config) + ) + + const pnpSign = new Controller( + new PnpSignAction( + config.phoneNumberPrivacy, + pnpThresholdStateService, + new PnpSignIO(config.phoneNumberPrivacy, kit) + ) + ) + app.post(CombinerEndpoint.PNP_SIGN, (req, res) => + meterResponse(pnpSign.handle.bind(pnpSign), req, res, CombinerEndpoint.PNP_SIGN, config) + ) + + const domainThresholdStateService = new DomainThresholdStateService(config.domains) + + const domainQuota = new Controller( + new DomainQuotaAction( + config.domains, + domainThresholdStateService, + new DomainQuotaIO(config.domains) + ) + ) + app.post(CombinerEndpoint.DOMAIN_QUOTA_STATUS, (req, res) => + meterResponse( + domainQuota.handle.bind(domainQuota), + req, + res, + CombinerEndpoint.DOMAIN_QUOTA_STATUS, + config + ) + ) + const domainSign = new Controller( + new DomainSignAction( + config.domains, + domainThresholdStateService, + new DomainSignIO(config.domains) + ) + ) + app.post(CombinerEndpoint.DOMAIN_SIGN, (req, res) => + meterResponse( + domainSign.handle.bind(domainSign), + req, + res, + CombinerEndpoint.DOMAIN_SIGN, + config + ) + ) + const domainDisable = new Controller( + new DomainDisableAction( + config.domains, + domainThresholdStateService, + new DomainDisableIO(config.domains) + ) + ) + app.post(CombinerEndpoint.DISABLE_DOMAIN, (req, res) => + meterResponse( + domainDisable.handle.bind(domainDisable), + req, + res, + CombinerEndpoint.DISABLE_DOMAIN, + config + ) + ) + + return app +} + +export async function meterResponse( + handler: (req: Request, res: Response) => Promise, + req: Request, + res: Response, + endpoint: Endpoint, + config: CombinerConfig +) { + if (!res.locals) { + res.locals = {} + } + const logger: Logger = loggerMiddleware(config.serviceName)(req, res) + logger.fields.endpoint = endpoint + logger.info({ req: req.body }, 'Request received') + const eventLoopLagMeasurementStart = Date.now() + setTimeout(() => { + const eventLoopLag = Date.now() - eventLoopLagMeasurementStart + logger.info({ eventLoopLag }, 'Measure event loop lag') + }) + const startMark = `Begin ${endpoint}` + const endMark = `End ${endpoint}` + const entryName = `${endpoint} latency` + + const obs = new PerformanceObserver((list) => { + const entry = list.getEntriesByName(entryName)[0] + if (entry) { + logger.info({ latency: entry }, 'e2e response latency measured') + } + }) + obs.observe({ entryTypes: ['measure'], buffered: false }) + + performance.mark(startMark) + await handler(req, res) + .then(() => { + logger.info({ res }, 'Response sent') + }) + .catch((err) => { + logger.error(ErrorMessage.CAUGHT_ERROR_IN_ENDPOINT_HANDLER) + logger.error(err) + if (!res.headersSent) { + logger.info('Responding with error in outer endpoint handler') + res.status(500).json({ + success: false, + error: ErrorMessage.UNKNOWN_ERROR, + }) + } else { + logger.error(ErrorMessage.ERROR_AFTER_RESPONSE_SENT) + } + }) + .finally(() => { + performance.mark(endMark) + performance.measure(entryName, startMark, endMark) + performance.clearMarks() + obs.disconnect() + }) +} diff --git a/packages/phone-number-privacy/combiner/src/signing/get-threshold-signature.ts b/packages/phone-number-privacy/combiner/src/signing/get-threshold-signature.ts deleted file mode 100644 index 60741efd4da..00000000000 --- a/packages/phone-number-privacy/combiner/src/signing/get-threshold-signature.ts +++ /dev/null @@ -1,390 +0,0 @@ -import { - authenticateUser, - ErrorMessage, - GetBlindedMessageSigRequest, - hasValidAccountParam, - hasValidBlindedPhoneNumberParam, - identifierIsValidIfExists, - isBodyReasonablySized, - MAX_BLOCK_DISCREPANCY_THRESHOLD, - SignMessageResponse, - SignMessageResponseFailure, - SignMessageResponseSuccess, - WarningMessage, -} from '@celo/phone-number-privacy-common' -import AbortController from 'abort-controller' -import Logger from 'bunyan' -import { Request, Response } from 'firebase-functions' -import fetch, { Response as FetchResponse } from 'node-fetch' -import { performance, PerformanceObserver } from 'perf_hooks' -import { BLSCryptographyClient } from '../bls/bls-cryptography-client' -import { respondWithError } from '../common/error-utils' -import config, { VERSION } from '../config' -import { getContractKit } from '../web3/contracts' - -const PARTIAL_SIGN_MESSAGE_ENDPOINT = '/getBlindedMessagePartialSig' - -type SignerResponse = SignMessageResponseSuccess | SignMessageResponseFailure - -interface SignerService { - url: string - fallbackUrl?: string -} - -interface SignMsgRespWithStatus { - url: string - signMessageResponse: SignMessageResponse - status: number -} - -export async function handleGetBlindedMessageSig(request: Request, response: Response) { - const logger: Logger = response.locals.logger - - try { - if (!isValidGetSignatureInput(request.body)) { - respondWithError(response, 400, WarningMessage.INVALID_INPUT, logger) - return - } - if (!(await authenticateUser(request, getContractKit(), logger))) { - respondWithError(response, 401, WarningMessage.UNAUTHENTICATED_USER, logger) - return - } - logger.debug('Requesting signatures') - await requestSignatures(request, response) - } catch (err) { - logger.error('Unknown error in handleGetBlindedMessageSig') - logger.error(err) - respondWithError(response, 500, ErrorMessage.UNKNOWN_ERROR, logger) - } -} - -async function requestSignatures(request: Request, response: Response) { - const responses: SignMsgRespWithStatus[] = [] - const failedRequests = new Set() - const errorCodes: Map = new Map() - const blsCryptoClient = new BLSCryptographyClient() - - const logger: Logger = response.locals.logger - - const obs = new PerformanceObserver((list) => { - const entry = list.getEntries()[0] - logger.info({ latency: entry, signer: entry!.name }, 'Signer response latency measured') - }) - obs.observe({ entryTypes: ['measure'], buffered: true }) - - const signers = JSON.parse(config.odisServices.signers) as SignerService[] - let timedOut = false - const controller = new AbortController() - const timeout = setTimeout(() => { - timedOut = true - controller.abort() - }, config.odisServices.timeoutMilliSeconds) - - const signerReqs = signers.map((service) => { - const startMark = `Begin requestSignature ${service.url}` - const endMark = `End requestSignature ${service.url}` - const entryName = service.url - performance.mark(startMark) - - return requestSignature(service, request, controller, logger) - .then(async (res: FetchResponse) => { - const data = await res.text() - logger.info( - { signer: service, res: data, status: res.status }, - 'received requestSignature response from signer' - ) - if (res.ok) { - await handleSuccessResponse( - data, - res.status, - response, - responses, - service.url, - blsCryptoClient, - request.body.blindedQueryPhoneNumber, - controller - ) - } else { - handleFailedResponse( - service, - res.status, - signers.length, - failedRequests, - response, - controller, - errorCodes - ) - } - }) - .catch((err) => { - let status: number | undefined = 500 - if (err.name === 'AbortError') { - if (timedOut) { - status = 408 - logger.error({ signer: service }, ErrorMessage.TIMEOUT_FROM_SIGNER) - } else { - // Request was cancelled, assuming it would have been successful - status = undefined - logger.info({ signer: service }, WarningMessage.CANCELLED_REQUEST_TO_SIGNER) - } - } else { - logger.error({ signer: service }, ErrorMessage.ERROR_REQUESTING_SIGNATURE) - } - logger.error(err) - handleFailedResponse( - service, - status, - signers.length, - failedRequests, - response, - controller, - errorCodes - ) - }) - .finally(() => { - performance.mark(endMark) - performance.measure(entryName, startMark, endMark) - }) - }) - - await Promise.all(signerReqs) - clearTimeout(timeout) - performance.clearMarks() - obs.disconnect() - - logResponseDiscrepancies(responses, logger) - const majorityErrorCode = getMajorityErrorCode(errorCodes, logger) - if (blsCryptoClient.hasSufficientSignatures()) { - try { - const combinedSignature = await blsCryptoClient.combinePartialBlindedSignatures( - request.body.blindedQueryPhoneNumber, - logger - ) - response.json({ success: true, combinedSignature, version: VERSION }) - return - } catch { - // May fail upon combining signatures if too many sigs are invalid - // Fallback to handleMissingSignatures - } - } - handleMissingSignatures(majorityErrorCode, response, logger) -} - -async function handleSuccessResponse( - data: string, - status: number, - response: Response, - responses: SignMsgRespWithStatus[], - serviceUrl: string, - blsCryptoClient: BLSCryptographyClient, - blindedQueryPhoneNumber: string, - controller: AbortController -) { - const logger: Logger = response.locals.logger - const signResponse = JSON.parse(data) as SignerResponse - if (!signResponse.success) { - // Continue on failure as long as signature is present to unblock user - logger.error( - { - error: signResponse.error, - signer: serviceUrl, - }, - 'Signer responded with error' - ) - } - if (!signResponse.signature) { - throw new Error(`Signature is missing from signer ${serviceUrl}`) - } - responses.push({ url: serviceUrl, signMessageResponse: signResponse, status }) - const partialSig = { url: serviceUrl, signature: signResponse.signature } - logger.info({ signer: serviceUrl }, 'Add signature') - const signatureAdditionStart = Date.now() - await blsCryptoClient.addSignature(partialSig) - logger.info( - { - signer: serviceUrl, - hasSufficientSignatures: blsCryptoClient.hasSufficientSignatures(), - additionLatency: Date.now() - signatureAdditionStart, - }, - 'Added signature' - ) - // Send response immediately once we cross threshold - // BLS threshold signatures can be combined without all partial signatures - if (blsCryptoClient.hasSufficientSignatures()) { - try { - await blsCryptoClient.combinePartialBlindedSignatures(blindedQueryPhoneNumber, logger) - // Close outstanding requests - controller.abort() - } catch { - // Already logged, continue to collect signatures - } - } -} - -// Fail fast if a sufficient number of signatures cannot be collected -function handleFailedResponse( - service: SignerService, - status: number | undefined, - signerCount: number, - failedRequests: Set, - response: Response, - controller: AbortController, - errorCodes: Map -) { - if (status) { - errorCodes.set(status, (errorCodes.get(status) || 0) + 1) - } - const logger: Logger = response.locals.logger - // Tracking failed request count via signer url prevents - // double counting the same failed request by mistake - failedRequests.add(service.url) - const shouldFailFast = signerCount - failedRequests.size < config.thresholdSignature.threshold - logger.info(`Recieved failure from ${failedRequests.size}/${signerCount} signers.`) - if (shouldFailFast) { - logger.info('Not possible to reach a sufficient number of signatures. Failing fast.') - controller.abort() - } -} - -function logResponseDiscrepancies(responses: SignMsgRespWithStatus[], logger: Logger) { - // Only compare responses which have values for the quota fields - const successfulResponses = responses.filter( - (response) => - response.signMessageResponse && - response.signMessageResponse.performedQueryCount && - response.signMessageResponse.totalQuota && - response.signMessageResponse.blockNumber - ) - - if (successfulResponses.length === 0) { - return - } - // Compare the first response to the rest of the responses - const expectedQueryCount = successfulResponses[0].signMessageResponse.performedQueryCount - const expectedTotalQuota = successfulResponses[0].signMessageResponse.totalQuota - const expectedBlockNumber = successfulResponses[0].signMessageResponse.blockNumber! - let discrepancyFound = false - for (const resp of successfulResponses) { - // Performed query count should never diverge; however the totalQuota may - // diverge if the queried block number is different - if ( - resp.signMessageResponse.performedQueryCount !== expectedQueryCount || - (resp.signMessageResponse.totalQuota !== expectedTotalQuota && - resp.signMessageResponse.blockNumber === expectedBlockNumber) - ) { - const values = successfulResponses.map((response) => { - return { - signer: response.url, - performedQueryCount: response.signMessageResponse.performedQueryCount, - totalQuota: response.signMessageResponse.totalQuota, - } - }) - logger.error({ values }, WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS) - discrepancyFound = true - } - if ( - Math.abs(resp.signMessageResponse.blockNumber! - expectedBlockNumber) > - MAX_BLOCK_DISCREPANCY_THRESHOLD - ) { - const values = successfulResponses.map((response) => { - return { - signer: response.url, - blockNumber: response.signMessageResponse.blockNumber, - } - }) - logger.error({ values }, WarningMessage.INCONSISTENT_SIGNER_BLOCK_NUMBERS) - discrepancyFound = true - } - if (discrepancyFound) { - return - } - } -} - -function requestSignature( - service: SignerService, - request: Request, - controller: AbortController, - logger: Logger -): Promise { - return parameterizedSignatureRequest(service.url, request, controller, logger).catch((e) => { - logger.error(`Signer failed with primary url ${service.url}`, e) - if (service.fallbackUrl) { - logger.warn(`Using fallback url to call signer ${service.fallbackUrl!}`) - return parameterizedSignatureRequest(service.fallbackUrl!, request, controller, logger) - } - throw e - }) -} - -function parameterizedSignatureRequest( - baseUrl: string, - request: Request, - controller: AbortController, - logger: Logger -): Promise { - logger.debug({ signer: baseUrl }, `Requesting partial sig`) - const url = baseUrl + PARTIAL_SIGN_MESSAGE_ENDPOINT - return fetch(url, { - method: 'POST', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - Authorization: request.headers.authorization!, - }, - body: JSON.stringify(request.body), - signal: controller.signal, - }) -} - -function getMajorityErrorCode(errorCodes: Map, logger: Logger) { - // Ignore timeouts - const ignoredErrorCodes = [408] - const uniqueErrorCount = Array.from(errorCodes.keys()).filter( - (status) => !ignoredErrorCodes.includes(status) - ).length - if (uniqueErrorCount > 1) { - logger.error( - { errorCodes: JSON.stringify([...errorCodes]) }, - ErrorMessage.INCONSISTENT_SIGNER_RESPONSES - ) - } - - let maxErrorCode = -1 - let maxCount = -1 - errorCodes.forEach((count, errorCode) => { - // This gives priority to the lower status codes in the event of a tie - // because 400s are more helpful than 500s for user feedback - if (count > maxCount || (count === maxCount && errorCode < maxErrorCode)) { - maxCount = count - maxErrorCode = errorCode - } - }) - return maxErrorCode > 0 ? maxErrorCode : null -} - -function isValidGetSignatureInput(requestBody: GetBlindedMessageSigRequest): boolean { - return ( - hasValidAccountParam(requestBody) && - hasValidBlindedPhoneNumberParam(requestBody) && - identifierIsValidIfExists(requestBody) && - isBodyReasonablySized(requestBody) - ) -} - -function handleMissingSignatures( - majorityErrorCode: number | null, - response: Response, - logger: Logger -) { - if (majorityErrorCode === 403) { - respondWithError(response, 403, WarningMessage.EXCEEDED_QUOTA, logger) - } else { - respondWithError( - response, - majorityErrorCode || 500, - ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, - logger - ) - } -} diff --git a/packages/phone-number-privacy/combiner/src/web3/contracts.ts b/packages/phone-number-privacy/combiner/src/web3/contracts.ts deleted file mode 100644 index af5c56b4258..00000000000 --- a/packages/phone-number-privacy/combiner/src/web3/contracts.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ContractKit, newKit, newKitWithApiKey } from '@celo/contractkit' -import config from '../config' - -const contractKit = config.blockchain.apiKey - ? newKitWithApiKey(config.blockchain.provider, config.blockchain.apiKey) - : newKit(config.blockchain.provider) - -export function getContractKit(): ContractKit { - return contractKit -} diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts new file mode 100644 index 00000000000..6ce612b026e --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/end-to-end/domain.test.ts @@ -0,0 +1,338 @@ +import { + BackupErrorTypes, + buildOdisDomain, + E2E_TESTING_ALFAJORES_CONFIG, + NO_QUOTA_ALFAJORES_CONFIG, + odisHardenKey, + odisQueryAuthorizer, + requestOdisDomainQuotaStatus, +} from '@celo/encrypted-backup' +import { OdisUtils } from '@celo/identity' +import { + CombinerEndpoint, + DisableDomainRequest, + disableDomainRequestEIP712, + disableDomainResponseSchema, + DisableDomainResponseSuccess, + domainHash, + DomainQuotaStatusResponseSuccess, + DomainRequestTypeTag, + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestEIP712, + domainRestrictedSignatureResponseSchema, + DomainRestrictedSignatureResponseSuccess, + genSessionID, + KEY_VERSION_HEADER, + PoprfClient, + SequentialDelayDomain, + SequentialDelayDomainStateSchema, + TestUtils, +} from '@celo/phone-number-privacy-common' +import { defined, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils' +import * as crypto from 'crypto' +import 'isomorphic-fetch' +import { getCombinerVersion } from '../../src' +import { getTestContextName } from './resources' + +require('dotenv').config() + +jest.setTimeout(60000) + +const { ErrorMessages, getServiceContext, OdisAPI } = OdisUtils.Query + +const SERVICE_CONTEXT = getServiceContext(getTestContextName(), OdisAPI.DOMAIN) +const combinerUrl = SERVICE_CONTEXT.odisUrl +const fullNodeUrl = process.env.ODIS_BLOCKCHAIN_PROVIDER + +const authorizer = odisQueryAuthorizer(Buffer.from('combiner e2e authorizer test seed')) + +const domain = buildOdisDomain(E2E_TESTING_ALFAJORES_CONFIG.odis!, authorizer.address) + +const expectedVersion = getCombinerVersion() + +describe(`Running against service deployed at ${combinerUrl} w/ blockchain provider ${fullNodeUrl}`, () => { + it('Service is deployed at correct version', async () => { + const response = await fetch(combinerUrl + CombinerEndpoint.STATUS, { + method: 'GET', + }) + const body = await response.json() + // This checks against local package.json version, change if necessary + expect(body.version).toBe(expectedVersion) + }) + + describe(`${CombinerEndpoint.DOMAIN_QUOTA_STATUS}`, () => { + const testThatValidRequestSucceeds = async () => { + const res = await requestOdisDomainQuotaStatus( + domain, + SERVICE_CONTEXT, + genSessionID(), + authorizer.wallet + ) + + expect(res.ok).toBe(true) + if (res.ok) { + expect(res.result).toStrictEqual({ + success: true, + version: expectedVersion, + status: { + timer: res.result.status.timer, + counter: res.result.status.counter, + now: res.result.status.now, + disabled: false, + }, + }) + } + } + + it('Should succeed on valid request', async () => { + await testThatValidRequestSucceeds() + }) + + it('Should succeed on repeated valid requests', async () => { + await testThatValidRequestSucceeds() + await testThatValidRequestSucceeds() + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_SIGN}`, () => { + const testThatValidRequestSucceeds = async () => { + const res = await odisHardenKey( + Buffer.from('password'), + domain, + SERVICE_CONTEXT, + authorizer.wallet + ) + // odisHardenKey verifies the signature against the service public key + expect(res.ok).toBe(true) + } + + it('Should succeed on valid request', async () => { + await testThatValidRequestSucceeds() + }) + + it('Should succeed on repeated valid request', async () => { + await testThatValidRequestSucceeds() + await testThatValidRequestSucceeds() + }) + + const signatureRequest = async ( + keyVersion: number, + nonce: number, + _domain: SequentialDelayDomain = domain + ): Promise<[DomainRestrictedSignatureRequest, PoprfClient]> => { + const poprfClient = new PoprfClient( + Buffer.from(TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEYS[keyVersion - 1], 'base64'), + domainHash(_domain), + Buffer.from('test message', 'utf8') + ) + + const req: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, + domain: _domain, + options: { + signature: noString, + nonce: defined(nonce), + }, + blindedMessage: poprfClient.blindedMessage.toString('base64'), + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await authorizer.wallet.signTypedData( + authorizer.address, + domainRestrictedSignatureRequestEIP712(req) + ) + ) + return [req, poprfClient] + } + + for (let i = 1; i <= 2; i++) { + it(`Should succeed on valid request with key version header ${i}`, async () => { + const quotaRes = await requestOdisDomainQuotaStatus( + domain, + SERVICE_CONTEXT, + genSessionID(), + authorizer.wallet + ) + + let nonce = 0 + + expect(quotaRes.ok).toBe(true) + if (quotaRes.ok) { + expect(quotaRes.result).toStrictEqual({ + success: true, + version: expectedVersion, + status: { + timer: quotaRes.result.status.timer, + counter: quotaRes.result.status.counter, + now: quotaRes.result.status.now, + disabled: false, + }, + }) + nonce = quotaRes.result.status.counter + } + + const keyVersion = 1 + const [req, _] = await signatureRequest(keyVersion, nonce) + const res = await OdisUtils.Query.sendOdisDomainRequest( + req, + SERVICE_CONTEXT, + CombinerEndpoint.DOMAIN_SIGN, + domainRestrictedSignatureResponseSchema(SequentialDelayDomainStateSchema), + { + [KEY_VERSION_HEADER]: keyVersion.toString(), + } + ) + + expect(res.success).toBe(true) + if (res.success) { + expect(res).toStrictEqual({ + success: true, + version: expectedVersion, + signature: res.signature, + status: { + timer: res.status.timer, + counter: res.status.counter, + now: res.status.now, + disabled: false, + }, + }) + } + }) + } + + it('Should throw on invalid authentication', async () => { + const quotaRes = await requestOdisDomainQuotaStatus( + domain, + SERVICE_CONTEXT, + genSessionID(), + authorizer.wallet + ) + + let nonce = 0 + + expect(quotaRes.ok).toBe(true) + if (quotaRes.ok) { + expect(quotaRes.result).toStrictEqual({ + success: true, + version: expectedVersion, + status: { + timer: quotaRes.result.status.timer, + counter: quotaRes.result.status.counter, + now: quotaRes.result.status.now, + disabled: false, + }, + }) + nonce = quotaRes.result.status.counter + } + + const keyVersion = 1 + const [req, _] = await signatureRequest(keyVersion, nonce) + + req.domain.salt = defined('badSalt') + + await expect( + OdisUtils.Query.sendOdisDomainRequest( + req, + SERVICE_CONTEXT, + CombinerEndpoint.DOMAIN_SIGN, + domainRestrictedSignatureResponseSchema(SequentialDelayDomainStateSchema), + { + [KEY_VERSION_HEADER]: keyVersion.toString(), + } + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) + + it('Should return error on out of quota', async () => { + const noQuotaDomain = buildOdisDomain(NO_QUOTA_ALFAJORES_CONFIG.odis!, authorizer.address) + const res = await odisHardenKey( + Buffer.from('password'), + noQuotaDomain, + SERVICE_CONTEXT, + authorizer.wallet + ) + expect(res.ok).toBe(false) + if (!res.ok) { + expect(res.error.errorType).toEqual(BackupErrorTypes.ODIS_RATE_LIMITING_ERROR) + } + }) + }) + + describe(`${CombinerEndpoint.DISABLE_DOMAIN}`, () => { + const domainForDisabling = buildOdisDomain( + E2E_TESTING_ALFAJORES_CONFIG.odis!, + authorizer.address, + 'e2e testing, okay to disable ' + crypto.randomBytes(16).toString('base64') + ) + const disableRequest = async (): Promise> => { + const req: DisableDomainRequest = { + type: DomainRequestTypeTag.DISABLE, + domain: domainForDisabling, + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await authorizer.wallet.signTypedData(authorizer.address, disableDomainRequestEIP712(req)) + ) + return req + } + + const testThatDomainIsNotAlreadyDisabled = async () => { + const quotaRes = await requestOdisDomainQuotaStatus( + domainForDisabling, + SERVICE_CONTEXT, + genSessionID(), + authorizer.wallet + ) + expect(quotaRes.ok).toBe(true) + if (quotaRes.ok) { + expect(quotaRes.result).toStrictEqual({ + success: true, + version: expectedVersion, + status: { + timer: quotaRes.result.status.timer, + counter: quotaRes.result.status.counter, + now: quotaRes.result.status.now, + disabled: false, // checking that domain is not already disabled + }, + }) + } + } + + const testThatValidRequestSucceeds = async () => { + const res = await OdisUtils.Query.sendOdisDomainRequest( + await disableRequest(), + SERVICE_CONTEXT, + CombinerEndpoint.DISABLE_DOMAIN, + disableDomainResponseSchema(SequentialDelayDomainStateSchema) + ) + + expect(res.success).toBe(true) + if (res.success) { + expect(res).toStrictEqual({ + success: true, + version: expectedVersion, + status: { + timer: res.status.timer, + now: res.status.now, + disabled: true, // checking that domain is now disabled + counter: res.status.counter, + }, + }) + } + } + + it('Should succeed on valid request', async () => { + await testThatDomainIsNotAlreadyDisabled() + await testThatValidRequestSucceeds() + }) + + it('Should succeed on repeated valid request', async () => { + await testThatValidRequestSucceeds() + await testThatValidRequestSucceeds() + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/get-contact-matches.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/get-contact-matches.test.ts deleted file mode 100644 index cba04f88a25..00000000000 --- a/packages/phone-number-privacy/combiner/test/end-to-end/get-contact-matches.test.ts +++ /dev/null @@ -1,145 +0,0 @@ -import { OdisUtils } from '@celo/identity/lib/odis' -import { ErrorMessages } from '@celo/identity/lib/odis/query' -import { ensureLeading0x } from '@celo/utils/lib/address' -import 'isomorphic-fetch' -import { E2E_TEST_ACCOUNTS, E2E_TEST_PHONE_NUMBERS_RAW } from '../../src/config' -import { - ACCOUNT_ADDRESS, - CONTACT_PHONE_NUMBERS, - contractKit, - dekAuthSigner, - deks, - PHONE_HASH_IDENTIFIER, - PHONE_NUMBER, - SERVICE_CONTEXT, - walletAuthSigner, -} from './resources' - -require('dotenv').config() - -jest.setTimeout(60000) - -describe('Running against a deployed service', () => { - it('Returns input error for invalid phone hash', async () => { - await expect( - OdisUtils.Matchmaking.getContactMatches( - PHONE_NUMBER, - CONTACT_PHONE_NUMBERS, - ACCOUNT_ADDRESS, - 'invalid-phone-hash', - walletAuthSigner, - SERVICE_CONTEXT, - dekAuthSigner(0) - ) - ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) - }) - - it('Returns error when querying with an unauthenticated request', async () => { - await expect( - OdisUtils.Matchmaking.getContactMatches( - PHONE_NUMBER, - CONTACT_PHONE_NUMBERS, - ACCOUNT_ADDRESS, - PHONE_HASH_IDENTIFIER, - { ...dekAuthSigner(0), rawKey: 'fake' }, - SERVICE_CONTEXT - ) - ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) - }) - - it('Returns error when querying with an unverified account', async () => { - await expect( - OdisUtils.Matchmaking.getContactMatches( - PHONE_NUMBER, - CONTACT_PHONE_NUMBERS, - ACCOUNT_ADDRESS, - PHONE_HASH_IDENTIFIER, - walletAuthSigner, - SERVICE_CONTEXT, - dekAuthSigner(0) - ) - ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) - }) - - it('Returns error when querying with invalid DEK', async () => { - await expect( - OdisUtils.Matchmaking.getContactMatches( - E2E_TEST_PHONE_NUMBERS_RAW[0], - CONTACT_PHONE_NUMBERS, - E2E_TEST_ACCOUNTS[0], - PHONE_HASH_IDENTIFIER, - walletAuthSigner, - SERVICE_CONTEXT, - { ...dekAuthSigner(0), rawKey: 'fake' } - ) - ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) - }) - - describe('When requerying matches', () => { - beforeAll(async () => { - // set DEK - const accounts = await contractKit.contracts.getAccounts() - await accounts - .setAccountDataEncryptionKey(ensureLeading0x(deks[0].publicKey)) - .sendAndWaitForReceipt() - }) - - it('Returns success when requerying with same phone number and valid DEK', async () => { - await expect( - OdisUtils.Matchmaking.getContactMatches( - E2E_TEST_PHONE_NUMBERS_RAW[0], - CONTACT_PHONE_NUMBERS, - E2E_TEST_ACCOUNTS[0], - PHONE_HASH_IDENTIFIER, - dekAuthSigner(0), - SERVICE_CONTEXT - ) - ).resolves.toBeInstanceOf(Array) - }) - - it('Returns error when requerying with same phone number and no DEK', async () => { - await expect( - OdisUtils.Matchmaking.getContactMatches( - E2E_TEST_PHONE_NUMBERS_RAW[0], - CONTACT_PHONE_NUMBERS, - E2E_TEST_ACCOUNTS[0], - PHONE_HASH_IDENTIFIER, - walletAuthSigner, - SERVICE_CONTEXT - ) - ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) - }) - - it('Returns error when requerying with different phone number and valid DEK', async () => { - await expect( - OdisUtils.Matchmaking.getContactMatches( - E2E_TEST_PHONE_NUMBERS_RAW[1], - CONTACT_PHONE_NUMBERS, - E2E_TEST_ACCOUNTS[0], - PHONE_HASH_IDENTIFIER, - dekAuthSigner(0), - SERVICE_CONTEXT - ) - ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) - }) - - it('Returns success when requerying with same phone number and valid DEK after key rotation', async () => { - // Key rotation - const accounts = await contractKit.contracts.getAccounts() - await accounts - .setAccountDataEncryptionKey(ensureLeading0x(deks[1].publicKey)) - .sendAndWaitForReceipt() - - await expect( - OdisUtils.Matchmaking.getContactMatches( - E2E_TEST_PHONE_NUMBERS_RAW[0], - CONTACT_PHONE_NUMBERS, - E2E_TEST_ACCOUNTS[0], - PHONE_HASH_IDENTIFIER, - dekAuthSigner(1), - SERVICE_CONTEXT - ) - ).resolves.toBeInstanceOf(Array) - }) - }) -}) diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/legacypnp.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/legacypnp.test.ts new file mode 100644 index 00000000000..6d8cd160148 --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/end-to-end/legacypnp.test.ts @@ -0,0 +1,376 @@ +import { newKit } from '@celo/contractkit' +import { OdisUtils } from '@celo/identity' +import { PhoneNumberHashDetails } from '@celo/identity/lib/odis/phone-number-identifier' +import { + ErrorMessages, + getOdisPnpRequestAuth, + getServiceContext, + OdisAPI, + WalletKeySigner, +} from '@celo/identity/lib/odis/query' +import { + AuthenticationMethod, + CombinerEndpoint, + LegacySignMessageRequest, + SignMessageResponseSchema, + SignMessageResponseSuccess, +} from '@celo/phone-number-privacy-common' +import threshold_bls from 'blind-threshold-bls' +import { randomBytes } from 'crypto' +import 'isomorphic-fetch' +import { getCombinerVersion } from '../../src' +import { getBlindedPhoneNumber } from '../utils' +import { + ACCOUNT_ADDRESS, + ACCOUNT_ADDRESS_NO_QUOTA, + DEFAULT_FORNO_URL, + dekAuthSigner, + getTestContextName, + PHONE_NUMBER, + walletAuthSigner, +} from './resources' + +require('dotenv').config() + +jest.setTimeout(60000) + +const SERVICE_CONTEXT = getServiceContext(getTestContextName(), OdisAPI.PNP) +const combinerUrl = SERVICE_CONTEXT.odisUrl +const fullNodeUrl = process.env.ODIS_BLOCKCHAIN_PROVIDER + +const expectedVersion = getCombinerVersion() + +describe(`Running against service deployed at ${combinerUrl} w/ blockchain provider ${fullNodeUrl}`, () => { + it('Service is deployed at correct version', async () => { + const response = await fetch(combinerUrl + CombinerEndpoint.STATUS, { + method: 'GET', + }) + const body = await response.json() + // This checks against local package.json version, change if necessary + expect(body.version).toBe(expectedVersion) + }) + + describe(`${CombinerEndpoint.LEGACY_PNP_SIGN}`, () => { + it('Should succeed when authenticated with WALLET_KEY', async () => { + const res = await OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + walletAuthSigner, + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + undefined, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + }) + + it('Should succeed when authenticated with DEK', async () => { + const res = await OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + undefined, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + }) + + it('Should succeed on repeated valid requests', async () => { + const res1 = await OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + undefined, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res1.unblindedSignature!, 'base64') + ) + const res2 = await OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + undefined, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + expect(res2).toStrictEqual(res1) + }) + + it('Should increment performedQueryCount on success', async () => { + const req: LegacySignMessageRequest = { + account: ACCOUNT_ADDRESS, + blindedQueryPhoneNumber: getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)), + authenticationMethod: dekAuthSigner(0).authenticationMethod, + } + const res1 = (await OdisUtils.Query.queryOdis( + req, + SERVICE_CONTEXT, + CombinerEndpoint.LEGACY_PNP_SIGN, + SignMessageResponseSchema, + { + Authorization: await getOdisPnpRequestAuth(req, dekAuthSigner(0)), + } + )) as SignMessageResponseSuccess + expect(res1.success).toBe(true) + const req2 = req + req2.blindedQueryPhoneNumber = getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)) + const res2 = (await OdisUtils.Query.queryOdis( + req2, + SERVICE_CONTEXT, + CombinerEndpoint.LEGACY_PNP_SIGN, + SignMessageResponseSchema, + { + Authorization: await getOdisPnpRequestAuth(req, dekAuthSigner(0)), + } + )) as SignMessageResponseSuccess + + expect(res2.success).toBe(true) + // There may be warnings but that's ok + expect(res2).toMatchObject({ + success: true, + version: expectedVersion, + signature: res2.signature, + performedQueryCount: res1.performedQueryCount + 1, + totalQuota: res1.totalQuota, + blockNumber: res2.blockNumber, + }) + }) + + it('Should not increment performedQueryCount on replayed request when using DEK auth', async () => { + const req: LegacySignMessageRequest = { + account: ACCOUNT_ADDRESS, + blindedQueryPhoneNumber: getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)), + authenticationMethod: dekAuthSigner(0).authenticationMethod, + } + const res1 = (await OdisUtils.Query.queryOdis( + req, + SERVICE_CONTEXT, + CombinerEndpoint.LEGACY_PNP_SIGN, + SignMessageResponseSchema, + { + Authorization: await getOdisPnpRequestAuth(req, dekAuthSigner(0)), + } + )) as SignMessageResponseSuccess + expect(res1.success).toBe(true) + const res2 = (await OdisUtils.Query.queryOdis( + req, + SERVICE_CONTEXT, + CombinerEndpoint.LEGACY_PNP_SIGN, + SignMessageResponseSchema, + { + Authorization: await getOdisPnpRequestAuth(req, dekAuthSigner(0)), + } + )) as SignMessageResponseSuccess + expect(res2.success).toBe(true) + // There may be warnings but that's ok + expect(res2).toMatchObject({ + success: true, + version: expectedVersion, + signature: res2.signature, + performedQueryCount: res1.performedQueryCount, + totalQuota: res1.totalQuota, + blockNumber: res2.blockNumber, + }) + }) + + for (let i = 1; i <= 2; i++) { + it(`Should succeed on valid request with key version header ${i}`, async () => { + const res = await OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + i, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + }) + } + + it(`Should succeed on invalid key version`, async () => { + const res = await OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 1.5, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_INPUT_ERROR} on unsupported key version`, async () => { + await expect( + OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 10, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_INPUT_ERROR} on invalid address`, async () => { + await expect( + OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + 'not an address', + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 1, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_INPUT_ERROR} on invalid phone number`, async () => { + await expect( + OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + 'not a phone number', + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 1, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + ).rejects.toThrow('Invalid phone number: not a phone number') + }) + + it(`Should reject to throw 'unknown account' with invalid WALLET_KEY auth`, async () => { + const badWalletAuthSigner: WalletKeySigner = { + authenticationMethod: AuthenticationMethod.WALLET_KEY, + contractKit: newKit(DEFAULT_FORNO_URL), // doesn't have any private keys + } + await expect( + OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + badWalletAuthSigner, + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + undefined, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + ).rejects.toThrow('unknown account') + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_AUTH_ERROR} with invalid WALLET_KEY auth`, async () => { + const req: LegacySignMessageRequest = { + account: ACCOUNT_ADDRESS, + blindedQueryPhoneNumber: getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)), + authenticationMethod: walletAuthSigner.authenticationMethod, + } + await expect( + OdisUtils.Query.queryOdis( + req, + SERVICE_CONTEXT, + CombinerEndpoint.LEGACY_PNP_SIGN, + SignMessageResponseSchema, + { + Authorization: await walletAuthSigner.contractKit.connection.sign( + JSON.stringify(req), + ACCOUNT_ADDRESS_NO_QUOTA + ), + } + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_AUTH_ERROR} with invalid DEK auth`, async () => { + await expect( + OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(1), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + undefined, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_QUOTA_ERROR} when account has no quota`, async () => { + // Ensure it's not a replayed request. + const unusedPN = `+1${Date.now()}` + await expect( + OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + unusedPN, + ACCOUNT_ADDRESS_NO_QUOTA, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + undefined, + CombinerEndpoint.LEGACY_PNP_SIGN + ) + ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts new file mode 100644 index 00000000000..3efa088bb66 --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts @@ -0,0 +1,454 @@ +import { StableToken } from '@celo/contractkit' +import { OdisUtils } from '@celo/identity' +import { ErrorMessages, getServiceContext, OdisAPI } from '@celo/identity/lib/odis/query' +import { PnpClientQuotaStatus } from '@celo/identity/lib/odis/quota' +import { + CombinerEndpoint, + PnpQuotaRequest, + PnpQuotaResponseSchema, + SignMessageRequest, + SignMessageResponseSchema, +} from '@celo/phone-number-privacy-common' +import threshold_bls from 'blind-threshold-bls' +import { randomBytes } from 'crypto' +import 'isomorphic-fetch' +import { config as signerConfig } from '../../../signer/src/config' +import { getCombinerVersion } from '../../src' +import { + ACCOUNT_ADDRESS, + ACCOUNT_ADDRESS_NO_QUOTA, + BLINDED_PHONE_NUMBER, + dekAuthSigner, + getTestContextName, + PHONE_NUMBER, + walletAuthSigner, +} from './resources' + +const { IdentifierPrefix } = OdisUtils.Identifier + +require('dotenv').config() + +jest.setTimeout(60000) + +const SERVICE_CONTEXT = getServiceContext(getTestContextName(), OdisAPI.PNP) +const combinerUrl = SERVICE_CONTEXT.odisUrl +const fullNodeUrl = process.env.ODIS_BLOCKCHAIN_PROVIDER + +const expectedVersion = getCombinerVersion() + +describe(`Running against service deployed at ${combinerUrl} w/ blockchain provider ${fullNodeUrl}`, () => { + it('Service is deployed at correct version', async () => { + const response = await fetch(combinerUrl + CombinerEndpoint.STATUS, { + method: 'GET', + }) + const body = await response.json() + // This checks against local package.json version, change if necessary + expect(body.version).toBe(expectedVersion) + }) + + describe(`${CombinerEndpoint.PNP_QUOTA}`, () => { + it('Should succeed when authenticated with WALLET_KEY', async () => { + const res = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + walletAuthSigner, + SERVICE_CONTEXT + ) + expect(res).toStrictEqual({ + version: expectedVersion, + performedQueryCount: res.performedQueryCount, + totalQuota: res.totalQuota, + remainingQuota: res.totalQuota - res.performedQueryCount, + blockNumber: res.blockNumber, + warnings: [], + }) + }) + + it('Should succeed when authenticated with DEK', async () => { + const res = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + expect(res).toStrictEqual({ + version: expectedVersion, + performedQueryCount: res.performedQueryCount, + totalQuota: res.totalQuota, + remainingQuota: res.totalQuota - res.performedQueryCount, + blockNumber: res.blockNumber, + warnings: [], + }) + }) + + it('Should succeed on repeated valid requests', async () => { + const res1 = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + const expectedRes: PnpClientQuotaStatus = { + version: expectedVersion, + performedQueryCount: res1.performedQueryCount, + totalQuota: res1.totalQuota, + remainingQuota: res1.totalQuota - res1.performedQueryCount, + blockNumber: res1.blockNumber, + warnings: [], + } + expect(res1).toStrictEqual(expectedRes) + const res2 = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + expectedRes.blockNumber = res2.blockNumber + expect(res2).toStrictEqual(expectedRes) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_INPUT_ERROR} with invalid address`, async () => { + await expect( + OdisUtils.Quota.getPnpQuotaStatus('not an address', dekAuthSigner(0), SERVICE_CONTEXT) + ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_AUTH_ERROR} with invalid WALLET_KEY auth`, async () => { + const req: PnpQuotaRequest = { + account: ACCOUNT_ADDRESS, + authenticationMethod: walletAuthSigner.authenticationMethod, + } + await expect( + OdisUtils.Query.queryOdis( + req, + SERVICE_CONTEXT, + CombinerEndpoint.PNP_QUOTA, + PnpQuotaResponseSchema, + { + Authorization: await walletAuthSigner.contractKit.connection.sign( + JSON.stringify(req), + ACCOUNT_ADDRESS_NO_QUOTA + ), + } + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_AUTH_ERROR} with invalid DEK auth`, async () => { + await expect( + OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(1), // DEK auth signer doesn't match the registered DEK for ACCOUNT_ADDRESS + SERVICE_CONTEXT + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) + }) + + describe(`${CombinerEndpoint.PNP_SIGN}`, () => { + describe('new requests', () => { + beforeAll(async () => { + // Replenish quota for ACCOUNT_ADDRESS + // If this fails, may be necessary to faucet ACCOUNT_ADDRESS more funds + const numQueriesToReplenish = 2 + const amountInWei = signerConfig.quota.queryPriceInCUSD + .times(1e18) + .times(numQueriesToReplenish) + .toString() + const stableToken = await walletAuthSigner.contractKit.contracts.getStableToken( + StableToken.cUSD + ) + const odisPayments = await walletAuthSigner.contractKit.contracts.getOdisPayments() + await stableToken + .approve(odisPayments.address, amountInWei) + .sendAndWaitForReceipt({ from: ACCOUNT_ADDRESS }) + await odisPayments + .payInCUSD(ACCOUNT_ADDRESS, amountInWei) + .sendAndWaitForReceipt({ from: ACCOUNT_ADDRESS }) + }) + + // Requests made for PHONE_NUMBER from ACCOUNT_ADDRESS & same blinding factor + // are replayed from previous test runs (for every run after the very first) + let startingPerformedQueryCount: number + let startingTotalQuota: number + beforeEach(async () => { + const res = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + startingPerformedQueryCount = res.performedQueryCount + startingTotalQuota = res.totalQuota + }) + + it('Should increment performedQueryCount on success with DEK auth', async () => { + // Raw key is used as the blinding client's seed, so we need a new PN + // Create a fake PN that is always incrementing and shouldn't ever repeat + const unusedPN = `+1${Date.now()}` + await OdisUtils.Identifier.getObfuscatedIdentifier( + unusedPN, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + const quotaRes = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + expect(quotaRes).toStrictEqual({ + version: expectedVersion, + performedQueryCount: startingPerformedQueryCount + 1, + totalQuota: startingTotalQuota, + remainingQuota: startingTotalQuota - (startingPerformedQueryCount + 1), + blockNumber: quotaRes.blockNumber, + warnings: [], + }) + }) + + it('Should increment performedQueryCount on success with WALLET_KEY auth', async () => { + await OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + walletAuthSigner, + SERVICE_CONTEXT, + Buffer.from(randomBytes(32)).toString('base64') + ) + const quotaRes = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + walletAuthSigner, + SERVICE_CONTEXT + ) + expect(quotaRes).toStrictEqual({ + version: expectedVersion, + performedQueryCount: startingPerformedQueryCount + 1, + totalQuota: startingTotalQuota, + remainingQuota: startingTotalQuota - (startingPerformedQueryCount + 1), + blockNumber: quotaRes.blockNumber, + warnings: [], + }) + }) + }) + + describe('replayed requests', () => { + const replayedBlindingFactor = Buffer.from('test string for blinding factor').toString( + 'base64' + ) + beforeAll(async () => { + // Ensure that these are each called at least once for the first test runs + await OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + walletAuthSigner, + SERVICE_CONTEXT, + replayedBlindingFactor + ) + await OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + }) + + // Requests made for PHONE_NUMBER from ACCOUNT_ADDRESS + // are replayed from previous test runs (for every run after the very first) + let startingPerformedQueryCount: number + let startingTotalQuota: number + beforeEach(async () => { + const res = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + startingPerformedQueryCount = res.performedQueryCount + startingTotalQuota = res.totalQuota + }) + + it('Should succeed and not update performedQueryCount when authenticated with WALLET_KEY', async () => { + const res = await OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + walletAuthSigner, + SERVICE_CONTEXT, + replayedBlindingFactor + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + const quotaRes = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + walletAuthSigner, + SERVICE_CONTEXT + ) + expect(quotaRes.performedQueryCount).toEqual(startingPerformedQueryCount) + expect(quotaRes.totalQuota).toEqual(startingTotalQuota) + }) + + it('Should succeed and not update performedQueryCount when authenticated with DEK', async () => { + const res = await OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + const quotaRes = await OdisUtils.Quota.getPnpQuotaStatus( + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + expect(quotaRes.performedQueryCount).toEqual(startingPerformedQueryCount) + expect(quotaRes.totalQuota).toEqual(startingTotalQuota) + }) + }) + + // NOTE: these are also replayed requests + for (let i = 1; i <= 2; i++) { + it(`Should succeed on valid request with key version header ${i}`, async () => { + const res = await OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + i + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + }) + } + + it(`Should succeed on invalid key version`, async () => { + const res = await OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 1.5 + ) + threshold_bls.verify( + Buffer.from(SERVICE_CONTEXT.odisPubKey, 'base64'), + Buffer.from(PHONE_NUMBER), + Buffer.from(res.unblindedSignature!, 'base64') + ) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_INPUT_ERROR} on unsupported key version`, async () => { + await expect( + OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 10 + ) + ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_INPUT_ERROR} on invalid address`, async () => { + await expect( + OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + 'not an address', + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 1 + ) + ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_INPUT_ERROR} on invalid phone number`, async () => { + await expect( + OdisUtils.Identifier.getObfuscatedIdentifier( + '12345', + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(0), + SERVICE_CONTEXT, + undefined, + undefined, + undefined, + undefined, + 1 + ) + ).rejects.toThrow('Invalid phone number: 12345') + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_AUTH_ERROR} with invalid WALLET_KEY auth`, async () => { + const req: SignMessageRequest = { + account: ACCOUNT_ADDRESS, + blindedQueryPhoneNumber: BLINDED_PHONE_NUMBER, + authenticationMethod: walletAuthSigner.authenticationMethod, + } + await expect( + OdisUtils.Query.queryOdis( + req, + SERVICE_CONTEXT, + CombinerEndpoint.PNP_SIGN, + SignMessageResponseSchema, + { + Authorization: await walletAuthSigner.contractKit.connection.sign( + JSON.stringify(req), + ACCOUNT_ADDRESS_NO_QUOTA + ), + } + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_AUTH_ERROR} with invalid DEK auth`, async () => { + await expect( + OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS, + dekAuthSigner(1), // DEK auth signer doesn't match the registered DEK for ACCOUNT_ADDRESS + SERVICE_CONTEXT + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) + + it(`Should reject to throw ${ErrorMessages.ODIS_QUOTA_ERROR} when account has no quota`, async () => { + await expect( + OdisUtils.Identifier.getObfuscatedIdentifier( + PHONE_NUMBER, + IdentifierPrefix.PHONE_NUMBER, + ACCOUNT_ADDRESS_NO_QUOTA, + dekAuthSigner(0), + SERVICE_CONTEXT + ) + ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts b/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts index 9b22dd148fc..c90c4a7b9be 100644 --- a/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts +++ b/packages/phone-number-privacy/combiner/test/end-to-end/resources.ts @@ -1,10 +1,10 @@ import { newKit } from '@celo/contractkit' import { - AuthenticationMethod, EncryptionKeySigner, - ServiceContext, + OdisContextName, WalletKeySigner, } from '@celo/identity/lib/odis/query' +import { AuthenticationMethod } from '@celo/phone-number-privacy-common' import { PhoneNumberUtils } from '@celo/phone-utils' import { ensureLeading0x, @@ -12,18 +12,27 @@ import { privateKeyToAddress, } from '@celo/utils/lib/address' import 'isomorphic-fetch' -import { getBlindedPhoneNumber } from '../../../common/src/test/utils' require('dotenv').config() +export const getTestContextName = (): OdisContextName => { + switch (process.env.CONTEXT_NAME) { + case 'alfajores': + return OdisContextName.ALFAJORES + case 'staging': + return OdisContextName.STAGING + case 'mainnet': + return OdisContextName.MAINNET + default: + throw new Error('CONTEXT_NAME env var is undefined or invalid') + } +} + /** * CONSTS */ -export const ODIS_COMBINER = - process.env.ODIS_COMBINER_SERVICE_URL || - 'https://us-central1-celo-phone-number-privacy-stg.cloudfunctions.net' export const DEFAULT_FORNO_URL = - process.env.ODIS_BLOCKCHAIN_PROVIDER || 'https://alfajoresstaging-forno.celo-testnet.org' + process.env.ODIS_BLOCKCHAIN_PROVIDER ?? 'https://alfajores-forno.celo-testnet.org' export const PRIVATE_KEY = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' export const ACCOUNT_ADDRESS = normalizeAddressWith0x(privateKeyToAddress(PRIVATE_KEY)) // 0x1be31a94361a391bbafb2a4ccd704f57dc04d4bb @@ -34,13 +43,10 @@ export const ACCOUNT_ADDRESS_NO_QUOTA = privateKeyToAddress(PRIVATE_KEY_NO_QUOTA export const PHONE_NUMBER = '+17777777777' export const BLINDING_FACTOR = Buffer.from('0IsBvRfkBrkKCIW6HV0/T1zrzjQSe8wRyU3PKojCnww=', 'base64') -export const BLINDED_PHONE_NUMBER = getBlindedPhoneNumber(PHONE_NUMBER, BLINDING_FACTOR) - -export const SERVICE_CONTEXT: ServiceContext = { - odisUrl: ODIS_COMBINER, - odisPubKey: - '7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA', -} +// BLINDED_PHONE_NUMBER value is dependent on PHONE_NUMBER AND BLINDING_FACTOR +// hardcoding to avoid importing blind_threshols_bls library +export const BLINDED_PHONE_NUMBER = + 'hZXDhpC5onzBSFa1agZ9vfHzqwJ/QeJg77NGvWiQG/sFWsvHETzZvdWr2GpF3QkB' export const PHONE_HASH_IDENTIFIER = PhoneNumberUtils.getPhoneHash(PHONE_NUMBER) diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/get-blinded-sig.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/tmpBackwardsCompatibility.test.ts similarity index 57% rename from packages/phone-number-privacy/combiner/test/end-to-end/get-blinded-sig.test.ts rename to packages/phone-number-privacy/combiner/test/end-to-end/tmpBackwardsCompatibility.test.ts index 2f6bbadd336..9db2ebe2ed1 100644 --- a/packages/phone-number-privacy/combiner/test/end-to-end/get-blinded-sig.test.ts +++ b/packages/phone-number-privacy/combiner/test/end-to-end/tmpBackwardsCompatibility.test.ts @@ -1,72 +1,79 @@ -import { OdisUtils } from '@celo/identity/lib/odis' -import { - AuthenticationMethod, - ErrorMessages, - SignMessageRequest, -} from '@celo/identity/lib/odis/query' -import { Endpoints } from '@celo/phone-number-privacy-common' +import { newKit } from '@celo/contractkit' +import { OdisUtils } from '@celo/identity-prev' +import { getServiceContext, SignMessageRequest } from '@celo/identity-prev/lib/odis/query' +import { ErrorMessages } from '@celo/identity/lib/odis/query' +import { AuthenticationMethod, Endpoint } from '@celo/phone-number-privacy-common' +import { replenishQuota } from '@celo/phone-number-privacy-common/lib/test/utils' import { genSessionID } from '@celo/phone-number-privacy-common/lib/utils/logger' +import { ensureLeading0x } from '@celo/utils/lib/address' import 'isomorphic-fetch' -import { replenishQuota } from '../../../common/src/test/utils' -import { VERSION } from '../../src/config' import { ACCOUNT_ADDRESS, ACCOUNT_ADDRESS_NO_QUOTA, BLINDED_PHONE_NUMBER, - contractKit, + DEFAULT_FORNO_URL, dekAuthSigner, + deks, + getTestContextName, PHONE_NUMBER, - SERVICE_CONTEXT, - walletAuthSigner, + PRIVATE_KEY, + PRIVATE_KEY_NO_QUOTA, } from './resources' require('dotenv').config() -export const SIGN_MESSAGE_ENDPOINT = '/getBlindedMessageSig' - jest.setTimeout(60000) -describe('Running against a deployed service', () => { - beforeAll(() => { - console.log('ODIS_COMBINER_SERVICE_URL: ' + process.env.ODIS_COMBINER_SERVICE_URL) - console.log('ODIS_BLOCKCHAIN_PROVIDER: ' + process.env.ODIS_BLOCKCHAIN_PROVIDER) - }) +const contractKit = newKit(DEFAULT_FORNO_URL) +contractKit.addAccount(PRIVATE_KEY_NO_QUOTA) +contractKit.addAccount(PRIVATE_KEY) +contractKit.defaultAccount = ACCOUNT_ADDRESS - // This test is disabled because the Combiner status endpoint doesn't work - xit('Service is deployed at correct version', async () => { - const response = await fetch(process.env.ODIS_COMBINER_SERVICE_URL + Endpoints.STATUS, { - method: 'GET', - }) - const body = await response.json() - // This checks against local package.json version, change if necessary - expect(body.version).toBe(VERSION) +const SERVICE_CONTEXT = getServiceContext(getTestContextName()) + +const fullNodeUrl = process.env.ODIS_BLOCKCHAIN_PROVIDER + +describe(`Running against service deployed at ${SERVICE_CONTEXT.odisUrl} w/ blockchain provider ${fullNodeUrl}`, () => { + beforeAll(async () => { + const dek0 = ensureLeading0x(deks[0].publicKey) + const accountsWrapper = await contractKit.contracts.getAccounts() + if ((await accountsWrapper.getDataEncryptionKey(ACCOUNT_ADDRESS)) !== dek0) { + await accountsWrapper + .setAccountDataEncryptionKey(dek0) + .sendAndWaitForReceipt({ from: ACCOUNT_ADDRESS }) + } + if ((await accountsWrapper.getDataEncryptionKey(ACCOUNT_ADDRESS_NO_QUOTA)) !== dek0) { + await accountsWrapper + .setAccountDataEncryptionKey(dek0) + .sendAndWaitForReceipt({ from: ACCOUNT_ADDRESS_NO_QUOTA }) + } }) describe('Returns status ODIS_INPUT_ERROR', () => { it('With invalid address', async () => { const body: SignMessageRequest = { account: '0x1234', - authenticationMethod: AuthenticationMethod.WALLET_KEY, + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, blindedQueryPhoneNumber: BLINDED_PHONE_NUMBER, version: 'ignore', sessionID: genSessionID(), } await expect( - OdisUtils.Query.queryOdis(dekAuthSigner(0), body, SERVICE_CONTEXT, SIGN_MESSAGE_ENDPOINT) + OdisUtils.Query.queryOdis(dekAuthSigner(0), body, SERVICE_CONTEXT, Endpoint.LEGACY_PNP_SIGN) ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) }) it('With missing blindedQueryPhoneNumber', async () => { const body: SignMessageRequest = { account: ACCOUNT_ADDRESS, - authenticationMethod: AuthenticationMethod.WALLET_KEY, + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, blindedQueryPhoneNumber: '', version: 'ignore', sessionID: genSessionID(), } await expect( - OdisUtils.Query.queryOdis(walletAuthSigner, body, SERVICE_CONTEXT, SIGN_MESSAGE_ENDPOINT) + OdisUtils.Query.queryOdis(dekAuthSigner(0), body, SERVICE_CONTEXT, Endpoint.LEGACY_PNP_SIGN) ).rejects.toThrow(ErrorMessages.ODIS_INPUT_ERROR) }) }) @@ -80,7 +87,7 @@ describe('Running against a deployed service', () => { version: 'ignore', } await expect( - OdisUtils.Query.queryOdis(dekAuthSigner(0), body, SERVICE_CONTEXT, SIGN_MESSAGE_ENDPOINT) + OdisUtils.Query.queryOdis(dekAuthSigner(0), body, SERVICE_CONTEXT, Endpoint.LEGACY_PNP_SIGN) ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) }) }) @@ -91,7 +98,7 @@ describe('Running against a deployed service', () => { OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( PHONE_NUMBER, ACCOUNT_ADDRESS_NO_QUOTA, - walletAuthSigner, + dekAuthSigner(0), SERVICE_CONTEXT ) ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) @@ -105,7 +112,7 @@ describe('Running against a deployed service', () => { await replenishQuota(ACCOUNT_ADDRESS, contractKit) const body: SignMessageRequest = { account: ACCOUNT_ADDRESS, - authenticationMethod: AuthenticationMethod.WALLET_KEY, + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, blindedQueryPhoneNumber: BLINDED_PHONE_NUMBER, version: 'ignore', sessionID: genSessionID(), @@ -113,10 +120,10 @@ describe('Running against a deployed service', () => { // Query twice to test reusing the request for (let i = 0; i < 2; i++) { const result = OdisUtils.Query.queryOdis( - walletAuthSigner, + dekAuthSigner(0), body, SERVICE_CONTEXT, - SIGN_MESSAGE_ENDPOINT + Endpoint.LEGACY_PNP_SIGN ) await expect(result).resolves.toMatchObject({ success: true }) } diff --git a/packages/phone-number-privacy/combiner/test/index.test.ts b/packages/phone-number-privacy/combiner/test/index.test.ts deleted file mode 100644 index d8465209e85..00000000000 --- a/packages/phone-number-privacy/combiner/test/index.test.ts +++ /dev/null @@ -1,567 +0,0 @@ -import { signWithDEK } from '@celo/identity/lib/odis/query' -import { getDataEncryptionKey, isVerified } from '@celo/phone-number-privacy-common' -import { Request, Response } from 'firebase-functions' -import { BLSCryptographyClient } from '../src/bls/bls-cryptography-client' -import config, { E2E_TEST_ACCOUNTS, E2E_TEST_PHONE_NUMBERS, VERSION } from '../src/config' -import { getTransaction } from '../src/database/database' -import { - getAccountSignedUserPhoneNumberRecord, - getDekSignerRecord, - getDidMatchmaking, - setDidMatchmaking, -} from '../src/database/wrappers/account' -import { getNumberPairContacts, setNumberPairContacts } from '../src/database/wrappers/number-pairs' -import { getBlindedMessageSig, getContactMatches } from '../src/index' -import { BLINDED_PHONE_NUMBER, dekAuthSigner, deks } from './end-to-end/resources' -const BLS_SIGNATURE = '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A' - -jest.mock('@celo/phone-number-privacy-common', () => ({ - ...jest.requireActual('@celo/phone-number-privacy-common'), - authenticateUser: jest.fn().mockReturnValue(true), - isVerified: jest.fn(), - getDataEncryptionKey: jest.fn(), -})) -const mockIsVerified = isVerified as jest.Mock -const mockGetDataEncryptionKey = getDataEncryptionKey as jest.Mock - -jest.mock('../src/bls/bls-cryptography-client') -const mockComputeBlindedSignature = jest.fn() -BLSCryptographyClient.prototype.combinePartialBlindedSignatures = mockComputeBlindedSignature -mockComputeBlindedSignature.mockResolvedValue(BLS_SIGNATURE) -const mockSufficientVerifiedSigs = jest.fn() -BLSCryptographyClient.prototype.hasSufficientSignatures = mockSufficientVerifiedSigs -mockSufficientVerifiedSigs.mockReturnValue(true) - -jest.mock('../src/database/wrappers/account') -const mockGetDidMatchmaking = getDidMatchmaking as jest.Mock -const mockSetDidMatchmaking = setDidMatchmaking as jest.Mock -mockSetDidMatchmaking.mockImplementation() -const mockGetAccountSignedUserPhoneNumberRecord = getAccountSignedUserPhoneNumberRecord as jest.Mock -const mockGetDekSignerRecord = getDekSignerRecord as jest.Mock - -jest.mock('../src/database/wrappers/number-pairs') -const mockSetNumberPairContacts = setNumberPairContacts as jest.Mock -mockSetNumberPairContacts.mockImplementation() -const mockGetNumberPairContacts = getNumberPairContacts as jest.Mock -mockGetNumberPairContacts.mockResolvedValue([]) - -jest.mock('../src/database/database') -const mockGetTransaction = getTransaction as jest.Mock -mockGetTransaction.mockReturnValue({}) - -jest.mock('node-fetch') -const fetchMock: jest.Mock = require('node-fetch') -const FetchResponse: typeof Response = jest.requireActual('node-fetch').Response -const defaultResponseJson = JSON.stringify({ - success: true, - signature: 'string', -}) - -const mockHeaders = { authorization: 'fdsfdsfs' } - -const invalidResponseExpected = (done: any, code: number) => - ({ - status(status: any) { - try { - expect(status).toEqual(code) - done() - } catch (e) { - done(e) - } - return { - json() { - return {} - }, - } - }, - } as Response) - -describe(`POST /getBlindedMessageSig endpoint`, () => { - const validRequest = { - blindedQueryPhoneNumber: BLINDED_PHONE_NUMBER, - hashedPhoneNumber: '0x5f6e88c3f724b3a09d3194c0514426494955eff7127c29654e48a361a19b4b96', - account: '0x78dc5D2D739606d31509C31d654056A45185ECb6', - } - - beforeEach(() => { - fetchMock.mockClear() - fetchMock.mockImplementation(() => Promise.resolve(new FetchResponse(defaultResponseJson))) - }) - - describe('with valid input', () => { - const req = { - body: validRequest, - headers: mockHeaders, - } as Request - - const validResponseExpected = (done: any, code: number) => - ({ - json(body: any) { - expect(body.success).toEqual(true) - expect(body.combinedSignature).toEqual(BLS_SIGNATURE) - expect(body.version).toEqual(VERSION) - done() - }, - status(status: any) { - try { - expect(status).toEqual(code) - done() - } catch (e) { - done(e) - } - return { - json() { - return {} - }, - } - }, - } as Response) - - it('provides signature', (done) => { - getBlindedMessageSig(req, validResponseExpected(done, 200)) - }) - - it('provides signature from a fallback', (done) => { - let numberOfCalls = 0 - fetchMock.mockClear() - fetchMock.mockImplementation((url) => { - const primaryUrl = - JSON.parse(config.odisServices.signers)[0].url + '/getBlindedMessagePartialSig' - numberOfCalls += 1 - if (url === primaryUrl) { - return Promise.reject() - } - return Promise.resolve(new FetchResponse(defaultResponseJson)) - }) - getBlindedMessageSig( - req, - validResponseExpected(() => { - expect(numberOfCalls).toEqual(2) - done() - }, 200) - ) - }) - - it('returns 500 on bls error', (done) => { - mockSufficientVerifiedSigs.mockReturnValueOnce(false) - mockComputeBlindedSignature.mockImplementationOnce(() => { - throw Error() - }) - - getBlindedMessageSig(req, invalidResponseExpected(done, 500)) - }) - }) - - describe('with invalid input', () => { - it('invalid address returns 400', (done) => { - const req = { - body: { - ...validRequest, - account: 'd31509C31d654056A45185ECb6', - }, - headers: mockHeaders, - } as Request - - getBlindedMessageSig(req, invalidResponseExpected(done, 400)) - }) - it('invalid hashedPhoneNumber returns 400', (done) => { - const req = { - body: { - ...validRequest, - hashedPhoneNumber: '+1234567890', - }, - headers: mockHeaders, - } as Request - - getBlindedMessageSig(req, invalidResponseExpected(done, 400)) - }) - it('invalid blinded phone number returns 400', (done) => { - const req = { - body: { - ...validRequest, - blindedQueryPhoneNumber: '+1234567890', - }, - headers: mockHeaders, - } as Request - - getBlindedMessageSig(req, invalidResponseExpected(done, 400)) - }) - }) -}) - -describe(`POST /getContactMatches endpoint`, () => { - const validInput = { - userPhoneNumber: 'o+EZnvfWS3K9X1krfcuH68Ueg1OPzqSnTyFzgtpCGlY=', - contactPhoneNumbers: ['aXq4I31oe0pSQtl8nq7vTorY9ehCz0z0pN0UMePWK9Y='], - account: '0x78dc5D2D739606d31509C31d654056A45185ECb6', - hashedPhoneNumber: '0x5f6e88c3f724b3a09d3194c0514426494955eff7127c29654e48a361a19b4b96', - } - - const expectFailure = (req: Request, code: number) => { - it(`Rejects request to matchmake with ${code}`, (done) => { - getContactMatches(req, invalidResponseExpected(done, code)) - }) - } - const expectSuccess = (req: Request) => { - it('provides matches', (done) => expectMatches(req, req.body.contactPhoneNumbers, done)) - it('provides matches empty array', (done) => expectMatches(req, [], done)) - } - const expectMatches = (req: Request, numbers: string[], done: jest.DoneCallback) => { - mockGetNumberPairContacts.mockResolvedValue(numbers) - const res = { - json(body: any) { - try { - expect(body.success).toEqual(true) - expect(body.matchedContacts).toEqual( - numbers.map((number) => ({ - phoneNumber: number, - })) - ) - done() - } catch (e) { - done(e) - } - }, - status(status: any) { - try { - expect(status).toEqual(200) - done() - } catch (e) { - done(e) - } - return { - json() { - return {} - }, - } - }, - } as Response - - getContactMatches(req, res) - } - const expectSuccessWithRecord = (req: Request) => { - expectSuccess(req) - expectSignatureWasRecorded(req) - } - const expectSuccessWithoutRecord = (req: Request) => { - expectSuccess(req) - expectSignatureWasNotRecorded() - } - const expectFirstMatchmakingToSucceed = (req: Request) => { - mockGetDidMatchmaking.mockResolvedValue(false) - expectSuccess(req) - } - const expectFirstMatchmakingToSucceedWithoutRecord = (req: Request) => { - expectFirstMatchmakingToSucceed(req) - expectSignatureWasNotRecorded() - } - const expectFirstMatchmakingToSucceedWithRecord = (req: Request) => { - expectFirstMatchmakingToSucceed(req) - expectSignatureWasRecorded(req) - } - const expectSignatureWasRecorded = (req: Request) => { - it('Should have recorded dek phone number signature for the last request', () => { - expect(mockSetDidMatchmaking).toHaveBeenLastCalledWith( - req.body.account, - expect.anything(), - expect.anything() - ) - }) - } - const expectSignatureWasNotRecorded = () => { - it('Should not have recorded dek phone number signature for the last request', () => { - expect(mockSetDidMatchmaking).toHaveBeenLastCalledWith( - validInput.account, - expect.anything(), - undefined - ) - }) - } - const expectReplaysToFail = (req: Request) => { - describe('When user has already performed matchmaking', () => { - beforeAll(() => { - mockGetDidMatchmaking.mockResolvedValueOnce(true) - }) - expectFailure(req, 403) - }) - } - const expectPotentialReplaysToSucceedWithoutRecord = (req: Request) => { - it('provides matches on getDidMatchmaking error', (done) => { - mockGetDidMatchmaking.mockRejectedValueOnce(new Error()) - expectMatches(req, req.body.contactPhoneNumbers, done) - }) - expectSignatureWasNotRecorded() - } - - describe('with valid input', () => { - beforeAll(() => { - mockIsVerified.mockResolvedValue(true) - }) - - describe('w/o signedUserPhoneNumber', () => { - const req = { - body: validInput, - headers: mockHeaders, - } as Request - expectFirstMatchmakingToSucceedWithoutRecord(req) - expectReplaysToFail(req) - expectPotentialReplaysToSucceedWithoutRecord(req) - }) - - describe('w/ signedUserPhoneNumber', () => { - const signedUserPhoneNumber = signWithDEK(validInput.userPhoneNumber, dekAuthSigner(0)) - const req = { - body: { - ...validInput, - signedUserPhoneNumber, - }, - headers: mockHeaders, - } as Request - - describe('When DEK is fetched successfully', () => { - beforeAll(() => { - mockGetDataEncryptionKey.mockResolvedValue(deks[0].publicKey) - }) - - describe('When DEK signedUserPhoneNumber signature is invalid', () => { - beforeAll(() => { - req.body.signedUserPhoneNumber = 'fake' - }) - afterAll(() => { - req.body.signedUserPhoneNumber = signedUserPhoneNumber - }) - expectFailure(req, 403) - }) - - describe('When DEK signedUserPhoneNumber signature is valid', () => { - expectFirstMatchmakingToSucceedWithRecord(req) - expectPotentialReplaysToSucceedWithoutRecord(req) - - describe('With replayed requests', () => { - beforeAll(() => { - mockGetDidMatchmaking.mockResolvedValue(true) - }) - describe('When signedUserPhoneNumberRecord matches request', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue( - req.body.signedUserPhoneNumber - ) - }) - expectSuccessWithRecord(req) - describe('Should bypass verification when e2e test phone number and account are provided', () => { - beforeAll(() => { - mockIsVerified.mockResolvedValue(false) - req.body.account = E2E_TEST_ACCOUNTS[0] - req.body.userPhoneNumber = E2E_TEST_PHONE_NUMBERS[0] - req.body.signedUserPhoneNumber = signWithDEK( - req.body.userPhoneNumber, - dekAuthSigner(0) - ) - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue( - req.body.signedUserPhoneNumber - ) - }) - afterAll(() => { - mockIsVerified.mockResolvedValue(true) - req.body.account = validInput.account - req.body.userPhoneNumber = validInput.userPhoneNumber - req.body.signedUserPhoneNumber = signWithDEK( - req.body.userPhoneNumber, - dekAuthSigner(0) - ) - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue( - req.body.signedUserPhoneNumber - ) - }) - expectSuccessWithRecord(req) - }) - }) - - describe('When signedUserPhoneNumberRecord does not match request', () => { - describe('When user has not rotated their dek', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue('fake') - }) - expectFailure(req, 403) - }) - - describe('When user has rotated their dek', () => { - beforeAll(() => { - mockGetDataEncryptionKey.mockResolvedValue(deks[1].publicKey) - req.body.signedUserPhoneNumber = signWithDEK( - validInput.userPhoneNumber, - dekAuthSigner(1) - ) - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue( - signWithDEK(validInput.userPhoneNumber, dekAuthSigner(0)) - ) - mockGetDekSignerRecord.mockResolvedValue(deks[0].publicKey) - }) - expectSuccessWithRecord(req) - }) - - describe('When we cannot find a dekSignerRecord for the user', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue('fake') - mockGetDekSignerRecord.mockResolvedValue(undefined) - }) - expectFailure(req, 403) - }) - }) - - describe('When signedUserPhoneNumberRecord does not exist in db', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue(undefined) - }) - expectSuccessWithRecord(req) - }) - - describe('When GetAccountSignedUserPhoneNumberRecord throws db error', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockRejectedValue(new Error()) - }) - expectSuccessWithoutRecord(req) - }) - }) - }) - }) - - describe('When DEK is not fetched succesfully', () => { - beforeAll(() => { - mockGetDataEncryptionKey.mockRejectedValue(new Error()) - }) - - expectFirstMatchmakingToSucceedWithoutRecord(req) - expectPotentialReplaysToSucceedWithoutRecord(req) - - describe('With replayed requests', () => { - beforeAll(() => { - mockGetDidMatchmaking.mockResolvedValue(true) - }) - - describe('When signedUserPhoneNumberRecord matches request', () => { - beforeAll(() => { - req.body.signedUserPhoneNumber = signedUserPhoneNumber - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue(signedUserPhoneNumber) - }) - expectSuccessWithoutRecord(req) - }) - - describe('When signedUserPhoneNumberRecord does not match request', () => { - describe('When user has not rotated their dek', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue('fake') - }) - expectFailure(req, 403) - }) - - describe('When user has rotated their dek', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue( - signWithDEK(validInput.userPhoneNumber, dekAuthSigner(1)) - ) - mockGetDekSignerRecord.mockResolvedValue(deks[1].publicKey) - }) - expectSuccessWithoutRecord(req) - }) - - describe('When we cannot find a dekSignerRecord for the user', () => { - beforeAll(() => { - mockGetDekSignerRecord.mockResolvedValue(undefined) - }) - expectFailure(req, 403) - }) - }) - - describe('When signedUserPhoneNumberRecord does not exist in db', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockResolvedValue(undefined) - }) - expectSuccessWithoutRecord(req) - }) - - describe('When GetAccountSignedUserPhoneNumberRecord throws db error', () => { - beforeAll(() => { - mockGetAccountSignedUserPhoneNumberRecord.mockRejectedValue(new Error()) - }) - expectSuccessWithoutRecord(req) - }) - }) - }) - }) - }) - - describe('with invalid input', () => { - it('missing user number returns 400', (done) => { - const req = { - body: { - ...validInput, - userPhoneNumber: undefined, - }, - headers: mockHeaders, - } as Request - - getContactMatches(req, invalidResponseExpected(done, 400)) - }) - - it('invalid user number returns 400', (done) => { - const req = { - body: { - ...validInput, - userPhoneNumber: '+14155550123', - }, - headers: mockHeaders, - } as Request - - getContactMatches(req, invalidResponseExpected(done, 400)) - }) - - it('invalid account returns 400', (done) => { - const req = { - body: { - ...validInput, - account: 'garbage', - }, - headers: mockHeaders, - } as Request - - getContactMatches(req, invalidResponseExpected(done, 400)) - }) - - it('missing contact phone numbers returns 400', (done) => { - const req = { - body: { - ...validInput, - contactPhoneNumbers: undefined, - }, - headers: mockHeaders, - } as Request - - getContactMatches(req, invalidResponseExpected(done, 400)) - }) - - it('empty contact phone numbers returns 400', (done) => { - const req = { - body: { - ...validInput, - contactPhoneNumbers: [], - }, - headers: mockHeaders, - } as Request - - getContactMatches(req, invalidResponseExpected(done, 400)) - }) - - it('invalid contact phone numbers returns 400', (done) => { - const req = { - body: { - ...validInput, - contactPhoneNumbers: ['+14155550123'], - }, - headers: mockHeaders, - } as Request - - getContactMatches(req, invalidResponseExpected(done, 400)) - }) - }) -}) diff --git a/packages/phone-number-privacy/combiner/test/integration/domain.test.ts b/packages/phone-number-privacy/combiner/test/integration/domain.test.ts new file mode 100644 index 00000000000..5641c2fcdde --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/integration/domain.test.ts @@ -0,0 +1,1283 @@ +import { + CombinerEndpoint, + DisableDomainRequest, + disableDomainRequestEIP712, + DisableDomainResponse, + domainHash, + DomainIdentifiers, + DomainQuotaStatusRequest, + domainQuotaStatusRequestEIP712, + DomainQuotaStatusResponse, + DomainRequestTypeTag, + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestEIP712, + DomainRestrictedSignatureResponse, + ErrorMessage, + genSessionID, + getContractKit, + KEY_VERSION_HEADER, + PoprfClient, + SequentialDelayDomain, + SequentialDelayStage, + TestUtils, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { + initDatabase as initSignerDatabase, + startSigner, + SupportedDatabase, + SupportedKeystore, +} from '@celo/phone-number-privacy-signer' +import { + DefaultKeyName, + KeyProvider, +} from '@celo/phone-number-privacy-signer/dist/common/key-management/key-provider-base' +import { SignerConfig } from '@celo/phone-number-privacy-signer/dist/config' +import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils' +import { LocalWallet } from '@celo/wallet-local' +import BigNumber from 'bignumber.js' +import { Server as HttpsServer } from 'https' +import { Knex } from 'knex' +import { Server } from 'net' +import request from 'supertest' +import { MockKeyProvider } from '../../../signer/dist/common/key-management/mock-key-provider' +import config from '../../src/config' +import { startCombiner } from '../../src/server' + +const { + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V1, + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V2, + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V3, + DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V1, + DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V2, + DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V3, + DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V1, + DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V2, + DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V3, +} = TestUtils.Values + +// create deep copy of config +const combinerConfig: typeof config = JSON.parse(JSON.stringify(config)) +combinerConfig.domains.enabled = true + +const signerConfig: SignerConfig = { + serviceName: 'odis-signer', + server: { + port: undefined, + sslKeyPath: undefined, + sslCertPath: undefined, + }, + quota: { + unverifiedQueryMax: 10, + additionalVerifiedQueryMax: 30, + queryPerTransaction: 2, + // Min balance is .01 cUSD + minDollarBalance: new BigNumber(1e16), + // Min balance is .01 cEUR + minEuroBalance: new BigNumber(1e16), + // Min balance is .005 CELO + minCeloBalance: new BigNumber(5e15), + // Equivalent to 0.001 cUSD/query + queryPriceInCUSD: new BigNumber(0.001), + }, + api: { + domains: { + enabled: true, + }, + phoneNumberPrivacy: { + enabled: false, + shouldFailOpen: false, + }, + legacyPhoneNumberPrivacy: { + enabled: false, + shouldFailOpen: false, + }, + }, + attestations: { + numberAttestationsRequired: 3, + }, + blockchain: { + provider: 'https://alfajores-forno.celo-testnet.org', + apiKey: undefined, + }, + db: { + type: SupportedDatabase.Sqlite, + user: '', + password: '', + database: '', + host: 'http://localhost', + port: undefined, + ssl: true, + poolMaxSize: 50, + }, + keystore: { + type: SupportedKeystore.MOCK_SECRET_MANAGER, + keys: { + phoneNumberPrivacy: { + name: 'phoneNumberPrivacy', + latest: 2, + }, + domains: { + name: 'domains', + latest: 1, + }, + }, + azure: { + clientID: '', + clientSecret: '', + tenant: '', + vaultName: '', + }, + google: { + projectId: '', + }, + aws: { + region: '', + secretKey: '', + }, + }, + timeout: 5000, + test_quota_bypass_percentage: 0, +} + +describe('domainService', () => { + const wallet = new LocalWallet() + wallet.addAccount('0x00000000000000000000000000000000000000000000000000000000deadbeef') + const walletAddress = wallet.getAccounts()[0]! + + const domainStages = (): SequentialDelayStage[] => [ + { delay: 0, resetTimer: noBool, batchSize: defined(2), repetitions: defined(10) }, + ] + + const authenticatedDomain = (_stages?: SequentialDelayStage[]): SequentialDelayDomain => ({ + name: DomainIdentifiers.SequentialDelay, + version: '1', + stages: _stages ?? domainStages(), + address: defined(walletAddress), + salt: defined('himalayanPink'), + }) + + const DEFAULT_PUB_KEY = + TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEYS[config.domains.keys.currentVersion - 1] + const signatureRequest = async ( + _domain?: SequentialDelayDomain, + _nonce?: number, + _pubKey: string = DEFAULT_PUB_KEY + ): Promise<[DomainRestrictedSignatureRequest, PoprfClient]> => { + const domain = _domain ?? authenticatedDomain() + const poprfClient = new PoprfClient( + Buffer.from(_pubKey, 'base64'), + domainHash(domain), + Buffer.from('test message', 'utf8') + ) + + const req: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, + domain: domain, + options: { + signature: noString, + nonce: defined(_nonce ?? 0), + }, + blindedMessage: poprfClient.blindedMessage.toString('base64'), + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, domainRestrictedSignatureRequestEIP712(req)) + ) + return [req, poprfClient] + } + + const quotaRequest = async (): Promise> => { + const req: DomainQuotaStatusRequest = { + type: DomainRequestTypeTag.QUOTA, + domain: authenticatedDomain(), + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, domainQuotaStatusRequestEIP712(req)) + ) + return req + } + + // Build and sign an example disable domain request. + const disableRequest = async ( + _domain?: SequentialDelayDomain + ): Promise> => { + const req: DisableDomainRequest = { + type: DomainRequestTypeTag.DISABLE, + domain: _domain ?? authenticatedDomain(), + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, disableDomainRequestEIP712(req)) + ) + return req + } + + let keyProvider1: KeyProvider + let keyProvider2: KeyProvider + let keyProvider3: KeyProvider + let signerDB1: Knex + let signerDB2: Knex + let signerDB3: Knex + let signer1: Server | HttpsServer + let signer2: Server | HttpsServer + let signer3: Server | HttpsServer + let app: any + + const signerMigrationsPath = '../signer/dist/common/database/migrations' + + describe('with n=3, t=2', () => { + const expectedEvals: string[] = [ + '3QLFPV6VvnhhnZ7mOu0xm7BUUJIUVY6vEHvZONOtZ/c=', + 'BBG0fAZJ6VNQwjge+3vOCF3uBo5KCs2+er/f/2QcV58=', + '1/otd1fW1nhUoU3ubjFDS8/RX0OClvHDsmGdnz6fZVE=', + ] + const expectedEval = expectedEvals[config.domains.keys.currentVersion - 1] + + beforeAll(async () => { + keyProvider1 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.DOMAINS}-1`, DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V1], + [`${DefaultKeyName.DOMAINS}-2`, DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V2], + [`${DefaultKeyName.DOMAINS}-3`, DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V3], + ]) + ) + keyProvider2 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.DOMAINS}-1`, DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V1], + [`${DefaultKeyName.DOMAINS}-2`, DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V2], + [`${DefaultKeyName.DOMAINS}-3`, DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V3], + ]) + ) + keyProvider3 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.DOMAINS}-1`, DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V1], + [`${DefaultKeyName.DOMAINS}-2`, DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V2], + [`${DefaultKeyName.DOMAINS}-3`, DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V3], + ]) + ) + + app = startCombiner(combinerConfig, getContractKit(combinerConfig.blockchain)) + }) + + beforeEach(async () => { + signerDB1 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB2 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB3 = await initSignerDatabase(signerConfig, signerMigrationsPath) + }) + + afterEach(async () => { + await signerDB1?.destroy() + await signerDB2?.destroy() + await signerDB3?.destroy() + signer1?.close() + signer2?.close() + signer3?.close() + }) + + describe('when signers are operating correctly', () => { + beforeEach(async () => { + signer1 = startSigner(signerConfig, signerDB1, keyProvider1).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3).listen(3003) + }) + + describe(`${CombinerEndpoint.DISABLE_DOMAIN}`, () => { + it('Should respond with 200 on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DISABLE_DOMAIN) + .send(await disableRequest()) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: true, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const req = await disableRequest() + const res1 = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(req) + expect(res1.status).toBe(200) + const expectedResponse: DisableDomainResponse = { + success: true, + version: res1.body.version, + status: { disabled: true, counter: 0, timer: 0, now: res1.body.status.now }, + } + expect(res1.body).toStrictEqual(expectedResponse) + const res2 = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(req) + expect(res2.status).toBe(200) + expectedResponse.status.now = res2.body.status.now + expect(res2.body).toStrictEqual(expectedResponse) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = await disableRequest() + // @ts-ignore Intentionally adding an extra field to the request type + req.options.extraField = noString + + const res = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: true, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = await disableRequest() + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + + const res = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + // Create a requests with an invalid domain identifier. + const unknownRequest = await disableRequest() + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + unknownRequest.domain.name = 'UnknownDomain' + + const res = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(unknownRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const badRequest1 = await disableRequest() + // @ts-ignore Intentionally not JSON + badRequest1.domain = 'Freddy' + + const res1 = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(badRequest1) + + expect(res1.status).toBe(400) + expect(res1.body).toStrictEqual({ + success: false, + version: res1.body.version, + error: WarningMessage.INVALID_INPUT, + }) + + const badRequest2 = '' + + const res2 = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(badRequest2) + + expect(res2.status).toBe(400) + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + // Create a manipulated request, which will have a bad signature. + const badRequest = await disableRequest() + badRequest.domain.salt = defined('badSalt') + + const res = await request(app).post(CombinerEndpoint.DISABLE_DOMAIN).send(badRequest) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + configWithApiDisabled.domains.enabled = false + const appWithApiDisabled = startCombiner( + configWithApiDisabled, + getContractKit(configWithApiDisabled.blockchain) + ) + const req = await disableRequest() + + const res = await request(appWithApiDisabled) + .post(CombinerEndpoint.DISABLE_DOMAIN) + .send(req) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_QUOTA_STATUS}`, () => { + it('Should respond with 200 on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(await quotaRequest()) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const req = await quotaRequest() + const res1 = await request(app).post(CombinerEndpoint.DOMAIN_QUOTA_STATUS).send(req) + const expectedResponse: DomainQuotaStatusResponse = { + success: true, + version: res1.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res1.body.status.now }, + } + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual(expectedResponse) + + const res2 = await request(app).post(CombinerEndpoint.DOMAIN_QUOTA_STATUS).send(req) + expect(res2.status).toBe(200) + // Prevent flakiness due to slight timing inconsistencies + expectedResponse.status.now = res2.body.status.now + expect(res2.body).toStrictEqual(expectedResponse) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = await quotaRequest() + // @ts-ignore Intentionally adding an extra field to the request type + req.options.extraField = noString + + const res = await request(app).post(CombinerEndpoint.DOMAIN_QUOTA_STATUS).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = await quotaRequest() + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + + const res = await request(app).post(CombinerEndpoint.DOMAIN_QUOTA_STATUS).send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + // Create a requests with an invalid domain identifier. + const unknownRequest = await quotaRequest() + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + unknownRequest.domain.name = 'UnknownDomain' + + const res = await request(app) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(unknownRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const badRequest1 = await quotaRequest() + // @ts-ignore Intentionally not JSON + badRequest1.domain = 'Freddy' + + const res1 = await request(app) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(badRequest1) + + expect(res1.status).toBe(400) + expect(res1.body).toStrictEqual({ + success: false, + version: res1.body.version, + error: WarningMessage.INVALID_INPUT, + }) + + const badRequest2 = '' + + const res2 = await request(app) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(badRequest2) + + expect(res2.status).toBe(400) + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + // Create a manipulated request, which will have a bad signature. + const badRequest = await quotaRequest() + badRequest.domain.salt = defined('badSalt') + + const res = await request(app).post(CombinerEndpoint.DOMAIN_QUOTA_STATUS).send(badRequest) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + configWithApiDisabled.domains.enabled = false + const appWithApiDisabled = startCombiner( + configWithApiDisabled, + getContractKit(configWithApiDisabled.blockchain) + ) + + const req = await quotaRequest() + + const res = await request(appWithApiDisabled) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(req) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_SIGN}`, () => { + it('Should respond with 200 on valid request', async () => { + const [req, poprfClient] = await signatureRequest() + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = poprfClient.unblindResponse(Buffer.from(res.body.signature, 'base64')) + expect(evaluation.toString('base64')).toEqual(expectedEval) + }) + + for (let i = 1; i <= 3; i++) { + it(`Should respond with 200 on valid request with key version header ${i}`, async () => { + const [req, poprfClient] = await signatureRequest( + undefined, + undefined, + TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEYS[i - 1] + ) + + const res = await request(app) + .post(CombinerEndpoint.DOMAIN_SIGN) + .set(KEY_VERSION_HEADER, i.toString()) + .send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = poprfClient.unblindResponse( + Buffer.from(res.body.signature, 'base64') + ) + expect(evaluation.toString('base64')).toEqual(expectedEvals[i - 1]) + }) + } + + it('Should respond with 200 if nonce > domainState', async () => { + const [req, poprfClient] = await signatureRequest(undefined, 2) + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, // counter gets incremented, not set to nonce value + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = poprfClient.unblindResponse(Buffer.from(res.body.signature, 'base64')) + expect(evaluation.toString('base64')).toEqual(expectedEval) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const [req1, poprfClient] = await signatureRequest() + + const res1 = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req1) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: res1.body.version, + signature: res1.body.signature, + status: { + disabled: false, + counter: 1, + timer: res1.body.status.timer, + now: res1.body.status.now, + }, + }) + const eval1 = poprfClient.unblindResponse(Buffer.from(res1.body.signature, 'base64')) + expect(eval1.toString('base64')).toEqual(expectedEval) + + // submit identical request with nonce set to 1 + req1.options.nonce = defined(1) + req1.options.signature = noString + req1.options.signature = defined( + await wallet.signTypedData(walletAddress, domainRestrictedSignatureRequestEIP712(req1)) + ) + const res2 = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req1) + + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual({ + success: true, + version: res2.body.version, + signature: res2.body.signature, + status: { + disabled: false, + counter: 2, + timer: res2.body.status.timer, + now: res2.body.status.now, + }, + }) + const eval2 = poprfClient.unblindResponse(Buffer.from(res1.body.signature, 'base64')) + expect(eval2).toEqual(eval1) + }) + + it('Should respond with 200 on extra request fields', async () => { + const [req, poprfClient] = await signatureRequest() + // @ts-ignore Intentionally adding an extra field to the request type + req.options.extraField = noString + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = poprfClient.unblindResponse(Buffer.from(res.body.signature, 'base64')) + expect(evaluation.toString('base64')).toEqual(expectedEval) + }) + + it('Should respond with 400 on missing request fields', async () => { + const [badRequest, _] = await signatureRequest() + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + // Create a requests with an invalid domain identifier. + const [unknownRequest, _] = await signatureRequest() + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + unknownRequest.domain.name = 'UnknownDomain' + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(unknownRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const [badRequest1, _] = await signatureRequest() + // @ts-ignore Intentionally not JSON + badRequest1.domain = 'Freddy' + + const res1 = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(badRequest1) + + expect(res1.status).toBe(400) + expect(res1.body).toStrictEqual({ + success: false, + version: res1.body.version, + error: WarningMessage.INVALID_INPUT, + }) + + const badRequest2 = '' + + const res2 = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(badRequest2) + + expect(res2.status).toBe(400) + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unsupported key version', async () => { + const [badRequest, _] = await signatureRequest() + + const res = await request(app) + .post(CombinerEndpoint.DOMAIN_SIGN) + .set(KEY_VERSION_HEADER, '4') + .send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + // Create a manipulated request, which will have a bad signature. + const [badRequest, _] = await signatureRequest() + badRequest.domain.salt = defined('badSalt') + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on invalid nonce', async () => { + // Request must be sent first since nonce check is >= 0 + const [req1, _] = await signatureRequest() + const res1 = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req1) + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: res1.body.version, + signature: res1.body.signature, + status: { + disabled: false, + counter: 1, + timer: res1.body.status.timer, + now: res1.body.status.now, + }, + }) + const res2 = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req1) + expect(res2.status).toBe(401) + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_NONCE, + }) + }) + + it('Should respond with 429 on out of quota', async () => { + const noQuotaDomain = authenticatedDomain([ + { delay: 0, resetTimer: noBool, batchSize: defined(0), repetitions: defined(0) }, + ]) + const [badRequest, _] = await signatureRequest(noQuotaDomain) + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(429) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 429 on request too early', async () => { + // This domain won't accept requests until ~10 seconds after test execution + const noQuotaDomain = authenticatedDomain([ + { + delay: Math.floor(Date.now() / 1000) + 10, + resetTimer: noBool, + batchSize: defined(2), + repetitions: defined(1), + }, + ]) + const [badRequest, _] = await signatureRequest(noQuotaDomain) + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(429) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 429 when requesting a signature from a disabled domain', async () => { + const testDomain = authenticatedDomain() + const resDisable = await request(app) + .post(CombinerEndpoint.DISABLE_DOMAIN) + .send(await disableRequest(testDomain)) + expect(resDisable.status).toBe(200) + expect(resDisable.body).toStrictEqual({ + success: true, + version: resDisable.body.version, + status: { disabled: true, counter: 0, timer: 0, now: resDisable.body.status.now }, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + configWithApiDisabled.domains.enabled = false + const appWithApiDisabled = startCombiner( + configWithApiDisabled, + getContractKit(configWithApiDisabled.blockchain) + ) + + const [req, _] = await signatureRequest() + + const res = await request(appWithApiDisabled).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + }) + }) + + describe('when signers are not operating correctly', () => { + // In this case (1/3 signers are correct), response unblinding is guaranteed to fail + // Testing 2/3 signers is flaky since the combiner sometimes combines two + // correct signatures and returns, and sometimes combines one wrong/one correct + // since it cannot verify the sigs server-side. + describe('when 1/3 signers return correct signatures', () => { + beforeEach(async () => { + // Signer 1 & 2's v1 keys are misconfigured to point to the v3 share + const badKeyProvider1 = new MockKeyProvider( + new Map([[`${DefaultKeyName.DOMAINS}-1`, DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V3]]) + ) + const badKeyProvider2 = new MockKeyProvider( + new Map([[`${DefaultKeyName.DOMAINS}-1`, DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V3]]) + ) + signer1 = startSigner(signerConfig, signerDB1, badKeyProvider1).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, badKeyProvider2).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3).listen(3003) + }) + + describe(`${CombinerEndpoint.DOMAIN_SIGN}`, () => { + it('Should respond with 200 on valid request', async () => { + // Ensure requested keyVersion is one that signer1 does not have + const [req, poprfClient] = await signatureRequest( + undefined, + undefined, + TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEY_V1 + ) + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + expect(() => + poprfClient.unblindResponse(Buffer.from(res.body.signature, 'base64')) + ).toThrow(/verification failed/) + }) + }) + }) + + describe('when 2/3 of signers are disabled', () => { + beforeEach(async () => { + const configWithApiDisabled: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithApiDisabled.api.domains.enabled = false + signer1 = startSigner(signerConfig, signerDB1, keyProvider1).listen(3001) + signer2 = startSigner(configWithApiDisabled, signerDB2, keyProvider2).listen(3002) + signer3 = startSigner(configWithApiDisabled, signerDB3, keyProvider3).listen(3003) + }) + + describe(`${CombinerEndpoint.DISABLE_DOMAIN}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DISABLE_DOMAIN) + .send(await disableRequest()) + expect(res.status).toBe(503) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: ErrorMessage.THRESHOLD_DISABLE_DOMAIN_FAILURE, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_QUOTA_STATUS}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(await quotaRequest()) + expect(res.status).toBe(503) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: ErrorMessage.THRESHOLD_DOMAIN_QUOTA_STATUS_FAILURE, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_SIGN}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const [req, _] = await signatureRequest() + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + expect(res.status).toBe(503) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + }) + + describe('when 1/3 of signers are disabled', () => { + beforeEach(async () => { + const configWithApiDisabled: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithApiDisabled.api.domains.enabled = false + signer1 = startSigner(signerConfig, signerDB1, keyProvider1).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2).listen(3002) + signer3 = startSigner(configWithApiDisabled, signerDB3, keyProvider3).listen(3003) + }) + + describe(`${CombinerEndpoint.DISABLE_DOMAIN}`, () => { + it('Should respond with 200 on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DISABLE_DOMAIN) + .send(await disableRequest()) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: true, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_QUOTA_STATUS}`, () => { + it('Should respond with 200 on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(await quotaRequest()) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_SIGN}`, () => { + it('Should respond with 200 on valid request', async () => { + const [req, poprfClient] = await signatureRequest() + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = poprfClient.unblindResponse( + Buffer.from(res.body.signature, 'base64') + ) + expect(evaluation.toString('base64')).toEqual(expectedEval) + }) + }) + }) + + describe('when signers timeout', () => { + beforeEach(async () => { + const testTimeoutMS = 0 + + const configWithShortTimeout: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithShortTimeout.timeout = testTimeoutMS + // Test this with all signers timing out to decrease possibility of race conditions + signer1 = startSigner(configWithShortTimeout, signerDB1, keyProvider1).listen(3001) + signer2 = startSigner(configWithShortTimeout, signerDB2, keyProvider2).listen(3002) + signer3 = startSigner(configWithShortTimeout, signerDB3, keyProvider3).listen(3003) + }) + + describe(`${CombinerEndpoint.DISABLE_DOMAIN}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DISABLE_DOMAIN) + .send(await disableRequest()) + expect(res.status).toBe(500) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: ErrorMessage.THRESHOLD_DISABLE_DOMAIN_FAILURE, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_QUOTA_STATUS}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const res = await request(app) + .post(CombinerEndpoint.DOMAIN_QUOTA_STATUS) + .send(await quotaRequest()) + expect(res.status).toBe(500) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: ErrorMessage.THRESHOLD_DOMAIN_QUOTA_STATUS_FAILURE, + }) + }) + }) + + describe(`${CombinerEndpoint.DOMAIN_SIGN}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const [req, _] = await signatureRequest() + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + expect(res.status).toBe(500) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + }) + }) + }) + + // Ensure the same behavior when a minority of signers can block the threshold. + // On failure, the majority error code should not reflect the abort. + describe('with n=5, t=4', () => { + let keyProvider4: KeyProvider + let keyProvider5: KeyProvider + let signerDB4: Knex + let signerDB5: Knex + let signer4: Server | HttpsServer + let signer5: Server | HttpsServer + + const combinerConfigLargerN: typeof config = JSON.parse(JSON.stringify(combinerConfig)) + combinerConfigLargerN.domains.odisServices.signers = JSON.stringify([ + { + url: 'http://localhost:3001', + fallbackUrl: 'http://localhost:3001/fallback', + }, + { + url: 'http://localhost:3002', + fallbackUrl: 'http://localhost:3002/fallback', + }, + { + url: 'http://localhost:3003', + fallbackUrl: 'http://localhost:3003/fallback', + }, + { + url: 'http://localhost:3004', + fallbackUrl: 'http://localhost:3004/fallback', + }, + { + url: 'http://localhost:3005', + fallbackUrl: 'http://localhost:3005/fallback', + }, + ]) + const DOMAINS_PUBKEY_N5_T4 = + 'gEAedm5Gq+6s/r4ohLrduNmb7IznkYxHQ46+IW0iwEjcjWCi3lkJuItDVa3EXaoBKF4yFAa7wtuX7I8hB3m730XdEpd/77C2GOVGtwDshtCgajSzx7+0zvrnat5QmTkB' + + combinerConfigLargerN.domains.keys.versions = JSON.stringify([ + { + keyVersion: 1, + threshold: 4, + polynomial: + '040000000000000080401e766e46abeeacfebe2884baddb8d99bec8ce7918c47438ebe216d22c048dc8d60a2de5909b88b4355adc45daa01285e321406bbc2db97ec8f210779bbdf45dd12977fefb0b618e546b700ec86d0a06a34b3c7bfb4cefae76ade50993901bbf28cb0b2245e5de0926ce13338440e3b5a378dfe10ba41f61d145d9d5df29ce32abba7562804919101e4803bb47301da265654875d06a0c355b93918ff58efe29c6225d42c2b60c4efbdf7984e3b1ed4e997d53e719aa93fdc10171202460055955ad375e460a181f701a22f543365622c4a5f6ad16fce62e24584b77c23db48312840d0301197c3529cda8b712e01897a2cefab5437f658c59a2a3d880315c3268de1128b333a51d36b2999bf587d25ec82f3695db4c75f9825baf88a460002b11295e74511608041574063faa86f27251a2766861ada6a89bf45454aa4b933992f80622a810b8aead298964f37004ad57215433da765e1d3aae5d9b57ad2d9afcdf77f227e48040ac5701abce7995f94ac0c4c70996333396620e6cf8e00', + pubKey: DOMAINS_PUBKEY_N5_T4, + }, + ]) + + beforeAll(async () => { + keyProvider1 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.DOMAINS}-1`, + '01000000fa9f3c7a0ed050b3b4ab9df241e3e3e2069e36c96369b2bf378d7edd66e37a0e', + ], + ]) + ) + keyProvider2 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.DOMAINS}-1`, + '02000000b03e8d5203edb8b27a9c56185df0ee94e8be45f0c91e116beac68c851cc4ba10', + ], + ]) + ) + keyProvider3 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.DOMAINS}-1`, + '03000000bad95bc039a5418bd57e7f5bad4bf6c19ff85e523462925e226e6ac0a6770005', + ], + ]) + ) + keyProvider4 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.DOMAINS}-1`, + '040000002ffdcc94fd5322e4f3e0d7ba00b591c38f77e584b61b59dd6e62cc6cfed5fd06', + ], + ]) + ) + keyProvider5 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.DOMAINS}-1`, + '05000000243505a19a546f5002511f9527fe03401908cd6427991f69b2380e355fec0d0d', + ], + ]) + ) + app = startCombiner(combinerConfigLargerN, getContractKit(combinerConfigLargerN.blockchain)) + }) + + beforeEach(async () => { + signerDB1 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB2 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB3 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB4 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB5 = await initSignerDatabase(signerConfig, signerMigrationsPath) + + signer1 = startSigner(signerConfig, signerDB1, keyProvider1).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3).listen(3003) + signer4 = startSigner(signerConfig, signerDB4, keyProvider4).listen(3004) + signer5 = startSigner(signerConfig, signerDB5, keyProvider5).listen(3005) + }) + + afterEach(async () => { + await signerDB1?.destroy() + await signerDB2?.destroy() + await signerDB3?.destroy() + await signerDB4?.destroy() + await signerDB5?.destroy() + signer1?.close() + signer2?.close() + signer3?.close() + signer4?.close() + signer5?.close() + }) + + it('Should respond with 200 on valid request', async () => { + const [req, poprfClient] = await signatureRequest(undefined, undefined, DOMAINS_PUBKEY_N5_T4) + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + poprfClient.unblindResponse(Buffer.from(res.body.signature, 'base64')) + }) + + // This previously incorrectly returned 502 instead of 429 + it('Should respond with 429 on out of quota', async () => { + const noQuotaDomain = authenticatedDomain([ + { delay: 0, resetTimer: noBool, batchSize: defined(0), repetitions: defined(0) }, + ]) + const [badRequest, _] = await signatureRequest(noQuotaDomain, undefined, DOMAINS_PUBKEY_N5_T4) + + const res = await request(app).post(CombinerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(429) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/integration/legacypnp.test.ts b/packages/phone-number-privacy/combiner/test/integration/legacypnp.test.ts new file mode 100644 index 00000000000..630959579ef --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/integration/legacypnp.test.ts @@ -0,0 +1,791 @@ +import { newKit } from '@celo/contractkit' +import { + AuthenticationMethod, + CombinerEndpoint, + ErrorMessage, + genSessionID, + KEY_VERSION_HEADER, + LegacySignMessageRequest, + SignMessageResponseFailure, + SignMessageResponseSuccess, + TestUtils, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { AttestationsStatus } from '@celo/phone-number-privacy-common/lib/test/utils' +import { IDENTIFIER } from '@celo/phone-number-privacy-common/lib/test/values' +import { + initDatabase as initSignerDatabase, + startSigner, + SupportedDatabase, + SupportedKeystore, +} from '@celo/phone-number-privacy-signer' +import { + DefaultKeyName, + KeyProvider, +} from '@celo/phone-number-privacy-signer/dist/common/key-management/key-provider-base' +import { MockKeyProvider } from '@celo/phone-number-privacy-signer/dist/common/key-management/mock-key-provider' +import { SignerConfig } from '@celo/phone-number-privacy-signer/dist/config' +import BigNumber from 'bignumber.js' +import threshold_bls from 'blind-threshold-bls' +import { Server as HttpsServer } from 'https' +import { Knex } from 'knex' +import { Server } from 'net' +import request from 'supertest' +import config, { getCombinerVersion } from '../../src/config' +import { startCombiner } from '../../src/server' + +const { + ContractRetrieval, + createMockContractKit, + createMockAccounts, + createMockToken, + createMockWeb3, + getPnpRequestAuthorization, + createMockAttestation, +} = TestUtils.Utils +const { + PRIVATE_KEY1, + ACCOUNT_ADDRESS1, + mockAccount, + DEK_PRIVATE_KEY, + DEK_PUBLIC_KEY, + PNP_THRESHOLD_DEV_PK_SHARE_1_V1, + PNP_THRESHOLD_DEV_PK_SHARE_1_V2, + PNP_THRESHOLD_DEV_PK_SHARE_1_V3, + PNP_THRESHOLD_DEV_PK_SHARE_2_V1, + PNP_THRESHOLD_DEV_PK_SHARE_2_V2, + PNP_THRESHOLD_DEV_PK_SHARE_2_V3, + PNP_THRESHOLD_DEV_PK_SHARE_3_V1, + PNP_THRESHOLD_DEV_PK_SHARE_3_V2, + PNP_THRESHOLD_DEV_PK_SHARE_3_V3, +} = TestUtils.Values + +// create deep copy +const combinerConfig: typeof config = JSON.parse(JSON.stringify(config)) +combinerConfig.phoneNumberPrivacy.enabled = true + +const signerConfig: SignerConfig = { + serviceName: 'odis-signer', + server: { + port: undefined, + sslKeyPath: undefined, + sslCertPath: undefined, + }, + quota: { + unverifiedQueryMax: 10, + additionalVerifiedQueryMax: 30, + queryPerTransaction: 2, + // Min balance is .01 cUSD + minDollarBalance: new BigNumber(1e16), + // Min balance is .01 cEUR + minEuroBalance: new BigNumber(1e16), + // Min balance is .005 CELO + minCeloBalance: new BigNumber(5e15), + // Equivalent to 0.001 cUSD/query + queryPriceInCUSD: new BigNumber(0.001), + }, + api: { + domains: { + enabled: false, + }, + phoneNumberPrivacy: { + enabled: false, + shouldFailOpen: true, + }, + legacyPhoneNumberPrivacy: { + enabled: true, + shouldFailOpen: true, + }, + }, + attestations: { + numberAttestationsRequired: 3, + }, + blockchain: { + provider: 'https://alfajores-forno.celo-testnet.org', + apiKey: undefined, + }, + db: { + type: SupportedDatabase.Sqlite, + user: '', + password: '', + database: '', + host: 'http://localhost', + port: undefined, + ssl: true, + poolMaxSize: 50, + }, + keystore: { + type: SupportedKeystore.MOCK_SECRET_MANAGER, + keys: { + phoneNumberPrivacy: { + name: 'phoneNumberPrivacy', + latest: 2, + }, + domains: { + name: 'domains', + latest: 1, + }, + }, + azure: { + clientID: '', + clientSecret: '', + tenant: '', + vaultName: '', + }, + google: { + projectId: '', + }, + aws: { + region: '', + secretKey: '', + }, + }, + timeout: 5000, + test_quota_bypass_percentage: 0, +} + +const testBlockNumber = 1000000 + +const mockTokenBalance = jest.fn() +const mockGetVerifiedStatus = jest.fn() +const mockGetWalletAddress = jest.fn() +const mockGetDataEncryptionKey = jest.fn() + +const mockContractKit = createMockContractKit( + { + // getWalletAddress stays constant across all old query-quota.test.ts unit tests + [ContractRetrieval.getAccounts]: createMockAccounts( + mockGetWalletAddress, + mockGetDataEncryptionKey + ), + [ContractRetrieval.getStableToken]: createMockToken(mockTokenBalance), + [ContractRetrieval.getGoldToken]: createMockToken(mockTokenBalance), + [ContractRetrieval.getAttestations]: createMockAttestation(mockGetVerifiedStatus), + }, + createMockWeb3(5, testBlockNumber) +) + +// Mock newKit as opposed to the CK constructor +// Returns an object of type ContractKit that can be passed into the signers + combiner +jest.mock('@celo/contractkit', () => ({ + ...jest.requireActual('@celo/contractkit'), + newKit: jest.fn().mockImplementation(() => mockContractKit), +})) + +describe(`legacyPnpService: ${CombinerEndpoint.LEGACY_PNP_SIGN}`, () => { + let keyProvider1: KeyProvider + let keyProvider2: KeyProvider + let keyProvider3: KeyProvider + let signerDB1: Knex + let signerDB2: Knex + let signerDB3: Knex + let signer1: Server | HttpsServer + let signer2: Server | HttpsServer + let signer3: Server | HttpsServer + let app: any + + // Used by PNP_SIGN tests for various configurations of signers + let userSeed: Uint8Array + let blindedMsgResult: threshold_bls.BlindedMessage + + const signerMigrationsPath = '../signer/dist/common/database/migrations' + const expectedVersion = getCombinerVersion() + + const message = Buffer.from('test message', 'utf8') + const expectedQuota = 410 + const expectedSignatures: string[] = [ + 'xgFMQtcgAMHJAEX/m9B4VFopYtxqPFSw0024sWzRYvQDvnmFqhXOPdnRDfa8WCEA', + 'wUuFV8yFBXGyEzKbyWjBChG6dER264nwjOsqErd/UZieVKE0oDMZcMDG+qObu4QB', + 'PJHqBGavcQG3NGFl3hiR8GymeDNumxbl1DnCJzWz+Ik5yCN2ZpAITBe24RTX0iMA', + ] + const expectedSignature = expectedSignatures[config.phoneNumberPrivacy.keys.currentVersion - 1] + + const expectedUnblindedSigs: string[] = [ + 'lOASnDJNbJBTMYfkbU4fMiK7FcNwSyqZo8iQSM95X8YK+/158be4S1A+jcQsCUYA', + 'QIT7HtHTe/d0Tq40Mf3rpHCT8qY20+8q7ZW9PXHFMWGvwSGhk7l3Pfwnx8YdXomB', + 'XW//DolLzaXYS/gk9WBHfeKy5HKrGjuF/OpCok/i6fprE4AGFH2PjE7zeKTfOQ+A', + ] + const expectedUnblindedSig = + expectedUnblindedSigs[config.phoneNumberPrivacy.keys.currentVersion - 1] + + // In current setup, the same mocked kit is used for the combiner and signers + const mockKit = newKit('dummyKit') + + const sendLegacyPnpSignRequest = async ( + req: LegacySignMessageRequest, + authorization: string, + app: any, + keyVersionHeader?: string + ) => { + let reqWithHeaders = request(app) + .post(CombinerEndpoint.LEGACY_PNP_SIGN) + .set('Authorization', authorization) + + if (keyVersionHeader) { + reqWithHeaders = reqWithHeaders.set(KEY_VERSION_HEADER, keyVersionHeader) + } + return reqWithHeaders.send(req) + } + + const getLegacySignRequest = ( + _blindedMsgResult: threshold_bls.BlindedMessage + ): LegacySignMessageRequest => { + return { + account: ACCOUNT_ADDRESS1, + blindedQueryPhoneNumber: Buffer.from(_blindedMsgResult.message).toString('base64'), + sessionID: genSessionID(), + } + } + + const prepMocks = (hasQuota: boolean) => { + const [transactionCount, isVerified, balanceToken] = hasQuota + ? [100, true, new BigNumber(200000000000000000)] + : [0, false, new BigNumber(0)] + ;[ + mockContractKit.connection.getTransactionCount, + mockGetVerifiedStatus, + mockGetVerifiedStatus, + mockTokenBalance, + mockGetDataEncryptionKey, + mockGetWalletAddress, + ].forEach((mockFn) => mockFn.mockReset()) + + mockContractKit.connection.getTransactionCount.mockReturnValue(transactionCount) + mockGetVerifiedStatus.mockReturnValue( + // only the isVerified value below matters + { isVerified, completed: 1, total: 1, numAttestationsRemaining: 1 } + ) + mockTokenBalance.mockReturnValue(balanceToken) + mockGetDataEncryptionKey.mockReturnValue(DEK_PUBLIC_KEY) + mockGetWalletAddress.mockReturnValue(mockAccount) + } + + beforeAll(async () => { + keyProvider1 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, PNP_THRESHOLD_DEV_PK_SHARE_1_V1], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-2`, PNP_THRESHOLD_DEV_PK_SHARE_1_V2], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-3`, PNP_THRESHOLD_DEV_PK_SHARE_1_V3], + ]) + ) + keyProvider2 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, PNP_THRESHOLD_DEV_PK_SHARE_2_V1], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-2`, PNP_THRESHOLD_DEV_PK_SHARE_2_V2], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-3`, PNP_THRESHOLD_DEV_PK_SHARE_2_V3], + ]) + ) + keyProvider3 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, PNP_THRESHOLD_DEV_PK_SHARE_3_V1], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-2`, PNP_THRESHOLD_DEV_PK_SHARE_3_V2], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-3`, PNP_THRESHOLD_DEV_PK_SHARE_3_V3], + ]) + ) + + app = startCombiner(combinerConfig, mockKit) + }) + + let req: LegacySignMessageRequest + beforeEach(async () => { + signerDB1 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB2 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB3 = await initSignerDatabase(signerConfig, signerMigrationsPath) + + // this needs to be defined here to avoid errors + userSeed = new Uint8Array(32) + for (let i = 0; i < userSeed.length - 1; i++) { + userSeed[i] = i + } + + blindedMsgResult = threshold_bls.blind(message, userSeed) + + req = getLegacySignRequest(blindedMsgResult) + prepMocks(true) + }) + + afterEach(async () => { + await signerDB1?.destroy() + await signerDB2?.destroy() + await signerDB3?.destroy() + signer1?.close() + signer2?.close() + signer3?.close() + }) + + describe('when signers are operating correctly', () => { + beforeEach(async () => { + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3, mockKit).listen(3003) + }) + + it('Should respond with 200 on valid request', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + + expect(Buffer.from(unblindedSig).toString('base64')).toEqual(expectedUnblindedSig) + }) + + for (let i = 1; i <= 3; i++) { + it(`Should respond with 200 on valid request with key version header ${i}`, async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app, i.toString()) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignatures[i - 1], + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + + expect(Buffer.from(unblindedSig).toString('base64')).toEqual(expectedUnblindedSigs[i - 1]) + }) + } + + it('Should respond with 200 on valid request with identifier', async () => { + // Ensure that this gets passed through the combiner to the signer + req.hashedPhoneNumber = IDENTIFIER + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: 440, // Additional quota gets unlocked with an identifier + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + + // performedQueryCount should remain the same; same request should not + // consume any quota + const res2 = await sendLegacyPnpSignRequest(req, authorization, app) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual(res1.body) + }) + + it('Should increment performedQueryCount on request from the same account with a new message', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendLegacyPnpSignRequest(req, authorization, app) + + const expectedResponse: SignMessageResponseSuccess = { + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + } + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual(expectedResponse) + + // Second request for the same account but with new message + const message2 = Buffer.from('second test message', 'utf8') + const blindedMsg2 = threshold_bls.blind(message2, userSeed) + const req2 = getLegacySignRequest(blindedMsg2) + const authorization2 = getPnpRequestAuthorization(req2, PRIVATE_KEY1) + + // Expect performedQueryCount to increase + expectedResponse.performedQueryCount++ + expectedResponse.signature = + 'PWvuSYIA249x1dx+qzgl6PKSkoulXXE/P4WHJvGmtw77pCRilEWTn3xSp+6JS9+A' + const res2 = await sendLegacyPnpSignRequest(req2, authorization2, app) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual(expectedResponse) + }) + + it('Should respond with 200 on extra request fields', async () => { + // @ts-ignore Intentionally adding an extra field to the request type + req.extraField = 'dummyString' + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 when authenticated with DEK', async () => { + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should get the same unblinded signatures from the same message (different seed)', async () => { + const authorization1 = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendLegacyPnpSignRequest(req, authorization1, app) + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + + const secondUserSeed = new Uint8Array(userSeed) + secondUserSeed[0]++ + // Ensure message is identical except for message + const req2 = { ...req } + const blindedMsgResult2 = threshold_bls.blind(message, secondUserSeed) + req2.blindedQueryPhoneNumber = Buffer.from(blindedMsgResult2.message).toString('base64') + + // Sanity check + expect(req2.blindedQueryPhoneNumber).not.toEqual(req.blindedQueryPhoneNumber) + + const authorization2 = getPnpRequestAuthorization(req2, PRIVATE_KEY1) + const res2 = await sendLegacyPnpSignRequest(req2, authorization2, app) + expect(res2.status).toBe(200) + const unblindedSig1 = threshold_bls.unblind( + Buffer.from(res1.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + const unblindedSig2 = threshold_bls.unblind( + Buffer.from(res2.body.signature, 'base64'), + blindedMsgResult2.blindingFactor + ) + expect(Buffer.from(unblindedSig1).toString('base64')).toEqual(expectedUnblindedSig) + expect(unblindedSig1).toEqual(unblindedSig2) + }) + + it('Should respond with 400 on missing request fields', async () => { + // @ts-ignore Intentionally deleting required field + delete req.account + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unsupported key version', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app, '4') + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 400 on request with invalid identifier', async () => { + // Ensure that this gets passed through the combiner to the signer + req.hashedPhoneNumber = '+1234567890' + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + req.account = mockAccount + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth', async () => { + req.account = mockAccount + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 403 on out of quota', async () => { + prepMocks(false) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + configWithApiDisabled.phoneNumberPrivacy.enabled = false + const appWithApiDisabled = startCombiner(configWithApiDisabled, mockKit) + + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendLegacyPnpSignRequest(req, authorization, appWithApiDisabled) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should respond with 200 on failure to fetch DEK when shouldFailOpen is true', async () => { + mockGetDataEncryptionKey.mockImplementation(() => { + throw new Error() + }) + + // Would fail authentication if getDataEncryptionKey succeeded + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + const authorization = getPnpRequestAuthorization(req, differentPk) + + const combinerConfigWithFailOpenEnabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + combinerConfigWithFailOpenEnabled.phoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startCombiner(combinerConfigWithFailOpenEnabled, mockKit) + const res = await sendLegacyPnpSignRequest(req, authorization, appWithFailOpenEnabled) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + expect(Buffer.from(unblindedSig).toString('base64')).toEqual(expectedUnblindedSig) + }) + }) + }) + + // For testing combiner code paths when signers do not behave as expected + describe('when signers are not operating correctly', () => { + let authorization: string + + beforeEach(() => { + authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + }) + + describe('when 2/3 signers return correct signatures', () => { + beforeEach(async () => { + const badBlsShare1 = + '000000002e50aa714ef6b865b5de89c56969ef9f8f27b6b0a6d157c9cc01c574ac9df604' + const badKeyProvider1 = new MockKeyProvider( + new Map([[`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, badBlsShare1]]) + ) + + signer1 = startSigner(signerConfig, signerDB1, badKeyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3, mockKit).listen(3003) + }) + + it('Should respond with 200 on valid request', async () => { + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + expect(Buffer.from(unblindedSig).toString('base64')).toEqual(expectedUnblindedSig) + }) + }) + + describe('when 1/3 signers return correct signatures', () => { + beforeEach(async () => { + const badBlsShare1 = + '000000002e50aa714ef6b865b5de89c56969ef9f8f27b6b0a6d157c9cc01c574ac9df604' + const badBlsShare2 = + '01000000b8f0ef841dcf8d7bd1da5e8025e47d729eb67f513335784183b8fa227a0b9a0b' + + const badKeyProvider1 = new MockKeyProvider( + new Map([[`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, badBlsShare1]]) + ) + const badKeyProvider2 = new MockKeyProvider( + new Map([[`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, badBlsShare2]]) + ) + + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, badKeyProvider1, mockKit).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, badKeyProvider2, mockKit).listen(3003) + }) + + it('Should respond with 500 even if request is valid', async () => { + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + + describe('when 2/3 of signers are disabled', () => { + beforeEach(async () => { + const configWithApiDisabled: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithApiDisabled.api.legacyPhoneNumberPrivacy.enabled = false + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(configWithApiDisabled, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(configWithApiDisabled, signerDB3, keyProvider3, mockKit).listen(3003) + }) + + it('Should fail to reach threshold of signers on valid request', async () => { + const res = await sendLegacyPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(503) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + + describe('when 1/3 of signers are disabled', () => { + beforeEach(async () => { + const configWithApiDisabled: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithApiDisabled.api.legacyPhoneNumberPrivacy.enabled = false + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(configWithApiDisabled, signerDB3, keyProvider3, mockKit).listen(3003) + }) + + it('Should respond with 200 on valid request', async () => { + const res = await sendLegacyPnpSignRequest(req, authorization, app) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + }) + + describe('when signers timeout', () => { + beforeEach(async () => { + const testTimeoutMS = 0 + + const configWithShortTimeout: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithShortTimeout.timeout = testTimeoutMS + // Test this with all signers timing out to decrease possibility of race conditions + signer1 = startSigner(configWithShortTimeout, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(configWithShortTimeout, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(configWithShortTimeout, signerDB3, keyProvider3, mockKit).listen(3003) + }) + it('Should fail to reach threshold of signers on valid request', async () => { + const res = await sendLegacyPnpSignRequest(req, authorization, app) + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/integration/pnp.test.ts b/packages/phone-number-privacy/combiner/test/integration/pnp.test.ts new file mode 100644 index 00000000000..54fd0884dd5 --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/integration/pnp.test.ts @@ -0,0 +1,1374 @@ +import { newKit } from '@celo/contractkit' +import { + AuthenticationMethod, + CombinerEndpoint, + ErrorMessage, + genSessionID, + KEY_VERSION_HEADER, + PnpQuotaRequest, + PnpQuotaResponseFailure, + PnpQuotaResponseSuccess, + SignerEndpoint, + SignMessageRequest, + SignMessageResponseFailure, + SignMessageResponseSuccess, + TestUtils, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { + initDatabase as initSignerDatabase, + startSigner, + SupportedDatabase, + SupportedKeystore, +} from '@celo/phone-number-privacy-signer' +import { + DefaultKeyName, + KeyProvider, +} from '@celo/phone-number-privacy-signer/dist/common/key-management/key-provider-base' +import { MockKeyProvider } from '@celo/phone-number-privacy-signer/dist/common/key-management/mock-key-provider' +import { SignerConfig } from '@celo/phone-number-privacy-signer/dist/config' +import BigNumber from 'bignumber.js' +import threshold_bls from 'blind-threshold-bls' +import { Server as HttpsServer } from 'https' +import { Knex } from 'knex' +import { Server } from 'net' +import request from 'supertest' +import config, { getCombinerVersion } from '../../src/config' +import { startCombiner } from '../../src/server' +import { getBlindedPhoneNumber } from '../utils' + +const { + ContractRetrieval, + createMockContractKit, + createMockAccounts, + createMockOdisPayments, + createMockWeb3, + getPnpRequestAuthorization, +} = TestUtils.Utils +const { + PRIVATE_KEY1, + ACCOUNT_ADDRESS1, + mockAccount, + DEK_PRIVATE_KEY, + DEK_PUBLIC_KEY, + PNP_THRESHOLD_DEV_PK_SHARE_1_V1, + PNP_THRESHOLD_DEV_PK_SHARE_1_V2, + PNP_THRESHOLD_DEV_PK_SHARE_1_V3, + PNP_THRESHOLD_DEV_PK_SHARE_2_V1, + PNP_THRESHOLD_DEV_PK_SHARE_2_V2, + PNP_THRESHOLD_DEV_PK_SHARE_2_V3, + PNP_THRESHOLD_DEV_PK_SHARE_3_V1, + PNP_THRESHOLD_DEV_PK_SHARE_3_V2, + PNP_THRESHOLD_DEV_PK_SHARE_3_V3, + ACCOUNT_ADDRESS2, + BLINDING_FACTOR, +} = TestUtils.Values + +// create deep copy of config +const combinerConfig: typeof config = JSON.parse(JSON.stringify(config)) +combinerConfig.phoneNumberPrivacy.enabled = true + +const signerConfig: SignerConfig = { + serviceName: 'odis-signer', + server: { + port: undefined, + sslKeyPath: undefined, + sslCertPath: undefined, + }, + quota: { + unverifiedQueryMax: 10, + additionalVerifiedQueryMax: 30, + queryPerTransaction: 2, + // Min balance is .01 cUSD + minDollarBalance: new BigNumber(1e16), + // Min balance is .01 cEUR + minEuroBalance: new BigNumber(1e16), + // Min balance is .005 CELO + minCeloBalance: new BigNumber(5e15), + // Equivalent to 0.001 cUSD/query + queryPriceInCUSD: new BigNumber(0.001), + }, + api: { + domains: { + enabled: false, + }, + phoneNumberPrivacy: { + enabled: true, + shouldFailOpen: true, + }, + legacyPhoneNumberPrivacy: { + enabled: false, + shouldFailOpen: true, + }, + }, + attestations: { + numberAttestationsRequired: 3, + }, + blockchain: { + provider: 'https://alfajores-forno.celo-testnet.org', + apiKey: undefined, + }, + db: { + type: SupportedDatabase.Sqlite, + user: '', + password: '', + database: '', + host: 'http://localhost', + port: undefined, + ssl: true, + poolMaxSize: 50, + }, + keystore: { + type: SupportedKeystore.MOCK_SECRET_MANAGER, + keys: { + phoneNumberPrivacy: { + name: 'phoneNumberPrivacy', + latest: 2, + }, + domains: { + name: 'domains', + latest: 1, + }, + }, + azure: { + clientID: '', + clientSecret: '', + tenant: '', + vaultName: '', + }, + google: { + projectId: '', + }, + aws: { + region: '', + secretKey: '', + }, + }, + timeout: 5000, + test_quota_bypass_percentage: 0, +} + +const testBlockNumber = 1000000 + +const mockOdisPaymentsTotalPaidCUSD = jest.fn() +const mockGetWalletAddress = jest.fn() +const mockGetDataEncryptionKey = jest.fn() + +const mockContractKit = createMockContractKit( + { + [ContractRetrieval.getAccounts]: createMockAccounts( + mockGetWalletAddress, + mockGetDataEncryptionKey + ), + [ContractRetrieval.getOdisPayments]: createMockOdisPayments(mockOdisPaymentsTotalPaidCUSD), + }, + createMockWeb3(5, testBlockNumber) +) + +// Mock newKit as opposed to the CK constructor +// Returns an object of type ContractKit that can be passed into the signers + combiner +jest.mock('@celo/contractkit', () => ({ + ...jest.requireActual('@celo/contractkit'), + newKit: jest.fn().mockImplementation(() => mockContractKit), +})) + +describe('pnpService', () => { + let keyProvider1: KeyProvider + let keyProvider2: KeyProvider + let keyProvider3: KeyProvider + let signerDB1: Knex + let signerDB2: Knex + let signerDB3: Knex + let signer1: Server | HttpsServer + let signer2: Server | HttpsServer + let signer3: Server | HttpsServer + let app: any + + // Used by PNP_SIGN tests for various configurations of signers + let userSeed: Uint8Array + let blindedMsgResult: threshold_bls.BlindedMessage + + const signerMigrationsPath = '../signer/dist/common/database/migrations' + const expectedVersion = getCombinerVersion() + + const onChainPaymentsDefault = new BigNumber(1e18) + const expectedTotalQuota = 1000 + + const message = Buffer.from('test message', 'utf8') + + // In current setup, the same mocked kit is used for the combiner and signers + const mockKit = newKit('dummyKit') + + const sendPnpSignRequest = async ( + req: SignMessageRequest, + authorization: string, + app: any, + keyVersionHeader?: string + ) => { + let reqWithHeaders = request(app) + .post(CombinerEndpoint.PNP_SIGN) + .set('Authorization', authorization) + + if (keyVersionHeader) { + reqWithHeaders = reqWithHeaders.set(KEY_VERSION_HEADER, keyVersionHeader) + } + return reqWithHeaders.send(req) + } + + const getSignRequest = (_blindedMsgResult: threshold_bls.BlindedMessage): SignMessageRequest => { + return { + account: ACCOUNT_ADDRESS1, + blindedQueryPhoneNumber: Buffer.from(_blindedMsgResult.message).toString('base64'), + sessionID: genSessionID(), + } + } + + const useQuery = async (performedQueryCount: number, signer: Server | HttpsServer) => { + for (let i = 0; i < performedQueryCount; i++) { + const phoneNumber = '+1' + Math.floor(Math.random() * 10 ** 10) + const blindedNumber = getBlindedPhoneNumber(phoneNumber, BLINDING_FACTOR) + const req = { + account: ACCOUNT_ADDRESS1, + blindedQueryPhoneNumber: blindedNumber, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + await request(signer) + .post(SignerEndpoint.PNP_SIGN) + .set('Authorization', authorization) + .send(req) + } + } + + const getCombinerQuotaResponse = async ( + req: PnpQuotaRequest, + authorization: string, + _app: any = app + ) => { + const res = await request(_app) + .post(CombinerEndpoint.PNP_QUOTA) + .set('Authorization', authorization) + .send(req) + return res + } + + describe('with n=3, t=2', () => { + const expectedSignatures: string[] = [ + 'xgFMQtcgAMHJAEX/m9B4VFopYtxqPFSw0024sWzRYvQDvnmFqhXOPdnRDfa8WCEA', + 'wUuFV8yFBXGyEzKbyWjBChG6dER264nwjOsqErd/UZieVKE0oDMZcMDG+qObu4QB', + 'PJHqBGavcQG3NGFl3hiR8GymeDNumxbl1DnCJzWz+Ik5yCN2ZpAITBe24RTX0iMA', + ] + const expectedSignature = expectedSignatures[config.phoneNumberPrivacy.keys.currentVersion - 1] + + const expectedUnblindedSigs: string[] = [ + 'lOASnDJNbJBTMYfkbU4fMiK7FcNwSyqZo8iQSM95X8YK+/158be4S1A+jcQsCUYA', + 'QIT7HtHTe/d0Tq40Mf3rpHCT8qY20+8q7ZW9PXHFMWGvwSGhk7l3Pfwnx8YdXomB', + 'XW//DolLzaXYS/gk9WBHfeKy5HKrGjuF/OpCok/i6fprE4AGFH2PjE7zeKTfOQ+A', + ] + const expectedUnblindedSig = + expectedUnblindedSigs[config.phoneNumberPrivacy.keys.currentVersion - 1] + + beforeAll(async () => { + keyProvider1 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, PNP_THRESHOLD_DEV_PK_SHARE_1_V1], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-2`, PNP_THRESHOLD_DEV_PK_SHARE_1_V2], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-3`, PNP_THRESHOLD_DEV_PK_SHARE_1_V3], + ]) + ) + keyProvider2 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, PNP_THRESHOLD_DEV_PK_SHARE_2_V1], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-2`, PNP_THRESHOLD_DEV_PK_SHARE_2_V2], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-3`, PNP_THRESHOLD_DEV_PK_SHARE_2_V3], + ]) + ) + keyProvider3 = new MockKeyProvider( + new Map([ + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, PNP_THRESHOLD_DEV_PK_SHARE_3_V1], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-2`, PNP_THRESHOLD_DEV_PK_SHARE_3_V2], + [`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-3`, PNP_THRESHOLD_DEV_PK_SHARE_3_V3], + ]) + ) + app = startCombiner(combinerConfig, mockKit) + }) + + beforeEach(async () => { + signerDB1 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB2 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB3 = await initSignerDatabase(signerConfig, signerMigrationsPath) + + userSeed = new Uint8Array(32) + for (let i = 0; i < userSeed.length - 1; i++) { + userSeed[i] = i + } + + blindedMsgResult = threshold_bls.blind(message, userSeed) + + mockGetDataEncryptionKey.mockReset().mockReturnValue(DEK_PUBLIC_KEY) + mockGetWalletAddress.mockReset().mockReturnValue(mockAccount) + }) + + afterEach(async () => { + await signerDB1?.destroy() + await signerDB2?.destroy() + await signerDB3?.destroy() + signer1?.close() + signer2?.close() + signer3?.close() + }) + + describe('when signers are operating correctly', () => { + beforeEach(async () => { + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3, mockKit).listen(3003) + }) + + describe(`${CombinerEndpoint.PNP_QUOTA}`, () => { + const totalQuota = 10 + const weiTocusd = new BigNumber(1e18) + beforeAll(async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue( + weiTocusd.multipliedBy(totalQuota).multipliedBy(signerConfig.quota.queryPriceInCUSD) + ) + }) + + const queryCountParams = [ + { signerQueries: [0, 0, 0], expectedQueryCount: 0, expectedWarnings: [] }, + { + signerQueries: [1, 0, 0], + expectedQueryCount: 0, + expectedWarnings: [WarningMessage.SIGNER_RESPONSE_DISCREPANCIES], + }, // does not reach threshold + { + signerQueries: [1, 1, 0], + expectedQueryCount: 1, + expectedWarnings: [WarningMessage.SIGNER_RESPONSE_DISCREPANCIES], + }, // threshold reached + { + signerQueries: [0, 1, 1], + expectedQueryCount: 1, + expectedWarnings: [WarningMessage.SIGNER_RESPONSE_DISCREPANCIES], + }, // order of signers shouldn't matter + { + signerQueries: [1, 4, 9], + expectedQueryCount: 4, + expectedWarnings: [ + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + WarningMessage.INCONSISTENT_SIGNER_QUERY_MEASUREMENTS, + ], + }, + ] + queryCountParams.forEach(({ signerQueries, expectedQueryCount, expectedWarnings }) => { + it(`should get ${expectedQueryCount} performedQueryCount given signer responses of ${signerQueries}`, async () => { + await useQuery(signerQueries[0], signer1) + await useQuery(signerQueries[1], signer2) + await useQuery(signerQueries[2], signer3) + + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: expectedQueryCount, + totalQuota, + blockNumber: testBlockNumber, + warnings: expectedWarnings, + }) + }) + }) + + it('Should respond with 200 on valid request', async () => { + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await getCombinerQuotaResponse(req, authorization) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const res2 = await getCombinerQuotaResponse(req, authorization) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual(res1.body) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = { + account: ACCOUNT_ADDRESS1, + extraField: 'dummy', + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 when authenticated with DEK', async () => { + const req = { + account: ACCOUNT_ADDRESS1, + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, + } + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with a warning when there are slight discrepancies in total quota', async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValueOnce( + weiTocusd.multipliedBy(totalQuota + 1).multipliedBy(signerConfig.quota.queryPriceInCUSD) + ) + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota, + blockNumber: testBlockNumber, + warnings: [ + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS + + ', using threshold signer as best guess', + ], + }) + }) + + it('Should respond with 500 when there are large discrepancies in total quota', async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValueOnce(weiTocusd.multipliedBy(totalQuota + 15)) + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.THRESHOLD_PNP_QUOTA_STATUS_FAILURE, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + // @ts-ignore Intentionally missing required fields + const req: PnpQuotaRequest = {} + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 with invalid address', async () => { + const req = { + account: 'not an address', + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + // Request from one account, signed by another account + const req = { + account: ACCOUNT_ADDRESS2, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth', async () => { + const req = { + account: ACCOUNT_ADDRESS2, + AuthenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + // This previously returned 502 instead of 500 + it('Should respond with 500 when insufficient signer responses', async () => { + await signerDB1?.destroy() + await signerDB2?.destroy() + signer1?.close() + signer2?.close() + + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.THRESHOLD_PNP_QUOTA_STATUS_FAILURE, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + configWithApiDisabled.phoneNumberPrivacy.enabled = false + const appWithApiDisabled = startCombiner(configWithApiDisabled, mockKit) + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await request(appWithApiDisabled) + .post(CombinerEndpoint.PNP_QUOTA) + .set('Authorization', authorization) + .send(req) + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should respond with 200 on failure to fetch DEK when shouldFailOpen is true', async () => { + mockGetDataEncryptionKey.mockReset().mockImplementation(() => { + throw new Error() + }) + + const req = { + account: ACCOUNT_ADDRESS1, + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, + } + + // NOT the dek private key, so authentication would fail if getDataEncryptionKey succeeded + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + + const combinerConfigWithFailOpenEnabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + combinerConfigWithFailOpenEnabled.phoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startCombiner(combinerConfigWithFailOpenEnabled, mockKit) + const res = await getCombinerQuotaResponse(req, authorization, appWithFailOpenEnabled) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + }) + }) + + describe(`${CombinerEndpoint.PNP_SIGN}`, () => { + let req: SignMessageRequest + + beforeEach(async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(onChainPaymentsDefault) + req = getSignRequest(blindedMsgResult) + }) + + it('Should respond with 200 on valid request', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + + expect(Buffer.from(unblindedSig).toString('base64')).toEqual(expectedUnblindedSig) + }) + + for (let i = 1; i <= 3; i++) { + it(`Should respond with 200 on valid request with key version header ${i}`, async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app, i.toString()) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignatures[i - 1], + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + + expect(Buffer.from(unblindedSig).toString('base64')).toEqual( + expectedUnblindedSigs[i - 1] + ) + }) + } + + it('Should respond with 200 on repeated valid requests', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendPnpSignRequest(req, authorization, app) + const expectedResponse: SignMessageResponseSuccess = { + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + } + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual(expectedResponse) + + const res2 = await sendPnpSignRequest(req, authorization, app) + expect(res2.status).toBe(200) + // Do not expect performedQueryCount to increase since this is a duplicate request + expect(res2.body).toStrictEqual(expectedResponse) + }) + + it('Should increment performedQueryCount on request from the same account with a new message', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendPnpSignRequest(req, authorization, app) + const expectedResponse: SignMessageResponseSuccess = { + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + } + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual(expectedResponse) + + // Second request for the same account but with new message + const message2 = Buffer.from('second test message', 'utf8') + const blindedMsg2 = threshold_bls.blind(message2, userSeed) + const req2 = getSignRequest(blindedMsg2) + const authorization2 = getPnpRequestAuthorization(req2, PRIVATE_KEY1) + + // Expect performedQueryCount to increase + expectedResponse.performedQueryCount++ + expectedResponse.signature = + 'PWvuSYIA249x1dx+qzgl6PKSkoulXXE/P4WHJvGmtw77pCRilEWTn3xSp+6JS9+A' + const res2 = await sendPnpSignRequest(req2, authorization2, app) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual(expectedResponse) + }) + + it('Should respond with 200 on extra request fields', async () => { + // @ts-ignore Intentionally adding an extra field to the request type + req.extraField = 'dummyString' + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 when authenticated with DEK', async () => { + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on invalid key version', async () => { + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + const res = await sendPnpSignRequest(req, authorization, app, 'invalid') + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should get the same unblinded signatures from the same message (different seed)', async () => { + const authorization1 = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendPnpSignRequest(req, authorization1, app) + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + + const secondUserSeed = new Uint8Array(userSeed) + secondUserSeed[0]++ + // Ensure request is identical except for blinded message + const req2 = { ...req } + const blindedMsgResult2 = threshold_bls.blind(message, secondUserSeed) + req2.blindedQueryPhoneNumber = Buffer.from(blindedMsgResult2.message).toString('base64') + + // Sanity check + expect(req2.blindedQueryPhoneNumber).not.toEqual(req.blindedQueryPhoneNumber) + + const authorization2 = getPnpRequestAuthorization(req2, PRIVATE_KEY1) + const res2 = await sendPnpSignRequest(req2, authorization2, app) + expect(res2.status).toBe(200) + const unblindedSig1 = threshold_bls.unblind( + Buffer.from(res1.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + const unblindedSig2 = threshold_bls.unblind( + Buffer.from(res2.body.signature, 'base64'), + blindedMsgResult2.blindingFactor + ) + expect(Buffer.from(unblindedSig1).toString('base64')).toEqual(expectedUnblindedSig) + expect(unblindedSig1).toEqual(unblindedSig2) + }) + + it('Should respond with 400 on missing request fields', async () => { + // @ts-ignore Intentionally deleting required field + delete req.account + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unsupported key version', async () => { + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app, '4') + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + req.account = mockAccount + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth', async () => { + req.account = mockAccount + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 403 on out of quota', async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(new BigNumber(0)) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + configWithApiDisabled.phoneNumberPrivacy.enabled = false + const appWithApiDisabled = startCombiner(configWithApiDisabled, mockKit) + + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, appWithApiDisabled) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should return 200 on failure to fetch DEK when shouldFailOpen is true', async () => { + mockGetDataEncryptionKey.mockImplementation(() => { + throw new Error() + }) + + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + // NOT the dek private key, so authentication would fail if getDataEncryptionKey succeeded + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + + const combinerConfigWithFailOpenEnabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + combinerConfigWithFailOpenEnabled.phoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startCombiner(combinerConfigWithFailOpenEnabled, mockKit) + const res = await sendPnpSignRequest(req, authorization, appWithFailOpenEnabled) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + expect(Buffer.from(unblindedSig).toString('base64')).toEqual(expectedUnblindedSig) + }) + + it('Should return 401 on failure to fetch DEK when shouldFailOpen is false', async () => { + mockGetDataEncryptionKey.mockImplementation(() => { + throw new Error() + }) + + req.authenticationMethod = AuthenticationMethod.ENCRYPTION_KEY + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + + const combinerConfigWithFailOpenDisabled: typeof combinerConfig = JSON.parse( + JSON.stringify(combinerConfig) + ) + combinerConfigWithFailOpenDisabled.phoneNumberPrivacy.shouldFailOpen = false + const appWithFailOpenDisabled = startCombiner( + combinerConfigWithFailOpenDisabled, + mockKit + ) + const res = await sendPnpSignRequest(req, authorization, appWithFailOpenDisabled) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + }) + }) + }) + + // For testing combiner code paths when signers do not behave as expected + describe('when signers are not operating correctly', () => { + beforeEach(() => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(onChainPaymentsDefault) + }) + + describe('when 2/3 signers return correct signatures', () => { + beforeEach(async () => { + const badBlsShare1 = + '000000002e50aa714ef6b865b5de89c56969ef9f8f27b6b0a6d157c9cc01c574ac9df604' + + const badKeyProvider1 = new MockKeyProvider( + new Map([[`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, badBlsShare1]]) + ) + signer1 = startSigner(signerConfig, signerDB1, badKeyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3, mockKit).listen(3003) + }) + + describe(`${CombinerEndpoint.PNP_SIGN}`, () => { + it('Should respond with 200 on valid request', async () => { + const req = getSignRequest(blindedMsgResult) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const unblindedSig = threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + expect(Buffer.from(unblindedSig).toString('base64')).toEqual(expectedUnblindedSig) + }) + }) + }) + + describe('when 1/3 signers return correct signatures', () => { + beforeEach(async () => { + const badBlsShare1 = + '000000002e50aa714ef6b865b5de89c56969ef9f8f27b6b0a6d157c9cc01c574ac9df604' + const badBlsShare2 = + '01000000b8f0ef841dcf8d7bd1da5e8025e47d729eb67f513335784183b8fa227a0b9a0b' + + const badKeyProvider1 = new MockKeyProvider( + new Map([[`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, badBlsShare1]]) + ) + + const badKeyProvider2 = new MockKeyProvider( + new Map([[`${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, badBlsShare2]]) + ) + + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, badKeyProvider1, mockKit).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, badKeyProvider2, mockKit).listen(3003) + }) + + describe(`${CombinerEndpoint.PNP_SIGN}`, () => { + it('Should respond with 500 even if request is valid', async () => { + const req = getSignRequest(blindedMsgResult) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + }) + + describe('when 2/3 of signers are disabled', () => { + beforeEach(async () => { + const configWithApiDisabled: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithApiDisabled.api.phoneNumberPrivacy.enabled = false + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(configWithApiDisabled, signerDB2, keyProvider2, mockKit).listen( + 3002 + ) + signer3 = startSigner(configWithApiDisabled, signerDB3, keyProvider3, mockKit).listen( + 3003 + ) + }) + + describe(`${CombinerEndpoint.PNP_QUOTA}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + expect(res.status).toBe(503) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.THRESHOLD_PNP_QUOTA_STATUS_FAILURE, + }) + }) + }) + + describe(`${CombinerEndpoint.PNP_SIGN}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const req = getSignRequest(blindedMsgResult) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(503) // majority error code in this case + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + }) + + describe('when 1/3 of signers are disabled', () => { + beforeEach(async () => { + const configWithApiDisabled: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithApiDisabled.api.phoneNumberPrivacy.enabled = false + signer1 = startSigner(signerConfig, signerDB1, keyProvider1, mockKit).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2, mockKit).listen(3002) + signer3 = startSigner(configWithApiDisabled, signerDB3, keyProvider3, mockKit).listen( + 3003 + ) + }) + + describe(`${CombinerEndpoint.PNP_QUOTA}`, () => { + it('Should respond with 200 on valid request', async () => { + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + }) + + describe(`${CombinerEndpoint.PNP_SIGN}`, () => { + it('Should respond with 200 on valid request', async () => { + const req = getSignRequest(blindedMsgResult) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + }) + }) + + describe('when signers timeout', () => { + beforeEach(async () => { + const testTimeoutMS = 0 + + const configWithShortTimeout: SignerConfig = JSON.parse(JSON.stringify(signerConfig)) + configWithShortTimeout.timeout = testTimeoutMS + // Test this with all signers timing out to decrease possibility of race conditions + signer1 = startSigner(configWithShortTimeout, signerDB1, keyProvider1, mockKit).listen( + 3001 + ) + signer2 = startSigner(configWithShortTimeout, signerDB2, keyProvider2, mockKit).listen( + 3002 + ) + signer3 = startSigner(configWithShortTimeout, signerDB3, keyProvider3, mockKit).listen( + 3003 + ) + }) + + describe(`${CombinerEndpoint.PNP_QUOTA}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const req = { + account: ACCOUNT_ADDRESS1, + } + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await getCombinerQuotaResponse(req, authorization) + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.THRESHOLD_PNP_QUOTA_STATUS_FAILURE, + }) + }) + }) + + describe(`${CombinerEndpoint.PNP_SIGN}`, () => { + it('Should fail to reach threshold of signers on valid request', async () => { + const req = getSignRequest(blindedMsgResult) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.NOT_ENOUGH_PARTIAL_SIGNATURES, + }) + }) + }) + }) + }) + }) + + // Ensure the same behavior when a minority of signers can block the threshold. + // On failure, the majority error code should not reflect the abort. + describe('with n=5, t=4', () => { + let keyProvider4: KeyProvider + let keyProvider5: KeyProvider + let signerDB4: Knex + let signerDB5: Knex + let signer4: Server | HttpsServer + let signer5: Server | HttpsServer + + const combinerConfigLargerN: typeof config = JSON.parse(JSON.stringify(combinerConfig)) + combinerConfigLargerN.phoneNumberPrivacy.odisServices.signers = JSON.stringify([ + { + url: 'http://localhost:3001', + fallbackUrl: 'http://localhost:3001/fallback', + }, + { + url: 'http://localhost:3002', + fallbackUrl: 'http://localhost:3002/fallback', + }, + { + url: 'http://localhost:3003', + fallbackUrl: 'http://localhost:3003/fallback', + }, + { + url: 'http://localhost:3004', + fallbackUrl: 'http://localhost:3004/fallback', + }, + { + url: 'http://localhost:3005', + fallbackUrl: 'http://localhost:3005/fallback', + }, + ]) + combinerConfigLargerN.phoneNumberPrivacy.keys.versions = JSON.stringify([ + { + keyVersion: 1, + threshold: 4, + polynomial: + '04000000000000007e196818fb4a5677ab97ef04a8b6e188e253d822c0689e37626fe9690d3a60283e74f2c38ec768f32870d73c7e11ff005ad65aa45707922dfc78d1fd54d64200da22a87d82b93783e2f9ee83ec290e25951c0dac2fb856871eba991731367a80b5f92e54b90901594c5e4d56beb15c44a437e78b90eb01bd4770b9c130feaf42c68d28d4e51415949d692936d3689e000f192e4fdcb03d45d1ffcd3615132046a3c8400e30cecaedf8d9bf275ead903e06ef0552a8326159f5361f8c8d16208197367a3115d3f15651082337e125005814a3f94c307e2205864803cc45dbb1b7e11738edec1d0630973830d0a74d0e0113c6ab677f087fb919728b8e1cb4f0004c6b59b4dcf28be7b4b9a5e9522e216b4d70278eff131717ff121b4203a2668093c54c6287cf9b09dd611627872f40f018f7e5a63eed5c94ead63fcd59515b1b8948482a5b7bdf07f91014d0097bba009316a8219c2074d16de09d557c2e7109112ade0d3f68248df7acfbbc4891acbb313d20021be70664d7a114a7fa6d9e01', + pubKey: + 'fhloGPtKVnerl+8EqLbhiOJT2CLAaJ43Ym/paQ06YCg+dPLDjsdo8yhw1zx+Ef8AWtZapFcHki38eNH9VNZCANoiqH2CuTeD4vnug+wpDiWVHA2sL7hWhx66mRcxNnqA', + }, + ]) + + beforeAll(async () => { + keyProvider1 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, + '00000000a49c8a293839ccb24bbcc7b833b0d57fe2f6087d33271750e7d6cf40897f520c', + ], + ]) + ) + keyProvider2 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, + '01000000c0866754b43a0e7c6f86c6732c1bc1bc1900f71a0ccab81fcd4048c5ff2edb02', + ], + ]) + ) + keyProvider3 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, + '02000000c24271a9dd0827e2939e5afbd5cd1c6705fa40d6e962fb288bbc7201921efa10', + ], + ]) + ) + keyProvider4 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, + '030000006320e2a99d4ce6a491a6354feda06051966a056dffbb0e7c8431b246d863ac09', + ], + ]) + ) + keyProvider5 = new MockKeyProvider( + new Map([ + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, + '04000000606ff4d6ddae61ac454009af2a49aeb4c297410ef9d3f3ab751c1c4fe5a99c0a', + ], + ]) + ) + app = startCombiner(combinerConfigLargerN, mockKit) + }) + + let req: SignMessageRequest + + beforeEach(async () => { + signerDB1 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB2 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB3 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB4 = await initSignerDatabase(signerConfig, signerMigrationsPath) + signerDB5 = await initSignerDatabase(signerConfig, signerMigrationsPath) + + signer1 = startSigner(signerConfig, signerDB1, keyProvider1).listen(3001) + signer2 = startSigner(signerConfig, signerDB2, keyProvider2).listen(3002) + signer3 = startSigner(signerConfig, signerDB3, keyProvider3).listen(3003) + signer4 = startSigner(signerConfig, signerDB4, keyProvider4).listen(3004) + signer5 = startSigner(signerConfig, signerDB5, keyProvider5).listen(3005) + + userSeed = new Uint8Array(32) + for (let i = 0; i < userSeed.length - 1; i++) { + userSeed[i] = i + } + + blindedMsgResult = threshold_bls.blind(message, userSeed) + req = getSignRequest(blindedMsgResult) + }) + + afterEach(async () => { + await signerDB1?.destroy() + await signerDB2?.destroy() + await signerDB3?.destroy() + await signerDB4?.destroy() + await signerDB5?.destroy() + signer1?.close() + signer2?.close() + signer3?.close() + signer4?.close() + signer5?.close() + }) + + it('Should respond with 200 on valid request', async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(onChainPaymentsDefault) + + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: res.body.signature, + performedQueryCount: 1, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + threshold_bls.unblind( + Buffer.from(res.body.signature, 'base64'), + blindedMsgResult.blindingFactor + ) + }) + + it('Should respond with 403 on out of quota', async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(new BigNumber(0)) + + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendPnpSignRequest(req, authorization, app) + + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/signing/bls-signature.test.ts b/packages/phone-number-privacy/combiner/test/unit/bls-signature.test.ts similarity index 85% rename from packages/phone-number-privacy/combiner/test/signing/bls-signature.test.ts rename to packages/phone-number-privacy/combiner/test/unit/bls-signature.test.ts index e728c76ce1f..88a5cd3bb5d 100644 --- a/packages/phone-number-privacy/combiner/test/signing/bls-signature.test.ts +++ b/packages/phone-number-privacy/combiner/test/unit/bls-signature.test.ts @@ -1,8 +1,7 @@ +import { KeyVersionInfo, rootLogger } from '@celo/phone-number-privacy-common' import threshold_bls from 'blind-threshold-bls' -import { - BLSCryptographyClient, - ServicePartialSignature, -} from '../../src/bls/bls-cryptography-client' +import { BLSCryptographyClient } from '../../src/common/crypto-clients/bls-crypto-client' +import { ServicePartialSignature } from '../../src/common/crypto-clients/crypto-client' import config from '../../src/config' const PUBLIC_KEY = @@ -19,12 +18,18 @@ const COMBINED_SIGNATURE = '16RcENpbLgq5pIkcPWdgnMofeLqSyuUVin9h4jof9/I8GRsmt5iR const INVALID_SIGNATURE = 'MAAAAAAAAACanrA73tApLu+j569ICcXrEBRLi4czWJtInJPSUpoZUOVDc1667hvMq1ESncFzlgEHAAAA' -config.thresholdSignature = { +const keyVersionInfo: KeyVersionInfo = { + keyVersion: 1, threshold: 3, polynomial: PUBLIC_POLYNOMIAL, pubKey: PUBLIC_KEY, } +config.phoneNumberPrivacy.keys = { + currentVersion: keyVersionInfo.keyVersion, + versions: JSON.stringify([keyVersionInfo]), +} + describe(`BLS service computes signature`, () => { it('provides blinded signature', async () => { const signatures: ServicePartialSignature[] = [ @@ -55,7 +60,7 @@ describe(`BLS service computes signature`, () => { const blindedMsgResult = threshold_bls.blind(message, userSeed) const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') - const blsCryptoClient = new BLSCryptographyClient() + const blsCryptoClient = new BLSCryptographyClient(keyVersionInfo) for (let i = 0; i < signatures.length; i++) { blsCryptoClient.addSignature(signatures[i]) if (i >= 2) { @@ -65,7 +70,10 @@ describe(`BLS service computes signature`, () => { } } - const actual = await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) + const actual = blsCryptoClient.combineBlindedSignatureShares( + blindedMsg, + rootLogger(config.serviceName) + ) expect(actual).toEqual(COMBINED_SIGNATURE) const unblindedSignedMessage = threshold_bls.unblind( @@ -104,11 +112,14 @@ describe(`BLS service computes signature`, () => { const blindedMsgResult = threshold_bls.blind(message, userSeed) const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') - const blsCryptoClient = new BLSCryptographyClient() + const blsCryptoClient = new BLSCryptographyClient(keyVersionInfo) signatures.forEach(async (signature) => { blsCryptoClient.addSignature(signature) }) - const actual = await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) + const actual = blsCryptoClient.combineBlindedSignatureShares( + blindedMsg, + rootLogger(config.serviceName) + ) expect(actual).toEqual(COMBINED_SIGNATURE) const unblindedSignedMessage = threshold_bls.unblind( @@ -147,12 +158,12 @@ describe(`BLS service computes signature`, () => { const blindedMsgResult = threshold_bls.blind(message, userSeed) const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') - const blsCryptoClient = new BLSCryptographyClient() + const blsCryptoClient = new BLSCryptographyClient(keyVersionInfo) signatures.forEach(async (signature) => { blsCryptoClient.addSignature(signature) }) try { - await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) + blsCryptoClient.combineBlindedSignatureShares(blindedMsg, rootLogger(config.serviceName)) throw new Error('Expected failure with missing signatures') } catch (e: any) { expect(e.message.includes('Not enough partial signatures')).toBeTruthy() @@ -187,7 +198,7 @@ describe(`BLS service computes signature`, () => { const blindedMsgResult = threshold_bls.blind(message, userSeed) const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') - const blsCryptoClient = new BLSCryptographyClient() + const blsCryptoClient = new BLSCryptographyClient(keyVersionInfo) // Add sigs one-by-one and verify intermediary states blsCryptoClient.addSignature(signatures[0]) expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() @@ -197,7 +208,7 @@ describe(`BLS service computes signature`, () => { expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() // Should fail since 1/3 sigs are invalid try { - await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) + blsCryptoClient.combineBlindedSignatureShares(blindedMsg, rootLogger(config.serviceName)) } catch (e: any) { expect(e.message.includes('Not enough partial signatures')).toBeTruthy() } @@ -206,7 +217,10 @@ describe(`BLS service computes signature`, () => { blsCryptoClient.addSignature(signatures[3]) expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() - const actual = await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) + const actual = blsCryptoClient.combineBlindedSignatureShares( + blindedMsg, + rootLogger(config.serviceName) + ) expect(actual).toEqual(COMBINED_SIGNATURE) const unblindedSignedMessage = threshold_bls.unblind( @@ -245,7 +259,7 @@ describe(`BLS service computes signature`, () => { const blindedMsgResult = threshold_bls.blind(message, userSeed) const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') - const blsCryptoClient = new BLSCryptographyClient() + const blsCryptoClient = new BLSCryptographyClient(keyVersionInfo) // Add sigs one-by-one and verify intermediary states blsCryptoClient.addSignature(signatures[0]) expect(blsCryptoClient.hasSufficientSignatures()).toBeFalsy() @@ -255,7 +269,7 @@ describe(`BLS service computes signature`, () => { expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() // Should fail since signature from url3 was generated with the wrong key version try { - await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) + blsCryptoClient.combineBlindedSignatureShares(blindedMsg, rootLogger(config.serviceName)) } catch (e: any) { expect(e.message.includes('Not enough partial signatures')).toBeTruthy() } @@ -265,7 +279,10 @@ describe(`BLS service computes signature`, () => { blsCryptoClient.addSignature(signatures[3]) expect(blsCryptoClient.hasSufficientSignatures()).toBeTruthy() - const actual = await blsCryptoClient.combinePartialBlindedSignatures(blindedMsg) + const actual = blsCryptoClient.combineBlindedSignatureShares( + blindedMsg, + rootLogger(config.serviceName) + ) expect(actual).toEqual(COMBINED_SIGNATURE) const unblindedSignedMessage = threshold_bls.unblind( diff --git a/packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts b/packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts new file mode 100644 index 00000000000..990b18a5971 --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts @@ -0,0 +1,350 @@ +import { + DisableDomainRequest, + DomainQuotaStatusRequest, + DomainRequest, + DomainRestrictedSignatureRequest, + KeyVersionInfo, + OdisResponse, + rootLogger, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { getSignerVersion } from '@celo/phone-number-privacy-signer/src/config' +import { Request, Response } from 'express' +import { Session } from '../../src/common/session' +import config from '../../src/config' +import { DomainSignerResponseLogger } from '../../src/domain/services/log-responses' + +describe('domain response logger', () => { + const url = 'test signer url' + + const keyVersionInfo: KeyVersionInfo = { + keyVersion: 1, + threshold: 3, + polynomial: 'mock polynomial', + pubKey: 'mock pubKey', + } + + const getSession = (responses: OdisResponse[]) => { + const mockRequest = { + body: {}, + } as Request + const mockResponse = { + locals: { + logger: rootLogger(config.serviceName), + }, + } as Response + const session = new Session(mockRequest, mockResponse, keyVersionInfo) + responses.forEach((res) => { + session.responses.push({ url, res, status: 200 }) + }) + return session + } + + const version = getSignerVersion() + const counter = 1 + const disabled = false + const timer = 10000 + const domainResponseLogger = new DomainSignerResponseLogger() + + const testCases: { + it: string + responses: OdisResponse< + DomainRestrictedSignatureRequest | DomainQuotaStatusRequest | DisableDomainRequest + >[] + expectedLogs: { + params: string | any[] + level: 'info' | 'debug' | 'warn' | 'error' + }[] + }[] = [ + { + it: 'should log correctly when no responses provided', + responses: [], + expectedLogs: [ + { + params: ['No successful signer responses found!'], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when all the responses are the same (except for now field)', + responses: [ + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + ], + expectedLogs: [], + }, + { + it: 'should log correctly when there is a discrepency in version field', + responses: [ + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { + success: true, + version: 'differentVersion', + status: { counter, timer, disabled, now: Date.now() }, + }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version: 'differentVersion', + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when there is a discrepency in counter field', + responses: [ + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { + success: true, + version, + status: { counter: counter + 1, timer, disabled, now: Date.now() }, + }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter: counter + 1, + disabled, + timer, + version, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when there is a discrepency in disabled field', + responses: [ + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { success: true, version, status: { counter, timer, disabled: true, now: Date.now() } }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled: true, + timer, + version, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled: true, + timer, + version, + }, + }, + ], + }, + WarningMessage.INCONSISTENT_SIGNER_DOMAIN_DISABLED_STATES, + ], + level: 'error', + }, + ], + }, + { + it: 'should log correctly when there is a discrepency in timer field', + responses: [ + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { success: true, version, status: { counter, timer, disabled, now: Date.now() } }, + { + success: true, + version, + status: { counter, timer: timer + 1, disabled, now: Date.now() }, + }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled, + timer, + version, + }, + }, + { + signerUrl: url, + values: { + counter, + disabled, + timer: timer + 1, + version, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + ], + }, + ] + testCases.forEach((testCase) => { + it(testCase.it, () => { + const session = getSession(testCase.responses) + const logSpys = { + info: { + spy: jest.spyOn(session.logger, 'info'), + callCount: 0, + }, + debug: { + spy: jest.spyOn(session.logger, 'debug'), + callCount: 0, + }, + warn: { + spy: jest.spyOn(session.logger, 'warn'), + callCount: 0, + }, + error: { + spy: jest.spyOn(session.logger, 'error'), + callCount: 0, + }, + } + domainResponseLogger.logResponseDiscrepancies(session) + testCase.expectedLogs.forEach((log) => { + expect(logSpys[log.level].spy).toHaveBeenNthCalledWith( + ++logSpys[log.level].callCount, + ...log.params + ) + }) + Object.values(logSpys).forEach((level) => { + level.spy.mockClear() + level.spy.mockRestore() + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts b/packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts new file mode 100644 index 00000000000..a6d62da8e3b --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts @@ -0,0 +1,175 @@ +import { + DomainQuotaStatusResponseSuccess, + DomainRestrictedSignatureResponseSuccess, + KeyVersionInfo, + SequentialDelayDomainState, +} from '@celo/phone-number-privacy-common' +import { getSignerVersion } from '@celo/phone-number-privacy-signer/src/config' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import { Session } from '../../src/common/session' +import config from '../../src/config' +import { DomainThresholdStateService } from '../../src/domain/services/threshold-state' + +describe('domain threshold state', () => { + // TODO add tests with failed signer responses, depending on + // result of https://github.com/celo-org/celo-monorepo/issues/9826 + + const keyVersionInfo: KeyVersionInfo = { + keyVersion: 1, + threshold: 3, + polynomial: 'mock polynomial', + pubKey: 'mock pubKey', + } + + const getSession = (domainStates: SequentialDelayDomainState[]) => { + const mockRequest = { + body: {}, + } as Request + const mockResponse = { + locals: { + logger: new Logger({ name: 'logger' }), + }, + } as Response + const session = new Session(mockRequest, mockResponse, keyVersionInfo) + domainStates.forEach((status) => { + const res: DomainRestrictedSignatureResponseSuccess | DomainQuotaStatusResponseSuccess = { + success: true, + version: expectedVersion, + status, + } + session.responses.push({ url: 'random url', res, status: 200 }) + }) + return session + } + + const domainConfig = config.domains + domainConfig.keys.currentVersion = keyVersionInfo.keyVersion + domainConfig.keys.versions = JSON.stringify([keyVersionInfo]) + domainConfig.odisServices.signers = JSON.stringify([ + { url: 'http://localhost:3001', fallbackUrl: 'http://localhost:3001/fallback' }, + { url: 'http://localhost:3002', fallbackUrl: 'http://localhost:3002/fallback' }, + { url: 'http://localhost:3003', fallbackUrl: 'http://localhost:3003/fallback' }, + { url: 'http://localhost:4004', fallbackUrl: 'http://localhost:4004/fallback' }, + ]) + + const domainThresholdStateService = new DomainThresholdStateService(domainConfig) + + const expectedVersion = getSignerVersion() + const now = Date.now() + const timer = now - 1 + const counter = 2 + + const varyingDomainStates = [ + { + statuses: [ + { timer, counter: 2, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + ], + expectedCounter: 2, + expectedTimer: timer, + }, + { + statuses: [ + { timer, counter: 1, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + ], + expectedCounter: 2, + expectedTimer: timer, + }, + { + statuses: [ + { timer, counter: 0, disabled: false, now }, + { timer, counter: 1, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 3, disabled: false, now }, + ], + expectedCounter: 2, + expectedTimer: timer, + }, + { + statuses: [ + { timer, counter: 0, disabled: true, now }, + { timer, counter: 1, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 3, disabled: false, now }, + ], + expectedCounter: 3, + expectedTimer: timer, + }, + { + statuses: [ + { timer: timer - 1, counter, disabled: false, now }, + { timer, counter, disabled: false, now }, + { timer, counter, disabled: false, now }, + { timer, counter, disabled: false, now }, + ], + expectedCounter: counter, + expectedTimer: timer, + }, + { + statuses: [ + { timer: timer - 1, counter, disabled: false, now }, + { timer: timer - 1, counter, disabled: false, now }, + { timer: timer - 1, counter, disabled: false, now }, + { timer, counter, disabled: false, now }, + ], + expectedCounter: counter, + expectedTimer: timer - 1, + }, + { + statuses: [ + { timer: timer - 1, counter: 1, disabled: false, now }, + { timer, counter: 1, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 3, disabled: false, now }, + ], + expectedCounter: 2, + expectedTimer: timer, + }, + ] + + varyingDomainStates.forEach(({ statuses, expectedCounter, expectedTimer }) => { + it(`should return counter:${expectedCounter} and timer:${expectedTimer} given the domain states: ${statuses}`, () => { + const session = getSession(statuses) + const thresholdResult = domainThresholdStateService.findThresholdDomainState(session) + + expect(thresholdResult).toStrictEqual({ + timer: expectedTimer, + counter: expectedCounter, + disabled: false, + now, + }) + }) + }) + + it('should return 0 values when too many disabled responses', () => { + const statuses = [ + { timer, counter: 0, disabled: true, now }, + { timer, counter: 1, disabled: true, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + ] + const session = getSession(statuses) + const thresholdResult = domainThresholdStateService.findThresholdDomainState(session) + + expect(thresholdResult).toStrictEqual({ timer: 0, counter: 0, disabled: true, now: 0 }) + }) + + it('should throw an error if not enough signer responses', () => { + const statuses = [ + { timer, counter: 1, disabled: true, now }, + { timer, counter: 2, disabled: false, now }, + { timer, counter: 2, disabled: false, now }, + ] + const session = getSession(statuses) + + expect(() => domainThresholdStateService.findThresholdDomainState(session)).toThrow( + 'Insufficient number of signer responses. Domain may be disabled' + ) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts b/packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts new file mode 100644 index 00000000000..690cff4d959 --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts @@ -0,0 +1,713 @@ +import { + ErrorMessage, + KeyVersionInfo, + OdisResponse, + PnpQuotaRequest, + rootLogger, + SignMessageRequest, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { getSignerVersion } from '@celo/phone-number-privacy-signer/src/config' +import { Request, Response } from 'express' +import { Session } from '../../src/common/session' +import config, { + MAX_BLOCK_DISCREPANCY_THRESHOLD, + MAX_QUERY_COUNT_DISCREPANCY_THRESHOLD, + MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD, +} from '../../src/config' +import { PnpSignerResponseLogger } from '../../src/pnp/services/log-responses' + +describe('pnp response logger', () => { + const url = 'test signer url' + + const keyVersionInfo: KeyVersionInfo = { + keyVersion: 1, + threshold: 3, + polynomial: 'mock polynomial', + pubKey: 'mock pubKey', + } + + const getSession = (responses: OdisResponse[]) => { + const mockRequest = { + body: {}, + } as Request + const mockResponse = { + locals: { + logger: rootLogger(config.serviceName), + }, + } as Response + const session = new Session( + mockRequest, + mockResponse, + keyVersionInfo + ) + responses.forEach((res) => { + session.responses.push({ url, res, status: 200 }) + }) + return session + } + + const pnpConfig = config.phoneNumberPrivacy + pnpConfig.keys.currentVersion = keyVersionInfo.keyVersion + pnpConfig.keys.versions = JSON.stringify([keyVersionInfo]) + const pnpResponseLogger = new PnpSignerResponseLogger() + + const version = getSignerVersion() + const blockNumber = 1000000 + const totalQuota = 10 + const performedQueryCount = 5 + const warnings = ['warning'] + + const testCases: { + it: string + responses: OdisResponse[] + expectedLogs: { + params: string | any[] + level: 'info' | 'debug' | 'warn' | 'error' + }[] + }[] = [ + { + it: 'should log correctly when no responses provided', + responses: [], + expectedLogs: [ + { + params: ['No successful signer responses found!'], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when all the responses are the same', + responses: [ + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + ], + expectedLogs: [], + }, + { + it: 'should log correctly when there is a discrepency in version field', + responses: [ + { + success: true, + performedQueryCount, + totalQuota, + version: 'differentVersion', + blockNumber, + warnings, + }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version: 'differentVersion', + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when there is a discrepency in performedQueryCount field', + responses: [ + { success: true, performedQueryCount: 1, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount: 1, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when there is a large discrepency in performedQueryCount field', + responses: [ + { + success: true, + performedQueryCount: performedQueryCount + MAX_QUERY_COUNT_DISCREPANCY_THRESHOLD, + totalQuota, + version, + blockNumber, + warnings, + }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount: + performedQueryCount + MAX_QUERY_COUNT_DISCREPANCY_THRESHOLD, + totalQuota, + version, + warnings, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + { + params: [ + { + sortedByQueryCount: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount: + performedQueryCount + MAX_QUERY_COUNT_DISCREPANCY_THRESHOLD, + totalQuota, + version, + warnings, + }, + }, + ], + }, + WarningMessage.INCONSISTENT_SIGNER_QUERY_MEASUREMENTS, + ], + level: 'error', + }, + ], + }, + { + it: 'should log correctly when there is a discrepency in totalQuota field', + responses: [ + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota: 1, version, blockNumber, warnings }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota: 1, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when there is a large discrepency in totalQuota field', + responses: [ + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { + success: true, + performedQueryCount, + totalQuota: totalQuota + MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD, + version, + blockNumber, + warnings, + }, + ], + expectedLogs: [ + { + params: [ + { + sortedByTotalQuota: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota: totalQuota + MAX_TOTAL_QUOTA_DISCREPANCY_THRESHOLD, + version, + warnings, + }, + }, + ], + }, + WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS, + ], + level: 'error', + }, + ], + }, + { + it: 'should log correctly when one signer returns an undefined blockNumber', + responses: [ + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { + success: true, + performedQueryCount, + totalQuota, + version, + blockNumber: undefined, + warnings, + }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber: undefined, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + { + params: [{ signerUrl: url }, 'Signer responded with undefined blockNumber'], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when there is a large discrepency in blockNumber field', + responses: [ + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { + success: true, + performedQueryCount, + totalQuota, + version, + blockNumber: blockNumber + MAX_BLOCK_DISCREPANCY_THRESHOLD, + warnings, + }, + ], + expectedLogs: [ + { + params: [ + { + sortedByBlockNumber: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber: blockNumber + MAX_BLOCK_DISCREPANCY_THRESHOLD, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + ], + }, + WarningMessage.INCONSISTENT_SIGNER_BLOCK_NUMBERS, + ], + level: 'error', + }, + ], + }, + { + it: 'should log correctly when there is a discrepency in warnings field', + responses: [ + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { success: true, performedQueryCount, totalQuota, version, blockNumber, warnings }, + { + success: true, + performedQueryCount, + totalQuota, + version, + blockNumber, + warnings: ['differentWarning'], + }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings, + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings: ['differentWarning'], + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + ], + }, + { + it: 'should log correctly when signers respond with fail-open warnings', + responses: [ + { + success: true, + performedQueryCount, + totalQuota, + version, + blockNumber, + warnings: [ErrorMessage.FAILING_OPEN], + }, + { + success: true, + performedQueryCount, + totalQuota, + version, + blockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA], + }, + { + success: true, + performedQueryCount, + totalQuota, + version, + blockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_DEK], + }, + ], + expectedLogs: [ + { + params: [ + { + parsedResponses: [ + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings: [ErrorMessage.FAILING_OPEN], + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings: [ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA], + }, + }, + { + signerUrl: url, + values: { + blockNumber, + performedQueryCount, + totalQuota, + version, + warnings: [ErrorMessage.FAILURE_TO_GET_DEK], + }, + }, + ], + }, + WarningMessage.SIGNER_RESPONSE_DISCREPANCIES, + ], + level: 'warn', + }, + { + params: [ + { + signerWarning: ErrorMessage.FAILING_OPEN, + service: url, + }, + WarningMessage.SIGNER_FAILED_OPEN, + ], + level: 'error', + }, + { + params: [ + { + signerWarning: ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA, + service: url, + }, + WarningMessage.SIGNER_FAILED_OPEN, + ], + level: 'error', + }, + { + params: [ + { + signerWarning: ErrorMessage.FAILURE_TO_GET_DEK, + service: url, + }, + WarningMessage.SIGNER_FAILED_OPEN, + ], + level: 'error', + }, + ], + }, + ] + testCases.forEach((testCase) => { + it(testCase.it, () => { + const session = getSession(testCase.responses) + const logSpys = { + info: { + spy: jest.spyOn(session.logger, 'info'), + callCount: 0, + }, + debug: { + spy: jest.spyOn(session.logger, 'debug'), + callCount: 0, + }, + warn: { + spy: jest.spyOn(session.logger, 'warn'), + callCount: 0, + }, + error: { + spy: jest.spyOn(session.logger, 'error'), + callCount: 0, + }, + } + pnpResponseLogger.logResponseDiscrepancies(session) + pnpResponseLogger.logFailOpenResponses(session) + testCase.expectedLogs.forEach((log) => { + expect(logSpys[log.level].spy).toHaveBeenNthCalledWith( + ++logSpys[log.level].callCount, + ...log.params + ) + }) + Object.values(logSpys).forEach((level) => { + level.spy.mockClear() + level.spy.mockRestore() + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts b/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts new file mode 100644 index 00000000000..6d959b94fa5 --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts @@ -0,0 +1,225 @@ +import { + KeyVersionInfo, + PnpQuotaRequest, + PnpQuotaResponseSuccess, + rootLogger, + SignMessageRequest, + SignMessageResponseSuccess, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { getSignerVersion } from '@celo/phone-number-privacy-signer/src/config' +import { Request, Response } from 'express' +import { Session } from '../../src/common/session' +import config from '../../src/config' +import { PnpThresholdStateService } from '../../src/pnp/services/threshold-state' + +describe('pnp threshold state', () => { + // TODO add tests with failed signer responses, depending on + // result of https://github.com/celo-org/celo-monorepo/issues/9826 + + const keyVersionInfo: KeyVersionInfo = { + keyVersion: 1, + threshold: 3, + polynomial: 'mock polynomial', + pubKey: 'mock pubKey', + } + + const getSession = (quotaData: { totalQuota: number; performedQueryCount: number }[]) => { + const mockRequest = { + body: {}, + } as Request + const mockResponse = { + locals: { + logger: rootLogger, + }, + } as Response + const session = new Session( + mockRequest, + mockResponse, + keyVersionInfo + ) + quotaData.forEach((q) => { + const res: PnpQuotaResponseSuccess | SignMessageResponseSuccess = { + success: true, + version: expectedVersion, + ...q, + blockNumber: testBlockNumber, + } + session.responses.push({ url: 'random url', res, status: 200 }) + }) + return session + } + + const pnpConfig = config.phoneNumberPrivacy + pnpConfig.keys.currentVersion = keyVersionInfo.keyVersion + pnpConfig.keys.versions = JSON.stringify([keyVersionInfo]) + const pnpThresholdStateService = new PnpThresholdStateService() + + const expectedVersion = getSignerVersion() + const testBlockNumber = 1000000 + const totalQuota = 10 + const performedQueryCount = 5 + + const varyingQueryCount = [ + { + signerRes: [ + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 0, totalQuota }, + ], + expectedQueryCount: 0, + }, + { + signerRes: [ + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 1, totalQuota }, + ], + expectedQueryCount: 0, + }, // does not reach threshold + { + signerRes: [ + { performedQueryCount: 1, totalQuota }, + { performedQueryCount: 1, totalQuota }, + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 1, totalQuota }, + ], + expectedQueryCount: 1, + }, // threshold reached + { + signerRes: [ + { performedQueryCount: 0, totalQuota }, + { performedQueryCount: 1, totalQuota }, + { performedQueryCount: 1, totalQuota }, + { performedQueryCount: 1, totalQuota }, + ], + expectedQueryCount: 1, + }, // order of signers shouldn't matter + { + signerRes: [ + { performedQueryCount: 1, totalQuota }, + { performedQueryCount: 4, totalQuota }, + { performedQueryCount: 9, totalQuota }, + { performedQueryCount: 11, totalQuota }, + ], + expectedQueryCount: 9, + }, + ] + varyingQueryCount.forEach(({ signerRes, expectedQueryCount }) => { + it(`should return ${expectedQueryCount} performedQueryCount given signer responses of ${signerRes}`, () => { + const session = getSession(signerRes) + const thresholdResult = pnpThresholdStateService.findCombinerQuotaState(session) + expect(thresholdResult).toStrictEqual({ + performedQueryCount: expectedQueryCount, + totalQuota, + blockNumber: testBlockNumber, + }) + }) + }) + + const varyingTotalQuota = [ + { + signerRes: [ + { performedQueryCount, totalQuota }, + { performedQueryCount, totalQuota }, + { performedQueryCount, totalQuota }, + { performedQueryCount, totalQuota }, + ], + expectedTotalQuota: totalQuota, + warning: false, + }, + { + signerRes: [ + { performedQueryCount, totalQuota: 7 }, + { performedQueryCount, totalQuota: 8 }, + { performedQueryCount, totalQuota: 9 }, + { performedQueryCount, totalQuota: 10 }, + ], + expectedTotalQuota: 8, + warning: true, + }, + { + signerRes: [ + { performedQueryCount, totalQuota: 8 }, + { performedQueryCount, totalQuota: 9 }, + { performedQueryCount, totalQuota: 10 }, + { performedQueryCount, totalQuota: 7 }, + ], + expectedTotalQuota: 8, + warning: true, + }, + ] + varyingTotalQuota.forEach(({ signerRes, expectedTotalQuota, warning }) => { + it(`should return ${expectedTotalQuota} totalQuota given signer responses of ${signerRes}`, () => { + const session = getSession(signerRes) + const thresholdResult = pnpThresholdStateService.findCombinerQuotaState(session) + expect(thresholdResult).toStrictEqual({ + performedQueryCount, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + }) + if (warning) { + expect(session.warnings).toContain( + WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS + + ', using threshold signer as best guess' + ) + } + }) + }) + + const varyingQuotaAndQuery = [ + { + signerRes: [ + { performedQueryCount: 1, totalQuota: 10 }, + { performedQueryCount: 2, totalQuota: 9 }, + { performedQueryCount: 3, totalQuota: 8 }, + { performedQueryCount: 4, totalQuota: 7 }, + ], + expectedQueryCount: 3, + expectedTotalQuota: 8, + warning: true, + }, + { + signerRes: [ + { performedQueryCount: 1, totalQuota: 7 }, + { performedQueryCount: 2, totalQuota: 8 }, + { performedQueryCount: 5, totalQuota: 9 }, + { performedQueryCount: 6, totalQuota: 10 }, + ], + expectedQueryCount: 5, + expectedTotalQuota: 9, + warning: true, + }, + ] + varyingQuotaAndQuery.forEach(({ signerRes, expectedQueryCount, expectedTotalQuota, warning }) => { + it(`should return ${expectedTotalQuota} totalQuota and ${expectedQueryCount} performedQueryCount given signer responses of ${signerRes}`, () => { + const session = getSession(signerRes) + const thresholdResult = pnpThresholdStateService.findCombinerQuotaState(session) + expect(thresholdResult).toStrictEqual({ + performedQueryCount: expectedQueryCount, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + }) + if (warning) { + expect(session.warnings).toContain( + WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS + + ', using threshold signer as best guess' + ) + } + }) + }) + + it('should throw an error if the total quota varies too much between signers', () => { + const session = getSession([ + { performedQueryCount, totalQuota: 1 }, + { performedQueryCount, totalQuota: 9 }, + { performedQueryCount, totalQuota: 15 }, + { performedQueryCount, totalQuota: 14 }, + ]) + expect(() => pnpThresholdStateService.findCombinerQuotaState(session)).toThrow( + WarningMessage.INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS + ) + }) +}) diff --git a/packages/phone-number-privacy/combiner/test/utils.ts b/packages/phone-number-privacy/combiner/test/utils.ts new file mode 100644 index 00000000000..6dbc470c7d1 --- /dev/null +++ b/packages/phone-number-privacy/combiner/test/utils.ts @@ -0,0 +1,6 @@ +import threshold_bls from 'blind-threshold-bls' + +export function getBlindedPhoneNumber(phoneNumber: string, blindingFactor: Buffer): string { + const blindedPhoneNumber = threshold_bls.blind(Buffer.from(phoneNumber), blindingFactor).message + return Buffer.from(blindedPhoneNumber).toString('base64') +} diff --git a/packages/phone-number-privacy/combiner/tsconfig.json b/packages/phone-number-privacy/combiner/tsconfig.json index 5a050f2a779..c9ee1249ba9 100644 --- a/packages/phone-number-privacy/combiner/tsconfig.json +++ b/packages/phone-number-privacy/combiner/tsconfig.json @@ -22,6 +22,6 @@ "preserveConstEnums": true, "composite": true }, - "include": ["src", "index.d.ts"], + "include": ["src"], "compileOnSave": true } diff --git a/packages/phone-number-privacy/common/README.md b/packages/phone-number-privacy/common/README.md new file mode 100644 index 00000000000..369c3daaa9c --- /dev/null +++ b/packages/phone-number-privacy/common/README.md @@ -0,0 +1,49 @@ +# ODIS Common Package + +This package contains common code used across ODIS. It is depended on by the Combiner, Signer and Monitor services as well as the @celo/identity and @celo/encrypted-backup SDKS. In most cases where code will be re-used by multiple parts of ODIS, it probably belongs here. + +## Notable Contents + +- The request and response type schemas for all ODIS APIs. +- Error and Warning types used for monitoring and alerting in both the Combiner and Signer. +- The PEAR Sequential Delay rate limiting algorithm. + +## Release Process + +When updating the ODIS common package, it is important to remember that all changes must be published before they can be used in production ODIS services or SDKS. If your changes are needed in the SDKS, then you will need to also publish all the Celo SDKs. The instructions below detail this entire SDK release process, but if your changes are only needed in ODIS services you only need to do step 7 (remember to run `yarn && yarn build` before publishing, and consider reading the rest of the steps anyway for context) + +These instructions assume the following scenario for readability: + +- The latest released sdk version is `3.1.0` +- The SDK versions in the monorepo are all set to `3.1.1-dev` +- You are releasing version `3.2.0` of the SDKs +- The latest released ODIS common package version is `2.0.2` +- You are releasing version `2.0.3` of the ODIS common package + +1. Checkout a new branch for the SDK release. Name it something like `/release3.2.0` +2. Note that you should release version `3.2.0-beta.1` and `2.0.3-beta.1` and test that everything is working correctly before publishing them as `latest`. If everything is not working correctly, try again with `-beta.2` +3. Search and replace all instances of the current sdk version in the monorepo with the new sdk version you are releasing (check the search and replace changes do what you intend them to before hitting replace!) + - i.e. search and replace `3.1.1-dev` with `3.2.0-beta.1` (note that we’ve removed the `-dev`) +4. Same idea as above -- ensure the version of the `@celo/phone-number-privacy-common` package is set to the version you are trying to release (i.e. `2.0.3-beta.1`) and that all other packages are importing this version. +5. From the monorepo root directory, run `yarn reset && yarn && yarn build` (expect this to take at least 10 mins) +6. Commit your changes with the message `3.2.0-beta.1` +7. Publish the ODIS common package by navigating to the `phone-number-privacy/common` directory and running `npm publish —-tag beta --version 3.2.0-beta.1 —-otp ` + - When publishing as `latest`, omit the `--tag beta` +8. Publish the sdks by running `npm run deploy-sdks` from the monorepo root directory + - You will be prompted to enter a version number that you wish to publish. i.e. `3.2.0-beta.1` + - You will be repeatedly asked to enter your OTP, which will be automatically supplied if you hit ‘enter’ (you do not have to paste it to the command line each time) + - When your OTP expires, you will see an error and will have to re-enter the new one + - Note the `deploy-sdks` script will automatically append `-dev` to all the sdk versions after they're published. You may need to search and replace to undue this if you were publishing a beta release. +9. Depending on what you're releasing, you may want to test that the newly published SDKs work as intended. This may be as simple as checking that CI runs successfully on your `3.2.0-beta.1` commit. +10. Once you are confident in the beta release, repeat steps 3 through 9 with versions `3.2.0` and `2.0.3`. The SDKs will be published with the `latest` tag. +11. The `deploy-sdks` script will automatically append `-dev` to all the sdk versions after they're published. For `latest` releases, it will also increment to the next patch version. Please ensure this happened correctly and commit the result with the message `3.2.1-dev` +12. Get your PR for the release branch reviewed and merged + - If CI fails with output like below, it means that some packages outside of the SDK did not get incremented to `3.2.1-dev`. Please go through and make sure these are all incremented correctly and CI should pass. + + ``` + ./sdk/utils/src/address.ts(1,46): error TS2307: Cannot find module '@celo/base/lib/address' or its corresponding type declarations. + ../sdk/utils/src/address.ts(27,8): error TS2307: Cannot find module '@celo/base/lib/address' or its corresponding type declarations. + ../sdk/utils/src/async.ts(10,8): error TS2307: Cannot find module '@celo/base/lib/async' or its corresponding type declarations + ``` + +13. Don’t forget to tag the PR commit as a release in GitHub and add Release Notes diff --git a/packages/phone-number-privacy/common/jest.config.js b/packages/phone-number-privacy/common/jest.config.js index 650c513d7e6..ac1faeacbb9 100644 --- a/packages/phone-number-privacy/common/jest.config.js +++ b/packages/phone-number-privacy/common/jest.config.js @@ -1,3 +1,10 @@ module.exports = { preset: 'ts-jest', + coverageReporters: [['lcov', { projectRoot: '../../../' }], 'text'], + collectCoverageFrom: ['./src/**'], + coverageThreshold: { + global: { + lines: 80, + }, + }, } diff --git a/packages/phone-number-privacy/common/package.json b/packages/phone-number-privacy/common/package.json index 984a80ef0b0..f25836de250 100644 --- a/packages/phone-number-privacy/common/package.json +++ b/packages/phone-number-privacy/common/package.json @@ -1,6 +1,6 @@ { "name": "@celo/phone-number-privacy-common", - "version": "1.0.39", + "version": "3.0.0-dev", "description": "Common library for the combiner and signer libraries", "author": "Celo", "license": "Apache-2.0", @@ -11,20 +11,19 @@ "build": "tsc -b .", "clean": "tsc -b . --clean", "test": "jest --testPathIgnorePatterns test/end-to-end", - "test:coverage": "jest --testPathIgnorePatterns test/end-to-end --coverage", + "test:coverage": "yarn test --coverage", "lint": "tslint -c tslint.json --project ." }, "files": [ "lib/**/*" ], "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/base": "^3.2.1-dev", + "@celo/contractkit": "^3.2.1-dev", + "@celo/utils": "^3.2.1-dev", + "@celo/phone-utils": "^3.2.1-dev", "@types/bunyan": "1.8.8", "bignumber.js": "^9.0.0", - "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", - "btoa": "1.2.1", "bunyan": "1.8.12", "bunyan-debug-stream": "2.0.0", "bunyan-gke-stackdriver": "0.1.2", @@ -34,9 +33,8 @@ "is-base64": "^1.1.0" }, "devDependencies": { - "@celo/poprf": "^0.1.6", - "@celo/wallet-local": "2.2.1-dev", - "@types/btoa": "^1.2.3", + "@celo/poprf": "^0.1.9", + "@celo/wallet-local": "^3.2.1-dev", "@types/elliptic": "^6.4.12", "@types/express": "^4.17.6", "@types/is-base64": "^1.1.0", diff --git a/packages/phone-number-privacy/common/src/domains/sequential-delay.ts b/packages/phone-number-privacy/common/src/domains/sequential-delay.ts index 833e8edb4ca..91de2c00644 100644 --- a/packages/phone-number-privacy/common/src/domains/sequential-delay.ts +++ b/packages/phone-number-privacy/common/src/domains/sequential-delay.ts @@ -69,12 +69,24 @@ export type SequentialDelayDomainOptions = { } export interface SequentialDelayDomainState { - /** Timestamp in seconds since the Unix Epoch determining when a new request will be accepted. */ + /** + * Timestamp in seconds since the Unix Epoch to which the next delay should be applied + * to calculate when a new request will be accepted. + */ timer: number /** Number of queries that have been accepted for the SequentialDelayDomain instance. */ counter: number - /** Whether or not the domain has been disabled. If disabled, no more queries will be served */ + /** Whether or not the domain has been disabled. If disabled, no more queries will be served. */ disabled: boolean + /** Server timestamp in seconds since the Unix Epoch. */ + now: number +} + +export const INITIAL_SEQUENTIAL_DELAY_DOMAIN_STATE: SequentialDelayDomainState = { + timer: 0, + counter: 0, + disabled: false, + now: 0, } /** io-ts schema for encoding and decoding SequentialDelayStage structs */ @@ -105,6 +117,7 @@ export const SequentialDelayDomainStateSchema: t.Type @@ -146,18 +159,27 @@ export const sequentialDelayDomainOptionsEIP712Types: EIP712TypesWithPrimary = { } /** Result values of the sequential delay domain rate limiting function */ -export interface SequentialDelayResult { +export interface SequentialDelayResultAccepted { /** Whether or not a request will be accepted at the given time */ - accepted: boolean + accepted: true + /** State after applying an additional query against the quota */ + state: SequentialDelayDomainState +} + +export interface SequentialDelayResultRejected { + /** Whether or not a request will be accepted at the given time */ + accepted: false + /** State after rejecting the request. Should be unchanged. */ + state: SequentialDelayDomainState /** * Earliest time a request will be accepted at the current stage. - * Provided on rejected requests. Undefined if a request will never be accepted. + * Undefined if a request will never be accepted. */ notBefore?: number - /** State after applying adding a query to the quota. Unchnaged is accepted is false */ - state: SequentialDelayDomainState | undefined } +export type SequentialDelayResult = SequentialDelayResultAccepted | SequentialDelayResultRejected + interface IndexedSequentialDelayStage extends SequentialDelayStage { // The attempt number at which the stage begins start: number @@ -166,59 +188,69 @@ interface IndexedSequentialDelayStage extends SequentialDelayStage { /** * Rate limiting predicate for the sequential delay domain * - * @param domain SequentialDelayDomain instance against which the rate limit is being calculated. - * The domain instance supplied the rate limiting parameters. + * @param domain SequentialDelayDomain instance against which the rate limit is being calculated, + * and which supplied the rate limiting parameters. * @param attemptTime The Unix timestamp in seconds when the request was received. - * @param state The current state of the domain, endoing the used quota and timeer value. + * @param state The current state of the domain, including the used quota counter and timer values. + * Defaults to initial state if no state is available (i.e. for first request against the domain). */ export const checkSequentialDelayRateLimit = ( domain: SequentialDelayDomain, attemptTime: number, - state?: SequentialDelayDomainState + state: SequentialDelayDomainState = INITIAL_SEQUENTIAL_DELAY_DOMAIN_STATE ): SequentialDelayResult => { // If the domain has been disabled, all queries are to be rejected. - if (state?.disabled ?? false) { - return { accepted: false, state } + if (state.disabled) { + return { accepted: false, state: { ...state, now: attemptTime } } } - // If no state is available (i.e. this is the first request against the domain) use the initial state. - const counter = state?.counter ?? 0 - const timer = state?.timer ?? 0 - const stage = getIndexedStage(domain, counter) + const stage = getIndexedStage(domain, state.counter) // If the counter is past the last stage (i.e. the domain is permanently out of quota) return early. if (!stage) { - return { accepted: false, state } + return { accepted: false, state: { ...state, now: attemptTime } } } const resetTimer = stage.resetTimer.defined ? stage.resetTimer.value : true - const delay = getDelay(stage, counter) - const notBefore = timer + delay + const delay = getDelay(stage, state.counter) + const notBefore = state.timer + delay if (attemptTime < notBefore) { - return { accepted: false, notBefore, state } + return { accepted: false, notBefore, state: { ...state, now: attemptTime } } } // Request is accepted. Update the state. return { accepted: true, state: { - counter: counter + 1, + counter: state.counter + 1, timer: resetTimer ? attemptTime : notBefore, - disabled: state?.disabled ?? false, + disabled: state.disabled, + now: attemptTime, }, } } +/** + * Finds the current stage of the SequentialDelayDomain rate limit for a given attempt number + * + * @param domain SequentialDelayDomain instance against which the rate limit is being calculated, + * and which supplied the rate limiting parameters. + * @param counter The current attempt number + */ const getIndexedStage = ( domain: SequentialDelayDomain, counter: number ): IndexedSequentialDelayStage | undefined => { - let attemptsInStage = 0 - let index = 0 + // The attempt index marking the beginning of the current stage let start = 0 + // The index of the current stage in domain.stages[] + let index = 0 + // The number of attempts in the current stage + let attemptsInStage = 0 while (start <= counter) { if (index >= domain.stages.length) { + // Counter is past the last stage (i.e. the domain is permanently out of quota) return undefined } const stage = domain.stages[index] @@ -235,6 +267,14 @@ const getIndexedStage = ( return { ...domain.stages[index], start } } +/** + * Finds the delay to enforce for an attempt given its counter (attempt number) and + * the corresponding stage in the SequentialDelayDomain rate limit. + * + * @param stage IndexedSequentialDelayStage The given stage of the SequentialDelayDomain rate limit, + * extended to include the index of the first attempt in that stage. + * @param counter The current attempt number + */ const getDelay = (stage: IndexedSequentialDelayStage, counter: number): number => { const batchSize = stage.batchSize.defined ? stage.batchSize.value : 1 if ((counter - stage.start) % batchSize === 0) { diff --git a/packages/phone-number-privacy/common/src/index.ts b/packages/phone-number-privacy/common/src/index.ts index 1e6fc023a6c..8e216f2d5cf 100644 --- a/packages/phone-number-privacy/common/src/index.ts +++ b/packages/phone-number-privacy/common/src/index.ts @@ -1,6 +1,6 @@ export * from './domains' export * from './interfaces' -export { ErrorMessage, WarningMessage } from './interfaces/error-utils' +export { ErrorMessage, WarningMessage } from './interfaces/errors' export { PoprfClient, PoprfCombiner, @@ -8,14 +8,12 @@ export { ThresholdPoprfClient, ThresholdPoprfServer, } from './poprf' -export { - SignMessageResponse, - SignMessageResponseFailure, - SignMessageResponseSuccess, -} from './interfaces/responses' export { TestUtils } from './test/index' export * from './utils/authentication' -export { fetchEnv, fetchEnvOrDefault, toBool, toNum } from './utils/config-utils' +export { fetchEnv, fetchEnvOrDefault, toBool, toNum } from './utils/config.utils' export * from './utils/constants' +export { BlockchainConfig, getContractKit } from './utils/contracts' export * from './utils/input-validation' +export * from './utils/key-version' export { genSessionID, loggerMiddleware, rootLogger } from './utils/logger' +export * from './utils/responses.utils' diff --git a/packages/phone-number-privacy/common/src/interfaces/endpoints.ts b/packages/phone-number-privacy/common/src/interfaces/endpoints.ts new file mode 100644 index 00000000000..d7c7d998e0d --- /dev/null +++ b/packages/phone-number-privacy/common/src/interfaces/endpoints.ts @@ -0,0 +1,79 @@ +export enum SignerEndpointCommon { + METRICS = '/metrics', + STATUS = '/status', +} + +export enum SignerEndpointPNP { + LEGACY_PNP_SIGN = '/getBlindedMessagePartialSig', + LEGACY_PNP_QUOTA = '/getQuota', + PNP_QUOTA = '/quotaStatus', + PNP_SIGN = '/sign', +} + +export enum CombinerEndpointCommon { + STATUS = '/status', +} + +export enum CombinerEndpointPNP { + LEGACY_PNP_SIGN = '/getBlindedMessageSig', + PNP_QUOTA = '/quotaStatus', + PNP_SIGN = '/sign', + STATUS = '/status', +} + +export enum DomainEndpoint { + DOMAIN_SIGN = '/domain/sign', + DISABLE_DOMAIN = '/domain/disable', + DOMAIN_QUOTA_STATUS = '/domain/quotaStatus', +} + +export type SignerEndpoint = SignerEndpointCommon | SignerEndpointPNP | DomainEndpoint +export const SignerEndpoint = { ...SignerEndpointCommon, ...SignerEndpointPNP, ...DomainEndpoint } + +export type CombinerEndpoint = CombinerEndpointCommon | CombinerEndpointPNP | DomainEndpoint +export const CombinerEndpoint = { + ...CombinerEndpointCommon, + ...CombinerEndpointPNP, + ...DomainEndpoint, +} + +export type Endpoint = SignerEndpoint | CombinerEndpoint +export const Endpoint = { ...SignerEndpoint, ...CombinerEndpoint } + +export function getSignerEndpoint(endpoint: CombinerEndpoint): SignerEndpoint { + switch (endpoint) { + case CombinerEndpoint.DISABLE_DOMAIN: + return SignerEndpoint.DISABLE_DOMAIN + case CombinerEndpoint.DOMAIN_QUOTA_STATUS: + return SignerEndpoint.DOMAIN_QUOTA_STATUS + case CombinerEndpoint.DOMAIN_SIGN: + return SignerEndpoint.DOMAIN_SIGN + case CombinerEndpoint.PNP_QUOTA: + return SignerEndpoint.PNP_QUOTA + case CombinerEndpoint.PNP_SIGN: + return SignerEndpoint.PNP_SIGN + case CombinerEndpoint.LEGACY_PNP_SIGN: + return SignerEndpoint.LEGACY_PNP_SIGN + default: + throw new Error(`No corresponding signer endpoint exists for combiner endpoint ${endpoint}`) + } +} + +export function getCombinerEndpoint(endpoint: SignerEndpoint): CombinerEndpoint { + switch (endpoint) { + case SignerEndpoint.DISABLE_DOMAIN: + return CombinerEndpoint.DISABLE_DOMAIN + case SignerEndpoint.DOMAIN_QUOTA_STATUS: + return CombinerEndpoint.DOMAIN_QUOTA_STATUS + case SignerEndpoint.DOMAIN_SIGN: + return CombinerEndpoint.DOMAIN_SIGN + case SignerEndpoint.PNP_QUOTA: + return CombinerEndpoint.PNP_QUOTA + case SignerEndpoint.PNP_SIGN: + return CombinerEndpoint.PNP_SIGN + case SignerEndpoint.LEGACY_PNP_SIGN: + return CombinerEndpoint.LEGACY_PNP_SIGN + default: + throw new Error(`No corresponding combiner endpoint exists for signer endpoint ${endpoint}`) + } +} diff --git a/packages/phone-number-privacy/common/src/interfaces/error-utils.ts b/packages/phone-number-privacy/common/src/interfaces/error-utils.ts deleted file mode 100644 index 22e75c2af5b..00000000000 --- a/packages/phone-number-privacy/common/src/interfaces/error-utils.ts +++ /dev/null @@ -1,34 +0,0 @@ -export enum ErrorMessage { - UNKNOWN_ERROR = `CELO_ODIS_ERR_00 Something went wrong`, - DATABASE_UPDATE_FAILURE = `CELO_ODIS_ERR_01 DB_ERR Failed to update database entry`, - DATABASE_INSERT_FAILURE = `CELO_ODIS_ERR_02 DB_ERR Failed to insert database entry`, - DATABASE_GET_FAILURE = `CELO_ODIS_ERR_03 DB_ERR Failed to get database entry`, - KEY_FETCH_ERROR = `CELO_ODIS_ERR_04 INIT_ERR Failed to retrieve key from keystore`, - SIGNATURE_COMPUTATION_FAILURE = `CELO_ODIS_ERR_05 SIG_ERR Failed to compute BLS signature`, - VERIFY_PARITAL_SIGNATURE_ERROR = `CELO_ODIS_ERR_06 SIG_ERR BLS partial signature verification Failure`, - NOT_ENOUGH_PARTIAL_SIGNATURES = `CELO_ODIS_ERR_07 SIG_ERR Not enough partial signatures`, - INCONSISTENT_SIGNER_RESPONSES = `CELO_ODIS_ERR_08 SIG_ERR Inconsistent responses from signers`, - ERROR_REQUESTING_SIGNATURE = `CELO_ODIS_ERR_09 SIG_ERR Failed to request signature from signer`, - TIMEOUT_FROM_SIGNER = `CELO_ODIS_ERR_10 SIG_ERR Timeout from signer`, - CONTRACT_GET_FAILURE = `CELO_ODIS_ERR_11 SIG_ERR Failed to read contract state`, - FAILURE_TO_STORE_REQUEST = `CELO_ODIS_ERR_12 DB_ERR Failed to store partial sig request`, - FAILURE_TO_INCREMENT_QUERY_COUNT = `CELO_ODIS_ERR_13 DB_ERR Failed to increment user query count`, - DOMAIN_ALREADY_DISABLED_FAILURE = `CELO_ODIS_ERR_14 DB_ERR Domain is already disabled`, - UNSUPPORTED_DOMAIN = `CELO_ODIS_ERR_15 SIG_ERR Domain type is not supported`, -} - -export enum WarningMessage { - INVALID_INPUT = `CELO_ODIS_WARN_01 BAD_INPUT Invalid input parameters`, - UNAUTHENTICATED_USER = `CELO_ODIS_WARN_02 BAD_INPUT Missing or invalid authentication header`, - EXCEEDED_QUOTA = `CELO_ODIS_WARN_03 QUOTA Requester exceeded service query quota`, - UNVERIFIED_USER_ATTEMPT_TO_MATCHMAKE = `CELO_ODIS_WARN_04 QUOTA Unverified user attempting to matchmake`, - DUPLICATE_REQUEST_TO_MATCHMAKE = `CELO_ODIS_WARN_05 QUOTA Attempt to request >1 matchmaking`, - DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG = `CELO_ODIS_WARN_06 BAD_INPUT Attempt to replay partial signature request`, - INCONSISTENT_SIGNER_BLOCK_NUMBERS = `CELO_ODIS_WARN_07 SIGNER Discrepancy found in signers' latest block number that exceeds threshold`, - INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS = `CELO_ODIS_WARN_08 SIGNER Discrepancy found in signers' quota measurements`, - MISSING_SESSION_ID = `CELO_ODIS_WARN_09 BAD_INPUT Client did not provide sessionID in request`, - CANCELLED_REQUEST_TO_SIGNER = 'CELO_ODIS_WARN_09 SIGNER Cancelled request to signer', - INVALID_USER_PHONE_NUMBER_SIGNATURE = 'CELO_ODIS_WARN_10 BAD_INPUT User phone number signature is invalid', - UNKNOWN_DOMAIN = 'CELO_ODIS_WARN_11 BAD_INPUT Provided domain name and version is not recognized', - INVALID_AUTH_SIGNATURE = 'CELO_ODIS_WARN_12 BAD_INPUT Authorization signature was incorrectly generated. Request will be rejected in a future version.', -} diff --git a/packages/phone-number-privacy/common/src/interfaces/errors.ts b/packages/phone-number-privacy/common/src/interfaces/errors.ts new file mode 100644 index 00000000000..f1021e209a4 --- /dev/null +++ b/packages/phone-number-privacy/common/src/interfaces/errors.ts @@ -0,0 +1,60 @@ +// ERR_# is used for logging so ensure that this is unique when adding a new message +export enum ErrorMessage { + UNKNOWN_ERROR = `CELO_ODIS_ERR_00 Something went wrong`, + DATABASE_UPDATE_FAILURE = `CELO_ODIS_ERR_01 DB_ERR Failed to update database entry`, + DATABASE_INSERT_FAILURE = `CELO_ODIS_ERR_02 DB_ERR Failed to insert database entry`, + DATABASE_GET_FAILURE = `CELO_ODIS_ERR_03 DB_ERR Failed to get database entry`, + KEY_FETCH_ERROR = `CELO_ODIS_ERR_04 INIT_ERR Failed to retrieve key from keystore`, + SIGNATURE_COMPUTATION_FAILURE = `CELO_ODIS_ERR_05 SIG_ERR Failed to compute BLS signature`, + VERIFY_PARITAL_SIGNATURE_ERROR = `CELO_ODIS_ERR_06 SIG_ERR BLS partial signature verification Failure`, + NOT_ENOUGH_PARTIAL_SIGNATURES = `CELO_ODIS_ERR_07 SIG_ERR Not enough partial signatures`, + INCONSISTENT_SIGNER_RESPONSES = `CELO_ODIS_ERR_08 SIG_ERR Inconsistent responses from signers`, + SIGNER_REQUEST_ERROR = `CELO_ODIS_ERR_09 SIG_ERR Failure in signer request`, + TIMEOUT_FROM_SIGNER = `CELO_ODIS_ERR_10 SIG_ERR Timeout from signer`, + FULL_NODE_ERROR = `CELO_ODIS_ERR_11 NODE_ERR Failed to read on-chain state`, + FAILURE_TO_STORE_REQUEST = `CELO_ODIS_ERR_12 DB_ERR Failed to store partial sig request`, + FAILURE_TO_INCREMENT_QUERY_COUNT = `CELO_ODIS_ERR_13 DB_ERR Failed to increment user query count`, + DOMAIN_ALREADY_DISABLED_FAILURE = `CELO_ODIS_ERR_14 DB_ERR Domain is already disabled`, + UNSUPPORTED_DOMAIN = `CELO_ODIS_ERR_15 DOMAIN Domain type is not supported`, + SIGNER_DISABLE_DOMAIN_FAILURE = `CELO_ODIS_ERR_16 DOMAIN Failed to disable domain on a signer`, + THRESHOLD_DISABLE_DOMAIN_FAILURE = `CELO_ODIS_ERR_17 DOMAIN Failed to disable domain on a threshold of signers`, + SIGNER_DOMAIN_QUOTA_STATUS_FAILURE = `CELO_ODIS_ERR_18 DOMAIN Failed to get domain status from signer`, + THRESHOLD_DOMAIN_QUOTA_STATUS_FAILURE = `CELO_ODIS_ERR_19 DOMAIN Failed to get domain quota status from a threshold of signers`, + INVALID_KEY_VERSION_RESPONSE = `CELO_ODIS_ERR_20 SIG_ERR Signer response key version header is invalid`, + INVALID_SIGNER_RESPONSE = `CELO_ODIS_ERR_21 SIG_ERR Signer response body is invalid`, + SIGNER_RESPONSE_FAILED_WITH_OK_STATUS = `CELO_ODIS_ERR_22 SIG_ERR Signer response failed with 200 status`, + THRESHOLD_PNP_QUOTA_STATUS_FAILURE = `CELO_ODIS_ERR_23 SIG_ERR Failed to get PNP quota status from a threshold of signers`, + FAILURE_TO_GET_PERFORMED_QUERY_COUNT = `CELO_ODIS_ERR_24 DB_ERR Failed to read performedQueryCount from signer db`, + FAILURE_TO_GET_TOTAL_QUOTA = `CELO_ODIS_ERR_25 NODE_ERR Failed to read on-chain state to calculate total quota`, + FAILURE_TO_GET_BLOCK_NUMBER = `CELO_ODIS_ERR_26 NODE_ERR Failed to read block number from full node`, + FAILURE_TO_GET_DEK = `CELO_ODIS_ERR_27 NODE_ERR Failed to read user's DEK from full-node`, + FAILING_OPEN = `CELO_ODIS_ERR_28 NODE_ERR Failing open on full-node error`, + FAILING_CLOSED = `CELO_ODIS_ERR_29 NODE_ERR Failing closed on full-node error`, + CAUGHT_ERROR_IN_ENDPOINT_HANDLER = `CELO_ODIS_ERR_30 Caught error in outer endpoint handler`, + ERROR_AFTER_RESPONSE_SENT = `CELO_ODIS_ERR_31 Error in endpoint thrown after response was already sent`, + SIGNATURE_AGGREGATION_FAILURE = 'CELO_ODIS_ERR_32 SIG_ERR Failed to blind aggregate signature shares', +} + +export enum WarningMessage { + INVALID_INPUT = `CELO_ODIS_WARN_01 BAD_INPUT Invalid input parameters`, + UNAUTHENTICATED_USER = `CELO_ODIS_WARN_02 BAD_INPUT Missing or invalid authentication`, + EXCEEDED_QUOTA = `CELO_ODIS_WARN_03 QUOTA Requester exceeded service query quota`, + DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG = `CELO_ODIS_WARN_04 BAD_INPUT Attempt to replay partial signature request`, + INCONSISTENT_SIGNER_BLOCK_NUMBERS = `CELO_ODIS_WARN_05 SIGNER Discrepancy found in signers latest block number that exceeds threshold`, + INCONSISTENT_SIGNER_QUOTA_MEASUREMENTS = `CELO_ODIS_WARN_06 SIGNER Discrepancy found in signers quota measurements`, + MISSING_SESSION_ID = `CELO_ODIS_WARN_07 BAD_INPUT Client did not provide sessionID in request`, + CANCELLED_REQUEST_TO_SIGNER = `CELO_ODIS_WARN_08 SIGNER Cancelled request to signer`, + INVALID_USER_PHONE_NUMBER_SIGNATURE = `CELO_ODIS_WARN_09 BAD_INPUT User phone number signature is invalid`, + UNKNOWN_DOMAIN = `CELO_ODIS_WARN_10 BAD_INPUT Provided domain name and version is not recognized`, + DISABLED_DOMAIN = `CELO_ODIS_WARN_11 BAD_INPUT Provided domain is disabled`, + INVALID_KEY_VERSION_REQUEST = `CELO_ODIS_WARN_12 BAD_INPUT Request key version header is invalid`, + API_UNAVAILABLE = `CELO_ODIS_WARN_13 BAD_INPUT API is unavailable`, + INCONSISTENT_SIGNER_DOMAIN_DISABLED_STATES = `CELO_ODIS_WARN_14 SIGNER Discrepency found in signer domain disabled states`, + INVALID_AUTH_SIGNATURE = `CELO_ODIS_WARN_15 BAD_INPUT Authorization signature was incorrectly generated. Request will be rejected in a future version.`, + INVALID_NONCE = `CELO_ODIS_WARN_16 BAD_INPUT SequentialDelayDomain nonce check failed on Signer request`, + SIGNER_RESPONSE_DISCREPANCIES = `CELO_ODIS_WARN_17 SIGNER Discrepancies detected in signer responses`, + INCONSISTENT_SIGNER_QUERY_MEASUREMENTS = `CELO_ODIS_WARN_18 SIGNER Discrepancy found in signers performed query count measurements`, + SIGNER_FAILED_OPEN = `CELO_ODIS_WARN_19 SIGNER Signer failed open on request`, +} + +export type ErrorType = ErrorMessage | WarningMessage diff --git a/packages/phone-number-privacy/common/src/interfaces/index.ts b/packages/phone-number-privacy/common/src/interfaces/index.ts index 66431635de3..4a68aa366a9 100644 --- a/packages/phone-number-privacy/common/src/interfaces/index.ts +++ b/packages/phone-number-privacy/common/src/interfaces/index.ts @@ -1,3 +1,4 @@ -export * from './error-utils' +export * from './endpoints' +export * from './errors' export * from './requests' export * from './responses' diff --git a/packages/phone-number-privacy/common/src/interfaces/requests.ts b/packages/phone-number-privacy/common/src/interfaces/requests.ts index 62e75aeb887..164a4e97ec6 100644 --- a/packages/phone-number-privacy/common/src/interfaces/requests.ts +++ b/packages/phone-number-privacy/common/src/interfaces/requests.ts @@ -9,6 +9,7 @@ import { verifyEIP712TypedDataSigner } from '@celo/utils/lib/signatureUtils' import { chain, isRight } from 'fp-ts/lib/Either' import { pipe } from 'fp-ts/lib/pipeable' import * as t from 'io-ts' +import { KEY_VERSION_HEADER } from '..' import { Domain, domainEIP712Types, @@ -23,87 +24,106 @@ import { // of interface. Otherwise the compiler complains about a missing index signature. // tslint:disable:interface-over-type-literal -export enum PhoneNumberPrivacyEndpoint { - STATUS = '/status', - METRICS = '/metrics', - GET_BLINDED_MESSAGE_PARTIAL_SIG = '/getBlindedMessagePartialSig', - GET_QUOTA = '/getQuota', -} - -export enum DomainEndpoint { - DISABLE_DOMAIN = '/domain/disable', - DOMAIN_SIGN = '/domain/sign/', - DOMAIN_QUOTA_STATUS = '/domain/quotaStatus', -} - -export type SignerEndpoint = PhoneNumberPrivacyEndpoint | DomainEndpoint -export const SignerEndpoint = { ...PhoneNumberPrivacyEndpoint, ...DomainEndpoint } - -export enum CombinerEndpoint { - SIGN_MESSAGE = '/getBlindedMessageSig', - MATCHMAKING = '/getContactMatches', -} - -export type Endpoint = SignerEndpoint | CombinerEndpoint -export const Endpoint = { ...SignerEndpoint, ...CombinerEndpoint } - export enum AuthenticationMethod { WALLET_KEY = 'wallet_key', ENCRYPTION_KEY = 'encryption_key', } -export interface GetBlindedMessageSigRequest { +export interface SignMessageRequest { /** Celo account address. Query is charged against this account's quota. */ account: string - /** Authentication method to use for verifying the signature in the Authorization header */ - authenticationMethod?: AuthenticationMethod /** Query message. A blinded elliptic curve point encoded in base64. */ blindedQueryPhoneNumber: string - /** Optional on-chain identifier. Unlocks additional quota if the account is verified as an owner of the identifier. */ - hashedPhoneNumber?: string + /** Authentication method to use for verifying the signature in the Authorization header */ + authenticationMethod?: string /** Client-specified session ID for the request. */ sessionID?: string /** Client-specified version string */ version?: string } -export interface GetContactMatchesRequest { - account: string - /** Authentication method to use for verifying the signature in the Authorization header */ - authenticationMethod?: AuthenticationMethod - userPhoneNumber: string // obfuscated with deterministic salt - contactPhoneNumbers: string[] // obfuscated with deterministic salt - hashedPhoneNumber: string // on-chain identifier - signedUserPhoneNumber?: string // signed with DEK - sessionID?: string - /** Client-specified version string */ - version?: string +/** previously known as GetBlindedMessageSigRequest */ +export interface LegacySignMessageRequest extends SignMessageRequest { + /** Optional on-chain identifier. Unlocks additional quota if the account is verified as an owner of the identifier. */ + hashedPhoneNumber?: string } -export interface GetQuotaRequest { +export const SignMessageRequestSchema: t.Type = t.intersection([ + t.type({ + account: t.string, + blindedQueryPhoneNumber: t.string, + }), + t.partial({ + authenticationMethod: t.union([t.string, t.undefined]), + sessionID: t.union([t.string, t.undefined]), + version: t.union([t.string, t.undefined]), + }), +]) + +export const LegacySignMessageRequestSchema: t.Type = t.intersection([ + SignMessageRequestSchema, + t.partial({ + hashedPhoneNumber: t.union([t.string, t.undefined]), + }), +]) + +export interface PnpQuotaRequest { account: string /** Authentication method to use for verifying the signature in the Authorization header */ - authenticationMethod?: AuthenticationMethod - hashedPhoneNumber?: string // on-chain identifier + authenticationMethod?: string + /** Client-specified session ID for the request. */ sessionID?: string /** Client-specified version string */ version?: string } +export interface LegacyPnpQuotaRequest extends PnpQuotaRequest { + /** User's ODIS generated on-chain identifier */ + hashedPhoneNumber?: string +} + +// Backwards compatibility +export declare type GetQuotaRequest = LegacyPnpQuotaRequest + +export const PnpQuotaRequestSchema: t.Type = t.intersection([ + t.type({ + account: t.string, + }), + t.partial({ + authenticationMethod: t.union([t.string, t.undefined]), + sessionID: t.union([t.string, t.undefined]), + version: t.union([t.string, t.undefined]), + }), +]) + +export const LegacyPnpQuotaRequestSchema: t.Type = t.intersection([ + PnpQuotaRequestSchema, + t.partial({ + hashedPhoneNumber: t.union([t.string, t.undefined]), + }), +]) export type PhoneNumberPrivacyRequest = - | GetBlindedMessageSigRequest - | GetContactMatchesRequest - | GetQuotaRequest + | SignMessageRequest + | LegacySignMessageRequest + | PnpQuotaRequest + | LegacyPnpQuotaRequest + +export enum DomainRequestTypeTag { + SIGN = 'DomainRestrictedSignatureRequest', + QUOTA = 'DomainQuotaStatusRequest', + DISABLE = 'DisableDomainRequest', +} /** * Domain restricted signature request to get a pOPRF evaluation on the given message in a given * domain, as specified by CIP-40. * - * @remarks Concrete request types are created by specifying the type parameters for Domain and - * DomainOptions. If the specified Domain has associated options, then the options field is - * required. If not, it must not be provided. + * @remarks Concrete request types are created by specifying the type parameter for Domain. If a + * domain has no options, an empty struct should be used. */ export type DomainRestrictedSignatureRequest = { + /** Request type tag to ensure this type can be distinguished from other request objects. */ + type: DomainRequestTypeTag.SIGN /** Domain specification. Selects the PRF domain and rate limiting rules. */ domain: D /** @@ -125,11 +145,12 @@ export type DomainRestrictedSignatureRequest = { * Options may be provided for authentication in case the quota state is non-public information. * E.g. Quota state may reveal whether or not a user has attempted to recover a given account. * - * @remarks Concrete request types are created by specifying the type parameters for Domain and - * DomainOptions. If the specified Domain has associated options, then the options field is - * required. If not, it must not be provided. + * @remarks Concrete request types are created by specifying the type parameter for Domain. If a + * domain has no options, an empty struct should be used. */ export type DomainQuotaStatusRequest = { + /** Request type tag to ensure this type can be distinguished from other request objects. */ + type: DomainRequestTypeTag.QUOTA /** Domain specification. Selects the PRF domain and rate limiting rules. */ domain: D /** Domain-specific options. */ @@ -145,11 +166,12 @@ export type DomainQuotaStatusRequest = { * * Options may be provided for authentication to prevent unintended parties from disabling a domain. * - * @remarks Concrete request types are created by specifying the type parameters for Domain and - * DomainOptions. If the specified Domain has associated options, then the options field is - * required. If not, it must not be provided. + * @remarks Concrete request types are created by specifying the type parameter for Domain. If a + * domain has no options, an empty struct should be used. */ export type DisableDomainRequest = { + /** Request type tag to ensure this type can be distinguished from other request objects. */ + type: DomainRequestTypeTag.DISABLE /** Domain specification. Selects the PRF domain and rate limiting rules. */ domain: D /** Domain-specific options. */ @@ -164,8 +186,10 @@ export type DomainRequest = | DomainQuotaStatusRequest | DisableDomainRequest +export type OdisRequest = DomainRequest | PhoneNumberPrivacyRequest + // NOTE: Next three functions are a bit repetitive. An attempt was made to combine them, but the -// type signature got quite complicated. Feel free to attempt it if you are motivated. TODO(Alec) +// type signature got quite complicated. Feel free to attempt it if you are motivated. /** Parameterized schema for checking unknown input against DomainRestrictedSignatureRequest */ export function domainRestrictedSignatureRequestSchema( @@ -175,6 +199,7 @@ export function domainRestrictedSignatureRequestSchema( // domain and options fields. We wrap the schema below to add a consistency check. const schema = t.strict({ domain, + type: t.literal(DomainRequestTypeTag.QUOTA), options: t.unknown, sessionID: eip712OptionalSchema(t.string), }) @@ -261,6 +287,7 @@ export function disableDomainRequestSchema( // domain and options fields. We wrap the schema below to add a consistency check. const schema = t.strict({ domain, + type: t.literal(DomainRequestTypeTag.DISABLE), options: t.unknown, sessionID: eip712OptionalSchema(t.string), }) @@ -303,9 +330,9 @@ export function domainRestrictedSignatureRequestEIP712( return { types: { DomainRestrictedSignatureRequest: [ + { name: 'type', type: 'string' }, { name: 'blindedMessage', type: 'string' }, { name: 'domain', type: domainTypes.primaryType }, - // Only include the `options` field in the EIP-712 type if there are options. { name: 'options', type: optionsTypes.primaryType }, { name: 'sessionID', type: 'Optional' }, ], @@ -335,8 +362,8 @@ export function domainQuotaStatusRequestEIP712( return { types: { DomainQuotaStatusRequest: [ + { name: 'type', type: 'string' }, { name: 'domain', type: domainTypes.primaryType }, - // Only include the `options` field in the EIP-712 type if there are options. { name: 'options', type: optionsTypes.primaryType }, { name: 'sessionID', type: 'Optional' }, ], @@ -366,8 +393,8 @@ export function disableDomainRequestEIP712( return { types: { DisableDomainRequest: [ + { name: 'type', type: 'string' }, { name: 'domain', type: domainTypes.primaryType }, - // Only include the `options` field in the EIP-712 type if there are options. { name: 'options', type: optionsTypes.primaryType }, { name: 'sessionID', type: 'Optional' }, ], @@ -432,43 +459,82 @@ function verifyRequestSignature>( } /** - * Verifies the signature over a signature request for authenticated domains. + * Verifies the authentication (e.g. client signature) over a domain signature request. * If the domain is unauthenticated, this function returns false. * - * @remarks As specified in CIP-40, the signed message is the full request interpretted as EIP-712 + * @remarks As specified in CIP-40, the signed message is the full request interpreted as EIP-712 * typed data with the signature field in the domain options set to its zero value (i.e. It is set * to the undefined value for type EIP712Optional). */ -export function verifyDomainRestrictedSignatureRequestSignature( +export function verifyDomainRestrictedSignatureRequestAuthenticity( request: DomainRestrictedSignatureRequest ): boolean { return verifyRequestSignature(domainRestrictedSignatureRequestEIP712, request) } /** - * Verifies the signature over a domain quota status request for authenticated domains. + * Verifies the authentication (e.g. client signature) over a domain status request. * If the domain is unauthenticated, this function returns false. * - * @remarks As specified in CIP-40, the signed message is the full request interpretted as EIP-712 + * @remarks As specified in CIP-40, the signed message is the full request interpreted as EIP-712 * typed data with the signature field in the domain options set to its zero value (i.e. It is set * to the undefined value for type EIP712Optional). */ -export function verifyDomainQuotaStatusRequestSignature( +export function verifyDomainQuotaStatusRequestAuthenticity( request: DomainQuotaStatusRequest ): boolean { return verifyRequestSignature(domainQuotaStatusRequestEIP712, request) } /** - * Verifies the signature over a disable domain request for authenticated domains. + * Verifies the authentication (e.g. client signature) over a disable domain request. * If the domain is unauthenticated, this function returns false. * - * @remarks As specified in CIP-40, the signed message is the full request interpretted as EIP-712 + * @remarks As specified in CIP-40, the signed message is the full request interpreted as EIP-712 * typed data with the signature field in the domain options set to its zero value (i.e. It is set * to the undefined value for type EIP712Optional). */ -export function verifyDisableDomainRequestSignature( +export function verifyDisableDomainRequestAuthenticity( request: DisableDomainRequest ): boolean { return verifyRequestSignature(disableDomainRequestEIP712, request) } + +interface PnpAuthHeader { + Authorization: string +} + +interface KeyVersionHeader { + [KEY_VERSION_HEADER]?: string +} + +export type DomainRestrictedSignatureRequestHeader = KeyVersionHeader +export type DisableDomainRequestHeader = undefined +export type DomainQuotaStatusRequestHeader = undefined + +export type DomainRequestHeader = + R extends DomainRestrictedSignatureRequest + ? DomainRestrictedSignatureRequestHeader + : never | R extends DisableDomainRequest + ? DisableDomainRequestHeader + : never | R extends DomainQuotaStatusRequest + ? DomainQuotaStatusRequestHeader + : never + +export type SignMessageRequestHeader = KeyVersionHeader & PnpAuthHeader + +export type PnpQuotaRequestHeader = PnpAuthHeader + +export type PhoneNumberPrivacyRequestHeader = R extends + | SignMessageRequest + | LegacySignMessageRequest + ? SignMessageRequestHeader + : never | R extends PnpQuotaRequest + ? PnpQuotaRequestHeader + : never + +export type OdisRequestHeader = R extends DomainRequest + ? DomainRequestHeader + : never | R extends PhoneNumberPrivacyRequest + ? PhoneNumberPrivacyRequestHeader + : never diff --git a/packages/phone-number-privacy/common/src/interfaces/responses.ts b/packages/phone-number-privacy/common/src/interfaces/responses.ts index 828bc540377..70e60ad867d 100644 --- a/packages/phone-number-privacy/common/src/interfaces/responses.ts +++ b/packages/phone-number-privacy/common/src/interfaces/responses.ts @@ -1,60 +1,143 @@ import * as t from 'io-ts' -import { Domain, DomainState } from '../domains' import { DisableDomainRequest, DomainQuotaStatusRequest, DomainRequest, DomainRestrictedSignatureRequest, -} from './requests' + LegacyPnpQuotaRequest, + LegacySignMessageRequest, + OdisRequest, + PhoneNumberPrivacyRequest, + PnpQuotaRequest, + SignMessageRequest, +} from '.' +import { Domain, DomainState } from '../domains' -export interface SignMessageResponse { - success: boolean - version?: string - signature?: string - performedQueryCount?: number - totalQuota?: number +// Phone Number Privacy +export interface PnpQuotaStatus { + performedQueryCount: number + // all time total quota + totalQuota: number blockNumber?: number } -export interface SignMessageResponseFailure extends SignMessageResponse { +const PnpQuotaStatusSchema: t.Type = t.intersection([ + t.type({ + performedQueryCount: t.number, + totalQuota: t.number, + }), + t.partial({ + blockNumber: t.union([t.number, t.undefined]), + }), +]) + +export interface SignMessageResponseSuccess extends PnpQuotaStatus { + success: true + version: string + signature: string + warnings?: string[] +} + +export interface SignMessageResponseFailure { success: false + version: string error: string + // These fields are occasionally provided by the signer but not the combiner + // because the combiner separates failure/success responses before processing states. + // => If the signer response fails, then it's irrelevant if that signer returned quota values, + // since these won't be used in the quota calculation anyways. + // Changing this is more involved; TODO(future) https://github.com/celo-org/celo-monorepo/issues/9826 + performedQueryCount?: number + totalQuota?: number + blockNumber?: number } -export interface SignMessageResponseSuccess extends SignMessageResponse { - success: true -} +export type SignMessageResponse = SignMessageResponseSuccess | SignMessageResponseFailure + +export const SignMessageResponseSchema: t.Type = t.union([ + t.intersection([ + t.type({ + success: t.literal(true), + version: t.string, + signature: t.string, + }), + t.partial({ + warnings: t.union([t.array(t.string), t.undefined]), + }), + PnpQuotaStatusSchema, + ]), + t.intersection([ + t.type({ + success: t.literal(false), + version: t.string, + error: t.string, + }), + t.partial({ + performedQueryCount: t.union([t.number, t.undefined]), + totalQuota: t.union([t.number, t.undefined]), + blockNumber: t.union([t.number, t.undefined]), + }), + ]), +]) -export interface GetQuotaResponse { - success: boolean +export interface PnpQuotaResponseSuccess extends PnpQuotaStatus { + success: true version: string - performedQueryCount: number - totalQuota: number + warnings?: string[] } -export interface GetContactMatchesResponse { - success: boolean - matchedContacts: Array<{ - phoneNumber: string - }> +export interface PnpQuotaResponseFailure { + success: false version: string + error: string } -export interface DomainRestrictedSignatureResponseSuccess { +export type PnpQuotaResponse = PnpQuotaResponseSuccess | PnpQuotaResponseFailure + +export const PnpQuotaResponseSchema: t.Type = t.union([ + t.intersection([ + t.type({ + success: t.literal(true), + version: t.string, + }), + t.partial({ + warnings: t.union([t.array(t.string), t.undefined]), + }), + PnpQuotaStatusSchema, + ]), + t.type({ + success: t.literal(false), + version: t.string, + error: t.string, + }), +]) + +// prettier-ignore +export type PhoneNumberPrivacyResponse< + R extends PhoneNumberPrivacyRequest = PhoneNumberPrivacyRequest +> = + | R extends SignMessageRequest | LegacySignMessageRequest ? SignMessageResponse : never + | R extends PnpQuotaRequest | LegacyPnpQuotaRequest ? PnpQuotaResponse : never + +// Domains + +export interface DomainRestrictedSignatureResponseSuccess { success: true version: string signature: string + status: DomainState } -export interface DomainRestrictedSignatureResponseFailure { +export interface DomainRestrictedSignatureResponseFailure { success: false version: string error: string + status?: DomainState } -export type DomainRestrictedSignatureResponse = - | DomainRestrictedSignatureResponseSuccess - | DomainRestrictedSignatureResponseFailure +export type DomainRestrictedSignatureResponse = + | DomainRestrictedSignatureResponseSuccess + | DomainRestrictedSignatureResponseFailure export interface DomainQuotaStatusResponseSuccess { success: true @@ -72,9 +155,10 @@ export type DomainQuotaStatusResponse = | DomainQuotaStatusResponseSuccess | DomainQuotaStatusResponseFailure -export interface DisableDomainResponseSuccess { +export interface DisableDomainResponseSuccess { success: true version: string + status: DomainState } export interface DisableDomainResponseFailure { @@ -83,23 +167,49 @@ export interface DisableDomainResponseFailure { error: string } -export type DisableDomainResponse = DisableDomainResponseSuccess | DisableDomainResponseFailure +export type DisableDomainResponse = + | DisableDomainResponseSuccess + | DisableDomainResponseFailure -export type DomainResponse = - R extends DomainRestrictedSignatureRequest - ? DomainRestrictedSignatureResponse - : never | R extends DomainQuotaStatusRequest - ? DomainQuotaStatusResponse - : never | R extends DisableDomainRequest - ? DisableDomainResponse - : never +// prettier-ignore +export type DomainResponse< + R extends DomainRequest = DomainRequest +> = + | R extends DomainRestrictedSignatureRequest ? DomainRestrictedSignatureResponse : never + | R extends DomainQuotaStatusRequest ? DomainQuotaStatusResponse : never + | R extends DisableDomainRequest ? DisableDomainResponse : never -export const DomainRestrictedSignatureResponseSchema: t.Type = - t.union([ +export function domainRestrictedSignatureResponseSchema( + state: t.Type> +): t.Type> { + return t.union([ t.type({ success: t.literal(true), version: t.string, signature: t.string, + status: state, + }), + t.intersection([ + t.type({ + success: t.literal(false), + version: t.string, + error: t.string, + }), + t.partial({ + status: t.union([state, t.undefined]), + }), + ]), + ]) +} + +export function domainQuotaStatusResponseSchema( + state: t.Type> +): t.Type> { + return t.union([ + t.type({ + success: t.literal(true), + version: t.string, + status: state, }), t.type({ success: t.literal(false), @@ -107,10 +217,11 @@ export const DomainRestrictedSignatureResponseSchema: t.Type( +export function disableDomainResponseSchema( state: t.Type> -): t.Type> { +): t.Type> { return t.union([ t.type({ success: t.literal(true), @@ -125,14 +236,16 @@ export function domainQuotaStatusResponseSchema( ]) } -export const DisableDomainResponseSchema: t.Type = t.union([ - t.type({ - success: t.literal(true), - version: t.string, - }), - t.type({ - success: t.literal(false), - version: t.string, - error: t.string, - }), -]) +// General + +// prettier-ignore +export type OdisResponse = + | R extends DomainRequest ? DomainResponse : never + | R extends PhoneNumberPrivacyRequest ? PhoneNumberPrivacyResponse : never + +export type SuccessResponse = OdisResponse & { + success: true +} +export type FailureResponse = OdisResponse & { + success: false +} diff --git a/packages/phone-number-privacy/common/src/poprf.ts b/packages/phone-number-privacy/common/src/poprf.ts index 60bfbea52c8..633b469af51 100644 --- a/packages/phone-number-privacy/common/src/poprf.ts +++ b/packages/phone-number-privacy/common/src/poprf.ts @@ -1,9 +1,8 @@ -import { randomBytes } from 'crypto' - // Note that this import is only ever used for its type information. As a result, it will not be // included in the compiled JavaScript or result in an import at runtime. // https://www.typescriptlang.org/docs/handbook/modules.html#optional-module-loading-and-other-advanced-loading-scenarios import * as POPRF from '@celo/poprf' +import { randomBytes } from 'crypto' /** * @module @@ -35,7 +34,7 @@ let _poprf: typeof POPRF | undefined * functionality, it should add @celo/poprf to its dependencies (i.e. package.json). */ function poprf(): typeof POPRF { - // TODO(victor): This will only initially work in Node environments. If we want to have this work in + // TODO: This will only initially work in Node environments. If we want to have this work in // ReactNative and browser environments, some work will need to be done in @celo/poprf or here. if (_poprf === undefined) { try { @@ -140,7 +139,7 @@ export class PoprfCombiner { /** * If there are enough responses provided, aggregates the collection of partial evaluations - * to a single PORF evaluation. + * to a single POPRF evaluation. * * @param response An array of partial evaluation responses. * @returns A buffer with a POPRF evaluation, or undefined if there are less than the threshold @@ -159,7 +158,7 @@ export class PoprfCombiner { * Client for interacting with a threshold implementation of the POPRF service without a combiner. * * @privateRemarks - * TODO(victor) Combine this class with the functionality from the combiner to create a POPRF client + * TODO Combine this class with the functionality from the combiner to create a POPRF client * that can handle expunging bad partial evaluations from a set of responses. */ export class ThresholdPoprfClient extends PoprfClient { diff --git a/packages/phone-number-privacy/common/src/test/utils.ts b/packages/phone-number-privacy/common/src/test/utils.ts index b0d267d5485..a2e57365ec3 100644 --- a/packages/phone-number-privacy/common/src/test/utils.ts +++ b/packages/phone-number-privacy/common/src/test/utils.ts @@ -1,29 +1,57 @@ -import { Signature } from '@celo/utils/lib/signatureUtils' +import { privateKeyToAddress } from '@celo/utils/lib/address' +import { serializeSignature, Signature, signMessage } from '@celo/utils/lib/signatureUtils' import BigNumber from 'bignumber.js' -import * as threshold from 'blind-threshold-bls' -import btoa from 'btoa' import Web3 from 'web3' +import { + AuthenticationMethod, + LegacyPnpQuotaRequest, + LegacySignMessageRequest, + PhoneNumberPrivacyRequest, + PnpQuotaRequest, + SignMessageRequest, +} from '../interfaces' +import { signWithRawKey } from '../utils/authentication' +import { genSessionID } from '../utils/logger' -export function createMockAttestation(completed: number, total: number) { +export interface AttestationsStatus { + isVerified: boolean + numAttestationsRemaining: number + total: number + completed: number +} + +export function createMockAttestation(getVerifiedStatus: jest.Mock) { + return { + getVerifiedStatus, + } +} + +export function createMockToken(balanceOf: jest.Mock) { return { - getVerifiedStatus: jest.fn(() => ({ completed, total })), + balanceOf, } } -export function createMockToken(balance: BigNumber) { +export function createMockAccounts( + getWalletAddress: jest.Mock, + getDataEncryptionKey: jest.Mock +) { return { - balanceOf: jest.fn(() => balance), + getWalletAddress, + getDataEncryptionKey, } } -export function createMockAccounts(walletAddress: string) { +// Take in jest.Mock to enable individual tests to spy on function calls +// and more easily set return values +export function createMockOdisPayments(totalPaidCUSDFunc: jest.Mock) { return { - getWalletAddress: jest.fn(() => walletAddress), + totalPaidCUSD: totalPaidCUSDFunc, } } export function createMockContractKit( - c: { [contractName in ContractRetrieval]: any }, + c: { [contractName in ContractRetrieval]?: any }, mockWeb3?: any ) { const contracts: any = {} @@ -45,6 +73,9 @@ export function createMockConnection(mockWeb3?: any) { return { web3: mockWeb3, getTransactionCount: jest.fn(() => mockWeb3.eth.getTransactionCount()), + getBlockNumber: jest.fn(() => { + return mockWeb3.eth.getBlockNumber() + }), } } @@ -53,29 +84,18 @@ export enum ContractRetrieval { getStableToken = 'getStableToken', getGoldToken = 'getGoldToken', getAccounts = 'getAccounts', + getOdisPayments = 'getOdisPayments', } -export function createMockWeb3(txCount: number) { +export function createMockWeb3(txCount: number, blockNumber: number) { return { eth: { getTransactionCount: jest.fn(() => txCount), + getBlockNumber: jest.fn(() => blockNumber), }, } } -export function getBlindedPhoneNumber(phoneNumber: string, blindingFactor: Buffer): string { - const blindedPhoneNumber = threshold.blind(Buffer.from(phoneNumber), blindingFactor).message - return uint8ArrayToBase64(blindedPhoneNumber) -} - -function uint8ArrayToBase64(bytes: Uint8Array) { - let binary = '' - for (let i = 0; i < bytes.byteLength; i++) { - binary += String.fromCharCode(bytes[i]) - } - return btoa(binary) -} - export async function replenishQuota(account: string, contractKit: any) { const goldToken = await contractKit.contracts.getGoldToken() const selfTransferTx = goldToken.transfer(account, 1) @@ -98,3 +118,63 @@ export async function registerWalletAddress( .setWalletAddress(walletAddress, pop as Signature) .sendAndWaitForReceipt({ from: accountAddress } as any) } + +export function getPnpQuotaRequest( + account: string, + authenticationMethod?: string +): PnpQuotaRequest { + return { + account, + authenticationMethod, + sessionID: genSessionID(), + } +} +export function getLegacyPnpQuotaRequest( + account: string, + authenticationMethod?: string, + hashedPhoneNumber?: string +): LegacyPnpQuotaRequest { + return { + account, + authenticationMethod, + hashedPhoneNumber, + sessionID: genSessionID(), + } +} + +export function getLegacyPnpSignRequest( + account: string, + blindedQueryPhoneNumber: string, + authenticationMethod?: string, + hashedPhoneNumber?: string +): LegacySignMessageRequest { + return { + account, + blindedQueryPhoneNumber, + authenticationMethod, + hashedPhoneNumber, + sessionID: genSessionID(), + } +} + +export function getPnpSignRequest( + account: string, + blindedQueryPhoneNumber: string, + authenticationMethod?: string +): SignMessageRequest { + return { + account, + blindedQueryPhoneNumber, + authenticationMethod, + sessionID: genSessionID(), + } +} + +export function getPnpRequestAuthorization(req: PhoneNumberPrivacyRequest, pk: string) { + const msg = JSON.stringify(req) + if (req.authenticationMethod === AuthenticationMethod.ENCRYPTION_KEY) { + return signWithRawKey(JSON.stringify(req), pk) + } + const account = privateKeyToAddress(pk) + return serializeSignature(signMessage(msg, pk, account)) +} diff --git a/packages/phone-number-privacy/common/src/test/values.ts b/packages/phone-number-privacy/common/src/test/values.ts index dc51da2b34f..e92546f0592 100644 --- a/packages/phone-number-privacy/common/src/test/values.ts +++ b/packages/phone-number-privacy/common/src/test/values.ts @@ -1,6 +1,5 @@ import { PhoneNumberUtils } from '@celo/phone-utils' import { normalizeAddressWith0x, privateKeyToAddress } from '@celo/utils/lib/address' -import { getBlindedPhoneNumber } from './utils' export const mockAccount = '0x0000000000000000000000000000000000007E57' export const mockPhoneNumber = '+14155556666' @@ -15,4 +14,133 @@ export const ACCOUNT_ADDRESS3 = normalizeAddressWith0x(privateKeyToAddress(PRIVA export const PHONE_NUMBER = '+15555555555' export const IDENTIFIER = PhoneNumberUtils.getPhoneHash(PHONE_NUMBER) export const BLINDING_FACTOR = Buffer.from('0IsBvRfkBrkKCIW6HV0/T1zrzjQSe8wRyU3PKojCnww=', 'base64') -export const BLINDED_PHONE_NUMBER = getBlindedPhoneNumber(PHONE_NUMBER, BLINDING_FACTOR) +// BLINDED_PHONE_NUMBER value dependent on PHONE_NUMBER AND BLINDING_FACTOR +// hardcoding to avoid importing blind_threshols_bls library +export const BLINDED_PHONE_NUMBER = + 'n/I9srniwEHm5o6t3y0tTUB5fn7xjxRrLP1F/i8ORCdqV++WWiaAzUo3GA2UNHiB' +export const DEK_PUBLIC_KEY = '0x026063780c81991c032fb4fa7485c6607b7542e048ef85d08516fe5c4482360e4b' +export const DEK_PRIVATE_KEY = '0xc2bbdabb440141efed205497a41d5fb6114e0435fd541e368dc628a8e086bfee' + +// Public keys are expected to be in base64 +export const PNP_DEV_ODIS_PUBLIC_KEY = + 'HzMTasAppwLrBBCWvZ7wncnDaN3lKpcoZr3q/wiW+FlrdKt639cxi7o4UnWZdoQA30S8q2a884Q8F6LOg4vNWouhY0wYMU/wVlp8dpkFuKj7onqGv0xssi34nhut/iuB' +export const PNP_DEV_SIGNER_PRIVATE_KEY = + '00000000dd0005bf4de5f2f052174f5cf58dae1af1d556c7f7f85d6fb3656e1d0f10720f' +export const PNP_DEV_ODIS_POLYNOMIAL = + '01000000000000001f33136ac029a702eb041096bd9ef09dc9c368dde52a972866bdeaff0896f8596b74ab7adfd7318bba38527599768400df44bcab66bcf3843c17a2ce838bcd5a8ba1634c18314ff0565a7c769905b8a8fba27a86bf4c6cb22df89e1badfe2b81' + +// Public keys are expected to be in base64 +export const DOMAINS_DEV_ODIS_PUBLIC_KEY = + 'CyJK6fkM0ZRILiW0h85LFev4BbMcLH1RBX5I9BNDgwX5jM74kv8+FjFZuJ1C4P0ADU1fuPGXXQg+wAGCclUD+BCza6ItIxSYmwsZ4ie1Iw1/pdTcwPJJlXwYwcDo+LKA' +export const DOMAINS_DEV_SIGNER_PRIVATE_KEY = + '01000000f0c2d6231c9ed833da9478cbfd6e4970fcd893e156973862f6d286e7e1f6d904' +export const DOMAINS_DEV_ODIS_POLYNOMIAL = + '01000000000000000b224ae9f90cd194482e25b487ce4b15ebf805b31c2c7d51057e48f413438305f98ccef892ff3e163159b89d42e0fd000d4d5fb8f1975d083ec00182725503f810b36ba22d2314989b0b19e227b5230d7fa5d4dcc0f249957c18c1c0e8f8b280' + +// Generated with 2/3 ratio + +export const PNP_THRESHOLD_DEV_PUBKEY_V1 = + '61aeuHAdgxoKn/5d8yXu0qx/VpPHWMAqrVgEAJ/MpC7Oc/f1YLPiN7YKaw9eDWUBUWs4sPn6IN2UTGbt95jP6nO8IymD4IhbBONjLcElsq1jwTZ2cjuTHV9obSyDFl2B' +export const PNP_THRESHOLD_DEV_PK_SHARE_1_V1 = + '000000000e7e1a2fad3b54deb2b1b32cf4c7b084842d50bbb5c6143b9d9577d16e050f03' +export const PNP_THRESHOLD_DEV_PK_SHARE_2_V1 = + '01000000e43f10f7778e238e1ed58d5fad9363d7439d2b5a8eeda6073d68ba87c0b10011' +export const PNP_THRESHOLD_DEV_PK_SHARE_3_V1 = + '02000000b90106bf4261e13389f867c267e86bd0015dcf9c48c784738695d0a3b3f8460c' +export const PNP_THRESHOLD_DEV_POLYNOMIAL_V1 = + '0200000000000000eb569eb8701d831a0a9ffe5df325eed2ac7f5693c758c02aad5804009fcca42ece73f7f560b3e237b60a6b0f5e0d6501516b38b0f9fa20dd944c66edf798cfea73bc232983e0885b04e3632dc125b2ad63c13676723b931d5f686d2c83165d817aaff1f84d0b008ad218eff19db698f343168cf931ba8347640123a2f826f62b66ff084273f494d4647758e9a9f889009d573705824a0e74e1f49ed234462058e53bbb4fef370b55f78da89df070c661782a84239b8c7623d09e34b9f91f7781' + +// Note: The pubkey doesn't change with a resharing, so normally the different key versions would have the same pubkey. +// We generated these key versions independently (not through resharing), since that is sufficient to test the key rotation logic + +export const PNP_THRESHOLD_DEV_PUBKEY_V2 = + '2ckOWP3qphyao1R4s8VHbVRdenGcFsgskQh5eCMqAwAziJzQAZ6Wo9CFD30YhhoA6B91QFIQaqfDvdblNeOtMDsmIKTDFtxZjg+cZZtQzrCTLU2owWEEb8RPJc8F3ekA' +export const PNP_THRESHOLD_DEV_PK_SHARE_1_V2 = + '0000000087c722e1338395b942d8332328795a46c718baeb8fef9e5c63111d495469c50e' +export const PNP_THRESHOLD_DEV_PK_SHARE_2_V2 = + '01000000e4efa9b60743f8188a68d35663d877143ad1726931eaa9af168fc86472eafd0d' +export const PNP_THRESHOLD_DEV_PK_SHARE_3_V2 = + '020000004118318cdb025b78d1f8728a9e3795e2ac892be7d2e4b402ca0c7480906b360d' +export const PNP_THRESHOLD_DEV_POLYNOMIAL_V2 = + '0200000000000000d9c90e58fdeaa61c9aa35478b3c5476d545d7a719c16c82c91087978232a030033889cd0019e96a3d0850f7d18861a00e81f754052106aa7c3bdd6e535e3ad303b2620a4c316dc598e0f9c659b50ceb0932d4da8c161046fc44f25cf05dde900ebf6f83c5cb94288347ebf437e99fbb7a7eaf0c9873467352c1a9113f5fc0974d96cbf25462def50c39224da757ed300ce12e0fa8c6e73387cb43c69764bed41d0a0c55981642650b07fad1107a27b27fc8c552da3edd64494e8acc4de9a2600' + +export const PNP_THRESHOLD_DEV_PUBKEY_V3 = + '5o9Y516dvzZLy7E/SfOSm2kVh02t1rU1tkJrk55/HjhRSZtyHRgAOnbnvKJvQjAA1OE70LsYlrKK8PGNVOp7cVdrFbm9xbkew+BU6hdO473qierDOF4SjKQNToyh5UOB' +export const PNP_THRESHOLD_DEV_PK_SHARE_1_V3 = + '000000005b2c8089ead28a08233b6b16b2341542453523445950cfbd9bd2f1d09c8eee0c' +export const PNP_THRESHOLD_DEV_PK_SHARE_2_V3 = + '01000000f6c10aa979a0c33a3af5b03c37ffdf1d4a8517a5f9e6058e1d863337eeb59904' +export const PNP_THRESHOLD_DEV_PK_SHARE_3_V3 = + '02000000925795c808ee0d7752aff632bb40555350854362b8caf0bef5dea1379e42f00e' +export const PNP_THRESHOLD_DEV_POLYNOMIAL_V3 = + '0200000000000000e68f58e75e9dbf364bcbb13f49f3929b6915874dadd6b535b6426b939e7f1e3851499b721d18003a76e7bca26f423000d4e13bd0bb1896b28af0f18d54ea7b71576b15b9bdc5b91ec3e054ea174ee3bdea89eac3385e128ca40d4e8ca1e543813fae8439a057f8c17d4538afecf038624e552a8c226c9f82bfb7a072cff28fb7d26ab45801b67db270cec8037b8d7e016b1b78f7997160bd4ed1b54ab5d6be7663935992cd9c59ceb17010eccd708a9762df616c1fe45a220be634e21ba87581' + +export const PNP_THRESHOLD_DEV_POLYNOMIALS = [ + PNP_THRESHOLD_DEV_POLYNOMIAL_V1, + PNP_THRESHOLD_DEV_POLYNOMIAL_V2, + PNP_THRESHOLD_DEV_POLYNOMIAL_V3, +] + +export const PNP_THRESHOLD_DEV_PUBKEYS = [ + PNP_THRESHOLD_DEV_PUBKEY_V1, + PNP_THRESHOLD_DEV_PUBKEY_V2, + PNP_THRESHOLD_DEV_PUBKEY_V3, +] + +export const DOMAINS_THRESHOLD_DEV_PUBKEY_V1 = + 'zaetF6aXkBAkVwoUosuyQ8xiK2tKM9/zKrTPKbxoDoO7p6DSwbetk5uEICK+PjcAG4pGGY81jaUPSsPqlwIDfOy+RxJ2O+5ZPDM4I+b70MSYZYrsZ6qPxg+xtqLb9AOA' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V1 = + '010000000c63d9615b2ff0746562c0b438286544f029698a4205cd8b8f93afaa5b793211' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V1 = + '020000001b63b2c531070b176f56042da68923c5859b9f82181559646b58445976de5f08' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V1 = + '030000002b638b29085f37c3794a487512628c9f1cbd0dd70c72999d9dc205a2efa83812' +export const DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V1 = + '0200000000000000cda7ad17a697901024570a14a2cbb243cc622b6b4a33dff32ab4cf29bc680e83bba7a0d2c1b7ad939b842022be3e37001b8a46198f358da50f4ac3ea9702037cecbe4712763bee593c333823e6fbd0c498658aec67aa8fc60fb1b6a2dbf403804e71a1bb1f51f2186f579048cb224f8993295e699ea14552506418df6fcf019ffe6f89253d6122cc97b8f8c5785674006c821ca2d596e4c0d75aba2b03e8ba082e002d24ebe5c48956ef96b8ac85f96c9c7929e8facac50b74b3aac792ad5d00' + +export const DOMAINS_THRESHOLD_DEV_PUBKEY_V2 = + 'rc9WQhFQn64w9FzlbVgyZi8Cd/bep+l3MtzPOWMInRQ3XoJMDSJ15SzBgE6M6JEAr58f9m2zZi6TMEcogbg3hHp37MUoybowzbGeed9jWqCWGQ0VBMFMaJLR8exNdtkA' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V2 = + '01000000a8070976747d9bb1fe56d822a57252ce3ddd5a8acef7e3ed94aeb52a16da4d04' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V2 = + '020000003d8495ff96deb0109216d575bc0f6ff364466e830ecb4d0e860d869ef8b82e0b' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V2 = + '03000000d2002289b93fc66f25d6d1c8d3ac8b188caf817c4e9eb72e776c5612db970f12' +export const DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V2 = + '0200000000000000adcf564211509fae30f45ce56d5832662f0277f6dea7e97732dccf3963089d14375e824c0d2275e52cc1804e8ce89100af9f1ff66db3662e9330472881b837847a77ecc528c9ba30cdb19e79df635aa096190d1504c14c6892d1f1ec4d76d900c32eadf29b938d0466e566b527c798434931c6c2afd84fdd34aa5d620b15d19b6b1d59f9fa0c81150bf62d316a1b8f000708a46bd4c807cab0a60e9692e1efe74084ae1503172377e39600b8fd88b4885ee55adae7bb21993909da127d3c0c81' + +export const DOMAINS_THRESHOLD_DEV_PUBKEY_V3 = + 'OGHVPM0uXSduGBKQNyyGBr7IHXZQbnG9WopBhw5m0nddsmcoQP30/IBGCB0JGOsAemcw/mP43ueJxw7PPo/m+7JhFyu8cX7F61ULbmHAFd84wneZJf42U42rWSoC+IeB' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V3 = + '0100000030c5c6ae0959c96ccc3a31c73b1b603b9b448ccfc80dba2e496d31295caee40e' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V3 = + '02000000768eb3c42a126abaa80eb8cae14006f2a98cdd175d40984ad84e881c7bf7da0d' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V3 = + '03000000bc57a0da4bcb0a0885e23ece8766aca8b8d42e60f17276666730df0f9a40d10c' +export const DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V3 = + '02000000000000003861d53ccd2e5d276e181290372c8606bec81d76506e71bd5a8a41870e66d2775db2672840fdf4fc8046081d0918eb007a6730fe63f8dee789c70ecf3e8fe6fbb261172bbc717ec5eb550b6e61c015df38c2779925fe36538dab592a02f887817f62a8f350751888132fca7dd7ff06731102483340145ff1571229884b06bfbfb25636e4bc6ad5dc294a09e45f7171012d042d5be90537c3f0eb70d51c7f7a6c09cee7af8c4af1750afde124a47a98330073af8c9011ab8a1571bc8ee958e200' + +export const DOMAINS_THRESHOLD_DEV_PUBKEY_V4 = + 'iRyLg54DDNq2c1TUAbsnc2VB5BwjBjBjJCysj6NO/Fmuki3LHjaSOscbNTQtZkIBTjBTALBDPzJAr1hDFebQTFHfg7oNaFUiEKC7P7Mhd0X9BJWNV8MEm+ZG4DymrAgA' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V4 = + '0100000044d1155eb821064919ef3b35625aa3595e2f0285d23181997836c6b18c661901' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_2_V4 = + '02000000b02c15e2769896f6c8b9bd2e3be1ddcac753683e2b991ac7c12531334122ee00' +export const DOMAINS_THRESHOLD_DEV_PK_SHARE_3_V4 = + '030000001c881466350f27a478843f281468183c3178cef78300b4f40a159cb4f5ddc200' +export const DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V4 = + '0200000000000000891c8b839e030cdab67354d401bb27736541e41c23063063242cac8fa34efc59ae922dcb1e36923ac71b35342d6642014e305300b0433f3240af584315e6d04c51df83ba0d68552210a0bb3fb3217745fd04958d57c3049be646e03ca6ac08004a8cd44dd5f648a0f3cba05024829e25c79e603193fd7cdedce1cf400bf828bea0aee6b6b792c8efb6771713e6a30e01c8f8f981445a4455ee425a676133f8a095850245d32ce4765d83fc672a87c7116295c4b4927c51aec38b944260ea0200' + +export const DOMAINS_THRESHOLD_DEV_POLYNOMIALS = [ + DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V1, + DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V2, + DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V3, + DOMAINS_THRESHOLD_DEV_POLYNOMIAL_V4, +] + +export const DOMAINS_THRESHOLD_DEV_PUBKEYS = [ + DOMAINS_THRESHOLD_DEV_PUBKEY_V1, + DOMAINS_THRESHOLD_DEV_PUBKEY_V2, + DOMAINS_THRESHOLD_DEV_PUBKEY_V3, + DOMAINS_THRESHOLD_DEV_PUBKEY_V4, +] diff --git a/packages/phone-number-privacy/common/src/utils/authentication.ts b/packages/phone-number-privacy/common/src/utils/authentication.ts index 449bb8bbee0..b3b1ad42aab 100644 --- a/packages/phone-number-privacy/common/src/utils/authentication.ts +++ b/packages/phone-number-privacy/common/src/utils/authentication.ts @@ -1,4 +1,4 @@ -import { retryAsyncWithBackOffAndTimeout } from '@celo/base' +import { hexToBuffer, retryAsyncWithBackOffAndTimeout } from '@celo/base' import { ContractKit } from '@celo/contractkit' import { AccountsWrapper } from '@celo/contractkit/lib/wrappers/Accounts' import { AttestationsWrapper } from '@celo/contractkit/lib/wrappers/Attestations' @@ -7,18 +7,25 @@ import { verifySignature } from '@celo/utils/lib/signatureUtils' import Logger from 'bunyan' import crypto from 'crypto' import { Request } from 'express' -import { rootLogger } from '..' -import { AuthenticationMethod, ErrorMessage, WarningMessage } from '../interfaces' +import { fetchEnv, rootLogger } from '..' +import { + AuthenticationMethod, + ErrorMessage, + ErrorType, + PhoneNumberPrivacyRequest, +} from '../interfaces' import { FULL_NODE_TIMEOUT_IN_MS, RETRY_COUNT, RETRY_DELAY_IN_MS } from './constants' /* * Confirms that user is who they say they are and throws error on failure to confirm. * Authorization header should contain the EC signed body */ -export async function authenticateUser( - request: Request, +export async function authenticateUser( + request: Request<{}, {}, R>, contractKit: ContractKit, - logger: Logger + logger: Logger, + shouldFailOpen: boolean = false, + warnings: ErrorType[] = [] ): Promise { logger.debug('Authenticating user') @@ -36,20 +43,24 @@ export async function authenticateUser( let registeredEncryptionKey try { registeredEncryptionKey = await getDataEncryptionKey(signer, contractKit, logger) - } catch (error) { - logger.warn('Assuming request is authenticated') - return true + } catch (err) { + // getDataEncryptionKey should only throw if there is a full-node connection issue. + // That is, it does not throw if the DEK is undefined or invalid + const failureStatus = shouldFailOpen ? ErrorMessage.FAILING_OPEN : ErrorMessage.FAILING_CLOSED + logger.error({ + err, + warning: ErrorMessage.FAILURE_TO_GET_DEK, + failureStatus, + }) + warnings.push(ErrorMessage.FAILURE_TO_GET_DEK, failureStatus) + return shouldFailOpen } if (!registeredEncryptionKey) { logger.warn({ account: signer }, 'Account does not have registered encryption key') return false } else { logger.info({ dek: registeredEncryptionKey, account: signer }, 'Found DEK for account') - if ( - verifyDEKSignature(message, messageSignature, registeredEncryptionKey, logger, { - insecureAllowIncorrectlyGeneratedSignature: true, - }) - ) { + if (verifyDEKSignature(message, messageSignature, registeredEncryptionKey, logger)) { return true } } @@ -57,25 +68,42 @@ export async function authenticateUser( // Fallback to previous signing pattern logger.info( - { account: signer }, + { account: signer, message, messageSignature }, 'Message was not authenticated with DEK, attempting to authenticate using wallet key' ) + // TODO This uses signature utils, why doesn't DEK authentication? + // (https://github.com/celo-org/celo-monorepo/issues/9803) return verifySignature(message, messageSignature, signer) } +export function getMessageDigest(message: string) { + // NOTE: Elliptic will truncate the raw msg to 64 bytes before signing, + // so make sure to always pass the hex encoded msgDigest instead. + return crypto.createHash('sha256').update(JSON.stringify(message)).digest('hex') +} + +// Used primarily for signing requests with a DEK, counterpart of verifyDEKSignature +// For general signing, use SignatureUtils in @celo/utils +export function signWithRawKey(msg: string, rawKey: string) { + // NOTE: elliptic is disabled elsewhere in this library to prevent + // accidental signing of truncated messages. + // tslint:disable-next-line:import-blacklist + const EC = require('elliptic').ec + const ec = new EC('secp256k1') + + // Sign + const key = ec.keyFromPrivate(hexToBuffer(rawKey)) + return JSON.stringify(key.sign(getMessageDigest(msg)).toDER()) +} + export function verifyDEKSignature( message: string, messageSignature: string, registeredEncryptionKey: string, - logger?: Logger, - { insecureAllowIncorrectlyGeneratedSignature } = { - insecureAllowIncorrectlyGeneratedSignature: false, - } + logger?: Logger ) { - logger = logger ?? rootLogger() + logger = logger ?? rootLogger(fetchEnv('SERVICE_NAME')) try { - const msgDigest = crypto.createHash('sha256').update(JSON.stringify(message)).digest('hex') - // NOTE: elliptic is disabled elsewhere in this library to prevent // accidental signing of truncated messages. // tslint:disable-next-line:import-blacklist @@ -83,16 +111,9 @@ export function verifyDEKSignature( const ec = new EC('secp256k1') const key = ec.keyFromPublic(trimLeading0x(registeredEncryptionKey), 'hex') const parsedSig = JSON.parse(messageSignature) - if (key.verify(msgDigest, parsedSig)) { - return true - } - // TODO: Remove this once clients upgrade to @celo/identity v1.5.3 - // Due to an error in the original implementation of the sign and verify functions - // used here, older clients may generate signatures over the truncated message, - // instead of its hash. These signatures represent a risk to the signer as they do - // not protect against modifications of the message past the first 64 characters of the message. - if (insecureAllowIncorrectlyGeneratedSignature && key.verify(message, parsedSig)) { - logger.warn(WarningMessage.INVALID_AUTH_SIGNATURE) + // TODO why do we use a different signing method instead of SignatureUtils? + // (https://github.com/celo-org/celo-monorepo/issues/9803) + if (key.verify(getMessageDigest(message), parsedSig)) { return true } return false @@ -123,7 +144,7 @@ export async function getDataEncryptionKey( return res } catch (error) { logger.error('Failed to retrieve DEK: ' + error) - logger.error(ErrorMessage.CONTRACT_GET_FAILURE) + logger.error(ErrorMessage.FULL_NODE_ERROR) throw error } } @@ -164,7 +185,7 @@ export async function isVerified( return res } catch (error) { logger.error('Failed to get verification status: ' + error) - logger.error(ErrorMessage.CONTRACT_GET_FAILURE) + logger.error(ErrorMessage.FULL_NODE_ERROR) logger.warn('Assuming user is verified') return true } diff --git a/packages/phone-number-privacy/common/src/utils/config-utils.ts b/packages/phone-number-privacy/common/src/utils/config.utils.ts similarity index 100% rename from packages/phone-number-privacy/common/src/utils/config-utils.ts rename to packages/phone-number-privacy/common/src/utils/config.utils.ts diff --git a/packages/phone-number-privacy/common/src/utils/constants.ts b/packages/phone-number-privacy/common/src/utils/constants.ts index e3a67639c13..c50f375e84d 100644 --- a/packages/phone-number-privacy/common/src/utils/constants.ts +++ b/packages/phone-number-privacy/common/src/utils/constants.ts @@ -1,8 +1,6 @@ -// a getContactMatches request with 300 phone numbers still fits under -// this limit. export const REASONABLE_BODY_CHAR_LIMIT: number = 16_000 export const DB_TIMEOUT = 1000 export const FULL_NODE_TIMEOUT_IN_MS = 1000 export const RETRY_COUNT = 5 export const RETRY_DELAY_IN_MS = 100 -export const MAX_BLOCK_DISCREPANCY_THRESHOLD = 3 +export const KEY_VERSION_HEADER = 'odis-key-version' // headers must be all lower case diff --git a/packages/phone-number-privacy/common/src/utils/contracts.ts b/packages/phone-number-privacy/common/src/utils/contracts.ts new file mode 100644 index 00000000000..f4952231f1f --- /dev/null +++ b/packages/phone-number-privacy/common/src/utils/contracts.ts @@ -0,0 +1,10 @@ +import { ContractKit, newKit, newKitWithApiKey } from '@celo/contractkit' + +export interface BlockchainConfig { + provider: string + apiKey?: string +} + +export function getContractKit(config: BlockchainConfig): ContractKit { + return config.apiKey ? newKitWithApiKey(config.provider, config.apiKey) : newKit(config.provider) +} diff --git a/packages/phone-number-privacy/common/src/utils/input-validation.ts b/packages/phone-number-privacy/common/src/utils/input-validation.ts index 3e2cb7b1e92..6ce052d0304 100644 --- a/packages/phone-number-privacy/common/src/utils/input-validation.ts +++ b/packages/phone-number-privacy/common/src/utils/input-validation.ts @@ -1,9 +1,10 @@ import { isValidAddress, trimLeading0x } from '@celo/utils/lib/address' import isBase64 from 'is-base64' import { - GetBlindedMessageSigRequest, - GetContactMatchesRequest, GetQuotaRequest, + LegacySignMessageRequest, + PnpQuotaRequest, + SignMessageRequest, } from '../interfaces' import { REASONABLE_BODY_CHAR_LIMIT } from './constants' @@ -11,25 +12,12 @@ export function hasValidAccountParam(requestBody: { account: string }): boolean return !!requestBody.account && isValidAddress(requestBody.account) } -export function hasValidUserPhoneNumberParam(requestBody: GetContactMatchesRequest): boolean { - return !!requestBody.userPhoneNumber && isValidObfuscatedPhoneNumber(requestBody.userPhoneNumber) -} - -export function hasValidContactPhoneNumbersParam(requestBody: GetContactMatchesRequest): boolean { - return ( - Array.isArray(requestBody.contactPhoneNumbers) && - requestBody.contactPhoneNumbers.length > 0 && - requestBody.contactPhoneNumbers.every((contact) => isValidObfuscatedPhoneNumber(contact)) - ) -} - -export function isBodyReasonablySized( - requestBody: GetBlindedMessageSigRequest | GetQuotaRequest -): boolean { +// Legacy message signing & quota requests extend the new types +export function isBodyReasonablySized(requestBody: SignMessageRequest | PnpQuotaRequest): boolean { return JSON.stringify(requestBody).length <= REASONABLE_BODY_CHAR_LIMIT } -export function hasValidBlindedPhoneNumberParam(requestBody: GetBlindedMessageSigRequest): boolean { +export function hasValidBlindedPhoneNumberParam(requestBody: SignMessageRequest): boolean { return ( !!requestBody.blindedQueryPhoneNumber && requestBody.blindedQueryPhoneNumber.length === 64 && @@ -38,19 +26,11 @@ export function hasValidBlindedPhoneNumberParam(requestBody: GetBlindedMessageSi } export function identifierIsValidIfExists( - requestBody: GetQuotaRequest | GetBlindedMessageSigRequest + requestBody: GetQuotaRequest | LegacySignMessageRequest ): boolean { return !requestBody.hashedPhoneNumber || isByte32(requestBody.hashedPhoneNumber) } -export function hasValidIdentifier(requestBody: GetContactMatchesRequest): boolean { - return !!requestBody.hashedPhoneNumber && isByte32(requestBody.hashedPhoneNumber) -} - -function isValidObfuscatedPhoneNumber(phoneNumber: string) { - return isBase64(phoneNumber) && Buffer.from(phoneNumber, 'base64').length === 32 -} - const hexString = new RegExp(/[0-9A-Fa-f]{32}/, 'i') function isByte32(hashedData: string): boolean { diff --git a/packages/phone-number-privacy/common/src/utils/key-version.ts b/packages/phone-number-privacy/common/src/utils/key-version.ts new file mode 100644 index 00000000000..07657663793 --- /dev/null +++ b/packages/phone-number-privacy/common/src/utils/key-version.ts @@ -0,0 +1,105 @@ +import Logger from 'bunyan' +import { Request } from 'express' +import { Response as FetchResponse } from 'node-fetch' +import { ErrorMessage, KEY_VERSION_HEADER, OdisRequest, WarningMessage } from '..' + +export interface KeyVersionInfo { + keyVersion: number + threshold: number + polynomial: string + pubKey: string +} + +export function requestHasValidKeyVersion( + request: Request<{}, {}, OdisRequest>, + logger: Logger +): boolean { + try { + getRequestKeyVersion(request, logger) + return true + } catch (err) { + logger.debug('Error caught in requestHasValidKeyVersion') + logger.debug(err) + return false + } +} + +export function getRequestKeyVersion( + request: Request<{}, {}, OdisRequest>, + logger: Logger +): number | undefined { + const keyVersionHeader = request.headers[KEY_VERSION_HEADER] + const keyVersion = parseKeyVersionFromHeader(keyVersionHeader) + + if (keyVersion === undefined) { + return undefined + } + if (!isValidKeyVersion(keyVersion)) { + logger.error({ keyVersionHeader }, WarningMessage.INVALID_KEY_VERSION_REQUEST) + throw new Error(WarningMessage.INVALID_KEY_VERSION_REQUEST) + } + + logger.info({ keyVersion }, 'Request has valid key version') + return keyVersion +} + +export function responseHasExpectedKeyVersion( + response: FetchResponse, + expectedKeyVersion: number, + logger: Logger +): boolean { + let responseKeyVersion + try { + responseKeyVersion = getResponseKeyVersion(response, logger) + } catch (err) { + logger.debug('Error caught in responseHasExpectedKeyVersion') + logger.debug(err) + return false + } + + if (responseKeyVersion !== expectedKeyVersion) { + logger.error( + { expectedKeyVersion, responseKeyVersion }, + ErrorMessage.INVALID_KEY_VERSION_RESPONSE + ) + return false + } + + return true +} + +export function getResponseKeyVersion(response: FetchResponse, logger: Logger): number | undefined { + const keyVersionHeader = response.headers.get(KEY_VERSION_HEADER) + const keyVersion = parseKeyVersionFromHeader(keyVersionHeader) + + if (keyVersion === undefined) { + return undefined + } + if (!isValidKeyVersion(keyVersion)) { + logger.error({ keyVersionHeader }, ErrorMessage.INVALID_KEY_VERSION_RESPONSE) + throw new Error(ErrorMessage.INVALID_KEY_VERSION_RESPONSE) + } + + logger.info({ keyVersion }, 'Response has valid key version') + return keyVersion +} + +function parseKeyVersionFromHeader( + keyVersionHeader: string | string[] | undefined | null +): number | undefined { + if (keyVersionHeader === undefined || keyVersionHeader === null) { + return undefined + } + + const keyVersionHeaderString = keyVersionHeader.toString().trim() + + if (!keyVersionHeaderString.length) { + return undefined + } + + return Number(keyVersionHeaderString) +} + +function isValidKeyVersion(keyVersion: number): boolean { + return Number.isInteger(keyVersion) && keyVersion >= 0 +} diff --git a/packages/phone-number-privacy/common/src/utils/logger.ts b/packages/phone-number-privacy/common/src/utils/logger.ts index 22464b7a7a9..0114aebb649 100644 --- a/packages/phone-number-privacy/common/src/utils/logger.ts +++ b/packages/phone-number-privacy/common/src/utils/logger.ts @@ -2,19 +2,18 @@ import Logger, { createLogger, levelFromName, LogLevelString, stdSerializers } f import bunyanDebugStream from 'bunyan-debug-stream' import { createStream } from 'bunyan-gke-stackdriver' import { NextFunction, Request, Response } from 'express' -import { WarningMessage } from '../interfaces/error-utils' -import { fetchEnv, fetchEnvOrDefault } from './config-utils' +import { WarningMessage } from '../interfaces/errors' +import { fetchEnvOrDefault } from './config.utils' let _rootLogger: Logger | undefined -export function rootLogger(): Logger { +export function rootLogger(serviceName: string): Logger { if (_rootLogger !== undefined) { return _rootLogger } const logLevel = fetchEnvOrDefault('LOG_LEVEL', 'info') as LogLevelString const logFormat = fetchEnvOrDefault('LOG_FORMAT', 'human') - const serviceName = fetchEnv('SERVICE_NAME') let stream: any switch (logFormat) { @@ -30,28 +29,32 @@ export function rootLogger(): Logger { } _rootLogger = createLogger({ - name: serviceName, + name: serviceName ?? '', serializers: stdSerializers, streams: [stream], }) return _rootLogger } -export function loggerMiddleware(req: Request, res: Response, next?: NextFunction): Logger { - const requestLogger = rootLogger().child({ - endpoint: req.path, - sessionID: req.body.sessionID, // May be undefined - }) - res.locals.logger = requestLogger - - if (!req.body.sessionID && req.path !== '/metrics' && req.path !== '/status') { - requestLogger.info(WarningMessage.MISSING_SESSION_ID) - } - - if (next) { - next() +export function loggerMiddleware( + serviceName: string +): (req: Request, res: Response, next?: NextFunction) => Logger { + return (req, res, next) => { + const requestLogger = rootLogger(serviceName).child({ + endpoint: req.path, + sessionID: req.body.sessionID, // May be undefined + }) + res.locals.logger = requestLogger + + if (!req.body.sessionID && req.path !== '/metrics' && req.path !== '/status') { + requestLogger.info(WarningMessage.MISSING_SESSION_ID) + } + + if (next) { + next() + } + return requestLogger } - return requestLogger } export function genSessionID() { diff --git a/packages/phone-number-privacy/common/src/utils/responses.utils.ts b/packages/phone-number-privacy/common/src/utils/responses.utils.ts new file mode 100644 index 00000000000..467acb1b42c --- /dev/null +++ b/packages/phone-number-privacy/common/src/utils/responses.utils.ts @@ -0,0 +1,20 @@ +import Logger from 'bunyan' +import { Response } from 'express' +import { OdisRequest, OdisResponse, WarningMessage } from '..' + +export function send< + I extends OdisRequest = OdisRequest, + O extends OdisResponse = OdisResponse +>(response: Response, body: O, status: number, logger: Logger) { + if (!body.success) { + if (body.error in WarningMessage) { + logger.warn({ error: body.error, status, body }, 'Responding with warning') + } else { + logger.error({ error: body.error, status, body }, 'Responding with error') + } + } else { + logger.info({ status, body }, 'Responding with success') + } + response.status(status).json(body) + logger.info('Completed send') +} diff --git a/packages/phone-number-privacy/common/src/domains/domains.test.ts b/packages/phone-number-privacy/common/test/domains.test.ts similarity index 88% rename from packages/phone-number-privacy/common/src/domains/domains.test.ts rename to packages/phone-number-privacy/common/test/domains.test.ts index 73741a04ab5..92b97a101ae 100644 --- a/packages/phone-number-privacy/common/src/domains/domains.test.ts +++ b/packages/phone-number-privacy/common/test/domains.test.ts @@ -6,9 +6,9 @@ import { noNumber, noString, } from '@celo/utils/lib/sign-typed-data-utils' -import { DomainIdentifiers } from './constants' -import { Domain, domainEIP712, DomainOptions } from './domains' -import { SequentialDelayDomain } from './sequential-delay' +import { DomainIdentifiers } from '../src/domains/constants' +import { Domain, domainEIP712, DomainOptions } from '../src/domains/domains' +import { SequentialDelayDomain } from '../src/domains/sequential-delay' // Compile-time check that Domain can be cast to type EIP712Object export const TEST_DOMAIN_IS_EIP712: EIP712Object = {} as unknown as Domain diff --git a/packages/phone-number-privacy/common/test/interfaces/requests.test.ts b/packages/phone-number-privacy/common/test/interfaces/requests.test.ts index 3386c461312..d0f8a7d1e5c 100644 --- a/packages/phone-number-privacy/common/test/interfaces/requests.test.ts +++ b/packages/phone-number-privacy/common/test/interfaces/requests.test.ts @@ -3,8 +3,8 @@ import { EIP712Object, generateTypedDataHash, noBool, - noString, noNumber, + noString, } from '@celo/utils/lib/sign-typed-data-utils' import { LocalWallet } from '@celo/wallet-local' import { @@ -14,18 +14,19 @@ import { SequentialDelayDomainSchema, } from '../../src/domains' import { - DomainRestrictedSignatureRequest, - domainRestrictedSignatureRequestEIP712, - domainRestrictedSignatureRequestSchema, - DomainQuotaStatusRequest, - domainQuotaStatusRequestEIP712, - domainQuotaStatusRequestSchema, DisableDomainRequest, disableDomainRequestEIP712, disableDomainRequestSchema, - verifyDisableDomainRequestSignature, - verifyDomainQuotaStatusRequestSignature, - verifyDomainRestrictedSignatureRequestSignature, + DomainQuotaStatusRequest, + domainQuotaStatusRequestEIP712, + domainQuotaStatusRequestSchema, + DomainRequestTypeTag, + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestEIP712, + domainRestrictedSignatureRequestSchema, + verifyDisableDomainRequestAuthenticity, + verifyDomainQuotaStatusRequestAuthenticity, + verifyDomainRestrictedSignatureRequestAuthenticity, } from '../../src/interfaces/requests' // Compile-time check that DomainRestrictedSignatureRequest can be cast to type EIP712Object. @@ -48,6 +49,7 @@ TEST_DISABLE_DOMAIN_REQUEST_IS_EIP712 = {} as unknown as DisableDomainRequest { it('should generate the correct type data for request with SequentialDelayDomain', () => { const request: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, domain: { name: DomainIdentifiers.SequentialDelay, version: '1', @@ -62,7 +64,7 @@ describe('domainRestrictedSignatureRequestEIP712()', () => { blindedMessage: '', sessionID: noString, } - const expectedHash = 'bc958fdbf83dfa7253b9ad1d9a8c5a803617f7acbed9684ff4fda669647956b5' + const expectedHash = '9914e6bc3bd0d63727eeae4008654920b9879654f7159b1d5ab33768e61f56df' const typedData = domainRestrictedSignatureRequestEIP712(request) // console.debug(JSON.stringify(typedData, null, 2)) expect(generateTypedDataHash(typedData).toString('hex')).toEqual(expectedHash) @@ -72,6 +74,7 @@ describe('domainRestrictedSignatureRequestEIP712()', () => { describe('domainQuotaStatusRequestEIP712()', () => { it('should generate the correct type data for request with SequentialDelayDomain', () => { const request: DomainQuotaStatusRequest = { + type: DomainRequestTypeTag.QUOTA, domain: { name: DomainIdentifiers.SequentialDelay, version: '1', @@ -85,7 +88,7 @@ describe('domainQuotaStatusRequestEIP712()', () => { }, sessionID: noString, } - const expectedHash = '7fcd55bc848bb89bb14cee5f5b08a4ae3224b26fbffb86385e2b64056862de62' + const expectedHash = '0c1545b83f28d8d0f24886fa0d21ac540af706dd6f9ee6d045bac17780a2656e' const typedData = domainQuotaStatusRequestEIP712(request) //console.debug(JSON.stringify(typedData, null, 2)) expect(generateTypedDataHash(typedData).toString('hex')).toEqual(expectedHash) @@ -95,6 +98,7 @@ describe('domainQuotaStatusRequestEIP712()', () => { describe('disableDomainRequestEIP712()', () => { it('should generate the correct type data for request with SequentialDelayDomain', () => { const request: DisableDomainRequest = { + type: DomainRequestTypeTag.DISABLE, domain: { name: DomainIdentifiers.SequentialDelay, version: '1', @@ -108,7 +112,7 @@ describe('disableDomainRequestEIP712()', () => { }, sessionID: noString, } - const expectedHash = '150d96add3ad0c9ec4f72638fd1e452fb477c7aedde09bc3c67fa2611cbdc581' + const expectedHash = 'd30be7d1b1bb3a9a0b2b2148d9ea3fcae7775dc31ce984d658f90295887a323a' const typedData = disableDomainRequestEIP712(request) console.debug(JSON.stringify(typedData, null, 2)) expect(generateTypedDataHash(typedData).toString('hex')).toEqual(expectedHash) @@ -146,6 +150,7 @@ const manipulatedDomain: SequentialDelayDomain = { } const signatureRequest: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, domain: authenticatedDomain, options: { signature: noString, @@ -156,6 +161,7 @@ const signatureRequest: DomainRestrictedSignatureRequest } const quotaRequest: DomainQuotaStatusRequest = { + type: DomainRequestTypeTag.QUOTA, domain: authenticatedDomain, options: { signature: noString, @@ -165,6 +171,7 @@ const quotaRequest: DomainQuotaStatusRequest = { } const disableRequest: DisableDomainRequest = { + type: DomainRequestTypeTag.DISABLE, domain: authenticatedDomain, options: { signature: noString, @@ -177,20 +184,20 @@ const verifyCases = [ { request: signatureRequest, typedDataBuilder: domainRestrictedSignatureRequestEIP712, - verifier: verifyDomainRestrictedSignatureRequestSignature, - name: 'verifyDomainRestrictedSignatureRequestSignature()', + verifier: verifyDomainRestrictedSignatureRequestAuthenticity, + name: 'verifyDomainRestrictedSignatureRequestAuthenticity()', }, { request: quotaRequest, typedDataBuilder: domainQuotaStatusRequestEIP712, - verifier: verifyDomainQuotaStatusRequestSignature, - name: 'verifyDomainQuotaStatusRequestSignature()', + verifier: verifyDomainQuotaStatusRequestAuthenticity, + name: 'verifyDomainQuotaStatusRequestAuthenticity()', }, { request: disableRequest, typedDataBuilder: disableDomainRequestEIP712, - verifier: verifyDisableDomainRequestSignature, - name: 'verifyDisableDomainRequestSignature()', + verifier: verifyDisableDomainRequestAuthenticity, + name: 'verifyDisableDomainRequestAuthenticity()', }, ] diff --git a/packages/phone-number-privacy/common/test/poprf.test.ts b/packages/phone-number-privacy/common/test/poprf.test.ts index f5e6379be2e..474d324c8fa 100644 --- a/packages/phone-number-privacy/common/test/poprf.test.ts +++ b/packages/phone-number-privacy/common/test/poprf.test.ts @@ -1,11 +1,11 @@ +import * as poprf from '@celo/poprf' import { - PoprfCombiner, PoprfClient, + PoprfCombiner, PoprfServer, ThresholdPoprfClient, ThresholdPoprfServer, } from '../src/poprf' -import * as poprf from '@celo/poprf' const TEST_POPRF_KEYPAIR = poprf.keygen(Buffer.from('TEST POPRF KEYPAIR SEED')) const TEST_THRESHOLD_N = 3 @@ -92,7 +92,11 @@ describe('end-to-end', () => { (i) => new ThresholdPoprfServer(TEST_THRESHOLD_POPRF_KEYS.getShare(i)) ) const combiner = new PoprfCombiner(TEST_THRESHOLD_T) - const client = new PoprfClient(TEST_POPRF_KEYPAIR.publicKey, TEST_TAG_A, TEST_MESSAGE_A) + const client = new PoprfClient( + TEST_THRESHOLD_POPRF_KEYS.thresholdPublicKey, + TEST_TAG_A, + TEST_MESSAGE_A + ) const blindedPartials = servers.map((s) => s.blindPartialEval(client.tag, client.blindedMessage) @@ -106,7 +110,7 @@ describe('end-to-end', () => { // POPRF hashed outputs should be 32 bytes. expect(evaluation.length).toEqual(32) - expect(evaluation.toString('base64')).toEqual('5xHueBbMK1wfm7VyrPYJJAhOrV8X0rP0hz7gRxTLEcA=') + expect(evaluation.toString('base64')).toEqual('C1jKGStMWC3lNpYDV61D+3waetY0bHlD4ElYzV+Isqc=') }) it('successfully completes client-server exchange with threshold client and server', () => { @@ -139,6 +143,6 @@ describe('end-to-end', () => { // POPRF hashed outputs should be 32 bytes. expect(evaluation.length).toEqual(32) - expect(evaluation.toString('base64')).toEqual('5xHueBbMK1wfm7VyrPYJJAhOrV8X0rP0hz7gRxTLEcA=') + expect(evaluation.toString('base64')).toEqual('C1jKGStMWC3lNpYDV61D+3waetY0bHlD4ElYzV+Isqc=') }) }) diff --git a/packages/phone-number-privacy/common/test/utils/authentication.test.ts b/packages/phone-number-privacy/common/test/utils/authentication.test.ts index 431d244c7f5..4e129b6fbd5 100644 --- a/packages/phone-number-privacy/common/test/utils/authentication.test.ts +++ b/packages/phone-number-privacy/common/test/utils/authentication.test.ts @@ -2,7 +2,7 @@ import { hexToBuffer } from '@celo/base' import { ContractKit } from '@celo/contractkit' import Logger from 'bunyan' import { Request } from 'express' -import { signWithRawKey } from '../../../../sdk/identity/src/odis/query' +import { ErrorMessage, ErrorType } from '../../lib' import { AuthenticationMethod } from '../../src/interfaces/requests' import * as auth from '../../src/utils/authentication' @@ -22,9 +22,18 @@ describe('Authentication test suite', () => { } as Request const mockContractKit = {} as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(false) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(false) + expect(warnings).toEqual([]) }) it('Should fail authentication with missing signer', async () => { @@ -34,12 +43,21 @@ describe('Authentication test suite', () => { } as Request const mockContractKit = {} as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(false) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(false) + expect(warnings).toEqual([]) }) - it('Should succeed authentication with error in getDataEncryptionKey', async () => { + it('Should succeed authentication with error in getDataEncryptionKey when shouldFailOpen is true', async () => { const sampleRequest: Request = { get: (name: string) => (name === 'Authorization' ? 'Test' : ''), body: { @@ -49,9 +67,42 @@ describe('Authentication test suite', () => { } as Request const mockContractKit = {} as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(true) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(true) + expect(warnings).toEqual([ErrorMessage.FAILURE_TO_GET_DEK, ErrorMessage.FAILING_OPEN]) + }) + + it('Should fail authentication with error in getDataEncryptionKey when shouldFailOpen is false', async () => { + const sampleRequest: Request = { + get: (name: string) => (name === 'Authorization' ? 'Test' : ''), + body: { + account: '0xc1912fee45d61c87cc5ea59dae31190fffff232d', + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, + }, + } as Request + const mockContractKit = {} as ContractKit + + const warnings: ErrorType[] = [] + + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + false, + warnings + ) + + expect(success).toBe(false) + expect(warnings).toEqual([ErrorMessage.FAILURE_TO_GET_DEK, ErrorMessage.FAILING_CLOSED]) }) it('Should fail authentication when key is not registered', async () => { @@ -74,9 +125,18 @@ describe('Authentication test suite', () => { }, } as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(false) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(false) + expect(warnings).toEqual([]) }) it('Should fail authentication when key is registered but not valid', async () => { @@ -99,9 +159,12 @@ describe('Authentication test suite', () => { }, } as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(false) + const success = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + + expect(success).toBe(false) + expect(warnings).toEqual([]) }) it('Should succeed authentication when key is registered and valid', async () => { @@ -110,7 +173,7 @@ describe('Authentication test suite', () => { account: '0xc1912fee45d61c87cc5ea59dae31190fffff232d', authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, } - const sig = signWithRawKey(JSON.stringify(body), rawKey) + const sig = auth.signWithRawKey(JSON.stringify(body), rawKey) const sampleRequest: Request = { get: (name: string) => (name === 'Authorization' ? sig : ''), body, @@ -133,9 +196,18 @@ describe('Authentication test suite', () => { }, } as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(true) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(true) + expect(warnings).toEqual([]) }) it('Should fail authentication when the message is manipulated', async () => { @@ -152,7 +224,7 @@ describe('Authentication test suite', () => { message.slice(0, i) + String.fromCharCode(message.charCodeAt(i) + 1) + message.slice(i + 1) - const sig = signWithRawKey(modified, rawKey) + const sig = auth.signWithRawKey(modified, rawKey) const sampleRequest: Request = { get: (name: string) => (name === 'Authorization' ? sig : ''), body, @@ -175,9 +247,18 @@ describe('Authentication test suite', () => { }, } as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] + + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) - expect(result).toBe(false) + expect(success).toBe(false) + expect(warnings).toEqual([]) } }) @@ -187,7 +268,7 @@ describe('Authentication test suite', () => { account: '0xc1912fee45d61c87cc5ea59dae31190fffff232d', authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, } - const sig = signWithRawKey(JSON.stringify(body), rawKey) + const sig = auth.signWithRawKey(JSON.stringify(body), rawKey) const sampleRequest: Request = { get: (name: string) => (name === 'Authorization' ? sig : ''), body, @@ -212,9 +293,18 @@ describe('Authentication test suite', () => { }, } as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(false) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(false) + expect(warnings).toEqual([]) }) it('Should fail authentication when the sigature is modified', async () => { @@ -224,7 +314,7 @@ describe('Authentication test suite', () => { authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, } // Manipulate the signature. - const sig = signWithRawKey(JSON.stringify(body), rawKey) + const sig = auth.signWithRawKey(JSON.stringify(body), rawKey) const modified = JSON.stringify([0] + JSON.parse(sig)) const sampleRequest: Request = { get: (name: string) => (name === 'Authorization' ? modified : ''), @@ -250,14 +340,21 @@ describe('Authentication test suite', () => { }, } as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(false) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(false) + expect(warnings).toEqual([]) }) - // Backwards compatibility check - // TODO: Remove this once clients upgrade to @celo/identity v1.5.3 - it('Should succeed authentication when key is registered and valid and signature is incorrectly generated', async () => { + it('Should fail authentication when key is registered and valid and signature is incorrectly generated', async () => { const rawKey = '41e8e8593108eeedcbded883b8af34d2f028710355c57f4c10a056b72486aa04' const body = { account: '0xc1912fee45d61c87cc5ea59dae31190fffff232d', @@ -287,9 +384,18 @@ describe('Authentication test suite', () => { }, } as ContractKit - const result = await auth.authenticateUser(sampleRequest, mockContractKit, logger) + const warnings: ErrorType[] = [] - expect(result).toBe(true) + const success = await auth.authenticateUser( + sampleRequest, + mockContractKit, + logger, + true, + warnings + ) + + expect(success).toBe(false) + expect(warnings).toEqual([]) }) }) diff --git a/packages/phone-number-privacy/common/test/utils/input-validation.test.ts b/packages/phone-number-privacy/common/test/utils/input-validation.test.ts index 4102d31a033..1ec3ba1fd53 100644 --- a/packages/phone-number-privacy/common/test/utils/input-validation.test.ts +++ b/packages/phone-number-privacy/common/test/utils/input-validation.test.ts @@ -1,81 +1,8 @@ -import * as utils from '../../src/utils/input-validation' -import { - GetBlindedMessageSigRequest, - GetContactMatchesRequest, - GetQuotaRequest, -} from '../../src/interfaces' +import { GetQuotaRequest, LegacySignMessageRequest } from '../../src/interfaces' import { REASONABLE_BODY_CHAR_LIMIT } from '../../src/utils/constants' +import * as utils from '../../src/utils/input-validation' describe('Input Validation test suite', () => { - describe('hasValidIdentifier utility', () => { - it('Should return false with empty phone number', () => { - const sampleData: GetContactMatchesRequest = { - account: 'account', - contactPhoneNumbers: [], - userPhoneNumber: 'number', - hashedPhoneNumber: '', - } - - const result = utils.hasValidIdentifier(sampleData) - - expect(result).toBeFalsy() - }) - - it('Should return false with non-hex phone number', () => { - const sampleData: GetContactMatchesRequest = { - account: 'account', - contactPhoneNumbers: [], - userPhoneNumber: 'number', - hashedPhoneNumber: '0xTESTTESTTESTTESTTESTTESTTESTTESTTESTTESTTESTTESTTESTTESTTESTTEST', - } - - const result = utils.hasValidIdentifier(sampleData) - - expect(result).toBeFalsy() - }) - - it('Should return true with hex phone number', () => { - const sampleData: GetContactMatchesRequest = { - account: 'account', - contactPhoneNumbers: [], - userPhoneNumber: 'number', - hashedPhoneNumber: '0x0000123400001234000012340000123400001234000012340000123400001234', - } - - const result = utils.hasValidIdentifier(sampleData) - - expect(result).toBeTruthy() - }) - }) - - describe('identifierIsValidIfExists utility', () => { - it('Should return true with empty phone number', () => { - const sampleData: GetContactMatchesRequest = { - account: 'account', - contactPhoneNumbers: [], - userPhoneNumber: 'number', - hashedPhoneNumber: '', - } - - const result = utils.identifierIsValidIfExists(sampleData) - - expect(result).toBeTruthy() - }) - - it('Should return true with valid phone number', () => { - const sampleData: GetContactMatchesRequest = { - account: 'account', - contactPhoneNumbers: [], - userPhoneNumber: 'number', - hashedPhoneNumber: '0x0000123400001234000012340000123400001234000012340000123400001234', - } - - const result = utils.identifierIsValidIfExists(sampleData) - - expect(result).toBeTruthy() - }) - }) - describe('isBodyReasonablySized utility', () => { it('Should return true with small body', () => { const sampleData: GetQuotaRequest = { @@ -132,78 +59,9 @@ describe('Input Validation test suite', () => { }) }) - describe('hasValidUserPhoneNumberParam utility', () => { - it('Should return true for proper phone number', () => { - const sampleData: GetContactMatchesRequest = { - userPhoneNumber: Buffer.from('1912fee45d61c87cc5ea59dae31190ff').toString('base64'), - hashedPhoneNumber: 'hash', - contactPhoneNumbers: [], - account: '', - } - - const result = utils.hasValidUserPhoneNumberParam(sampleData) - - expect(result).toBeTruthy() - }) - - it('Should return false with wrong phone number', () => { - const sampleData: GetContactMatchesRequest = { - userPhoneNumber: Buffer.from('z').toString('base64'), - hashedPhoneNumber: 'hash', - contactPhoneNumbers: [], - account: '', - } - - const result = utils.hasValidUserPhoneNumberParam(sampleData) - - expect(result).toBeFalsy() - }) - }) - - describe('hasValidContactPhoneNumbersParam utility', () => { - it('Should return true for proper contact phone numbers', () => { - const sampleData: GetContactMatchesRequest = { - userPhoneNumber: 'phone', - hashedPhoneNumber: 'hash', - contactPhoneNumbers: [Buffer.from('1912fee45d61c87cc5ea59dae31190ff').toString('base64')], - account: '', - } - - const result = utils.hasValidContactPhoneNumbersParam(sampleData) - - expect(result).toBeTruthy() - }) - - it('Should return false for wrong contact phone number', () => { - const sampleData: GetContactMatchesRequest = { - userPhoneNumber: 'phone', - hashedPhoneNumber: 'hash', - contactPhoneNumbers: [Buffer.from('zz').toString('base64')], - account: '', - } - - const result = utils.hasValidContactPhoneNumbersParam(sampleData) - - expect(result).toBeFalsy() - }) - - it('Should return false for missing contact phone number', () => { - const sampleData: GetContactMatchesRequest = { - userPhoneNumber: 'phone', - hashedPhoneNumber: 'hash', - contactPhoneNumbers: [], - account: '', - } - - const result = utils.hasValidContactPhoneNumbersParam(sampleData) - - expect(result).toBeFalsy() - }) - }) - describe('hasValidBlindedPhoneNumberParam utility', () => { it('Should return true for blinded query', () => { - const sampleData: GetBlindedMessageSigRequest = { + const sampleData: LegacySignMessageRequest = { blindedQueryPhoneNumber: Buffer.from( '1912fee45d61c87cc5ea59dae31190ff1912fee45d61c8' ).toString('base64'), @@ -216,7 +74,7 @@ describe('Input Validation test suite', () => { }) it('Should return false for not base64 query', () => { - const sampleData: GetBlindedMessageSigRequest = { + const sampleData: LegacySignMessageRequest = { blindedQueryPhoneNumber: Buffer.from( 'JanAdamMickiewicz1234!@JanAdamMickiewicz1234!@123412345678901234' ).toString('utf-8'), @@ -229,7 +87,7 @@ describe('Input Validation test suite', () => { }) it('Should return false for too short blinded query', () => { - const sampleData: GetBlindedMessageSigRequest = { + const sampleData: LegacySignMessageRequest = { blindedQueryPhoneNumber: Buffer.from('1912fee45d61c87cc5e').toString('base64'), account: 'acc', } @@ -240,7 +98,7 @@ describe('Input Validation test suite', () => { }) it('Should return false for missing param in query', () => { - const sampleData: GetBlindedMessageSigRequest = { + const sampleData: LegacySignMessageRequest = { blindedQueryPhoneNumber: '', account: 'acc', } diff --git a/packages/phone-number-privacy/common/test/utils/key-version.test.ts b/packages/phone-number-privacy/common/test/utils/key-version.test.ts new file mode 100644 index 00000000000..46db29d71e4 --- /dev/null +++ b/packages/phone-number-privacy/common/test/utils/key-version.test.ts @@ -0,0 +1,228 @@ +import { Request } from 'express' +import { Response as FetchResponse } from 'node-fetch' +import { + ErrorMessage, + getRequestKeyVersion, + getResponseKeyVersion, + KEY_VERSION_HEADER, + requestHasValidKeyVersion, + responseHasExpectedKeyVersion, + rootLogger, + WarningMessage, +} from '../../src' + +describe('key version test suite', () => { + const logger = rootLogger('key version test suite') + + const request = { + headers: {}, + } as Request + + let response: FetchResponse + + const invalidKeyVersionHeaders: (string | string[])[] = [ + 'a', + '-1', + '1.5', + '1a', + 'blah', + 'one', + '-', + '+', + ['1', '2', '3'], + ' . ', + ] + + beforeEach(() => { + delete request.headers[KEY_VERSION_HEADER] + response = new FetchResponse() + }) + + describe(getRequestKeyVersion, () => { + it(`Should return undefined if key version header has not been set`, () => { + const res = getRequestKeyVersion(request, logger) + expect(res).toBe(undefined) + }) + + it(`Should return undefined if key version header is undefined`, () => { + request.headers[KEY_VERSION_HEADER] = undefined + const res = getRequestKeyVersion(request, logger) + expect(res).toBe(undefined) + }) + + it(`Should return undefined if key version header is empty`, () => { + request.headers[KEY_VERSION_HEADER] = '' + const res = getRequestKeyVersion(request, logger) + expect(res).toBe(undefined) + }) + + it(`Should return undefined if key version header is whitespace`, () => { + request.headers[KEY_VERSION_HEADER] = ' ' + const res = getRequestKeyVersion(request, logger) + expect(res).toBe(undefined) + }) + + for (let kv = 0; kv <= 10; kv++) { + it(`Should return valid key version header ${kv}`, () => { + request.headers[KEY_VERSION_HEADER] = kv.toString() + const res = getRequestKeyVersion(request, logger) + expect(res).toBe(kv) + }) + } + + it(`Should return valid key version header when there's whitespace`, () => { + request.headers[KEY_VERSION_HEADER] = ' 1 ' + const res = getRequestKeyVersion(request, logger) + expect(res).toBe(1) + }) + + invalidKeyVersionHeaders.forEach((kv) => { + it(`Should throw for invalid key version ${kv}`, () => { + request.headers[KEY_VERSION_HEADER] = kv.toString() + expect(() => getRequestKeyVersion(request, logger)).toThrow( + WarningMessage.INVALID_KEY_VERSION_REQUEST + ) + }) + }) + }) + + describe(requestHasValidKeyVersion, () => { + it(`Should return true if key version header has not been set`, () => { + const res = requestHasValidKeyVersion(request, logger) + expect(res).toBe(true) + }) + it(`Should return true if key version header is undefined`, () => { + request.headers[KEY_VERSION_HEADER] = undefined + const res = requestHasValidKeyVersion(request, logger) + expect(res).toBe(true) + }) + it(`Should return true if key version header is empty`, () => { + request.headers[KEY_VERSION_HEADER] = '' + const res = requestHasValidKeyVersion(request, logger) + expect(res).toBe(true) + }) + + it(`Should return true if key version header is whitespace`, () => { + request.headers[KEY_VERSION_HEADER] = ' ' + const res = requestHasValidKeyVersion(request, logger) + expect(res).toBe(true) + }) + + for (let kv = 0; kv <= 10; kv++) { + it(`Should return true for valid key version header ${kv}`, () => { + request.headers[KEY_VERSION_HEADER] = kv.toString() + const res = requestHasValidKeyVersion(request, logger) + expect(res).toBe(true) + }) + } + + it(`Should return true for valid key version header when there's whitespace`, () => { + request.headers[KEY_VERSION_HEADER] = ' 1 ' + const res = requestHasValidKeyVersion(request, logger) + expect(res).toBe(true) + }) + + invalidKeyVersionHeaders.forEach((kv) => { + it(`Should return false for invalid key version ${kv}`, () => { + request.headers[KEY_VERSION_HEADER] = kv.toString() + const res = requestHasValidKeyVersion(request, logger) + expect(res).toBe(false) + }) + }) + }) + + describe(getResponseKeyVersion, () => { + it(`Should return undefined if key version header has not been set`, () => { + const res = getResponseKeyVersion(response, logger) + expect(res).toBe(undefined) + }) + it(`Should return undefined if key version header is undefined`, () => { + response.headers.delete(KEY_VERSION_HEADER) + const res = getResponseKeyVersion(response, logger) + expect(res).toBe(undefined) + }) + + it(`Should return undefined if key version header is empty`, () => { + response.headers.set(KEY_VERSION_HEADER, '') + const res = getResponseKeyVersion(response, logger) + expect(res).toBe(undefined) + }) + + it(`Should return undefined if key version header is whitespace`, () => { + response.headers.set(KEY_VERSION_HEADER, ' ') + const res = getResponseKeyVersion(response, logger) + expect(res).toBe(undefined) + }) + + for (let kv = 0; kv <= 10; kv++) { + it(`Should return valid key version header ${kv}`, () => { + response.headers.set(KEY_VERSION_HEADER, kv.toString()) + const res = getResponseKeyVersion(response, logger) + expect(res).toBe(kv) + }) + } + + it(`Should return valid key version header when there's whitespace`, () => { + response.headers.set(KEY_VERSION_HEADER, ' 1 ') + const res = getResponseKeyVersion(response, logger) + expect(res).toBe(1) + }) + + invalidKeyVersionHeaders.forEach((kv) => { + it(`Should throw for invalid key version ${kv}`, () => { + response.headers.set(KEY_VERSION_HEADER, kv.toString()) + expect(() => getResponseKeyVersion(response, logger)).toThrow( + ErrorMessage.INVALID_KEY_VERSION_RESPONSE + ) + }) + }) + }) + + describe(responseHasExpectedKeyVersion, () => { + const testCases = [ + { + responseKeyVersion: 1, + expectedKeyVersion: 1, + expectedResult: true, + }, + { + responseKeyVersion: 2, + expectedKeyVersion: 1, + expectedResult: false, + }, + { + responseKeyVersion: undefined, + expectedKeyVersion: 1, + expectedResult: false, + }, + { + responseKeyVersion: -1, + expectedKeyVersion: -1, + expectedResult: false, + }, + { + responseKeyVersion: 1.5, + expectedKeyVersion: 1.5, + expectedResult: false, + }, + { + responseKeyVersion: 'a', + expectedKeyVersion: Number('a'), + expectedResult: false, + }, + ] + + testCases.forEach((testCase) => { + it(JSON.stringify(testCase), () => { + const { responseKeyVersion, expectedKeyVersion, expectedResult } = testCase + if (responseKeyVersion === undefined) { + response.headers.delete(KEY_VERSION_HEADER) + } else { + response.headers.set(KEY_VERSION_HEADER, responseKeyVersion.toString()) + } + const res = responseHasExpectedKeyVersion(response, expectedKeyVersion, logger) + expect(res).toBe(expectedResult) + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/common/test/utils/sequential-delay.test.ts b/packages/phone-number-privacy/common/test/utils/sequential-delay.test.ts index c833d0eeb29..decd72f9de8 100644 --- a/packages/phone-number-privacy/common/test/utils/sequential-delay.test.ts +++ b/packages/phone-number-privacy/common/test/utils/sequential-delay.test.ts @@ -40,14 +40,14 @@ describe('Sequential Delay Test Suite', () => { expectedResult: { accepted: false, notBefore: 0, - state: undefined, + state: { timer: 0, counter: 0, disabled: false, now: t - 1 }, }, }, { timestamp: t, expectedResult: { accepted: true, - state: { timer: t, counter: 1, disabled: false }, + state: { timer: t, counter: 1, disabled: false, now: t }, }, }, ] @@ -71,14 +71,14 @@ describe('Sequential Delay Test Suite', () => { timestamp: t + 1, expectedResult: { accepted: true, - state: { timer: t + 1, counter: 1, disabled: false }, + state: { timer: t + 1, counter: 1, disabled: false, now: t + 1 }, }, }, { timestamp: t + 1, expectedResult: { accepted: true, - state: { timer: t + 1, counter: 2, disabled: false }, + state: { timer: t + 1, counter: 2, disabled: false, now: t + 1 }, }, }, { @@ -86,7 +86,7 @@ describe('Sequential Delay Test Suite', () => { expectedResult: { accepted: false, notBefore: undefined, - state: { timer: t + 1, counter: 2, disabled: false }, + state: { timer: t + 1, counter: 2, disabled: false, now: t + 1 }, }, }, ] @@ -109,7 +109,7 @@ describe('Sequential Delay Test Suite', () => { result = checkSequentialDelayRateLimit(domain, t + 1, result?.state) expect(result).toEqual({ accepted: true, - state: { timer: t + 1, counter: 1, disabled: false }, + state: { timer: t + 1, counter: 1, disabled: false, now: t + 1 }, }) // Set the domain to disabled and attempt to make another reqeust. @@ -118,7 +118,7 @@ describe('Sequential Delay Test Suite', () => { expect(result).toEqual({ accepted: false, notBefore: undefined, - state: { timer: t + 1, counter: 1, disabled: true }, + state: { timer: t + 1, counter: 1, disabled: true, now: t + 1 }, }) }) @@ -143,28 +143,28 @@ describe('Sequential Delay Test Suite', () => { timestamp: t + 3, expectedResult: { accepted: true, - state: { timer: t, counter: 1, disabled: false }, + state: { timer: t, counter: 1, disabled: false, now: t + 3 }, }, }, { timestamp: t + 3, expectedResult: { accepted: true, - state: { timer: t + 1, counter: 2, disabled: false }, + state: { timer: t + 1, counter: 2, disabled: false, now: t + 3 }, }, }, { timestamp: t + 3, expectedResult: { accepted: true, - state: { timer: t + 2, counter: 3, disabled: false }, + state: { timer: t + 2, counter: 3, disabled: false, now: t + 3 }, }, }, { timestamp: t + 3, expectedResult: { accepted: true, - state: { timer: t + 3, counter: 4, disabled: false }, + state: { timer: t + 3, counter: 4, disabled: false, now: t + 3 }, }, }, { @@ -172,7 +172,7 @@ describe('Sequential Delay Test Suite', () => { expectedResult: { accepted: false, notBefore: undefined, - state: { timer: t + 3, counter: 4, disabled: false }, + state: { timer: t + 3, counter: 4, disabled: false, now: t + 3 }, }, }, ] @@ -199,7 +199,7 @@ describe('Sequential Delay Test Suite', () => { timestamp: t + 2, expectedResult: { accepted: true, - state: { timer: t + 2, counter: 1, disabled: false }, + state: { timer: t + 2, counter: 1, disabled: false, now: t + 2 }, }, }, { @@ -207,14 +207,14 @@ describe('Sequential Delay Test Suite', () => { expectedResult: { accepted: false, notBefore: t + 3, - state: { timer: t + 2, counter: 1, disabled: false }, + state: { timer: t + 2, counter: 1, disabled: false, now: t + 2 }, }, }, { timestamp: t + 3, expectedResult: { accepted: true, - state: { timer: t + 3, counter: 2, disabled: false }, + state: { timer: t + 3, counter: 2, disabled: false, now: t + 3 }, }, }, ] @@ -222,14 +222,14 @@ describe('Sequential Delay Test Suite', () => { checkTestAttempts(t, domain, attempts) }) - it('should return he correct results in the example sequence', () => { - const t = 0 // initial delay + it('should return the correct results in the example sequence', () => { + const t = 10 // initial delay const domain: SequentialDelayDomain = { name: DomainIdentifiers.SequentialDelay, version: '1', stages: [ - { delay: 0, resetTimer: noBool, batchSize: defined(2), repetitions: noNumber }, + { delay: t, resetTimer: noBool, batchSize: defined(2), repetitions: noNumber }, { delay: 1, resetTimer: defined(false), batchSize: noNumber, repetitions: noNumber }, { delay: 1, resetTimer: defined(true), batchSize: noNumber, repetitions: noNumber }, { delay: 2, resetTimer: defined(false), batchSize: noNumber, repetitions: defined(1) }, @@ -245,42 +245,42 @@ describe('Sequential Delay Test Suite', () => { expectedResult: { accepted: false, notBefore: t, - state: undefined, + state: { timer: 0, counter: 0, disabled: false, now: t - 1 }, }, }, { timestamp: t, expectedResult: { accepted: true, - state: { timer: t, counter: 1, disabled: false }, + state: { timer: t, counter: 1, disabled: false, now: t }, }, }, { timestamp: t + 1, expectedResult: { accepted: true, - state: { timer: t + 1, counter: 2, disabled: false }, + state: { timer: t + 1, counter: 2, disabled: false, now: t + 1 }, }, }, { timestamp: t + 3, expectedResult: { accepted: true, - state: { timer: t + 2, counter: 3, disabled: false }, + state: { timer: t + 2, counter: 3, disabled: false, now: t + 3 }, }, }, { timestamp: t + 3, expectedResult: { accepted: true, - state: { timer: t + 3, counter: 4, disabled: false }, + state: { timer: t + 3, counter: 4, disabled: false, now: t + 3 }, }, }, { timestamp: t + 6, expectedResult: { accepted: true, - state: { timer: t + 5, counter: 5, disabled: false }, + state: { timer: t + 5, counter: 5, disabled: false, now: t + 6 }, }, }, { @@ -288,35 +288,35 @@ describe('Sequential Delay Test Suite', () => { expectedResult: { accepted: false, notBefore: t + 9, - state: { timer: t + 5, counter: 5, disabled: false }, + state: { timer: t + 5, counter: 5, disabled: false, now: t + 8 }, }, }, { timestamp: t + 9, expectedResult: { accepted: true, - state: { timer: t + 9, counter: 6, disabled: false }, + state: { timer: t + 9, counter: 6, disabled: false, now: t + 9 }, }, }, { timestamp: t + 10, expectedResult: { accepted: true, - state: { timer: t + 10, counter: 7, disabled: false }, + state: { timer: t + 10, counter: 7, disabled: false, now: t + 10 }, }, }, { timestamp: t + 14, expectedResult: { accepted: true, - state: { timer: t + 14, counter: 8, disabled: false }, + state: { timer: t + 14, counter: 8, disabled: false, now: t + 14 }, }, }, { timestamp: t + 15, expectedResult: { accepted: true, - state: { timer: t + 15, counter: 9, disabled: false }, + state: { timer: t + 15, counter: 9, disabled: false, now: t + 15 }, }, }, ] diff --git a/packages/phone-number-privacy/monitor/package.json b/packages/phone-number-privacy/monitor/package.json index 984f40e5d0c..b5cd2daff02 100644 --- a/packages/phone-number-privacy/monitor/package.json +++ b/packages/phone-number-privacy/monitor/package.json @@ -1,14 +1,15 @@ { "name": "@celo/phone-number-privacy-monitor", - "version": "1.0.2", + "version": "3.0.0-dev", "description": "Regularly queries ODIS to ensure the system is functioning properly", "author": "Celo", "license": "Apache-2.0", "main": "dist/index.js", "scripts": { - "deploy:staging": "yarn build && firebase deploy --only functions --project celo-phone-number-privacy-stg", - "deploy:alfajores": "yarn build && firebase deploy --only functions --project celo-phone-number-privacy", - "deploy:mainnet": "yarn build && firebase deploy --only functions --project celo-pgpnp-mainnet", + "deploy": "yarn build && firebase deploy --only functions:odisMonitorScheduleFunctionLegacyPNP,functions:odisMonitorScheduleFunctionPNP,functions:odisMonitorScheduleFunctionDomains", + "deploy:staging": "yarn deploy --project celo-phone-number-privacy-stg", + "deploy:alfajores": "yarn deploy --project celo-phone-number-privacy", + "deploy:mainnet": "yarn deploy --project celo-pgpnp-mainnet", "config:get:staging": "firebase functions:config:get --project celo-phone-number-privacy-stg", "config:get:alfajores": "firebase functions:config:get --project celo-phone-number-privacy", "config:get:mainnet": "firebase functions:config:get --project celo-pgpnp-mainnet", @@ -18,15 +19,16 @@ "clean": "tsc -b . --clean", "build": "tsc -b .", "lint": "tslint --project .", - "loadTest": "ts-node src/scripts/runLoadTest.ts" + "loadTest": "ts-node src/scripts/run-load-test.ts" }, "dependencies": { - "@celo/contractkit": "2.2.0", - "@celo/cryptographic-utils": "2.2.1-dev", - "@celo/identity": "2.2.0", - "@celo/wallet-local": "2.2.0", - "@celo/phone-number-privacy-common": "1.0.39", - "@celo/utils": "2.2.0", + "@celo/contractkit": "^3.2.1-dev", + "@celo/cryptographic-utils": "^3.2.1-dev", + "@celo/encrypted-backup": "^3.2.1-dev", + "@celo/identity": "^3.2.1-dev", + "@celo/wallet-local": "^3.2.1-dev", + "@celo/phone-number-privacy-common": "^3.0.0-dev", + "@celo/utils": "^3.2.1-dev", "firebase-admin": "^9.12.0", "firebase-functions": "^3.15.7" }, diff --git a/packages/phone-number-privacy/monitor/src/index.ts b/packages/phone-number-privacy/monitor/src/index.ts index 8a65b957200..3ee9bb4567d 100644 --- a/packages/phone-number-privacy/monitor/src/index.ts +++ b/packages/phone-number-privacy/monitor/src/index.ts @@ -1,7 +1,29 @@ +import { CombinerEndpointPNP } from '@celo/phone-number-privacy-common' import * as functions from 'firebase-functions' -import { testQuery } from './test' +import { testDomainSignQuery, testPNPSignQuery } from './test' -export const odisMonitorScheduleFunction = functions - .region('us-central1', 'europe-west3') +const contextName = functions.config().monitor.context_name +const blockchainProvider = functions.config().blockchain.provider +if (!contextName || !blockchainProvider) { + throw new Error('blockchain provider and context name must be set in function config') +} + +// New functions do not overwrite ODIS 1.0 monitor function. +export const odisMonitorScheduleFunctionLegacyPNP = functions + .region('us-central1') + .pubsub.schedule('every 5 minutes') + .onRun(async () => + testPNPSignQuery(blockchainProvider, contextName, CombinerEndpointPNP.LEGACY_PNP_SIGN) + ) + +export const odisMonitorScheduleFunctionPNP = functions + .region('us-central1') + .pubsub.schedule('every 5 minutes') + .onRun(async () => + testPNPSignQuery(blockchainProvider, contextName, CombinerEndpointPNP.PNP_SIGN) + ) + +export const odisMonitorScheduleFunctionDomains = functions + .region('us-central1') .pubsub.schedule('every 5 minutes') - .onRun(testQuery) + .onRun(async () => testDomainSignQuery(contextName)) diff --git a/packages/phone-number-privacy/monitor/src/query.ts b/packages/phone-number-privacy/monitor/src/query.ts index eacc1481d44..8bd9a77d684 100644 --- a/packages/phone-number-privacy/monitor/src/query.ts +++ b/packages/phone-number-privacy/monitor/src/query.ts @@ -1,29 +1,43 @@ import { newKit } from '@celo/contractkit' import { generateKeys, generateMnemonic, MnemonicStrength } from '@celo/cryptographic-utils' +import { + buildOdisDomain, + OdisHardeningConfig, + odisHardenKey, + odisQueryAuthorizer, +} from '@celo/encrypted-backup' import { OdisUtils } from '@celo/identity' -import { AuthSigner } from '@celo/identity/lib/odis/query' -import { fetchEnv } from '@celo/phone-number-privacy-common' +import { + AuthSigner, + getServiceContext, + OdisAPI, + OdisContextName, +} from '@celo/identity/lib/odis/query' +import { CombinerEndpointPNP, fetchEnv } from '@celo/phone-number-privacy-common' import { genSessionID } from '@celo/phone-number-privacy-common/lib/utils/logger' import { normalizeAddressWith0x, privateKeyToAddress } from '@celo/utils/lib/address' +import { defined } from '@celo/utils/lib/sign-typed-data-utils' import { LocalWallet } from '@celo/wallet-local' -import * as functions from 'firebase-functions' - -const haveConfig = !!functions.config().blockchain -const network = () => (haveConfig ? functions.config().blockchain.network : process.env.NETWORK) -const blockchainProvider = () => - haveConfig ? functions.config().blockchain.provider : process.env.BLOCKCHAIN_PROVIDER const phoneNumber = fetchEnv('PHONE_NUMBER') -const contractKit = newKit(blockchainProvider(), new LocalWallet()) const newPrivateKey = async () => { const mnemonic = await generateMnemonic(MnemonicStrength.s256_24words) return (await generateKeys(mnemonic)).privateKey } -export const queryOdisForSalt = async () => { - console.log(network()) // tslint:disable-line:no-console - console.log(blockchainProvider()) // tslint:disable-line:no-console +export const queryOdisForSalt = async ( + blockchainProvider: string, + contextName: OdisContextName, + endpoint: CombinerEndpointPNP.LEGACY_PNP_SIGN | CombinerEndpointPNP.PNP_SIGN, + timeoutMs: number = 10000 +) => { + console.log(`contextName: ${contextName}`) // tslint:disable-line:no-console + console.log(`blockchain provider: ${blockchainProvider}`) // tslint:disable-line:no-console + + const serviceContext = getServiceContext(contextName, OdisAPI.PNP) + + const contractKit = newKit(blockchainProvider, new LocalWallet()) const privateKey = await newPrivateKey() const accountAddress = normalizeAddressWith0x(privateKeyToAddress(privateKey)) contractKit.connection.addAccount(privateKey) @@ -32,15 +46,90 @@ export const queryOdisForSalt = async () => { authenticationMethod: OdisUtils.Query.AuthenticationMethod.WALLET_KEY, contractKit, } - return OdisUtils.PhoneNumberIdentifier.getPhoneNumberIdentifier( + + const abortController = new AbortController() + const timeout = setTimeout(() => { + abortController.abort() + console.log(`ODIS salt request timed out after ${timeoutMs} ms`) // tslint:disable-line:no-console + }, timeoutMs) + + const res = await OdisUtils.Identifier.getObfuscatedIdentifier( phoneNumber, + OdisUtils.Identifier.IdentifierPrefix.PHONE_NUMBER, accountAddress, authSigner, - OdisUtils.Query.getServiceContext(network()), + serviceContext, undefined, undefined, - 'monitor:1.0.0', undefined, - genSessionID() + genSessionID(), + undefined, + endpoint, + abortController ) + + clearTimeout(timeout) + + return res +} + +export const queryOdisForQuota = async ( + blockchainProvider: string, + contextName: OdisContextName, + timeoutMs: number = 10000 +) => { + console.log(`contextName: ${contextName}`) // tslint:disable-line:no-console + console.log(`blockchain provider: ${blockchainProvider}`) // tslint:disable-line:no-console + + const serviceContext = getServiceContext(contextName, OdisAPI.PNP) + + const contractKit = newKit(blockchainProvider, new LocalWallet()) + const privateKey = await newPrivateKey() + const accountAddress = normalizeAddressWith0x(privateKeyToAddress(privateKey)) + contractKit.connection.addAccount(privateKey) + contractKit.defaultAccount = accountAddress + const authSigner: AuthSigner = { + authenticationMethod: OdisUtils.Query.AuthenticationMethod.WALLET_KEY, + contractKit, + } + + const abortController = new AbortController() + const timeout = setTimeout(() => { + abortController.abort() + }, timeoutMs) + + const res = await OdisUtils.Quota.getPnpQuotaStatus( + accountAddress, + authSigner, + serviceContext, + undefined, + undefined, + abortController + ) + + clearTimeout(timeout) + + return res +} + +export const queryOdisDomain = async (contextName: OdisContextName) => { + console.log(`contextName: ${contextName}`) // tslint:disable-line:no-console + + const serviceContext = getServiceContext(contextName, OdisAPI.DOMAIN) + const monitorDomainConfig: OdisHardeningConfig = { + rateLimit: [ + { + delay: 0, + resetTimer: defined(true), + // Running every 5 min, this should not run out for the next 9 million years + batchSize: defined(1000000000000), + repetitions: defined(1000000000000), + }, + ], + environment: serviceContext, + } + const authorizer = odisQueryAuthorizer(Buffer.from('ODIS domains monitor authorizer test seed')) + const domain = buildOdisDomain(monitorDomainConfig, authorizer.address) + // Throws if signature verification fails + return odisHardenKey(Buffer.from('password'), domain, serviceContext, authorizer.wallet) } diff --git a/packages/phone-number-privacy/monitor/src/scripts/run-load-test.ts b/packages/phone-number-privacy/monitor/src/scripts/run-load-test.ts new file mode 100644 index 00000000000..8edf343b2a5 --- /dev/null +++ b/packages/phone-number-privacy/monitor/src/scripts/run-load-test.ts @@ -0,0 +1,31 @@ +import { OdisContextName } from '@celo/identity/lib/odis/query' +import { concurrentLoadTest } from '../test' + +/* tslint:disable:no-console */ + +const args = process.argv.slice(2) + +const printHelpAndExit = () => { + console.log('Usage: yarn loadTest ') + process.exit(1) +} + +if (args[0] === '--help' || args.length !== 2) { + printHelpAndExit() +} + +let blockchainProvider: string +switch (args[0]) { + case 'alfajoresstaging': + case 'alfajores': + blockchainProvider = 'https://alfajores-forno.celo-testnet.org' + break + case 'mainnet': + blockchainProvider = 'https://forno.celo.org' + break + default: + printHelpAndExit() + break +} + +concurrentLoadTest(Number(args[1]), blockchainProvider!, args[0] as OdisContextName) // tslint:disable-line:no-floating-promises diff --git a/packages/phone-number-privacy/monitor/src/scripts/runLoadTest.ts b/packages/phone-number-privacy/monitor/src/scripts/runLoadTest.ts deleted file mode 100644 index d41eb422d77..00000000000 --- a/packages/phone-number-privacy/monitor/src/scripts/runLoadTest.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { concurrentLoadTest } from '../test' - -/* tslint:disable:no-console */ - -const args = process.argv.slice(2) - -const printHelpAndExit = () => { - console.log('Usage: yarn loadTest ') - process.exit(1) -} - -if (args[0] === '--help' || args.length !== 2) { - printHelpAndExit() -} - -switch (args[0]) { - case 'alfajores': - process.env.BLOCKCHAIN_PROVIDER = 'https://alfajores-forno.celo-testnet.org' - break - case 'mainnet': - process.env.BLOCKCHAIN_PROVIDER = 'https://forno.celo.org' - break - default: - printHelpAndExit() - break -} -process.env.NETWORK = args[0] - -concurrentLoadTest(Number(args[1])) // tslint:disable-line:no-floating-promises diff --git a/packages/phone-number-privacy/monitor/src/test.ts b/packages/phone-number-privacy/monitor/src/test.ts index 6fbae06eb37..1cb5958101f 100644 --- a/packages/phone-number-privacy/monitor/src/test.ts +++ b/packages/phone-number-privacy/monitor/src/test.ts @@ -1,37 +1,115 @@ import { concurrentMap, sleep } from '@celo/base' -import { PhoneNumberHashDetails } from '@celo/identity/lib/odis/phone-number-identifier' -import { ErrorMessages } from '@celo/identity/lib/odis/query' -import { rootLogger as logger } from '@celo/phone-number-privacy-common' -import { queryOdisForSalt } from './query' +import { Result } from '@celo/base/lib/result' +import { BackupError } from '@celo/encrypted-backup' +import { IdentifierHashDetails } from '@celo/identity/lib/odis/identifier' +import { ErrorMessages, OdisContextName } from '@celo/identity/lib/odis/query' +import { PnpClientQuotaStatus } from '@celo/identity/lib/odis/quota' +import { CombinerEndpointPNP, rootLogger } from '@celo/phone-number-privacy-common' +import { queryOdisDomain, queryOdisForQuota, queryOdisForSalt } from './query' -export async function testQuery() { - logger().info('Performing test query') +const logger = rootLogger('odis-monitor') + +export async function testPNPSignQuery( + blockchainProvider: string, + contextName: OdisContextName, + endpoint: CombinerEndpointPNP.LEGACY_PNP_SIGN | CombinerEndpointPNP.PNP_SIGN, + timeoutMs?: number +) { + logger.info(`Performing test PNP query for ${endpoint}`) try { - const odisResponse: PhoneNumberHashDetails = await queryOdisForSalt() - logger().info({ odisResponse }, 'ODIS salt request successful. System is healthy.') + const odisResponse: IdentifierHashDetails = await queryOdisForSalt( + blockchainProvider, + contextName, + endpoint, + timeoutMs + ) + logger.info({ odisResponse }, 'ODIS salt request successful. System is healthy.') } catch (err) { if ((err as Error).message === ErrorMessages.ODIS_QUOTA_ERROR) { - logger().info( + logger.info( { error: err }, 'ODIS salt request out of quota. This is expected. System is healthy.' ) } else { - logger().error('ODIS salt request failed.') - logger().error({ err }) + logger.error('ODIS salt request failed.') + logger.error({ err }) throw err } } } -export async function serialLoadTest(n: number) { +export async function testPNPQuotaQuery( + blockchainProvider: string, + contextName: OdisContextName, + timeoutMs?: number +) { + logger.info(`Performing test PNP query for ${CombinerEndpointPNP.PNP_QUOTA}`) + try { + const odisResponse: PnpClientQuotaStatus = await queryOdisForQuota( + blockchainProvider, + contextName, + timeoutMs + ) + logger.info({ odisResponse }, 'ODIS quota request successful. System is healthy.') + } catch (err) { + logger.error('ODIS quota request failed.') + logger.error({ err }) + throw err + } +} + +export async function testDomainSignQuery(contextName: OdisContextName) { + logger.info('Performing test domains query') + let odisResponse: Result + try { + odisResponse = await queryOdisDomain(contextName) + logger.info({ odisResponse }, 'ODIS response') + } catch (err) { + logger.error('ODIS key hardening request failed.') + logger.error({ err }) + throw err + } + if (odisResponse.ok) { + logger.info('System is healthy') + } else { + throw new Error('Received not ok response') + } +} + +export async function serialLoadTest( + n: number, + blockchainProvider: string, + contextName: OdisContextName, + endpoint: + | CombinerEndpointPNP.LEGACY_PNP_SIGN + | CombinerEndpointPNP.PNP_QUOTA + | CombinerEndpointPNP.PNP_SIGN = CombinerEndpointPNP.LEGACY_PNP_SIGN, + timeoutMs?: number +) { for (let i = 0; i < n; i++) { try { - await testQuery() + switch (endpoint) { + case CombinerEndpointPNP.LEGACY_PNP_SIGN: + case CombinerEndpointPNP.PNP_SIGN: + await testPNPSignQuery(blockchainProvider, contextName, endpoint, timeoutMs) + break + case CombinerEndpointPNP.PNP_QUOTA: + await testPNPQuotaQuery(blockchainProvider, contextName, timeoutMs) + } } catch {} // tslint:disable-line:no-empty } } -export async function concurrentLoadTest(workers: number) { +export async function concurrentLoadTest( + workers: number, + blockchainProvider: string, + contextName: OdisContextName, + endpoint: + | CombinerEndpointPNP.LEGACY_PNP_SIGN + | CombinerEndpointPNP.PNP_QUOTA + | CombinerEndpointPNP.PNP_SIGN = CombinerEndpointPNP.LEGACY_PNP_SIGN, + timeoutMs?: number +) { while (true) { const reqs = [] for (let i = 0; i < workers; i++) { @@ -41,7 +119,14 @@ export async function concurrentLoadTest(workers: number) { await sleep(i * 10) while (true) { try { - await testQuery() + switch (endpoint) { + case CombinerEndpointPNP.LEGACY_PNP_SIGN: + case CombinerEndpointPNP.PNP_SIGN: + await testPNPSignQuery(blockchainProvider, contextName, endpoint, timeoutMs) + break + case CombinerEndpointPNP.PNP_QUOTA: + await testPNPQuotaQuery(blockchainProvider, contextName, timeoutMs) + } } catch {} // tslint:disable-line:no-empty } }) diff --git a/packages/phone-number-privacy/signer/.env b/packages/phone-number-privacy/signer/.env index 9702fda18ce..7625631db3a 100644 --- a/packages/phone-number-privacy/signer/.env +++ b/packages/phone-number-privacy/signer/.env @@ -13,21 +13,33 @@ DB_USE_SSL=true #KEYSTORE_AZURE_CLIENT_SECRET=useMock #KEYSTORE_AZURE_TENANT=useMock #KEYSTORE_AZURE_VAULT_NAME=useMock -#KEYSTORE_AZURE_SECRET_NAME=useMock +PHONE_NUMBER_PRIVACY_KEY_NAME_BASE='phoneNumberPrivacy' +DOMAINS_KEY_NAME_BASE='domains' +PHONE_NUMBER_PRIVACY_LATEST_KEY_VERSION='1' +DOMAINS_LATEST_KEY_VERSION='1' KEYSTORE_TYPE=MockSecretManager KEYSTORE_GOOGLE_PROJECT_ID=mockProjectId -KEYSTORE_GOOGLE_SECRET_NAME=mockSecretName -KEYSTORE_GOOGLE_SECRET_VERSION=latest # Options: json, human (default), stackdriver LOG_FORMAT=stackdriver # Options: fatal, error, warn, info (default), debug, trace LOG_LEVEL=info SERVICE_NAME='odis-signer' + # For e2e Tests -ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer0.azurefd.net -ODIS_COMBINER_SERVICE_URL=https://us-central1-celo-phone-number-privacy-stg.cloudfunctions.net -ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org -ODIS_PUBLIC_POLYNOMIAL= 020000000000000090fa11c56744759fcd777b909e9dc5245b39e33ba24be92caaf3a6f71f2f63a2873c6f23adfab2b2f211534c2da98b01280ed2a00b0808c06ff02fc56f66690ceaa14aabebfec65b6681e641fbdbaabcdbb4320fbd422b1e0452d3274908cb00f3d2ba1d64ddc12f387ef5c6fb98265cee27afa66626edf91b9839d49f23890d75a550a49a2e7a75b06b3b49734a160035558eb2079c41926388ac560e75f1962dada39e5c30ba35bef59eb84ff4329432cdc10383b4dea40f5ad8fabbb09a81 -# alfajores polynomial = 020000000000000090fa11c56744759fcd777b909e9dc5245b39e33ba24be92caaf3a6f71f2f63a2873c6f23adfab2b2f211534c2da98b01280ed2a00b0808c06ff02fc56f66690ceaa14aabebfec65b6681e641fbdbaabcdbb4320fbd422b1e0452d3274908cb00f3d2ba1d64ddc12f387ef5c6fb98265cee27afa66626edf91b9839d49f23890d75a550a49a2e7a75b06b3b49734a160035558eb2079c41926388ac560e75f1962dada39e5c30ba35bef59eb84ff4329432cdc10383b4dea40f5ad8fabbb09a81 -# mainnet polynomial = 060000000000000016fade1df2e68418f0c47c6cc5ecab70e2ed4a89c2f63ecadd6ad2e106a962c407e8b75a0d368d1a69e540c7c5634e01a7f2b8c00bea4303bdfdba8f54229ff197bc399a3c16b9a8838258e31022c2bb2a397c6e835d7e86d8c47b5a63e2e30017f865337fd0060497457135173e2b0eaec6f8f14f0cacb17a5d150218e15bd46963ed1b9d56f956f9c4fc692813100042f098b7f70913f671e28ed1c99104b9b740549c42c59212b6671f1e1675674f7e6b6d690a13bd474ab9f0c83cd48e017514ca3874606f6abde2b957c791376e24d55efe6ccc7a1194a685b9589ca873a51c7e77b7b814a76cd9af2aafef500155280fb84efd3219b04312635568788b3393fd45a11f431a7eef8a8fc59ff2bfd4aab744baf9221bf1774653dda61d8193b720f60c627d5a9fec5c2c16a27e948f2f4545b460090303327262ec87f51fbf860f58d5e051d91d5bb869c8912300a9b1c2d922d329c9b7d5179946e049d52ed9b3876f36e5c8b2a47831eb235a51d8d877a284fbe07750449f9654d332808beb9641404188813cddb8ffad906752d71f3f042b583f501b3b7f3906946f9931c598575bf4c8d3e8941168f8cc8e001c092117257bb073db3885dffca5e8dd76b689d395bb5555cf00f9943a9e1ec9939f9d700407330163220f3c15a9420011b8693fb95c635168b6b0a021263b246301343e80161eac44fe79ba657fe59deb9d297ced18d090a8f65dc9c2e0990177f186d7501a2256ac9ecca36743e118f5dd4ce35dc976d38c8679d53cd11b0f11edb45c3473ce848d35875e63b2d100 -# staging polynomial = 0200000000000000ec5b161ac167995bd17cc0e9cf3f79369efac1fff5b0f68ad0e83dca207e3fc41b8e20bc155ebb3416a7b3d87364490169032189aa7380c47a0a464864fbe0c106e803197ae4959165e7067b95775cee2c74a78d7a67406764f342e5a4b99a003a510287524c9437b12ebb0bfdc7ea46078b807d1b665966961784bd71c4227c272b01c0fcd19c5b92226c1aac324b010abef36192e8ff3abb25686b3e6707bc747b129c32e572b5850db8446bd8f0af9a3fbf6b579793002b1b68528ca4ac00 \ No newline at end of file +ODIS_SIGNER_SERVICE_URL="SIGNER OPERATORS FILL IN" +STAGING_ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org +ALFAJORES_ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org +MAINNET_ODIS_BLOCKCHAIN_PROVIDER=https://forno.celo.org +ODIS_DOMAINS_TEST_KEY_VERSION=1 +ODIS_PNP_TEST_KEY_VERSION=1 +DEPLOYED_SIGNER_SERVICE_VERSION=2.0.1 +# PUBKEYS +STAGING_DOMAINS_PUBKEY=7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA +ALFAJORES_DOMAINS_PUBKEY=+ZrxyPvLChWUX/DyPw6TuGwQH0glDJEbSrSxUARyP5PuqYyP/U4WZTV1e0bAUioBZ6QCJMiLpDwTaFvy8VnmM5RBbLQUMrMg5p4+CBCqj6HhsMfcyUj8V0LyuNdStlCB +MAINNET_DOMAINS_PUBKEY=LX4tLiuYm8geZ3ztmH7oIWz4ohXt3ePRTd9BbG9RO86NMrApflioiOzKYtIsyjEA0uarnX8Emo+luTY4bwEWpgZDyPYE6UMWAoBaZBdy6NDMgAxSbdNtaQEq51fBjCUA +# Polynomials +STAGING_POLYNOMIAL=0200000000000000ec5b161ac167995bd17cc0e9cf3f79369efac1fff5b0f68ad0e83dca207e3fc41b8e20bc155ebb3416a7b3d87364490169032189aa7380c47a0a464864fbe0c106e803197ae4959165e7067b95775cee2c74a78d7a67406764f342e5a4b99a003a510287524c9437b12ebb0bfdc7ea46078b807d1b665966961784bd71c4227c272b01c0fcd19c5b92226c1aac324b010abef36192e8ff3abb25686b3e6707bc747b129c32e572b5850db8446bd8f0af9a3fbf6b579793002b1b68528ca4ac00 +ALFAJORES_PHONE_NUMBER_PRIVACY_POLYNOMIAL=020000000000000090fa11c56744759fcd777b909e9dc5245b39e33ba24be92caaf3a6f71f2f63a2873c6f23adfab2b2f211534c2da98b01280ed2a00b0808c06ff02fc56f66690ceaa14aabebfec65b6681e641fbdbaabcdbb4320fbd422b1e0452d3274908cb00f3d2ba1d64ddc12f387ef5c6fb98265cee27afa66626edf91b9839d49f23890d75a550a49a2e7a75b06b3b49734a160035558eb2079c41926388ac560e75f1962dada39e5c30ba35bef59eb84ff4329432cdc10383b4dea40f5ad8fabbb09a81 +MAINNET_PHONE_NUMBER_PRIVACY_POLYNOMIAL=060000000000000016fade1df2e68418f0c47c6cc5ecab70e2ed4a89c2f63ecadd6ad2e106a962c407e8b75a0d368d1a69e540c7c5634e01a7f2b8c00bea4303bdfdba8f54229ff197bc399a3c16b9a8838258e31022c2bb2a397c6e835d7e86d8c47b5a63e2e30017f865337fd0060497457135173e2b0eaec6f8f14f0cacb17a5d150218e15bd46963ed1b9d56f956f9c4fc692813100042f098b7f70913f671e28ed1c99104b9b740549c42c59212b6671f1e1675674f7e6b6d690a13bd474ab9f0c83cd48e017514ca3874606f6abde2b957c791376e24d55efe6ccc7a1194a685b9589ca873a51c7e77b7b814a76cd9af2aafef500155280fb84efd3219b04312635568788b3393fd45a11f431a7eef8a8fc59ff2bfd4aab744baf9221bf1774653dda61d8193b720f60c627d5a9fec5c2c16a27e948f2f4545b460090303327262ec87f51fbf860f58d5e051d91d5bb869c8912300a9b1c2d922d329c9b7d5179946e049d52ed9b3876f36e5c8b2a47831eb235a51d8d877a284fbe07750449f9654d332808beb9641404188813cddb8ffad906752d71f3f042b583f501b3b7f3906946f9931c598575bf4c8d3e8941168f8cc8e001c092117257bb073db3885dffca5e8dd76b689d395bb5555cf00f9943a9e1ec9939f9d700407330163220f3c15a9420011b8693fb95c635168b6b0a021263b246301343e80161eac44fe79ba657fe59deb9d297ced18d090a8f65dc9c2e0990177f186d7501a2256ac9ecca36743e118f5dd4ce35dc976d38c8679d53cd11b0f11edb45c3473ce848d35875e63b2d100 +ALFAJORES_DOMAINS_POLYNOMIAL=0200000000000000f99af1c8fbcb0a15945ff0f23f0e93b86c101f48250c911b4ab4b15004723f93eea98c8ffd4e166535757b46c0522a0167a40224c88ba43c13685bf2f159e63394416cb41432b320e69e3e0810aa8fa1e1b0c7dcc948fc5742f2b8d752b65081f10d83821b4e2cf90b56cc4fc8c98dc00e5f24f2c5b53fa8ad7c2ebd3963c9223cf95209692d267a4f8084edfc0b5f01f7a31d82bf5421c544b6258749c691b79e6f36d9ba963ead6f25b9986b6bcb7d45b5edb33a616af630b4ce17bf552c81 +MAINNET_DOMAINS_POLYNOMIAL=05000000000000002d7e2d2e2b989bc81e677ced987ee8216cf8a215eddde3d14ddf416c6f513bce8d32b0297e58a888ecca62d22cca3100d2e6ab9d7f049a8fa5b936386f0116a60643c8f604e9431602805a641772e8d0cc800c526dd36d69012ae757c18c250029d97c8a3d4b81e305780b49d511c80dc3009c02b8f651a06c8ec2d5530937a1f7eadf730ad46762a4c089bbd973a000ba77717ec36ebb6fd58904b444a6cde7dd3b3b7ac6fa37f9cd8d00aa67e7cfe81adee5ed45218f7f78b4f8473b564601f4361d228dc6dabf7decd3f61f5bb0ad2c7bd7fe5b7a88054959543e82f4deb08d4fe9af4ac775c9353e038e79f82200863ac9cb7fd6b5fa263eb9d1dead51002607f3eadac153596b671b854715bdb07bee1b0bc8d5178f0dac1b4d00ed0700f46e37135e96604d389f3a323028e29b07f36279e829da00eee1794f3ad6e5dca24eba65a7821755cc464add27c7a601c7e187756e79a5ec3c847f4d91b037fe3cd40590fc1a46b46c2f68c0edcbe5cd7727162a195a711008e4e956eb8a81011b290057cee3f14b9a4198a3e9909cac69a9e7d648fa3dd185794acc4c1e4b994637dca36621d463b42e015115ac2c015fc176d8f143bf99cca654ae95a3101afbdc0c5026f95fbf31af1ac115399f5b6b6d1de09af367745415be9533f8c080 diff --git a/packages/phone-number-privacy/signer/README.md b/packages/phone-number-privacy/signer/README.md index 0a05c442feb..8d6a2944c84 100644 --- a/packages/phone-number-privacy/signer/README.md +++ b/packages/phone-number-privacy/signer/README.md @@ -2,6 +2,14 @@ A service that generates unique partial signatures for blinded messages. Using a threshold BLS signature scheme, when K/N signatures are combined, a deterministic signature is obtained. +## APIs (ODIS v2) + +ODIS v2 provides support for three APIs, which need to be explicitly enabled ([see below](#enabling-apis-odis-v2) for configuration info): + +- **Legacy PNP API**: retrieve signatures for blinded messages, rate-limited using ODIS v1's scheme, based on an account's transaction history and verification status. +- **PNP API**: retrieve signatures for blinded messages, rate-limited based on quota purchased on-chain in `OdisPayments.sol`. +- **Domains API**: retrieve signatures over domains with custom rate-limiting schemes, as defined in more detail in [CIP-40](https://github.com/celo-org/celo-proposals/blob/master/CIPs/cip-0040.md). + ## Configuration You can use the following environment variables to configure the ODIS Signer service: @@ -13,6 +21,14 @@ You can use the following environment variables to configure the ODIS Signer ser - `SERVER_SSL_KEY_PATH` - (Optional) Path to SSL .key file. - `SERVER_SSL_CERT_PATH` - (Optional) Path to SSL .cert file. +### Enabling APIs (ODIS v2) + +Each API must be explicitly enabled by setting the following env vars to true (all are false by default): + +- `LEGACY_PHONE_NUMBER_PRIVACY_API_ENABLED` +- `PHONE_NUMBER_PRIVACY_API_ENABLED` +- `DOMAINS_API_ENABLED` + ### Database The service currently supports Postgres, MSSQL, and MySQL. @@ -66,17 +82,25 @@ The BLS key share should only exist in the keystore or as an encrypted backup. T ### Keystores -Currently, the service retrieving keys from Azure Key Vault (AKV), Google Secret Manager and AWS Secrets Manager. -You must specify the type, and then the keystore configs for that type. +Currently, the service supports Azure Key Vault (AKV), Google Secret Manager and AWS Secrets Manager. +You must specify the type, and then the keystore configs for that type as follows. - `KEYSTORE_TYPE` - `AzureKeyVault`, `GoogleSecretManager` or `AWSSecretManager` +In addition, you must name your keys in your keystore according to the pattern `-` where + +- `keyName` is configurable via the env variables `PHONE_NUMBER_PRIVACY_KEY_NAME_BASE` and `DOMAINS_KEY_NAME_BASE` which default to `phoneNumberPrivacy` and `domains` respectively. +- `keyVersion` is an integer corresponding to the iteration of the given key share. The variables `PHONE_NUMBER_PRIVACY_LATEST_KEY_VERSION` and `DOMAINS_LATEST_KEY_VERSION` should specify the latest version of the appropriate key share. This version will be fetched when the signer starts up. + +For example, the first iteration of the key share used for phone number privacy should be stored as `phoneNumberPrivacy-1` and the second iteration (after resharing) should be stored as `phoneNumberPrivacy-2` unless you specify a `PHONE_NUMBER_PRIVACY_KEY_NAME_BASE` env variable, in which case `phoneNumberPrivacy` should be replaced with that value. The version numbers and `-` delimeter are mandatory and not configurable. + +**Note: if you modify the stored secrets, you must restart the signer to ensure the updated versions are used in the signer.** + #### Azure Key Vault Use the following to configure the AKV connection. These values are generated when creating a service principal account (see [Configuring your Key Vault](https://www.npmjs.com/package/@azure/keyvault-keys#configuring-your-key-vault)). Or if the service is being hosted on Azure itself, authentication can be done by granted key access to the VM's managed identity, in which case the client_id, client_secret, and tenant configs can be left blank. - `KEYSTORE_AZURE_VAULT_NAME` - The name of your Azure Key Vault. -- `KEYSTORE_AZURE_SECRET_NAME` - The name of the secret that holds your BLS key. - `KEYSTORE_AZURE_CLIENT_ID` - (Optional) The clientId of the service principal account that has [Get, List] access to secrets. - `KEYSTORE_AZURE_CLIENT_SECRET` - (Optional) The client secret of the same service principal account. - `KEYSTORE_AZURE_TENANT` - (Optional) The tenant that the service principal is a member of. @@ -86,15 +110,12 @@ Use the following to configure the AKV connection. These values are generated wh Use the following to configure the Google Secret Manager. To authenticate with Google Cloud, you can see [Setting Up Authentication](https://cloud.google.com/docs/authentication/production). By default, the google lib will use the default app credentials assigned to the host VM. If the service is being run outside of GCP, you can manually set the `GOOGLE_APPLICATION_CREDENTIALS` env var to the path to a service account json file. - `KEYSTORE_GOOGLE_PROJECT_ID` - The google cloud project id. -- `KEYSTORE_GOOGLE_SECRET_NAME` - The secret's name. -- `KEYSTORE_GOOGLE_SECRET_VERSION` - Secret version (latest by default). #### AWS Secrets Manager Use the following to configure the AWS Secrets Manager. To authenticate with Amazon Web Services, you can see [Setting Credentials in Node.js](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html). If you are running the signer inside AWS, we do recommend to authenticate using IAM Roles. - `KEYSTORE_AWS_REGION` - The AWS Region code where the secret is, for example: `us-east-1`. -- `KEYSTORE_AWS_SECRET_NAME` - The secret's name. - `KEYSTORE_AWS_SECRET_KEY` - The key for the secret key/value pair. ## Operations @@ -125,21 +146,34 @@ Then check on the service to make sure its running: `docker logs -f {CONTAINER_ID_HERE}` +#### Key rotations + +After a key resharing, signers should rotate their key shares as follows: + +1. Store the new key share in the keystore according to the naming convention specified in the [Keystores](#keystores) section above. +2. Increment `PHONE_NUMBER_PRIVACY_LATEST_KEY_VERSION` or `DOMAINS_LATEST_KEY_VERSION` as appropriate. This will instruct the signer to prefetch this new key version the next time it starts up, but there is no need to restart the signer at this point. +3. Notify the combiner operator that your signer is ready for the key rotation. +4. The combiner operator will run e2e tests against your signer to verify it has the correct key configuration. +5. The combiner operator will update the combiner to request the new key share version via a custom request header field once all signers are ready. +6. The signers will fetch the new key shares from their keystores upon receiving these requests. +7. When the combiner operator sees that all signers are signing with the new key share and confirms that the system is healthy, signers will be instructed to delete their old key shares. Deleting the deprecated key shares ensures they cannot be stored and used by an attacker. + ### Validate before going live -You can test your mainnet service is set up correctly by running a specific end-to-end test that checks the signature against a public polynomial. Because the test requires quota, you must first point your provider endpoint to Alfajores. +You can test your mainnet service is set up correctly by running specific tests in the e2e suite ("[Signer configuration test]" cases) which check signatures against the public polynomial for the respective APIs. Because the tests require quota, you must first point your provider endpoint to Alfajores. -1. Change your signer’s forno endpoint to Alfajores: `https://alfajores-forno.celo-testnet.org` +1. Change your signer’s blockchain provider (`BLOCKCHAIN_PROVIDER`) to Alfajores Forno: `https://alfajores-forno.celo-testnet.org` 2. Navigate to the signer directory in monorepo (this directory). 3. Modify the .env file: - Change `ODIS_SIGNER_SERVICE_URL` to your service endpoint. - - Swap the `ODIS_PUBLIC_POLYNOMIAL` with the *mainnet* one. -4. Run `yarn jest test/end-to-end/get-blinded-sig.test.ts -t 'When walletAddress has enough quota Returns sig when querying succeeds with unused request'` -5. Verify test passes. -6. Change your signer’s forno endpoint back to Mainnet: `https://forno.celo.org` +4. Run `yarn test:signer:mainnet`. + + *Technical note: this command intentionally points the test's blockchain provider to Alfajores, in order to top up quota on Alfajores before running the test cases. It still verifies signatures against the respective mainnet polynomials.* +5. Verify that all tests pass. +6. Change your signer’s blockchain provider back to its original value (if using Forno: `https://forno.celo.org`). ### Logs -Error logs will be prefixed with `CELO_ODIS_ERROR_XX`. You can see a full list of them in [error.utils.ts](https://github.com/celo-org/celo-monorepo/blob/master/packages/phone-number-privacy/signer/src/common/error-utils.ts). +Error logs will be prefixed with `CELO_ODIS_ERROR_XX`. You can see a full list of them in [errors.ts](https://github.com/celo-org/celo-monorepo/blob/master/packages/phone-number-privacy/common/src/interfaces/errors.ts) in the common package. diff --git a/packages/phone-number-privacy/signer/azure-templates/README.md b/packages/phone-number-privacy/signer/azure-templates/README.md deleted file mode 100644 index d87ed47bf76..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/README.md +++ /dev/null @@ -1,129 +0,0 @@ -# Azure deployment templates - -Templates to facilitate deployment of new signers on Azure. - -## Prequisites - -This setup assumes you've got the Azure CLI installed and that you've already created the Key Vault with the secret. - -The container also requires a Log Analytics workspace id and key. To acquire those, [create a Log Analtyics workspace](https://docs.microsoft.com/en-us/azure/azure-monitor/learn/quick-create-workspace). If you won't be using Log Analytics, you'll need to cut those settings from the `container-template.json` file. - -## Choose subscription and resource group - -```bash -az account set --subscription {YOUR_SUB} -RESOURCE_GROUP={YOUR_RG} -``` - -## Deploy the database (postgres) - -Fill in the `TODO` placeholder params in `db-parameters.json` and then run the following: - -```bash -SERVER_NAME={YOUR_SERVER_NAME} - -az deployment group create \ - --resource-group $RESOURCE_GROUP \ - --template-file db-template.json \ - --parameters @db-parameters.json \ - --parameters serverName=${SERVER_NAME} - -az postgres db create \ - --name phoneNumberPrivacy \ - --resource-group $RESOURCE_GROUP \ - --server-name $SERVER_NAME - -az postgres db list --resource-group $RESOURCE_GROUP --server-name $SERVER_NAME - -# Allow access to Azure services -az postgres server firewall-rule create -g $RESOURCE_GROUP -s $SERVER_NAME -n AllowAllWindowsAzureIps --start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0 -``` - -You'll also need to run the db migrations, either via a special docker command or by temporarily whitelisting your dev box (see parent [Readme](../README.md)). - -## Create a managed identity, add it to container-parameters and grant it access to keyvault - -If a managed identity already exists for the signer, you can get it by clicking on the managed identity resource and looking under `properties -> Resource ID`, then just add that string to the container-parameters file. If not, you can create a new managed identity with the following command: - -```bash -az identity create \ - --resource-group $RESOURCE_GROUP \ - --name $CONTAINER_NAME -``` - -The command will output some json, and the string you need to add to the container-parameters file will be under the "id" field. You can then grant the new managed identity access to the keyvault with the following command, or via the azure portal. - -```bash -RESOURCE_ID={YOUR_RESOURCE_ID} -az keyvault set-policy \ - --name $KEYVAULT_NAME \ - --resource-group $RESOURCE_GROUP \ - --object-id $RESOURCE_ID \ - --secret-permissions get -``` - -## Deploy the container instance - -Fill in the `TODO` placeholder params in `container-parameters.json`. The `dnsNameLabel` will act as the prefix for your cointainer hostname. Run the following: - -```bash -CONTAINER_NAME={YOUR_CONTAINER_NAME} - -KEYVAULT_NAME={YOUR_VAULT_NAME} - -az deployment group create \ - --resource-group $RESOURCE_GROUP \ - --template-file container-template.json \ - --parameters @container-parameters.json \ - --parameters containerName=$CONTAINER_NAME -``` - -## Deploy the front door for TLS Termination - -```bash -CONTAINER_FQDN=$(az container show \ - --resource-group $RESOURCE_GROUP \ - --name $CONTAINER_NAME \ - --query ipAddress.fqdn --out tsv) - -FRONTDOOR_NAME={YOUR_FRONTDOOR_NAME} - -az deployment group create \ - --resource-group $RESOURCE_GROUP \ - --template-file frontdoor-template.json \ - --parameters frontdoors_name=$FRONTDOOR_NAME \ - --parameters backend_url=$CONTAINER_FQDN -``` - -## Monitoring - -### Logging - -The logs from the container should flow automatically into the configured Log Analytics workspace. - -To see errors, execute a query like the following, which you can save for convinient use in creating alerts: -`ContainerInstanceLog_CL | where Message contains "celo_odis_err"` - -### Metrics - -We use prometheus metrics to generate alerting and dashboards. For the most up to date on-call information please see the Runbook (https://docs.google.com/document/u/1/d/1fSN2_J-OHMr1TqAbj1_i5p7sFgBpZ9xsDIe9WeG4FV8/edit). - -### Deploy the prometheus server and sidecar - -We use prometheus metrics to collect real time data from signers. The prometheus server scrapes these metrics from the `/metrics` endpoint on the signers and sends them to the sidecar container via a shared volume. The sidecar then reformats the metrics data and exports it to stackdriver. - -To deploy the prometheus server and sidecar you must first find the `prometheus-service-account-key` json and paste it into the `prometheus-service-account-key.json` file. Make sure you remember to delete this key from the file again after you finish the deployment and before you push to github! The key can be found by searching for `Service Accounts` in GCP and then creating a service account with `metrics write` permissions if one does not already exist. To get the key, go to the `Actions` tab on the service account and select `Create key`. This should download some JSON to your computer that you can copy and paste into the `prometheus-service-account-key.json` file. - -Once you have the service account key, you should fill in the missing fields labeled `"TODO"` in `prometheus-parameters.yaml`. The location parameters should be filled in with the location of the resource group. For the `prometheus.yaml` and `prometheus-service-account-key.json` parameters, you must base64 encode the contents of the `prometheus-.yaml` and `prometheus-service-account-key.json` files respectively, and then paste the results into the file. - -```bash -cat | base64 -``` - -Then run the following command to deploy the containers - -```bash -az deployment group create --resource-group $RESOURCE_GROUP --template-file prometheus-template.json --parameters @prometheus-parameters.json -``` - -Make sure to change all these values back to `"TODO"` after you deploy and before committing to master. If you accidentally push the service account key to github, simply delete the service account and create a new one. Then, use the new service account to generate a key and repeat the steps above to redeploy the prometheus server and sidecar. diff --git a/packages/phone-number-privacy/signer/azure-templates/container-parameters.json b/packages/phone-number-privacy/signer/azure-templates/container-parameters.json deleted file mode 100644 index 16d23c1789e..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/container-parameters.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "location": { - "value": "TODO" - }, - "imageType": { - "value": "Public" - }, - "imageName": { - "value": "us.gcr.io/celo-testnet/celo-monorepo:phone-number-privacy-rc2" - }, - "osType": { - "value": "Linux" - }, - "numberCpuCores": { - "value": "2" - }, - "memory": { - "value": "2" - }, - "restartPolicy": { - "value": "Always" - }, - "environmentVariables": { - "value": [ - { - "name": "BLOCKCHAIN_PROVIDER", - "value": "https://forno.celo.org" - }, - { - "name": "SERVER_PORT", - "value": "80" - }, - { - "name": "DB_TYPE", - "value": "postgres" - }, - { - "name": "DB_HOST", - "value": "TODO" - }, - { - "name": "DB_USERNAME", - "value": "TODO" - }, - { - "name": "DB_PASSWORD", - "secureValue": "TODO" - }, - { - "name": "DB_DATABASE", - "value": "phoneNumberPrivacy" - }, - { - "name": "KEYSTORE_TYPE", - "value": "AzureKeyVault" - }, - { - "name": "KEYSTORE_AZURE_VAULT_NAME", - "value": "TODO" - }, - { - "name": "KEYSTORE_AZURE_SECRET_NAME", - "value": "TODO" - }, - { - "name": "LOG_LEVEL", - "value": "trace" - }, - { - "name": "LOG_FORMAT", - "value": "stackdriver" - } - ] - }, - "ipAddressType": { - "value": "Public" - }, - "ports": { - "value": [ - { - "port": "80", - "protocol": "TCP" - }, - { - "port": "443", - "protocol": "TCP" - } - ] - }, - "dnsNameLabel": { - "value": "TODO" - }, - "logAnalyticsWorkspaceId": { - "value": "TODO" - }, - "logAnalyticsWorkspaceKey": { - "value": "TODO" - }, - "userAssignedIdentity": { - "value": "TODO" - } - } -} \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/azure-templates/container-template.json b/packages/phone-number-privacy/signer/azure-templates/container-template.json deleted file mode 100644 index 142ea9e7327..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/container-template.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "location": { - "type": "string" - }, - "containerName": { - "type": "string" - }, - "imageType": { - "type": "string", - "allowedValues": [ - "Public", - "Private" - ] - }, - "imageName": { - "type": "string" - }, - "osType": { - "type": "string", - "allowedValues": [ - "Linux", - "Windows" - ] - }, - "numberCpuCores": { - "type": "string" - }, - "memory": { - "type": "string" - }, - "restartPolicy": { - "type": "string", - "allowedValues": [ - "OnFailure", - "Always", - "Never" - ] - }, - "environmentVariables": { - "type": "array" - }, - "ipAddressType": { - "type": "string" - }, - "ports": { - "type": "array" - }, - "dnsNameLabel": { - "type": "string" - }, - "logAnalyticsWorkspaceId": { - "type": "string" - }, - "logAnalyticsWorkspaceKey": { - "type": "string" - }, - "userAssignedIdentity": { - "type": "string" - } - }, - "resources": [ - { - "location": "[parameters('location')]", - "name": "[parameters('containerName')]", - "type": "Microsoft.ContainerInstance/containerGroups", - "apiVersion": "2018-10-01", - "properties": { - "containers": [ - { - "name": "[parameters('containerName')]", - "properties": { - "image": "[parameters('imageName')]", - "resources": { - "requests": { - "cpu": "[int(parameters('numberCpuCores'))]", - "memoryInGB": "[float(parameters('memory'))]" - } - }, - "environmentVariables": "[parameters('environmentVariables')]", - "ports": "[parameters('ports')]" - } - } - ], - "imageRegistryCredentials": [ - { - "server": "celoprod.azurecr.io", - "username": "publicpuller", - "password": "" - } - ], - "restartPolicy": "[parameters('restartPolicy')]", - "osType": "[parameters('osType')]", - "ipAddress": { - "type": "[parameters('ipAddressType')]", - "ports": "[parameters('ports')]", - "dnsNameLabel": "[parameters('dnsNameLabel')]" - }, - "diagnostics": { - "logAnalytics": { - "workspaceId": "[parameters('logAnalyticsWorkspaceId')]", - "workspaceKey": "[parameters('logAnalyticsWorkspaceKey')]" - } - } - }, - "identity":{ - "type": "UserAssigned", - "userAssignedIdentities": { "[parameters('userAssignedIdentity')]": {} } - }, - "tags": {} - } - ] -} diff --git a/packages/phone-number-privacy/signer/azure-templates/db-parameters.json b/packages/phone-number-privacy/signer/azure-templates/db-parameters.json deleted file mode 100644 index 6832959293f..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/db-parameters.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "location": { - "value": "TODO" - }, - "skuName": { - "value": "B_Gen5_1" - }, - "skuTier": { - "value": "Basic" - }, - "skuCapacity": { - "value": 1 - }, - "skuFamily": { - "value": "Gen5" - }, - "skuSizeMB": { - "value": 51200 - }, - "backupRetentionDays": { - "value": 35 - }, - "geoRedundantBackup": { - "value": "Disabled" - }, - "storageAutoGrow": { - "value": "Enabled" - }, - "tags": { - "value": {} - }, - "infrastructureEncryption": { - "value": "Disabled" - }, - "administratorLogin": { - "value": "TODO" - }, - "administratorLoginPassword": { - "value": "TODO" - }, - "previewFeature": { - "value": "" - }, - "version": { - "value": "10" - } - } -} \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/azure-templates/db-template.json b/packages/phone-number-privacy/signer/azure-templates/db-template.json deleted file mode 100644 index ad743a61213..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/db-template.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "administratorLogin": { - "type": "string" - }, - "administratorLoginPassword": { - "type": "securestring" - }, - "location": { - "type": "string" - }, - "serverName": { - "type": "string" - }, - "skuCapacity": { - "type": "int" - }, - "skuFamily": { - "type": "string" - }, - "skuName": { - "type": "string" - }, - "skuSizeMB": { - "type": "int" - }, - "skuTier": { - "type": "string" - }, - "version": { - "type": "string" - }, - "backupRetentionDays": { - "type": "int" - }, - "geoRedundantBackup": { - "type": "string" - }, - "previewFeature": { - "type": "string", - "defaultValue": "" - }, - "tags": { - "type": "object", - "defaultValue": {} - }, - "storageAutoGrow": { - "type": "string", - "defaultValue": "Disabled" - }, - "infrastructureEncryption": { - "type": "string", - "defaultValue": "Disabled" - } - }, - "resources": [ - { - "apiVersion": "2017-12-01-preview", - "kind": "", - "location": "[parameters('location')]", - "name": "[parameters('serverName')]", - "properties": { - "version": "[parameters('version')]", - "administratorLogin": "[parameters('administratorLogin')]", - "administratorLoginPassword": "[parameters('administratorLoginPassword')]", - "storageProfile": { - "storageMB": "[parameters('skuSizeMB')]", - "backupRetentionDays": "[parameters('backupRetentionDays')]", - "geoRedundantBackup": "[parameters('geoRedundantBackup')]", - "storageAutoGrow": "[parameters('storageAutoGrow')]" - }, - "previewFeature": "[parameters('previewFeature')]", - "infrastructureEncryption": "[parameters('infrastructureEncryption')]" - }, - "sku": { - "name": "[parameters('skuName')]", - "tier": "[parameters('skuTier')]", - "capacity": "[parameters('skuCapacity')]", - "size": "[parameters('skuSizeMB')]", - "family": "[parameters('skuFamily')]" - }, - "tags": "[parameters('tags')]", - "type": "Microsoft.DBforPostgreSQL/servers" - } - ], - "variables": {} -} \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/azure-templates/frontdoor-template.json b/packages/phone-number-privacy/signer/azure-templates/frontdoor-template.json deleted file mode 100644 index 8f3c67798d6..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/frontdoor-template.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "frontdoors_name": { - "type": "string" - }, - "backend_url": { - "type": "string" - } - }, - "variables": {}, - "resources": [ - { - "type": "Microsoft.Network/frontdoors", - "apiVersion": "2020-05-01", - "name": "[parameters('frontdoors_name')]", - "location": "Global", - "properties": { - "resourceState": "Enabled", - "backendPools": [ - { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), concat('/BackendPools/', parameters('frontdoors_name')))]", - "name": "[parameters('frontdoors_name')]", - "properties": { - "backends": [ - { - "address": "[parameters('backend_url')]", - "httpPort": 80, - "httpsPort": 443, - "priority": 1, - "weight": 100, - "backendHostHeader": "[parameters('backend_url')]", - "enabledState": "Enabled" - } - ], - "healthProbeSettings": { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), '/healthprobesettings/healthprobesettings-1592864885908')]" - }, - "loadBalancingSettings": { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), '/loadbalancingsettings/loadbalancingsettings-1592864885908')]" - }, - "resourceState": "Enabled" - } - } - ], - "healthProbeSettings": [ - { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), '/HealthProbeSettings/healthProbeSettings-1592864885908')]", - "name": "healthProbeSettings-1592864885908", - "properties": { - "intervalInSeconds": 60, - "path": "/status", - "protocol": "Http", - "resourceState": "Enabled", - "enabledState": "Disabled", - "healthProbeMethod": "Get" - } - } - ], - "frontendEndpoints": [ - { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), concat('/FrontendEndpoints/', parameters('frontdoors_name'), '-azurefd-net'))]", - "name": "[concat(parameters('frontdoors_name'), '-azurefd-net')]", - "properties": { - "hostName": "[concat(parameters('frontdoors_name'), '.azurefd.net')]", - "sessionAffinityEnabledState": "Disabled", - "sessionAffinityTtlSeconds": 0, - "resourceState": "Enabled" - } - } - ], - "loadBalancingSettings": [ - { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), '/LoadBalancingSettings/loadBalancingSettings-1592864885908')]", - "name": "loadBalancingSettings-1592864885908", - "properties": { - "additionalLatencyMilliseconds": 0, - "sampleSize": 4, - "successfulSamplesRequired": 3, - "resourceState": "Enabled" - } - } - ], - "routingRules": [ - { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), concat('/RoutingRules/', parameters('frontdoors_name')))]", - "name": "[parameters('frontdoors_name')]", - "properties": { - "frontendEndpoints": [ - { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), concat('/frontendendpoints/', parameters('frontdoors_name'), '-azurefd-net'))]" - } - ], - "acceptedProtocols": [ - "Https" - ], - "patternsToMatch": [ - "/*" - ], - "enabledState": "Enabled", - "resourceState": "Enabled", - "routeConfiguration": { - "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration", - "forwardingProtocol": "HttpOnly", - "backendPool": { - "id": "[concat(resourceId('Microsoft.Network/frontdoors', parameters('frontdoors_name')), concat('/backendPools/', parameters('frontdoors_name')))]" - } - } - } - } - ], - "backendPoolsSettings": { - "enforceCertificateNameCheck": "Enabled", - "sendRecvTimeoutSeconds": 30 - }, - "enabledState": "Enabled", - "friendlyName": "[parameters('frontdoors_name')]" - } - } - ] -} \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/azure-templates/prometheus-alfajores.yaml b/packages/phone-number-privacy/signer/azure-templates/prometheus-alfajores.yaml deleted file mode 100644 index 183deb57600..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/prometheus-alfajores.yaml +++ /dev/null @@ -1,14 +0,0 @@ -global: - scrape_interval: 60s -scrape_configs: - - job_name: scrape-odis - metrics_path: /metrics - scheme: http - static_configs: - - targets: - - pgpnp-alfajores-signer1.eastus.azurecontainer.io:80 - - pgpnp-alfajores-signer3.eastus.azurecontainer.io:80 - - pgpnp-alfajores-signer2.eastus.azurecontainer.io:80 - labels: - _generic_location: us-central1 - _generic_namespace: odis-signer diff --git a/packages/phone-number-privacy/signer/azure-templates/prometheus-mainnet.yaml b/packages/phone-number-privacy/signer/azure-templates/prometheus-mainnet.yaml deleted file mode 100644 index 744843b2f0f..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/prometheus-mainnet.yaml +++ /dev/null @@ -1,14 +0,0 @@ -global: - scrape_interval: 60s -scrape_configs: - - job_name: scrape-odis - metrics_path: /metrics - scheme: http - static_configs: - - targets: - - clabs-mainnet-pgpnp-signer.eastasia.azurecontainer.io:80 - - clabs-mainnet-pgpnp-signer.brazilsouth.azurecontainer.io:80 - - clabs-mainnet-pgpnp-signer.westus2.azurecontainer.io:80 - labels: - _generic_location: us-central1 - _generic_namespace: odis-signer diff --git a/packages/phone-number-privacy/signer/azure-templates/prometheus-parameters.json b/packages/phone-number-privacy/signer/azure-templates/prometheus-parameters.json deleted file mode 100644 index 24d5a39cc4a..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/prometheus-parameters.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "location": { - "value": "TODO" - }, - "containerGroupName": { - "value": "odis-prometheus" - }, - "containerName1": { - "value": "prometheus-server" - }, - "containerName2": { - "value": "prometheus-sidecar" - }, - "imageType1": { - "value": "Public" - }, - "imageType2": { - "value": "Public" - }, - "imageName1": { - "value": "prom/prometheus:v2.17.0" - }, - "imageName2": { - "value": "gcr.io/stackdriver-prometheus/stackdriver-prometheus-sidecar:0.7.3" - }, - "osType": { - "value": "Linux" - }, - "numberCpuCores": { - "value": "2" - }, - "memory": { - "value": "2" - }, - "restartPolicy": { - "value": "Always" - }, - "environmentVariables2": { - "value": [ - { - "name": "GOOGLE_APPLICATION_CREDENTIALS", - "value": "/var/secrets/google/prometheus-service-account-key.json" - } - ] - }, - "ipAddressType": { - "value": "Public" - }, - "ports1": { - "value": [ - { - "port": "9090", - "protocol": "TCP" - } - ] - }, - "ports2": { - "value": [ - { - "port": "9091", - "protocol": "TCP" - } - ] - }, - "command1": { - "value": [ - "/bin/prometheus", - "--config.file=/etc/prometheus/prometheus.yaml", - "--storage.tsdb.path=/prometheus/" - ] - }, - "command2": { - "value": [ - "/bin/stackdriver-prometheus-sidecar", - "--stackdriver.project-id=celo-phone-number-privacy-stg", - "--prometheus.wal-directory=/prometheus/wal", - "--stackdriver.kubernetes.location=us-central1", - "--stackdriver.kubernetes.cluster-name=odis-staging", - "--log.level=debug" - ] - }, - "volumeMounts1": { - "value": [ - { - "name": "prometheus-storage-volume", - "mountPath": "/prometheus" - }, - { - "name": "prometheus-config-volume", - "mountPath": "/etc/prometheus/" - } - ] - }, - "volumeMounts2": { - "value": [ - { - "name": "prometheus-storage-volume", - "mountPath": "/prometheus" - }, - { - "name": "prometheus-service-account-key", - "mountPath": "/var/secrets/google" - } - ] - }, - "volumes": { - "value": [ - { - "name": "prometheus-storage-volume", - "emptyDir": {} - }, - { - "name": "prometheus-service-account-key", - "secret": { - "prometheus-service-account-key.json": "TODO" - } - }, - { - "name": "prometheus-config-volume", - "secret": { - "prometheus.yaml": "TODO" - } - } - ] - } - } -} \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/azure-templates/prometheus-service-account-key.json b/packages/phone-number-privacy/signer/azure-templates/prometheus-service-account-key.json deleted file mode 100644 index f31a0e4bedc..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/prometheus-service-account-key.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "TODO", - "private_key_id": "TODO", - "private_key": "TODO", - "client_email": "TODO", - "client_id": "TODO", - "auth_uri": "TODO", - "token_uri": "TODO", - "auth_provider_x509_cert_url": "TODO", - "client_x509_cert_url": "TODO" -} \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/azure-templates/prometheus-staging.yaml b/packages/phone-number-privacy/signer/azure-templates/prometheus-staging.yaml deleted file mode 100644 index d6e7a94e190..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/prometheus-staging.yaml +++ /dev/null @@ -1,14 +0,0 @@ -global: - scrape_interval: 60s -scrape_configs: - - job_name: scrape-odis - metrics_path: /metrics - scheme: http - static_configs: - - targets: - - clabs-staging-pgpnp1-signer.centralus.azurecontainer.io:80 - - clabs-staging-pgpnp-signer.centralus.azurecontainer.io:80 - - clabs-staging-pgpnp2-signer.centralus.azurecontainer.io:80 - labels: - _generic_location: us-central1 - _generic_namespace: odis-signer diff --git a/packages/phone-number-privacy/signer/azure-templates/prometheus-template.json b/packages/phone-number-privacy/signer/azure-templates/prometheus-template.json deleted file mode 100644 index 4f80d68f99d..00000000000 --- a/packages/phone-number-privacy/signer/azure-templates/prometheus-template.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "location": { - "type": "string" - }, - "containerGroupName": { - "type": "string" - }, - "containerName1": { - "type": "string" - }, - "containerName2": { - "type": "string" - }, - "imageType1": { - "type": "string", - "allowedValues": [ - "Public", - "Private" - ] - }, - "imageType2": { - "type": "string", - "allowedValues": [ - "Public", - "Private" - ] - }, - "imageName1": { - "type": "string" - }, - "imageName2": { - "type": "string" - }, - "osType": { - "type": "string", - "allowedValues": [ - "Linux" - ] - }, - "numberCpuCores": { - "type": "string" - }, - "memory": { - "type": "string" - }, - "restartPolicy": { - "type": "string", - "allowedValues": [ - "OnFailure", - "Always", - "Never" - ] - }, - "environmentVariables2": { - "type": "array" - }, - "ipAddressType": { - "type": "string" - }, - "ports1": { - "type": "array" - }, - "ports2": { - "type": "array" - }, - "command1": { - "type": "array" - }, - "command2": { - "type": "array" - }, - "volumeMounts1": { - "type": "array" - }, - "volumeMounts2": { - "type": "array" - }, - "volumes": { - "type": "array" - } - }, - "resources": [ - { - "location": "[parameters('location')]", - "name": "[parameters('containerGroupName')]", - "type": "Microsoft.ContainerInstance/containerGroups", - "apiVersion": "2018-10-01", - "properties": { - "containers": [ - { - "name": "[parameters('containerName1')]", - "properties": { - "image": "[parameters('imageName1')]", - "resources": { - "requests": { - "cpu": "[int(parameters('numberCpuCores'))]", - "memoryInGB": "[float(parameters('memory'))]" - } - }, - "ports": "[parameters('ports1')]", - "volumeMounts": "[parameters('volumeMounts1')]", - "command": "[parameters('command1')]" - } - }, - { - "name": "[parameters('containerName2')]", - "properties": { - "image": "[parameters('imageName2')]", - "resources": { - "requests": { - "cpu": "[int(parameters('numberCpuCores'))]", - "memoryInGB": "[float(parameters('memory'))]" - } - }, - "environmentVariables": "[parameters('environmentVariables2')]", - "ports": "[parameters('ports2')]", - "volumeMounts": "[parameters('volumeMounts2')]", - "command": "[parameters('command2')]" - } - } - ], - "restartPolicy": "[parameters('restartPolicy')]", - "osType": "[parameters('osType')]", - "volumes": "[parameters('volumes')]" - }, - "tags": {} - } - ] -} \ No newline at end of file diff --git a/packages/phone-number-privacy/signer/jest.config.js b/packages/phone-number-privacy/signer/jest.config.js index 4d2076c1d8c..11c683c662f 100644 --- a/packages/phone-number-privacy/signer/jest.config.js +++ b/packages/phone-number-privacy/signer/jest.config.js @@ -4,4 +4,11 @@ module.exports = { preset: 'ts-jest', ...nodeFlakeTracking, setupFiles: ['dotenv/config'], + coverageReporters: [['lcov', { projectRoot: '../../../' }], 'text'], + collectCoverageFrom: ['./src/**'], + coverageThreshold: { + global: { + lines: 80, + }, + }, } diff --git a/packages/phone-number-privacy/signer/package.json b/packages/phone-number-privacy/signer/package.json index a09ea6eddf1..4931ae38120 100644 --- a/packages/phone-number-privacy/signer/package.json +++ b/packages/phone-number-privacy/signer/package.json @@ -1,6 +1,6 @@ { "name": "@celo/phone-number-privacy-signer", - "version": "1.1.9", + "version": "3.0.0-dev", "description": "Signing participator of ODIS", "author": "Celo", "license": "Apache-2.0", @@ -11,37 +11,45 @@ "clean": "tsc -b . --clean", "build": "tsc -b .", "lint": "tslint --project .", - "test": "jest --testPathIgnorePatterns test/end-to-end", - "test:e2e": "jest --runInBand test/end-to-end", - "test:e2e:staging:0": "ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer0.azurefd.net yarn test:e2e", - "test:e2e:staging:1": "ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer1.azurefd.net yarn test:e2e", - "test:e2e:staging:2": "ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer2.azurefd.net yarn test:e2e", - "test:e2e:alfajores:1": "ODIS_SIGNER_SERVICE_URL=https://odis-alfajores-signer-1-b.azurefd.net yarn test:e2e", - "test:e2e:alfajores:2": "ODIS_SIGNER_SERVICE_URL=https://odis-alfajores-signer2.azurefd.net yarn test:e2e", - "test:e2e:alfajores:3": "ODIS_SIGNER_SERVICE_URL=https://odis-alfajores-signer3.azurefd.net yarn test:e2e", - "test:e2e:mainnet:westus2": "ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-westus2.azurefd.net yarn test:e2e", - "test:e2e:mainnet:brazilsouth": "ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-brazilsouth.azurefd.net yarn test:e2e", - "test:e2e:mainnet:eastasia": "ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-eastasia.azurefd.net yarn test:e2e", - "test:e2e:mainnet:westeurope": "ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-westeurope.azurefd.net yarn test:e2e", + "test": "SKIP_KNOWN_FLAKES=false jest --testPathIgnorePatterns test/end-to-end", + "test:debughandles": "jest --watch --runInBand --detectOpenHandles --testPathIgnorePatterns test/end-to-end", + "test:debug": "node --inspect ../../../node_modules/.bin/jest --runInBand", + "test:coverage": "yarn test --coverage", + "test:integration": "jest --runInBand test/integration", + "test:integration:debugdb": "VERBOSE_DB_LOGGING=true jest --runInBand test/integration", + "test:e2e": "jest --runInBand test/end-to-end --testPathIgnorePatterns test/end-to-end/disabled-apis.test.ts", + "test:e2e:disabledapis": "jest --runInBand test/end-to-end/disabled-apis.test.ts", + "test:e2e:staging:0": "CONTEXT_NAME=staging ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer0.azurefd.net yarn test:e2e", + "test:e2e:staging:1": "CONTEXT_NAME=staging ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer1.azurefd.net yarn test:e2e", + "test:e2e:staging:2": "CONTEXT_NAME=staging ODIS_SIGNER_SERVICE_URL=https://staging-pgpnp-signer2.azurefd.net yarn test:e2e", + "test:e2e:alfajores:1": "CONTEXT_NAME=alfajores ODIS_SIGNER_SERVICE_URL=https://odis-alfajores-signer-1-b.azurefd.net yarn test:e2e", + "test:e2e:alfajores:2": "CONTEXT_NAME=alfajores ODIS_SIGNER_SERVICE_URL=https://odis-alfajores-signer2.azurefd.net yarn test:e2e", + "test:e2e:alfajores:3": "CONTEXT_NAME=alfajores ODIS_SIGNER_SERVICE_URL=https://odis-alfajores-signer3.azurefd.net yarn test:e2e", + "test:e2e:mainnet:westus2": "CONTEXT_NAME=mainnet ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-westus2.azurefd.net yarn test:e2e", + "test:e2e:mainnet:brazilsouth": "CONTEXT_NAME=mainnet ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-brazilsouth.azurefd.net yarn test:e2e", + "test:e2e:mainnet:eastasia": "CONTEXT_NAME=mainnet ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-eastasia.azurefd.net yarn test:e2e", + "test:e2e:mainnet:westeurope": "CONTEXT_NAME=mainnet ODIS_SIGNER_SERVICE_URL=https://mainnet-pgpnp-westeurope.azurefd.net yarn test:e2e", + "test:signer:mainnet": "MAINNET_ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org CONTEXT_NAME=mainnet yarn jest test/end-to-end -t='\\[Signer configuration test\\]'", "db:migrate": "ts-node scripts/run-migrations.ts", - "db:migrate:make": "knex --migrations-directory ./src/migrations migrate:make -x ts", - "bls:keygen": "ts-node scripts/create-bls-keys.ts", + "db:migrate:make": "knex --migrations-directory ./src/common/database/migrations migrate:make -x ts", + "bls:keygen": "ts-node scripts/threshold-bls-keygen.ts", + "poprf:keygen": "ts-node scripts/poprf-keygen.ts", "ssl:keygen": "./scripts/create-ssl-cert.sh" }, "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", - "@celo/phone-number-privacy-common": "1.0.39", - "@celo/identity": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", - "@celo/wallet-hsm-azure": "2.2.1-dev", + "@celo/base": "^3.2.1-dev", + "@celo/contractkit": "^3.2.1-dev", + "@celo/phone-number-privacy-common": "^3.0.0-dev", + "@celo/poprf": "^0.1.9", + "@celo/utils": "^3.2.1-dev", + "@celo/wallet-hsm-azure": "^3.2.1-dev", "@google-cloud/secret-manager": "3.0.0", "@types/bunyan": "^1.8.8", "aws-sdk": "^2.705.0", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", "dotenv": "^8.2.0", "express": "^4.17.1", - "knex": "^0.21.1", + "knex": "^2.1.0", "mssql": "^6.3.1", "mysql2": "^2.1.0", "pg": "^8.2.1", @@ -49,11 +57,10 @@ "promise.allsettled": "^1.0.2" }, "devDependencies": { - "@types/btoa": "^1.2.3", "@types/express": "^4.17.6", - "@types/promise.allsettled": "^1.0.3", - "@types/supertest": "^2.0.9", - "supertest": "^4.0.2", + "@types/supertest": "^2.0.12", + "sqlite3": "^5.0.8", + "supertest": "^6.2.3", "ts-mockito": "^2.6.1", "ts-node": "^8.3.0", "typescript": "4.4.3" diff --git a/packages/phone-number-privacy/signer/scripts/poprf-keygen.ts b/packages/phone-number-privacy/signer/scripts/poprf-keygen.ts new file mode 100644 index 00000000000..313e257f856 --- /dev/null +++ b/packages/phone-number-privacy/signer/scripts/poprf-keygen.ts @@ -0,0 +1,21 @@ +// tslint:disable: no-console +import * as poprf from '@celo/poprf' +import crypto from 'crypto' + +const t = 2 +const n = 3 +console.log('Creating POPRF Threshold BLS keypairs with %s/%s ratio...', t, n) +console.log('USE ONLY FOR DEVELOPMENT OR TESTING') + +const seed = crypto.randomBytes(32) +const keys = poprf.thresholdKeygen(n, t, seed) +console.log('Private keys (hex):') +for (let i = 0; i < keys.numShares(); i++) { + console.log('Key #%s: %s', i + 1, Buffer.from(keys.getShare(i)).toString('hex')) +} + +console.log('Threshold Public key (base64):') +console.log(Buffer.from(keys.thresholdPublicKey).toString('base64')) + +console.log('Polynomial (hex):') +console.log(Buffer.from(keys.polynomial).toString('hex')) diff --git a/packages/phone-number-privacy/signer/scripts/run-migrations.ts b/packages/phone-number-privacy/signer/scripts/run-migrations.ts index 1ed642c5f3a..583e13b6b29 100644 --- a/packages/phone-number-privacy/signer/scripts/run-migrations.ts +++ b/packages/phone-number-privacy/signer/scripts/run-migrations.ts @@ -1,10 +1,12 @@ // tslint:disable: no-console -import { initDatabase } from '../src/database/database' + +import { initDatabase } from '../src/common/database/database' +import { config } from '../src/config' async function start() { console.info('Running migrations') console.warn('It is no longer necessary to run db migrations seperately prior to startup') - await initDatabase(false) + await initDatabase(config, undefined, false) } start() diff --git a/packages/phone-number-privacy/signer/scripts/create-bls-keys.ts b/packages/phone-number-privacy/signer/scripts/threshold-bls-keygen.ts similarity index 70% rename from packages/phone-number-privacy/signer/scripts/create-bls-keys.ts rename to packages/phone-number-privacy/signer/scripts/threshold-bls-keygen.ts index ea972d78f12..cc5172604ba 100644 --- a/packages/phone-number-privacy/signer/scripts/create-bls-keys.ts +++ b/packages/phone-number-privacy/signer/scripts/threshold-bls-keygen.ts @@ -2,9 +2,9 @@ import threshold_bls from 'blind-threshold-bls' import crypto from 'crypto' -const t = 3 -const n = 4 -console.log('Creating Threshold BLS keypairs with %s/%s ratio...', t, n) +const t = 2 +const n = 3 +console.log('Creating OPRF Threshold BLS keypairs with %s/%s ratio...', t, n) console.log('USE ONLY FOR DEVELOPMENT OR TESTING') const seed = crypto.randomBytes(32) @@ -14,8 +14,8 @@ for (let i = 0; i < keys.numShares(); i++) { console.log('Key #%s: %s', i + 1, Buffer.from(keys.getShare(i)).toString('hex')) } -console.log('Threshold Public key (hex):') -console.log(Buffer.from(keys.thresholdPublicKey).toString('hex')) +console.log('Threshold Public key (base64):') +console.log(Buffer.from(keys.thresholdPublicKey).toString('base64')) console.log('Polynomial (hex):') console.log(Buffer.from(keys.polynomial).toString('hex')) diff --git a/packages/phone-number-privacy/signer/src/common/action.ts b/packages/phone-number-privacy/signer/src/common/action.ts new file mode 100644 index 00000000000..7b77c4b38eb --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/action.ts @@ -0,0 +1,21 @@ +import { + DomainRequest, + OdisRequest, + PhoneNumberPrivacyRequest, +} from '@celo/phone-number-privacy-common' +import { SignerConfig } from '../config' +import { DomainSession } from '../domain/session' +import { PnpSession } from '../pnp/session' +import { IO } from './io' + +export type Session = R extends DomainRequest + ? DomainSession + : never | R extends PhoneNumberPrivacyRequest + ? PnpSession + : never + +export interface Action { + readonly config: SignerConfig + readonly io: IO + perform(session: Session, timeoutError: symbol): Promise +} diff --git a/packages/phone-number-privacy/signer/src/bls/bls-cryptography-client.ts b/packages/phone-number-privacy/signer/src/common/bls/bls-cryptography-client.ts similarity index 83% rename from packages/phone-number-privacy/signer/src/bls/bls-cryptography-client.ts rename to packages/phone-number-privacy/signer/src/common/bls/bls-cryptography-client.ts index b3cbe9b006a..6e8b2d0205f 100644 --- a/packages/phone-number-privacy/signer/src/bls/bls-cryptography-client.ts +++ b/packages/phone-number-privacy/signer/src/common/bls/bls-cryptography-client.ts @@ -1,7 +1,7 @@ import { ErrorMessage } from '@celo/phone-number-privacy-common' import threshold_bls from 'blind-threshold-bls' import Logger from 'bunyan' -import { Counters } from '../common/metrics' +import { Counters } from '../metrics' /* * Computes the BLS signature for the blinded phone number. */ @@ -25,7 +25,7 @@ export function computeBlindedSignature( return Buffer.from(signedMsg).toString('base64') } catch (err) { Counters.signatureComputationErrors.inc() - logger.error(ErrorMessage.SIGNATURE_COMPUTATION_FAILURE) - throw err + logger.error({ err }, ErrorMessage.SIGNATURE_COMPUTATION_FAILURE) + throw new Error(ErrorMessage.SIGNATURE_COMPUTATION_FAILURE) } } diff --git a/packages/phone-number-privacy/signer/src/common/controller.ts b/packages/phone-number-privacy/signer/src/common/controller.ts new file mode 100644 index 00000000000..1854f930f20 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/controller.ts @@ -0,0 +1,52 @@ +import { + ErrorMessage, + ErrorType, + OdisRequest, + OdisResponse, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import { Action } from './action' +import { Counters, Histograms, meter } from './metrics' + +export class Controller { + constructor(readonly action: Action) {} + + public async handle( + request: Request<{}, {}, unknown>, + response: Response> + ): Promise { + Counters.requests.labels(this.action.io.endpoint).inc() + // Unique error to be thrown on timeout + const timeoutError = Symbol() + await meter( + async () => { + const session = await this.action.io.init(request, response) + // Init returns a response to the user internally. + if (session) { + await this.action.perform(session, timeoutError) + } + }, + [], + (err: any) => { + response.locals.logger.error({ err }, `Error in handler for ${this.action.io.endpoint}`) + + let errMsg: ErrorType = ErrorMessage.UNKNOWN_ERROR + if (err === timeoutError) { + Counters.timeouts.inc() + errMsg = ErrorMessage.TIMEOUT_FROM_SIGNER + } else if ( + err instanceof Error && + // Propagate standard error & warning messages thrown during endpoint handling + (Object.values(ErrorMessage).includes(err.message as ErrorMessage) || + Object.values(WarningMessage).includes(err.message as WarningMessage)) + ) { + errMsg = err.message as ErrorType + } + this.action.io.sendFailure(errMsg, 500, response) + }, + Histograms.responseLatency, + [this.action.io.endpoint] + ) + } +} diff --git a/packages/phone-number-privacy/signer/src/database/database.ts b/packages/phone-number-privacy/signer/src/common/database/database.ts similarity index 51% rename from packages/phone-number-privacy/signer/src/database/database.ts rename to packages/phone-number-privacy/signer/src/common/database/database.ts index b5204a55bfd..cee48e7f7dc 100644 --- a/packages/phone-number-privacy/signer/src/database/database.ts +++ b/packages/phone-number-privacy/signer/src/common/database/database.ts @@ -1,19 +1,22 @@ -import { rootLogger as logger } from '@celo/phone-number-privacy-common' -import knex from 'knex' -import Knex from 'knex/types' -import config, { DEV_MODE, SupportedDatabase } from '../config' +import { rootLogger } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Knex, knex } from 'knex' +import { DEV_MODE, SignerConfig, SupportedDatabase, VERBOSE_DB_LOGGING } from '../../config' import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from './models/account' -let db: Knex | undefined - -export async function initDatabase(doTestQuery = true) { - logger().info({ config: config.db }, 'Initializing database connection') +export async function initDatabase( + config: SignerConfig, + migrationsPath?: string, + doTestQuery = true +): Promise { + const logger = rootLogger(config.serviceName) + logger.info({ config: config.db }, 'Initializing database connection') const { type, host, port, user, password, database, ssl, poolMaxSize } = config.db let connection: any let client: string if (type === SupportedDatabase.Postgres) { - logger().info('Using Postgres') + logger.info('Using Postgres') client = 'pg' connection = { user, @@ -25,7 +28,7 @@ export async function initDatabase(doTestQuery = true) { pool: { max: poolMaxSize }, } } else if (type === SupportedDatabase.MySql) { - logger().info('Using MySql') + logger.info('Using MySql') client = 'mysql2' connection = { user, @@ -37,7 +40,7 @@ export async function initDatabase(doTestQuery = true) { pool: { max: poolMaxSize }, } } else if (type === SupportedDatabase.MsSql) { - logger().info('Using MS SQL') + logger.info('Using MS SQL') client = 'mssql' connection = { user, @@ -48,47 +51,38 @@ export async function initDatabase(doTestQuery = true) { pool: { max: poolMaxSize }, } } else if (type === SupportedDatabase.Sqlite) { - logger().info('Using SQLite') + logger.info('Using SQLite') client = 'sqlite3' connection = ':memory:' } else { throw new Error(`Unsupported database type: ${type}`) } - db = knex({ + const db = knex({ client, useNullAsDefault: type === SupportedDatabase.Sqlite, connection, - debug: DEV_MODE, + debug: DEV_MODE && VERBOSE_DB_LOGGING, }) - logger().info('Running Migrations') + logger.info('Running Migrations') await db.migrate.latest({ - directory: './dist/migrations', + directory: migrationsPath ?? './dist/common/database/migrations', loadExtensions: ['.js'], }) if (doTestQuery) { - await executeTestQuery(db) + await executeTestQuery(db, logger) } - logger().info('Database initialized successfully') + logger.info('Database initialized successfully') return db } -// Closes the connections to the database. -// If the database is sqlite in-memory database, the database will be destroyed. -export async function closeDatabase() { - // NOTE: If this operation is stuck (e.g. if you tests are failing because this operation causes - // them to time out) it is likely because a connection is being held open e.g. by a transaction. - await db?.destroy() - db = undefined -} - -async function executeTestQuery(_db: Knex) { - logger().info('Counting accounts') - const result = await _db(ACCOUNTS_TABLE).count(ACCOUNTS_COLUMNS.address).first() +async function executeTestQuery(db: Knex, logger: Logger) { + logger.info('Counting accounts') + const result = await db(ACCOUNTS_TABLE.LEGACY).count(ACCOUNTS_COLUMNS.address).first() if (!result) { throw new Error('No result from count, have migrations been run?') @@ -99,13 +93,5 @@ async function executeTestQuery(_db: Knex) { throw new Error('No result from count, have migrations been run?') } - logger().info(`Found ${count} accounts`) -} - -export function getDatabase() { - if (!db) { - throw new Error('Database not yet initialized') - } - - return db + logger.info(`Found ${count} accounts`) } diff --git a/packages/phone-number-privacy/signer/src/migrations/20200330212224_create-accounts-table.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20200330212224_create-accounts-table.ts similarity index 55% rename from packages/phone-number-privacy/signer/src/migrations/20200330212224_create-accounts-table.ts rename to packages/phone-number-privacy/signer/src/common/database/migrations/20200330212224_create-accounts-table.ts index 2a2365422b5..fae5a17ca13 100644 --- a/packages/phone-number-privacy/signer/src/migrations/20200330212224_create-accounts-table.ts +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20200330212224_create-accounts-table.ts @@ -1,19 +1,18 @@ -import * as Knex from 'knex' -import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../database/models/account' +import { Knex } from 'knex' +import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../models/account' export async function up(knex: Knex): Promise { // This check was necessary to switch from using .ts migrations to .js migrations. - if (!(await knex.schema.hasTable(ACCOUNTS_TABLE))) { - return knex.schema.createTable(ACCOUNTS_TABLE, (t) => { + if (!(await knex.schema.hasTable(ACCOUNTS_TABLE.LEGACY))) { + return knex.schema.createTable(ACCOUNTS_TABLE.LEGACY, (t) => { t.string(ACCOUNTS_COLUMNS.address).notNullable().primary() t.dateTime(ACCOUNTS_COLUMNS.createdAt).notNullable() t.integer(ACCOUNTS_COLUMNS.numLookups).unsigned() - t.dateTime(ACCOUNTS_COLUMNS.didMatchmaking) }) } return null } export async function down(knex: Knex): Promise { - return knex.schema.dropTable(ACCOUNTS_TABLE) + return knex.schema.dropTable(ACCOUNTS_TABLE.LEGACY) } diff --git a/packages/phone-number-privacy/signer/src/migrations/20200811163913_create_requests_table.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20200811163913_create_requests_table.ts similarity index 65% rename from packages/phone-number-privacy/signer/src/migrations/20200811163913_create_requests_table.ts rename to packages/phone-number-privacy/signer/src/common/database/migrations/20200811163913_create_requests_table.ts index 4534fa6b8d3..8c8014725d5 100644 --- a/packages/phone-number-privacy/signer/src/migrations/20200811163913_create_requests_table.ts +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20200811163913_create_requests_table.ts @@ -1,10 +1,10 @@ -import * as Knex from 'knex' -import { REQUESTS_COLUMNS, REQUESTS_TABLE } from '../database/models/request' +import { Knex } from 'knex' +import { REQUESTS_COLUMNS, REQUESTS_TABLE } from '../models/request' export async function up(knex: Knex): Promise { // This check was necessary to switch from using .ts migrations to .js migrations. - if (!(await knex.schema.hasTable(REQUESTS_TABLE))) { - return knex.schema.createTable(REQUESTS_TABLE, (t) => { + if (!(await knex.schema.hasTable(REQUESTS_TABLE.LEGACY))) { + return knex.schema.createTable(REQUESTS_TABLE.LEGACY, (t) => { t.string(REQUESTS_COLUMNS.address).notNullable() t.dateTime(REQUESTS_COLUMNS.timestamp).notNullable() t.string(REQUESTS_COLUMNS.blindedQuery).notNullable() @@ -19,5 +19,5 @@ export async function up(knex: Knex): Promise { } export async function down(knex: Knex): Promise { - return knex.schema.dropTable(REQUESTS_TABLE) + return knex.schema.dropTable(REQUESTS_TABLE.LEGACY) } diff --git a/packages/phone-number-privacy/signer/src/common/database/migrations/20210421212301_create-indices.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20210421212301_create-indices.ts new file mode 100644 index 00000000000..94672330d33 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20210421212301_create-indices.ts @@ -0,0 +1,17 @@ +import { Knex } from 'knex' +import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../models/account' + +export async function up(knex: Knex): Promise { + if (!(await knex.schema.hasTable(ACCOUNTS_TABLE.LEGACY))) { + throw new Error('Unexpected error: Could not find ACCOUNTS_TABLE.LEGACY') + } + return knex.schema.alterTable(ACCOUNTS_TABLE.LEGACY, (t) => { + t.index(ACCOUNTS_COLUMNS.address) + }) +} + +export async function down(knex: Knex): Promise { + return knex.schema.alterTable(ACCOUNTS_TABLE.LEGACY, (t) => { + t.dropIndex(ACCOUNTS_COLUMNS.address) + }) +} diff --git a/packages/phone-number-privacy/signer/src/common/database/migrations/20210921173354_create-domain-state.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20210921173354_create-domain-state.ts new file mode 100644 index 00000000000..cb8c7406e2d --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20210921173354_create-domain-state.ts @@ -0,0 +1,22 @@ +import { Knex } from 'knex' +import { DOMAIN_STATE_COLUMNS } from '../models/domain-state' + +export async function up(knex: Knex): Promise { + // Due to a name change, the old migration uses the old names of these tables + // The change-name-domain-state migration then updates the name + // to match the value stored in DOMAIN_STATE_TABLE + if (!(await knex.schema.hasTable('domainsStates'))) { + return knex.schema.createTable('domainsStates', (t) => { + t.string(DOMAIN_STATE_COLUMNS.domainHash).notNullable().primary() + t.integer(DOMAIN_STATE_COLUMNS.counter).nullable() + t.boolean(DOMAIN_STATE_COLUMNS.disabled).notNullable().defaultTo(false) + t.integer(DOMAIN_STATE_COLUMNS.timer).nullable() + }) + } + + return null +} + +export async function down(knex: Knex): Promise { + return knex.schema.dropTable('domainsStates') +} diff --git a/packages/phone-number-privacy/signer/src/common/database/migrations/20220119165335_domain-requests.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20220119165335_domain-requests.ts new file mode 100644 index 00000000000..d5873ba0803 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20220119165335_domain-requests.ts @@ -0,0 +1,26 @@ +import { Knex } from 'knex' +import { DOMAIN_REQUESTS_COLUMNS, DOMAIN_REQUESTS_TABLE } from '../models/domain-request' + +export async function up(knex: Knex): Promise { + if (!(await knex.schema.hasTable(DOMAIN_REQUESTS_TABLE))) { + return knex.schema.createTable(DOMAIN_REQUESTS_TABLE, (t) => { + t.string(DOMAIN_REQUESTS_COLUMNS.domainHash).notNullable() + // Note: this field was nullable in an older version of the migration. + // More context is included as part of this issue: + // https://github.com/celo-org/celo-monorepo/issues/9909 + t.dateTime(DOMAIN_REQUESTS_COLUMNS.timestamp).notNullable() + t.string(DOMAIN_REQUESTS_COLUMNS.blindedMessage).notNullable() + t.primary([ + DOMAIN_REQUESTS_COLUMNS.domainHash, + DOMAIN_REQUESTS_COLUMNS.timestamp, + DOMAIN_REQUESTS_COLUMNS.blindedMessage, + ]) + }) + } + + return null +} + +export async function down(knex: Knex): Promise { + return knex.schema.dropTable(DOMAIN_REQUESTS_TABLE) +} diff --git a/packages/phone-number-privacy/signer/src/common/database/migrations/20220923161710_pnp-requests-onchain.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20220923161710_pnp-requests-onchain.ts new file mode 100644 index 00000000000..9e1dd91184e --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20220923161710_pnp-requests-onchain.ts @@ -0,0 +1,22 @@ +import { Knex } from 'knex' +import { REQUESTS_COLUMNS, REQUESTS_TABLE } from '../models/request' + +export async function up(knex: Knex): Promise { + if (!(await knex.schema.hasTable(REQUESTS_TABLE.ONCHAIN))) { + return knex.schema.createTable(REQUESTS_TABLE.ONCHAIN, (t) => { + t.string(REQUESTS_COLUMNS.address).notNullable() + t.dateTime(REQUESTS_COLUMNS.timestamp).notNullable() + t.string(REQUESTS_COLUMNS.blindedQuery).notNullable() + t.primary([ + REQUESTS_COLUMNS.address, + REQUESTS_COLUMNS.timestamp, + REQUESTS_COLUMNS.blindedQuery, + ]) + }) + } + return null +} + +export async function down(knex: Knex): Promise { + return knex.schema.dropTable(REQUESTS_TABLE.ONCHAIN) +} diff --git a/packages/phone-number-privacy/signer/src/common/database/migrations/20220923165433_pnp-accounts-onchain.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20220923165433_pnp-accounts-onchain.ts new file mode 100644 index 00000000000..8e3d3e16843 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20220923165433_pnp-accounts-onchain.ts @@ -0,0 +1,18 @@ +import { Knex } from 'knex' +import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../models/account' + +export async function up(knex: Knex): Promise { + // This check was necessary to switch from using .ts migrations to .js migrations. + if (!(await knex.schema.hasTable(ACCOUNTS_TABLE.ONCHAIN))) { + return knex.schema.createTable(ACCOUNTS_TABLE.ONCHAIN, (t) => { + t.string(ACCOUNTS_COLUMNS.address).notNullable().primary().index() + t.dateTime(ACCOUNTS_COLUMNS.createdAt).notNullable() + t.integer(ACCOUNTS_COLUMNS.numLookups).unsigned() + }) + } + return null +} + +export async function down(knex: Knex): Promise { + return knex.schema.dropTable(ACCOUNTS_TABLE.ONCHAIN) +} diff --git a/packages/phone-number-privacy/signer/src/common/database/migrations/20221102141044_change-name-domain-state.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20221102141044_change-name-domain-state.ts new file mode 100644 index 00000000000..d1515a40f37 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20221102141044_change-name-domain-state.ts @@ -0,0 +1,11 @@ +import { Knex } from 'knex' +import { DOMAIN_STATE_TABLE } from '../models/domain-state' + +// The original create-domain-state migration used a different name for DOMAIN_STATE_TABLE +export async function up(knex: Knex): Promise { + return knex.schema.renameTable('domainsStates', DOMAIN_STATE_TABLE) +} + +export async function down(knex: Knex): Promise { + return knex.schema.renameTable(DOMAIN_STATE_TABLE, 'domainsStates') +} diff --git a/packages/phone-number-privacy/signer/src/common/database/migrations/20221213125526_add-constraint-domain-requests.ts b/packages/phone-number-privacy/signer/src/common/database/migrations/20221213125526_add-constraint-domain-requests.ts new file mode 100644 index 00000000000..b86ff3c083d --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/migrations/20221213125526_add-constraint-domain-requests.ts @@ -0,0 +1,20 @@ +import { Knex } from 'knex' +import { DOMAIN_REQUESTS_COLUMNS, DOMAIN_REQUESTS_TABLE } from '../models/domain-request' + +// The goal of this migration is to ensure that the timestamp column is +// not nullable, to make sure that all signers' DB states end up in the same place +// despite the required change in the old migration from nullable -> nonNullable +// for the timestamp column (due to errors in MySQL). +// Revisit all of this when returning to: +// https://github.com/celo-org/celo-monorepo/issues/9909 +export async function up(knex: Knex): Promise { + return knex.schema.alterTable(DOMAIN_REQUESTS_TABLE, (t) => { + t.dropNullable(DOMAIN_REQUESTS_COLUMNS.timestamp) + }) +} + +export async function down(knex: Knex): Promise { + return knex.schema.alterTable(DOMAIN_REQUESTS_TABLE, (t) => { + t.setNullable(DOMAIN_REQUESTS_COLUMNS.timestamp) + }) +} diff --git a/packages/phone-number-privacy/signer/src/common/database/models/account.ts b/packages/phone-number-privacy/signer/src/common/database/models/account.ts new file mode 100644 index 00000000000..aab8bd3444b --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/models/account.ts @@ -0,0 +1,24 @@ +export enum ACCOUNTS_TABLE { + ONCHAIN = 'accountsOnChain', + LEGACY = 'accounts', +} + +export enum ACCOUNTS_COLUMNS { + address = 'address', + createdAt = 'created_at', + numLookups = 'num_lookups', +} + +export interface AccountRecord { + [ACCOUNTS_COLUMNS.address]: string + [ACCOUNTS_COLUMNS.createdAt]: Date + [ACCOUNTS_COLUMNS.numLookups]: number +} + +export function toAccountRecord(account: string, numLookups: number): AccountRecord { + return { + [ACCOUNTS_COLUMNS.address]: account, + [ACCOUNTS_COLUMNS.createdAt]: new Date(), + [ACCOUNTS_COLUMNS.numLookups]: numLookups, + } +} diff --git a/packages/phone-number-privacy/signer/src/common/database/models/domain-request.ts b/packages/phone-number-privacy/signer/src/common/database/models/domain-request.ts new file mode 100644 index 00000000000..84a3a6fd959 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/models/domain-request.ts @@ -0,0 +1,25 @@ +import { Domain, domainHash } from '@celo/phone-number-privacy-common' + +export const DOMAIN_REQUESTS_TABLE = 'domainRequests' +export enum DOMAIN_REQUESTS_COLUMNS { + domainHash = 'domainHash', + timestamp = 'timestamp', + blindedMessage = 'blinded_message', +} + +export interface DomainRequestRecord { + [DOMAIN_REQUESTS_COLUMNS.domainHash]: string + [DOMAIN_REQUESTS_COLUMNS.timestamp]: Date + [DOMAIN_REQUESTS_COLUMNS.blindedMessage]: string +} + +export function toDomainRequestRecord( + domain: D, + blindedMessage: string +): DomainRequestRecord { + return { + [DOMAIN_REQUESTS_COLUMNS.domainHash]: domainHash(domain).toString('hex'), + [DOMAIN_REQUESTS_COLUMNS.timestamp]: new Date(), + [DOMAIN_REQUESTS_COLUMNS.blindedMessage]: blindedMessage, + } +} diff --git a/packages/phone-number-privacy/signer/src/common/database/models/domain-state.ts b/packages/phone-number-privacy/signer/src/common/database/models/domain-state.ts new file mode 100644 index 00000000000..ae1a964eced --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/models/domain-state.ts @@ -0,0 +1,46 @@ +import { + Domain, + domainHash, + DomainState, + SequentialDelayDomainState, +} from '@celo/phone-number-privacy-common/lib/domains' + +export const DOMAIN_STATE_TABLE = 'domainState' +export enum DOMAIN_STATE_COLUMNS { + domainHash = 'domainHash', + counter = 'counter', + timer = 'timer', + disabled = 'disabled', +} + +export interface DomainStateRecord { + [DOMAIN_STATE_COLUMNS.domainHash]: string + [DOMAIN_STATE_COLUMNS.disabled]: boolean + [DOMAIN_STATE_COLUMNS.counter]: number + [DOMAIN_STATE_COLUMNS.timer]: number +} + +export function toDomainStateRecord( + domain: D, + domainState: DomainState +): DomainStateRecord { + return { + [DOMAIN_STATE_COLUMNS.domainHash]: domainHash(domain).toString('hex'), + [DOMAIN_STATE_COLUMNS.disabled]: domainState.disabled, + [DOMAIN_STATE_COLUMNS.counter]: domainState.counter, + [DOMAIN_STATE_COLUMNS.timer]: domainState.timer, + } +} + +export function toSequentialDelayDomainState( + record: DomainStateRecord, + attemptTime?: number +): SequentialDelayDomainState { + return { + disabled: record[DOMAIN_STATE_COLUMNS.disabled], + counter: record[DOMAIN_STATE_COLUMNS.counter], + timer: record[DOMAIN_STATE_COLUMNS.timer], + // Timestamp precision is lowered to seconds to reduce the chance of effective timing attacks. + now: attemptTime ?? Math.floor(Date.now() / 1000), + } +} diff --git a/packages/phone-number-privacy/signer/src/common/database/models/request.ts b/packages/phone-number-privacy/signer/src/common/database/models/request.ts new file mode 100644 index 00000000000..dcdb5ae5f75 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/models/request.ts @@ -0,0 +1,27 @@ +export enum REQUESTS_TABLE { + LEGACY = 'requests', + ONCHAIN = 'requestsOnChain', +} + +export enum REQUESTS_COLUMNS { + address = 'caller_address', + timestamp = 'timestamp', + blindedQuery = 'blinded_query', +} + +export interface PnpSignRequestRecord { + [REQUESTS_COLUMNS.address]: string + [REQUESTS_COLUMNS.timestamp]: Date + [REQUESTS_COLUMNS.blindedQuery]: string +} + +export function toPnpSignRequestRecord( + account: string, + blindedQuery: string +): PnpSignRequestRecord { + return { + [REQUESTS_COLUMNS.address]: account, + [REQUESTS_COLUMNS.timestamp]: new Date(), + [REQUESTS_COLUMNS.blindedQuery]: blindedQuery, + } +} diff --git a/packages/phone-number-privacy/signer/src/common/database/utils.ts b/packages/phone-number-privacy/signer/src/common/database/utils.ts new file mode 100644 index 00000000000..4d2f8c03eef --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/utils.ts @@ -0,0 +1,42 @@ +import { ErrorMessage } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Knex } from 'knex' +import { Counters, Labels } from '../metrics' + +export type DatabaseErrorMessage = + | ErrorMessage.DATABASE_GET_FAILURE + | ErrorMessage.DATABASE_INSERT_FAILURE + | ErrorMessage.DATABASE_UPDATE_FAILURE + +export function countAndThrowDBError( + err: any, + logger: Logger, + errorMsg: DatabaseErrorMessage +): T { + let label: Labels + switch (errorMsg) { + case ErrorMessage.DATABASE_UPDATE_FAILURE: + label = Labels.UPDATE + break + case ErrorMessage.DATABASE_GET_FAILURE: + label = Labels.READ + break + case ErrorMessage.DATABASE_INSERT_FAILURE: + label = Labels.INSERT + break + default: + throw new Error('Unknown database label provided') + } + + Counters.databaseErrors.labels(label).inc() + logger.error({ err }, errorMsg) + throw new Error(errorMsg) +} + +export function tableWithLockForTrx(baseQuery: Knex.QueryBuilder, trx?: Knex.Transaction) { + if (trx) { + // Lock relevant database rows for the duration of the transaction + return baseQuery.transacting(trx).forUpdate() + } + return baseQuery +} diff --git a/packages/phone-number-privacy/signer/src/common/database/wrappers/account.ts b/packages/phone-number-privacy/signer/src/common/database/wrappers/account.ts new file mode 100644 index 00000000000..b40af283d4c --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/wrappers/account.ts @@ -0,0 +1,105 @@ +import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Knex } from 'knex' +import { Histograms, meter } from '../../metrics' +import { AccountRecord, ACCOUNTS_COLUMNS, ACCOUNTS_TABLE, toAccountRecord } from '../models/account' +import { countAndThrowDBError, tableWithLockForTrx } from '../utils' + +function accounts(db: Knex, table: ACCOUNTS_TABLE) { + return db(table) +} + +/* + * Returns how many queries the account has already performed. + */ +export async function getPerformedQueryCount( + db: Knex, + accountsTable: ACCOUNTS_TABLE, + account: string, + logger: Logger, + trx?: Knex.Transaction +): Promise { + return meter( + async () => { + logger.debug({ account }, 'Getting performed query count') + const queryCounts = await tableWithLockForTrx(accounts(db, accountsTable), trx) + .select(ACCOUNTS_COLUMNS.numLookups) + .where(ACCOUNTS_COLUMNS.address, account) + .first() + .timeout(DB_TIMEOUT) + return queryCounts === undefined ? 0 : queryCounts[ACCOUNTS_COLUMNS.numLookups] + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_GET_FAILURE), + Histograms.dbOpsInstrumentation, + ['getPerformedQueryCount'] + ) +} + +async function getAccountExists( + db: Knex, + accountsTable: ACCOUNTS_TABLE, + account: string, + logger: Logger, + trx?: Knex.Transaction +): Promise { + return meter( + async () => { + const accountRecord = await tableWithLockForTrx(accounts(db, accountsTable), trx) + .where(ACCOUNTS_COLUMNS.address, account) + .first() + .timeout(DB_TIMEOUT) + + return !!accountRecord + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_GET_FAILURE), + Histograms.dbOpsInstrumentation, + ['getAccountExists'] + ) +} + +/* + * Increments query count in database. If record doesn't exist, create one. + */ +export async function incrementQueryCount( + db: Knex, + accountsTable: ACCOUNTS_TABLE, + account: string, + logger: Logger, + trx: Knex.Transaction +): Promise { + return meter( + async () => { + logger.debug({ account }, 'Incrementing query count') + if (await getAccountExists(db, accountsTable, account, logger, trx)) { + await accounts(db, accountsTable) + .transacting(trx) + .where(ACCOUNTS_COLUMNS.address, account) + .increment(ACCOUNTS_COLUMNS.numLookups, 1) + .timeout(DB_TIMEOUT) + } else { + const newAccountRecord = toAccountRecord(account, 1) + await insertRecord(db, accountsTable, newAccountRecord, logger, trx) + } + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_UPDATE_FAILURE), + Histograms.dbOpsInstrumentation, + ['incrementQueryCount'] + ) +} + +async function insertRecord( + db: Knex, + accountsTable: ACCOUNTS_TABLE, + data: AccountRecord, + logger: Logger, + trx: Knex.Transaction +): Promise { + try { + await accounts(db, accountsTable).transacting(trx).insert(data).timeout(DB_TIMEOUT) + } catch (error) { + countAndThrowDBError(error, logger, ErrorMessage.DATABASE_INSERT_FAILURE) + } +} diff --git a/packages/phone-number-privacy/signer/src/common/database/wrappers/domain-request.ts b/packages/phone-number-privacy/signer/src/common/database/wrappers/domain-request.ts new file mode 100644 index 00000000000..3ce83ccfc67 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/wrappers/domain-request.ts @@ -0,0 +1,68 @@ +import { DB_TIMEOUT, Domain, domainHash, ErrorMessage } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Knex } from 'knex' +import { Histograms, meter } from '../../metrics' +import { + DOMAIN_REQUESTS_COLUMNS, + DOMAIN_REQUESTS_TABLE, + DomainRequestRecord, + toDomainRequestRecord, +} from '../models/domain-request' +import { countAndThrowDBError } from '../utils' + +// TODO implement replay handling; this file is currently unused +// https://github.com/celo-org/celo-monorepo/issues/9909 + +function domainRequests(db: Knex) { + return db(DOMAIN_REQUESTS_TABLE) +} + +export async function getDomainRequestRecordExists( + db: Knex, + domain: D, + blindedMessage: string, + trx: Knex.Transaction, + logger: Logger +): Promise { + return meter( + async () => { + const hash = domainHash(domain).toString('hex') + logger.debug({ domain, blindedMessage, hash }, 'Checking if domain request exists') + const existingRequest = await domainRequests(db) + .transacting(trx) + .where({ + [DOMAIN_REQUESTS_COLUMNS.domainHash]: hash, + [DOMAIN_REQUESTS_COLUMNS.blindedMessage]: blindedMessage, + }) + .first() + .timeout(DB_TIMEOUT) + return !!existingRequest + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_GET_FAILURE), + Histograms.dbOpsInstrumentation, + ['getDomainRequestRecordExists'] + ) +} + +export async function storeDomainRequestRecord( + db: Knex, + domain: D, + blindedMessage: string, + trx: Knex.Transaction, + logger: Logger +) { + return meter( + async () => { + logger.debug({ domain, blindedMessage }, 'Storing domain restricted signature request') + await domainRequests(db) + .transacting(trx) + .insert(toDomainRequestRecord(domain, blindedMessage)) + .timeout(DB_TIMEOUT) + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_INSERT_FAILURE), + Histograms.dbOpsInstrumentation, + ['storeDomainRequestRecord'] + ) +} diff --git a/packages/phone-number-privacy/signer/src/common/database/wrappers/domain-state.ts b/packages/phone-number-privacy/signer/src/common/database/wrappers/domain-state.ts new file mode 100644 index 00000000000..2c87d23db43 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/wrappers/domain-state.ts @@ -0,0 +1,141 @@ +import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' +import { Domain, domainHash } from '@celo/phone-number-privacy-common/lib/domains' +import Logger from 'bunyan' +import { Knex } from 'knex' +import { Histograms, meter } from '../../metrics' +import { + DOMAIN_STATE_COLUMNS, + DOMAIN_STATE_TABLE, + DomainStateRecord, + toDomainStateRecord, +} from '../models/domain-state' +import { countAndThrowDBError, tableWithLockForTrx } from '../utils' + +function domainStates(db: Knex) { + return db(DOMAIN_STATE_TABLE) +} + +export async function setDomainDisabled( + db: Knex, + domain: D, + trx: Knex.Transaction, + logger: Logger +): Promise { + return meter( + async () => { + const hash = domainHash(domain).toString('hex') + logger.debug({ hash, domain }, 'Disabling domain') + await domainStates(db) + .transacting(trx) + .where(DOMAIN_STATE_COLUMNS.domainHash, hash) + .update(DOMAIN_STATE_COLUMNS.disabled, true) + .timeout(DB_TIMEOUT) + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_UPDATE_FAILURE), + Histograms.dbOpsInstrumentation, + ['disableDomain'] + ) +} + +export async function getDomainStateRecordOrEmpty( + db: Knex, + domain: Domain, + logger: Logger, + trx?: Knex.Transaction +): Promise { + return ( + (await getDomainStateRecord(db, domain, logger, trx)) ?? createEmptyDomainStateRecord(domain) + ) +} + +export function createEmptyDomainStateRecord(domain: Domain, disabled: boolean = false) { + return toDomainStateRecord(domain, { + timer: 0, + counter: 0, + disabled, + now: 0, + }) +} + +export async function getDomainStateRecord( + db: Knex, + domain: D, + logger: Logger, + trx?: Knex.Transaction +): Promise { + return meter( + async () => { + const hash = domainHash(domain).toString('hex') + logger.debug({ hash, domain }, 'Getting domain state from db') + const result = await tableWithLockForTrx(domainStates(db), trx) + .where(DOMAIN_STATE_COLUMNS.domainHash, hash) + .first() + .timeout(DB_TIMEOUT) + + // bools are stored in db as ints (1 or 0), so we must cast them back + if (result) { + result.disabled = !!result.disabled + } + + return result ?? null + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_GET_FAILURE), + Histograms.dbOpsInstrumentation, + ['getDomainStateRecord'] + ) +} + +export async function updateDomainStateRecord( + db: Knex, + domain: D, + domainState: DomainStateRecord, + trx: Knex.Transaction, + logger: Logger +): Promise { + return meter( + async () => { + const hash = domainHash(domain).toString('hex') + logger.debug({ hash, domain, domainState }, 'Update domain state') + // Check whether the domain is already in the database. + // The current signature flow results in redundant queries of the domain state. + // Consider optimizing in the future: https://github.com/celo-org/celo-monorepo/issues/9855 + const result = await getDomainStateRecord(db, domain, logger, trx) + + // Insert or update the domain state record. + if (!result) { + await insertDomainStateRecord(db, domainState, trx, logger) + } else { + await domainStates(db) + .transacting(trx) + .where(DOMAIN_STATE_COLUMNS.domainHash, hash) + .update(domainState) + .timeout(DB_TIMEOUT) + } + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_UPDATE_FAILURE), + Histograms.dbOpsInstrumentation, + ['updateDomainStateRecord'] + ) +} + +export async function insertDomainStateRecord( + db: Knex, + domainState: DomainStateRecord, + trx: Knex.Transaction, + logger: Logger +): Promise { + return meter( + async () => { + logger.debug({ domainState }, 'Insert domain state') + await domainStates(db).transacting(trx).insert(domainState).timeout(DB_TIMEOUT) + return domainState + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_INSERT_FAILURE), + Histograms.dbOpsInstrumentation, + ['insertDomainState'] + ) +} diff --git a/packages/phone-number-privacy/signer/src/common/database/wrappers/request.ts b/packages/phone-number-privacy/signer/src/common/database/wrappers/request.ts new file mode 100644 index 00000000000..6e90960ffb7 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/database/wrappers/request.ts @@ -0,0 +1,67 @@ +import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Knex } from 'knex' +import { Histograms, meter } from '../../metrics' +import { + PnpSignRequestRecord, + REQUESTS_COLUMNS, + REQUESTS_TABLE, + toPnpSignRequestRecord, +} from '../models/request' +import { countAndThrowDBError, tableWithLockForTrx } from '../utils' + +function requests(db: Knex, table: REQUESTS_TABLE) { + return db(table) +} + +export async function getRequestExists( + db: Knex, + requestsTable: REQUESTS_TABLE, + account: string, + blindedQuery: string, + logger: Logger, + trx?: Knex.Transaction +): Promise { + return meter( + async () => { + logger.debug( + `Checking if request exists for account: ${account}, blindedQuery: ${blindedQuery}` + ) + const existingRequest = await tableWithLockForTrx(requests(db, requestsTable), trx) + .where({ + [REQUESTS_COLUMNS.address]: account, + [REQUESTS_COLUMNS.blindedQuery]: blindedQuery, + }) + .first() + .timeout(DB_TIMEOUT) + return !!existingRequest + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_GET_FAILURE), + Histograms.dbOpsInstrumentation, + ['getRequestExists'] + ) +} + +export async function storeRequest( + db: Knex, + requestsTable: REQUESTS_TABLE, + account: string, + blindedQuery: string, + logger: Logger, + trx: Knex.Transaction +): Promise { + return meter( + async () => { + logger.debug(`Storing salt request for: ${account}, blindedQuery: ${blindedQuery}`) + await requests(db, requestsTable) + .transacting(trx) + .insert(toPnpSignRequestRecord(account, blindedQuery)) + .timeout(DB_TIMEOUT) + }, + [], + (err: any) => countAndThrowDBError(err, logger, ErrorMessage.DATABASE_INSERT_FAILURE), + Histograms.dbOpsInstrumentation, + ['storeRequest'] + ) +} diff --git a/packages/phone-number-privacy/signer/src/common/domain/domainState.mapper.ts b/packages/phone-number-privacy/signer/src/common/domain/domainState.mapper.ts deleted file mode 100644 index 8ee165a0dae..00000000000 --- a/packages/phone-number-privacy/signer/src/common/domain/domainState.mapper.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { SequentialDelayDomainState } from '@celo/phone-number-privacy-common' -import { DOMAINS_STATES_COLUMNS, DomainStateRecord } from '../../database/models/domainState' - -export function toSequentialDelayDomainState( - domainState: DomainStateRecord -): SequentialDelayDomainState { - return { - counter: domainState[DOMAINS_STATES_COLUMNS.counter]!, - timer: domainState[DOMAINS_STATES_COLUMNS.timer]!, - disabled: domainState[DOMAINS_STATES_COLUMNS.disabled]!, - } -} diff --git a/packages/phone-number-privacy/signer/src/common/error-utils.ts b/packages/phone-number-privacy/signer/src/common/error-utils.ts deleted file mode 100644 index f353582b75b..00000000000 --- a/packages/phone-number-privacy/signer/src/common/error-utils.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { - ErrorMessage, - SignMessageResponseFailure, - WarningMessage, -} from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { Response } from 'express' -import { getVersion } from '../config' -import { Counters } from './metrics' - -export type ErrorType = ErrorMessage | WarningMessage - -export function respondWithError( - endpoint: string, - res: Response, - statusCode: number, - error: ErrorType, - performedQueryCount: number = -1, - totalQuota: number = -1, - blockNumber: number = -1, - signature?: string -) { - const response: SignMessageResponseFailure = { - success: false, - version: getVersion(), - error, - performedQueryCount, - totalQuota, - blockNumber, - signature, - } - - const logger: Logger = res.locals.logger - - if (error in WarningMessage) { - logger.warn({ error, statusCode, response }, 'Responding with warning') - } else { - logger.error({ error, statusCode, response }, 'Responding with error') - } - - Counters.responses.labels(endpoint, statusCode.toString()).inc() - res.status(statusCode).json(response) -} diff --git a/packages/phone-number-privacy/signer/src/common/io.ts b/packages/phone-number-privacy/signer/src/common/io.ts new file mode 100644 index 00000000000..96df9e8115b --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/io.ts @@ -0,0 +1,59 @@ +import { + ErrorType, + FailureResponse, + OdisRequest, + OdisResponse, + SignerEndpoint, + SuccessResponse, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import { Session } from './action' + +export abstract class IO { + abstract readonly endpoint: SignerEndpoint + + constructor(readonly enabled: boolean) {} + + abstract init( + request: Request<{}, {}, unknown>, + response: Response> + ): Promise | null> + + abstract validate(request: Request<{}, {}, unknown>): request is Request<{}, {}, R> + + abstract authenticate( + request: Request<{}, {}, R>, + warnings?: string[], + logger?: Logger + ): Promise + + abstract sendFailure( + error: ErrorType, + status: number, + response: Response>, + ...args: unknown[] + ): void + + abstract sendSuccess( + status: number, + response: Response>, + ...args: unknown[] + ): void + + protected inputChecks( + request: Request<{}, {}, unknown>, + response: Response> + ): request is Request<{}, {}, R> { + if (!this.enabled) { + this.sendFailure(WarningMessage.API_UNAVAILABLE, 503, response) + return false + } + if (!this.validate(request)) { + this.sendFailure(WarningMessage.INVALID_INPUT, 400, response) + return false + } + return true + } +} diff --git a/packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts b/packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts new file mode 100644 index 00000000000..9a6c5dfbb01 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts @@ -0,0 +1,71 @@ +import { ErrorMessage, rootLogger } from '@celo/phone-number-privacy-common' +import { SecretsManager } from 'aws-sdk' +import { config } from '../../config' +import { Key, KeyProviderBase } from './key-provider-base' + +interface SecretStringResult { + [key: string]: string +} + +export class AWSKeyProvider extends KeyProviderBase { + public async fetchPrivateKeyFromStore(key: Key) { + const logger = rootLogger(config.serviceName) + try { + // Credentials are managed by AWS client as described in https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html + const { region, secretKey } = config.keystore.aws + const client = new SecretsManager({ region }) + client.config.update({ region }) + + const customKeyVersionString = this.getCustomKeyVersionString(key) + logger.debug(`Attempting to fetch key named: ${customKeyVersionString}`) + const privateKey = await this.fetch(client, customKeyVersionString, secretKey) + this.setPrivateKey(key, privateKey) + } catch (err) { + logger.info('Error retrieving key') + logger.error(err) + throw new Error(ErrorMessage.KEY_FETCH_ERROR) + } + } + + private async fetch(client: SecretsManager, secretName: string, secretKey: string) { + // check for empty strings from undefined env vars + if (!secretName) { + throw new Error('key name is undefined') + } + + const response = await client.getSecretValue({ SecretId: secretName }).promise() + + let privateKey + if (response.SecretString) { + privateKey = this.tryParseSecretString(response.SecretString, secretKey) + } else if (response.SecretBinary) { + // @ts-ignore AWS sdk typings not quite correct + const buff = new Buffer(response.SecretBinary, 'base64') + privateKey = buff.toString('ascii') + } else { + throw new Error('Response has neither string nor binary') + } + + if (!privateKey) { + throw new Error('Secret is empty or undefined') + } + + return privateKey + } + + private tryParseSecretString(secretString: string, key: string) { + if (!secretString) { + throw new Error('Cannot parse empty string') + } + if (!key) { + throw new Error('Cannot parse secret without key') + } + + try { + const secret = JSON.parse(secretString) as SecretStringResult + return secret[key] + } catch (e) { + throw new Error('Expecting JSON, secret string is not valid JSON') + } + } +} diff --git a/packages/phone-number-privacy/signer/src/common/key-management/azure-key-provider.ts b/packages/phone-number-privacy/signer/src/common/key-management/azure-key-provider.ts new file mode 100644 index 00000000000..d6c5a675816 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/key-management/azure-key-provider.ts @@ -0,0 +1,38 @@ +import { ErrorMessage, rootLogger } from '@celo/phone-number-privacy-common' +import { AzureKeyVaultClient } from '@celo/wallet-hsm-azure' +import { config } from '../../config' +import { Key, KeyProviderBase } from './key-provider-base' + +export class AzureKeyProvider extends KeyProviderBase { + public async fetchPrivateKeyFromStore(key: Key) { + const logger = rootLogger(config.serviceName) + try { + const { vaultName } = config.keystore.azure + const client = new AzureKeyVaultClient(vaultName) + + const customKeyVersionString = this.getCustomKeyVersionString(key) + logger.debug(`Attempting to fetch key named: ${customKeyVersionString}`) + const privateKey = await this.fetch(client, customKeyVersionString) + this.setPrivateKey(key, privateKey) + } catch (err) { + logger.info('Error retrieving key') + logger.error(err) + throw new Error(ErrorMessage.KEY_FETCH_ERROR) + } + } + + private async fetch(client: AzureKeyVaultClient, secretName: string) { + // check for empty strings from undefined env vars + if (!secretName) { + throw new Error('key name is undefined') + } + + const privateKey = await client.getSecret(secretName) + + if (!privateKey) { + throw new Error('Key is empty or undefined') + } + + return privateKey + } +} diff --git a/packages/phone-number-privacy/signer/src/common/key-management/google-key-provider.ts b/packages/phone-number-privacy/signer/src/common/key-management/google-key-provider.ts new file mode 100644 index 00000000000..0d3c7f9fa08 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/key-management/google-key-provider.ts @@ -0,0 +1,47 @@ +import { ErrorMessage, rootLogger } from '@celo/phone-number-privacy-common' +import { SecretManagerServiceClient } from '@google-cloud/secret-manager/build/src/v1' +import { config } from '../../config' +import { Key, KeyProviderBase } from './key-provider-base' + +export class GoogleKeyProvider extends KeyProviderBase { + public async fetchPrivateKeyFromStore(key: Key) { + const logger = rootLogger(config.serviceName) + try { + const { projectId } = config.keystore.google + const client = new SecretManagerServiceClient() + + const customKeyName = this.getCustomKeyName(key) + const keyVersion = key.version.toString() + logger.debug(`Attempting to fetch key named: ${customKeyName}, version: ${keyVersion}`) + const privateKey = await this.fetch(client, projectId, customKeyName, keyVersion) + this.setPrivateKey(key, privateKey) + } catch (err) { + logger.info('Error retrieving key') + logger.error(err) + throw new Error(ErrorMessage.KEY_FETCH_ERROR) + } + } + + private async fetch( + client: SecretManagerServiceClient, + projectId: string, + secretName: string, + secretVersion: string + ) { + // check for empty strings from undefined env vars + if (!(projectId && secretName && secretVersion)) { + throw new Error('key name is undefined') + } + const secretID = `projects/${projectId}/secrets/${secretName}/versions/${secretVersion}` + const [versionResponse] = await client.accessSecretVersion({ name: secretID }) + + // Extract the payload as a string. + const privateKey = versionResponse?.payload?.data?.toString() + + if (!privateKey) { + throw new Error('Key is empty or undefined') + } + + return privateKey + } +} diff --git a/packages/phone-number-privacy/signer/src/common/key-management/key-provider-base.ts b/packages/phone-number-privacy/signer/src/common/key-management/key-provider-base.ts new file mode 100644 index 00000000000..db1f8e03fcd --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/key-management/key-provider-base.ts @@ -0,0 +1,70 @@ +import { config } from '../../config' + +export enum DefaultKeyName { + PHONE_NUMBER_PRIVACY = 'phoneNumberPrivacy', + DOMAINS = 'domains', +} +export interface Key { + name: DefaultKeyName + version: number +} +export interface KeyProvider { + fetchPrivateKeyFromStore: (key: Key) => Promise + getPrivateKey: (key: Key) => string + getPrivateKeyOrFetchFromStore: (key: Key) => Promise +} + +const PRIVATE_KEY_SIZE = 72 + +export abstract class KeyProviderBase implements KeyProvider { + protected privateKeys: Map + + constructor() { + this.privateKeys = new Map() + } + + public getPrivateKey(key: Key) { + const privateKey = this.privateKeys.get(this.getCustomKeyVersionString(key)) + if (!privateKey) { + throw new Error(`Private key is unavailable: ${key}`) + } + return privateKey + } + + public async getPrivateKeyOrFetchFromStore(key: Key): Promise { + if (key.version < 0) { + throw new Error('Invalid private key version. Key version must be a positive integer.') + } + try { + return this.getPrivateKey(key) + } catch { + await this.fetchPrivateKeyFromStore(key) + return this.getPrivateKey(key) + } + } + + public abstract fetchPrivateKeyFromStore(key: Key): Promise + + getCustomKeyVersionString(key: Key): string { + return `${this.getCustomKeyName(key)}-${key.version}` + } + + protected setPrivateKey(key: Key, privateKey: string) { + privateKey = privateKey ? privateKey.trim() : '' + if (privateKey.length !== PRIVATE_KEY_SIZE) { + throw new Error('Invalid private key') + } + this.privateKeys.set(this.getCustomKeyVersionString(key), privateKey) + } + + protected getCustomKeyName(key: Key) { + switch (key.name) { + case DefaultKeyName.PHONE_NUMBER_PRIVACY: + return config.keystore.keys.phoneNumberPrivacy.name || key.name + case DefaultKeyName.DOMAINS: + return config.keystore.keys.domains.name || key.name + default: + return key.name + } + } +} diff --git a/packages/phone-number-privacy/signer/src/common/key-management/key-provider.ts b/packages/phone-number-privacy/signer/src/common/key-management/key-provider.ts new file mode 100644 index 00000000000..6e6e9a384d1 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/key-management/key-provider.ts @@ -0,0 +1,52 @@ +import { rootLogger } from '@celo/phone-number-privacy-common' +import { SignerConfig, SupportedKeystore } from '../../config' +import { AWSKeyProvider } from './aws-key-provider' +import { AzureKeyProvider } from './azure-key-provider' +import { GoogleKeyProvider } from './google-key-provider' +import { DefaultKeyName, Key, KeyProvider } from './key-provider-base' +import { MockKeyProvider } from './mock-key-provider' + +export function keysToPrefetch(config: SignerConfig): Key[] { + return [ + { + name: DefaultKeyName.PHONE_NUMBER_PRIVACY, + version: config.keystore.keys.phoneNumberPrivacy.latest, + }, + { + name: DefaultKeyName.DOMAINS, + version: config.keystore.keys.domains.latest, + }, + ] +} + +export async function initKeyProvider(config: SignerConfig): Promise { + const logger = rootLogger(config.serviceName) + logger.info('Initializing keystore') + const type = config.keystore.type + + let keyProvider: KeyProvider + + if (type === SupportedKeystore.AZURE_KEY_VAULT) { + logger.info('Using Azure key vault') + keyProvider = new AzureKeyProvider() + } else if (type === SupportedKeystore.GOOGLE_SECRET_MANAGER) { + logger.info('Using Google Secret Manager') + keyProvider = new GoogleKeyProvider() + } else if (type === SupportedKeystore.AWS_SECRET_MANAGER) { + logger.info('Using AWS Secret Manager') + keyProvider = new AWSKeyProvider() + } else if (type === SupportedKeystore.MOCK_SECRET_MANAGER) { + logger.info('Using Mock Secret Manager') + keyProvider = new MockKeyProvider() + } else { + throw new Error('Valid keystore type must be provided') + } + + logger.info(`Fetching keys: ${JSON.stringify(keysToPrefetch(config))}`) + await Promise.all( + keysToPrefetch(config).map(keyProvider.fetchPrivateKeyFromStore.bind(keyProvider)) + ) + logger.info('Done fetching key. Key provider initialized successfully.') + + return keyProvider +} diff --git a/packages/phone-number-privacy/signer/src/common/key-management/mock-key-provider.ts b/packages/phone-number-privacy/signer/src/common/key-management/mock-key-provider.ts new file mode 100644 index 00000000000..8d3e11b5b28 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/key-management/mock-key-provider.ts @@ -0,0 +1,51 @@ +import { + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V1, + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V2, + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V3, + PNP_THRESHOLD_DEV_PK_SHARE_1_V1, + PNP_THRESHOLD_DEV_PK_SHARE_1_V2, + PNP_THRESHOLD_DEV_PK_SHARE_1_V3, +} from '@celo/phone-number-privacy-common/lib/test/values' +import { DefaultKeyName, Key, KeyProviderBase } from './key-provider-base' + +export class MockKeyProvider extends KeyProviderBase { + // prettier-ignore + constructor( + private keyMocks: Map = new Map([ + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-1`, + PNP_THRESHOLD_DEV_PK_SHARE_1_V1 + ], + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-2`, + PNP_THRESHOLD_DEV_PK_SHARE_1_V2, + ], + [ + `${DefaultKeyName.PHONE_NUMBER_PRIVACY}-3`, + PNP_THRESHOLD_DEV_PK_SHARE_1_V3 + ], + [ + `${DefaultKeyName.DOMAINS}-1`, + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V1 + ], + [ + `${DefaultKeyName.DOMAINS}-2`, + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V2, + ], + [ + `${DefaultKeyName.DOMAINS}-3`, + DOMAINS_THRESHOLD_DEV_PK_SHARE_1_V3 + ], + ]) + ) { + super() + } + + public async fetchPrivateKeyFromStore(key: Key) { + const keyString = this.keyMocks.get(this.getCustomKeyVersionString(key)) + if (keyString) { + return this.setPrivateKey(key, keyString) + } + throw new Error('unknown key for MockKeyProvider') + } +} diff --git a/packages/phone-number-privacy/signer/src/common/metrics.ts b/packages/phone-number-privacy/signer/src/common/metrics.ts index e6aa69e2674..918cbfd7df6 100644 --- a/packages/phone-number-privacy/signer/src/common/metrics.ts +++ b/packages/phone-number-privacy/signer/src/common/metrics.ts @@ -4,10 +4,10 @@ const { Counter, Histogram } = client client.collectDefaultMetrics() // This is just so autocomplete will remind devs what the options are. -export const Labels = { - read: 'read', - update: 'update', - insert: 'insert', +export enum Labels { + READ = 'read', + UPDATE = 'update', + INSERT = 'insert', } export const Counters = { @@ -59,6 +59,22 @@ export const Counters = { name: 'timeouts', help: 'Counter for the number of signer timeouts as measured by the signer', }), + requestsFailingOpen: new Counter({ + name: 'requests_failing_open', + help: 'Counter for the number of requests bypassing quota or authentication checks due to full-node errors', + }), + requestsFailingClosed: new Counter({ + name: 'requests_failing_closed', + help: 'Counter for the number of requests failing quota or authentication checks due to full-node errors', + }), + errorsCaughtInEndpointHandler: new Counter({ + name: 'errors_caught_in_endpoint_handler', + help: 'Counter for the number of errors caught in the outermost endpoint handler', + }), + errorsThrownAfterResponseSent: new Counter({ + name: 'errors_thrown_after_response_sent', + help: 'Counter for the number of errors thrown after a response was already sent', + }), } const buckets = [ 0.001, 0.01, 0.1, 0.2, 0.3, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.2, 1.4, 1.6, 1.8, 2, 2.3, 2.6, 2.9, 3.5, @@ -81,7 +97,7 @@ export const Histograms = { getRemainingQueryCountInstrumentation: new Histogram({ name: 'get_remaining_query_count_instrumentation', help: 'Histogram tracking latency of getRemainingQueryCount function by code segment', - labelNames: ['codeSegment'], + labelNames: ['codeSegment', 'endpoint'], buckets, }), dbOpsInstrumentation: new Histogram({ @@ -93,6 +109,22 @@ export const Histograms = { userRemainingQuotaAtRequest: new Histogram({ name: 'user_remaining_quota_at_request', help: 'Histogram tracking remaining quota of users at time of request', + labelNames: ['endpoint'], buckets, }), } + +declare type InFunction = (...params: T) => Promise + +export async function meter( + inFunction: InFunction, + params: T, + onError: (err: any) => U, + prometheus: client.Histogram, + labels: string[] +): Promise { + const _meter = prometheus.labels(...labels).startTimer() + return inFunction(...params) + .catch(onError) + .finally(_meter) +} diff --git a/packages/phone-number-privacy/signer/src/common/quota.ts b/packages/phone-number-privacy/signer/src/common/quota.ts new file mode 100644 index 00000000000..7900eaf7473 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/quota.ts @@ -0,0 +1,34 @@ +import { + DomainQuotaStatusRequest, + DomainRestrictedSignatureRequest, + OdisRequest, + PnpQuotaRequest, + PnpQuotaStatus, + SignMessageRequest, +} from '@celo/phone-number-privacy-common' +import { Knex } from 'knex' +import { Session } from './action' +import { DomainStateRecord } from './database/models/domain-state' + +// prettier-ignore +export type OdisQuotaStatus = R extends + | DomainQuotaStatusRequest | DomainRestrictedSignatureRequest ? DomainStateRecord : never + | R extends SignMessageRequest | PnpQuotaRequest ? PnpQuotaStatus: never + +export interface OdisQuotaStatusResult { + sufficient: boolean + state: OdisQuotaStatus +} + +export interface QuotaService { + checkAndUpdateQuotaStatus( + state: OdisQuotaStatus, + session: Session, + trx: Knex.Transaction> + ): Promise> + + getQuotaStatus( + session: Session, + trx?: Knex.Transaction> + ): Promise> +} diff --git a/packages/phone-number-privacy/signer/src/common/web3/contracts.ts b/packages/phone-number-privacy/signer/src/common/web3/contracts.ts new file mode 100644 index 00000000000..7b0801f8f3b --- /dev/null +++ b/packages/phone-number-privacy/signer/src/common/web3/contracts.ts @@ -0,0 +1,203 @@ +import { NULL_ADDRESS, retryAsyncWithBackOffAndTimeout } from '@celo/base' +import { ContractKit, StableToken } from '@celo/contractkit' +import { + FULL_NODE_TIMEOUT_IN_MS, + RETRY_COUNT, + RETRY_DELAY_IN_MS, +} from '@celo/phone-number-privacy-common' +import { BigNumber } from 'bignumber.js' +import Logger from 'bunyan' +import { Counters, Histograms, Labels, meter } from '../metrics' + +export async function getBlockNumber(kit: ContractKit): Promise { + return meter( + retryAsyncWithBackOffAndTimeout, + [ + () => kit.connection.getBlockNumber(), + RETRY_COUNT, + [], + RETRY_DELAY_IN_MS, + undefined, + FULL_NODE_TIMEOUT_IN_MS, + ], + (err: any) => { + Counters.blockchainErrors.labels(Labels.READ).inc() + throw err + }, + Histograms.getBlindedSigInstrumentation, + ['getBlockNumber'] + ) +} + +export async function getTransactionCount( + kit: ContractKit, + logger: Logger, + endpoint: string, + ...addresses: string[] +): Promise { + const _getTransactionCount = (...params: string[]) => + Promise.all( + params + .filter((address) => address !== NULL_ADDRESS) + .map((address) => + retryAsyncWithBackOffAndTimeout( + () => kit.connection.getTransactionCount(address), + RETRY_COUNT, + [], + RETRY_DELAY_IN_MS, + undefined, + FULL_NODE_TIMEOUT_IN_MS + ).catch((err) => { + Counters.blockchainErrors.labels(Labels.READ).inc() + throw err + }) + ) + ).then((values) => { + logger.trace({ addresses, txCounts: values }, 'Fetched txCounts for addresses') + return values.reduce((a, b) => a + b) + }) + return meter( + _getTransactionCount, + addresses.filter((address) => address !== NULL_ADDRESS), + (err: any) => { + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getTransactionCount', endpoint] + ) +} + +export async function getStableTokenBalance( + kit: ContractKit, + stableToken: StableToken, + logger: Logger, + endpoint: string, + ...addresses: string[] +): Promise { + const _getStableTokenBalance = (...params: string[]) => + Promise.all( + params + .filter((address) => address !== NULL_ADDRESS) + .map((address) => + retryAsyncWithBackOffAndTimeout( + async () => (await kit.contracts.getStableToken(stableToken)).balanceOf(address), + RETRY_COUNT, + [], + RETRY_DELAY_IN_MS, + undefined, + FULL_NODE_TIMEOUT_IN_MS + ).catch((err) => { + Counters.blockchainErrors.labels(Labels.READ).inc() + throw err + }) + ) + ).then((values) => { + logger.trace( + { addresses, balances: values.map((bn) => bn.toString()) }, + `Fetched ${stableToken} balances for addresses` + ) + return values.reduce((a, b) => a.plus(b)) + }) + return meter( + _getStableTokenBalance, + addresses, + (err: any) => { + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getStableTokenBalance', endpoint] + ) +} + +export async function getCeloBalance( + kit: ContractKit, + logger: Logger, + endpoint: string, + ...addresses: string[] +): Promise { + const _getCeloBalance = (...params: string[]) => + Promise.all( + params + .filter((address) => address !== NULL_ADDRESS) + .map((address) => + retryAsyncWithBackOffAndTimeout( + async () => (await kit.contracts.getGoldToken()).balanceOf(address), + RETRY_COUNT, + [], + RETRY_DELAY_IN_MS, + undefined, + FULL_NODE_TIMEOUT_IN_MS + ).catch((err) => { + Counters.blockchainErrors.labels(Labels.READ).inc() + throw err + }) + ) + ).then((values) => { + logger.trace( + { addresses, balances: values.map((bn) => bn.toString()) }, + 'Fetched celo balances for addresses' + ) + return values.reduce((a, b) => a.plus(b)) + }) + return meter( + _getCeloBalance, + addresses, + (err: any) => { + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getStableTokenBalance', endpoint] + ) +} + +export async function getWalletAddress( + kit: ContractKit, + logger: Logger, + account: string, + endpoint: string +): Promise { + return meter( + retryAsyncWithBackOffAndTimeout, + [ + async () => (await kit.contracts.getAccounts()).getWalletAddress(account), + RETRY_COUNT, + [], + RETRY_DELAY_IN_MS, + undefined, + FULL_NODE_TIMEOUT_IN_MS, + ], + (err: any) => { + logger.error({ err, account }, 'failed to get wallet address for account') + Counters.blockchainErrors.labels(Labels.READ).inc() + return NULL_ADDRESS + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getWalletAddress', endpoint] + ) +} + +export async function getOnChainOdisPayments( + kit: ContractKit, + logger: Logger, + account: string, + endpoint: string +): Promise { + return meter( + retryAsyncWithBackOffAndTimeout, + [ + async () => (await kit.contracts.getOdisPayments()).totalPaidCUSD(account), + RETRY_COUNT, + [], + RETRY_DELAY_IN_MS, + undefined, + FULL_NODE_TIMEOUT_IN_MS, + ], + (err: any) => { + logger.error({ err, account }, 'failed to get on-chain odis balance for account') + Counters.blockchainErrors.labels(Labels.READ).inc() + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getOnChainOdisPayments', endpoint] + ) +} diff --git a/packages/phone-number-privacy/signer/src/config.ts b/packages/phone-number-privacy/signer/src/config.ts index 6feacf6d87c..cfa3881b91f 100644 --- a/packages/phone-number-privacy/signer/src/config.ts +++ b/packages/phone-number-privacy/signer/src/config.ts @@ -1,19 +1,13 @@ -import { toBool, toNum } from '@celo/phone-number-privacy-common' +import { BlockchainConfig, toBool } from '@celo/phone-number-privacy-common' import BigNumber from 'bignumber.js' require('dotenv').config() -export function getVersion(): string { - return process.env.npm_package_version ? process.env.npm_package_version : '0.0.0' +export function getSignerVersion(): string { + return process.env.npm_package_version ?? '0.0.0' } export const DEV_MODE = process.env.NODE_ENV !== 'production' - -export const DEV_PUBLIC_KEY = - '1f33136ac029a702eb041096bd9ef09dc9c368dde52a972866bdeaff0896f8596b74ab7adfd7318bba38527599768400df44bcab66bcf3843c17a2ce838bcd5a8ba1634c18314ff0565a7c769905b8a8fba27a86bf4c6cb22df89e1badfe2b81' -export const DEV_PRIVATE_KEY = - '00000000dd0005bf4de5f2f052174f5cf58dae1af1d556c7f7f85d6fb3656e1d0f10720f' -export const DEV_POLYNOMIAL = - '01000000000000001f33136ac029a702eb041096bd9ef09dc9c368dde52a972866bdeaff0896f8596b74ab7adfd7318bba38527599768400df44bcab66bcf3843c17a2ce838bcd5a8ba1634c18314ff0565a7c769905b8a8fba27a86bf4c6cb22df89e1badfe2b81' +export const VERBOSE_DB_LOGGING = toBool(process.env.VERBOSE_DB_LOGGING, false) export enum SupportedDatabase { Postgres = 'postgres', // PostgresSQL @@ -23,15 +17,16 @@ export enum SupportedDatabase { } export enum SupportedKeystore { - AzureKeyVault = 'AzureKeyVault', - GoogleSecretManager = 'GoogleSecretManager', - AWSSecretManager = 'AWSSecretManager', - MockSecretManager = 'MockSecretManager', + AZURE_KEY_VAULT = 'AzureKeyVault', + GOOGLE_SECRET_MANAGER = 'GoogleSecretManager', + AWS_SECRET_MANAGER = 'AWSSecretManager', + MOCK_SECRET_MANAGER = 'MockSecretManager', } -interface Config { +export interface SignerConfig { + serviceName: string server: { - port: string | number + port: string | number | undefined sslKeyPath?: string sslCertPath?: string } @@ -42,14 +37,25 @@ interface Config { minDollarBalance: BigNumber minEuroBalance: BigNumber minCeloBalance: BigNumber + queryPriceInCUSD: BigNumber + } + api: { + domains: { + enabled: boolean + } + phoneNumberPrivacy: { + enabled: boolean + shouldFailOpen: boolean + } + legacyPhoneNumberPrivacy: { + enabled: boolean + shouldFailOpen: boolean + } } attestations: { numberAttestationsRequired: number } - blockchain: { - provider: string - apiKey?: string - } + blockchain: BlockchainConfig db: { type: SupportedDatabase user: string @@ -62,21 +68,27 @@ interface Config { } keystore: { type: SupportedKeystore + keys: { + phoneNumberPrivacy: { + name: string + latest: number + } + domains: { + name: string + latest: number + } + } azure: { clientID: string clientSecret: string tenant: string vaultName: string - secretName: string } google: { projectId: string - secretName: string - secretVersion: string } aws: { region: string - secretName: string secretKey: string } } @@ -85,25 +97,41 @@ interface Config { } const env = process.env as any -const config: Config = { +export const config: SignerConfig = { + serviceName: env.SERVICE_NAME ?? 'odis-signer', server: { - port: toNum(env.SERVER_PORT) || 8080, + port: Number(env.SERVER_PORT ?? 8080), sslKeyPath: env.SERVER_SSL_KEY_PATH, sslCertPath: env.SERVER_SSL_CERT_PATH, }, quota: { - unverifiedQueryMax: toNum(env.UNVERIFIED_QUERY_MAX) || 10, - additionalVerifiedQueryMax: toNum(env.ADDITIONAL_VERIFIED_QUERY_MAX) || 30, - queryPerTransaction: toNum(env.QUERY_PER_TRANSACTION) || 2, + unverifiedQueryMax: Number(env.UNVERIFIED_QUERY_MAX ?? 10), + additionalVerifiedQueryMax: Number(env.ADDITIONAL_VERIFIED_QUERY_MAX ?? 30), + queryPerTransaction: Number(env.QUERY_PER_TRANSACTION ?? 2), // Min balance is .01 cUSD - minDollarBalance: new BigNumber(env.MIN_DOLLAR_BALANCE || 1e16), + minDollarBalance: new BigNumber(env.MIN_DOLLAR_BALANCE ?? 1e16), // Min balance is .01 cEUR - minEuroBalance: new BigNumber(env.MIN_DOLLAR_BALANCE || 1e16), + minEuroBalance: new BigNumber(env.MIN_DOLLAR_BALANCE ?? 1e16), // Min balance is .005 CELO - minCeloBalance: new BigNumber(env.MIN_DOLLAR_BALANCE || 5e15), + minCeloBalance: new BigNumber(env.MIN_DOLLAR_BALANCE ?? 5e15), + // Equivalent to 0.001 cUSD/query + queryPriceInCUSD: new BigNumber(env.QUERY_PRICE_PER_CUSD ?? 0.001), + }, + api: { + domains: { + enabled: toBool(env.DOMAINS_API_ENABLED, false), + }, + phoneNumberPrivacy: { + enabled: toBool(env.PHONE_NUMBER_PRIVACY_API_ENABLED, false), + shouldFailOpen: toBool(env.FULL_NODE_ERRORS_SHOULD_FAIL_OPEN, false), + }, + legacyPhoneNumberPrivacy: { + enabled: toBool(env.LEGACY_PHONE_NUMBER_PRIVACY_API_ENABLED, false), + shouldFailOpen: toBool(env.LEGACY_FULL_NODE_ERRORS_SHOULD_FAIL_OPEN, false), + }, }, attestations: { - numberAttestationsRequired: toNum(env.ATTESTATIONS_NUMBER_ATTESTATIONS_REQUIRED) || 3, + numberAttestationsRequired: Number(env.ATTESTATIONS_NUMBER_ATTESTATIONS_REQUIRED ?? 3), }, blockchain: { provider: env.BLOCKCHAIN_PROVIDER, @@ -115,31 +143,36 @@ const config: Config = { password: env.DB_PASSWORD, database: env.DB_DATABASE, host: env.DB_HOST, - port: env.DB_PORT ? toNum(env.DB_PORT) : undefined, + port: env.DB_PORT ? Number(env.DB_PORT) : undefined, ssl: toBool(env.DB_USE_SSL, true), - poolMaxSize: env.DB_POOL_MAX_SIZE || 50, + poolMaxSize: env.DB_POOL_MAX_SIZE ?? 50, }, keystore: { type: env.KEYSTORE_TYPE, + keys: { + phoneNumberPrivacy: { + name: env.PHONE_NUMBER_PRIVACY_KEY_NAME_BASE, + latest: Number(env.PHONE_NUMBER_PRIVACY_LATEST_KEY_VERSION ?? 1), + }, + domains: { + name: env.DOMAINS_KEY_NAME_BASE, + latest: Number(env.DOMAINS_LATEST_KEY_VERSION ?? 1), + }, + }, azure: { clientID: env.KEYSTORE_AZURE_CLIENT_ID, clientSecret: env.KEYSTORE_AZURE_CLIENT_SECRET, tenant: env.KEYSTORE_AZURE_TENANT, vaultName: env.KEYSTORE_AZURE_VAULT_NAME, - secretName: env.KEYSTORE_AZURE_SECRET_NAME, }, google: { projectId: env.KEYSTORE_GOOGLE_PROJECT_ID, - secretName: env.KEYSTORE_GOOGLE_SECRET_NAME, - secretVersion: env.KEYSTORE_GOOGLE_SECRET_VERSION || 'latest', }, aws: { region: env.KEYSTORE_AWS_REGION, - secretName: env.KEYSTORE_AWS_SECRET_NAME, secretKey: env.KEYSTORE_AWS_SECRET_KEY, }, }, - timeout: env.ODIS_SIGNER_TIMEOUT || 5000, - test_quota_bypass_percentage: toNum(env.TEST_QUOTA_BYPASS_PERCENTAGE) || 0, + timeout: Number(env.ODIS_SIGNER_TIMEOUT ?? 5000), + test_quota_bypass_percentage: Number(env.TEST_QUOTA_BYPASS_PERCENTAGE ?? 0), } -export default config diff --git a/packages/phone-number-privacy/signer/src/database/models/account.ts b/packages/phone-number-privacy/signer/src/database/models/account.ts deleted file mode 100644 index 61abff838f3..00000000000 --- a/packages/phone-number-privacy/signer/src/database/models/account.ts +++ /dev/null @@ -1,17 +0,0 @@ -export const ACCOUNTS_TABLE = 'accounts' -export enum ACCOUNTS_COLUMNS { - address = 'address', - createdAt = 'created_at', - numLookups = 'num_lookups', - didMatchmaking = 'did_matchmaking', -} -export class Account { - [ACCOUNTS_COLUMNS.address]: string | undefined; - [ACCOUNTS_COLUMNS.createdAt]: Date = new Date(); - [ACCOUNTS_COLUMNS.numLookups]: number = 0; - [ACCOUNTS_COLUMNS.didMatchmaking]: Date | null = null - - constructor(address: string) { - this.address = address - } -} diff --git a/packages/phone-number-privacy/signer/src/database/models/domainState.ts b/packages/phone-number-privacy/signer/src/database/models/domainState.ts deleted file mode 100644 index 6b36f0a8b7c..00000000000 --- a/packages/phone-number-privacy/signer/src/database/models/domainState.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { SequentialDelayDomainState, WarningMessage } from '@celo/phone-number-privacy-common' -import { - Domain, - domainHash, - isSequentialDelayDomain, -} from '@celo/phone-number-privacy-common/lib/domains' - -export const DOMAINS_STATES_TABLE = 'domainsStates' -export enum DOMAINS_STATES_COLUMNS { - domainHash = 'domainHash', - counter = 'counter', - timer = 'timer', - disabled = 'disabled', -} -export class DomainStateRecord { - public static createEmptyDomainState(domain: Domain): DomainStateRecord { - if (isSequentialDelayDomain(domain)) { - return { - [DOMAINS_STATES_COLUMNS.domainHash]: domainHash(domain).toString('hex'), - [DOMAINS_STATES_COLUMNS.counter]: 0, - [DOMAINS_STATES_COLUMNS.timer]: 0, - [DOMAINS_STATES_COLUMNS.disabled]: false, - } - } - - // canary provides a compile-time check that all subtypes of Domain have branches. If a case - // was missed, then an error will report that domain cannot be assigned to type `never`. - const canary = (x: never) => x - canary(domain) - - throw new Error(WarningMessage.UNKNOWN_DOMAIN) - } - - [DOMAINS_STATES_COLUMNS.domainHash]: string; - [DOMAINS_STATES_COLUMNS.counter]: number | undefined; - [DOMAINS_STATES_COLUMNS.timer]: number | undefined; - [DOMAINS_STATES_COLUMNS.disabled]: boolean - - constructor(hash: string, domainState: SequentialDelayDomainState) { - this[DOMAINS_STATES_COLUMNS.domainHash] = hash - this[DOMAINS_STATES_COLUMNS.counter] = domainState.counter - this[DOMAINS_STATES_COLUMNS.timer] = domainState.timer - this[DOMAINS_STATES_COLUMNS.disabled] = domainState.disabled - } -} diff --git a/packages/phone-number-privacy/signer/src/database/models/request.ts b/packages/phone-number-privacy/signer/src/database/models/request.ts deleted file mode 100644 index f8fea9db8cb..00000000000 --- a/packages/phone-number-privacy/signer/src/database/models/request.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { GetBlindedMessagePartialSigRequest } from '../../signing/get-partial-signature' - -export const REQUESTS_TABLE = 'requests' -export enum REQUESTS_COLUMNS { - address = 'caller_address', - timestamp = 'timestamp', - blindedQuery = 'blinded_query', -} -export class Request { - [REQUESTS_COLUMNS.address]: string; - [REQUESTS_COLUMNS.timestamp]: Date; - [REQUESTS_COLUMNS.blindedQuery]: string - - constructor(request: GetBlindedMessagePartialSigRequest) { - this[REQUESTS_COLUMNS.address] = request.account - this[REQUESTS_COLUMNS.timestamp] = new Date() - this[REQUESTS_COLUMNS.blindedQuery] = request.blindedQueryPhoneNumber - } -} diff --git a/packages/phone-number-privacy/signer/src/database/wrappers/account.ts b/packages/phone-number-privacy/signer/src/database/wrappers/account.ts deleted file mode 100644 index ee5a2f3c9ee..00000000000 --- a/packages/phone-number-privacy/signer/src/database/wrappers/account.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { Counters, Histograms, Labels } from '../../common/metrics' -import { getDatabase } from '../database' -import { Account, ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../models/account' - -function accounts() { - return getDatabase()(ACCOUNTS_TABLE) -} - -/* - * Returns how many queries the account has already performed. - */ -export async function getPerformedQueryCount(account: string, logger: Logger): Promise { - logger.debug({ account }, 'Getting performed query count') - const getPerformedQueryCountMeter = Histograms.dbOpsInstrumentation - .labels('getPerformedQueryCount') - .startTimer() - try { - const queryCounts = await accounts() - .select(ACCOUNTS_COLUMNS.numLookups) - .where(ACCOUNTS_COLUMNS.address, account) - .first() - .timeout(DB_TIMEOUT) - getPerformedQueryCountMeter() - return queryCounts === undefined ? 0 : queryCounts[ACCOUNTS_COLUMNS.numLookups] - } catch (err) { - Counters.databaseErrors.labels(Labels.read).inc() - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - getPerformedQueryCountMeter() - return 0 - } -} - -async function getAccountExists(account: string): Promise { - const getAccountExistsMeter = Histograms.dbOpsInstrumentation - .labels('getAccountExists') - .startTimer() - return _getAccountExists(account).finally(getAccountExistsMeter) -} - -async function _getAccountExists(account: string): Promise { - const existingAccountRecord = await accounts().where(ACCOUNTS_COLUMNS.address, account).first() - return !!existingAccountRecord -} - -/* - * Increments query count in database. If record doesn't exist, create one. - */ -async function _incrementQueryCount(account: string, logger: Logger) { - logger.debug({ account }, 'Incrementing query count') - try { - if (await getAccountExists(account)) { - await accounts() - .where(ACCOUNTS_COLUMNS.address, account) - .increment(ACCOUNTS_COLUMNS.numLookups, 1) - .timeout(DB_TIMEOUT) - return true - } else { - const newAccount = new Account(account) - newAccount[ACCOUNTS_COLUMNS.numLookups] = 1 - return insertRecord(newAccount) - } - } catch (err) { - Counters.databaseErrors.labels(Labels.update).inc() - logger.error(ErrorMessage.DATABASE_UPDATE_FAILURE) - logger.error(err) - return null - } -} - -export async function incrementQueryCount(account: string, logger: Logger) { - const incrementQueryCountMeter = Histograms.dbOpsInstrumentation - .labels('incrementQueryCount') - .startTimer() - return _incrementQueryCount(account, logger).finally(incrementQueryCountMeter) -} - -async function insertRecord(data: Account) { - await accounts().insert(data).timeout(DB_TIMEOUT) - return true -} diff --git a/packages/phone-number-privacy/signer/src/database/wrappers/domainState.ts b/packages/phone-number-privacy/signer/src/database/wrappers/domainState.ts deleted file mode 100644 index 30cdf308dc2..00000000000 --- a/packages/phone-number-privacy/signer/src/database/wrappers/domainState.ts +++ /dev/null @@ -1,166 +0,0 @@ -import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' -import { Domain, domainHash } from '@celo/phone-number-privacy-common/lib/domains' -import Logger from 'bunyan' -import { Transaction } from 'knex' -import { Counters, Histograms, Labels } from '../../common/metrics' -import { getDatabase } from '../database' -import { - DOMAINS_STATES_COLUMNS, - DOMAINS_STATES_TABLE, - DomainStateRecord, -} from '../models/domainState' - -function domainsStates() { - return getDatabase()(DOMAINS_STATES_TABLE) -} - -export async function setDomainDisabled( - domain: Domain, - trx: Transaction, - logger: Logger -): Promise { - const disableDomainMeter = Histograms.dbOpsInstrumentation.labels('disableDomain').startTimer() - const hash = domainHash(domain).toString('hex') - logger.debug('Disabling domain', { hash, domain }) - try { - await domainsStates() - .transacting(trx) - .where(DOMAINS_STATES_COLUMNS.domainHash, hash) - .update(DOMAINS_STATES_COLUMNS.disabled, true) - .timeout(DB_TIMEOUT) - disableDomainMeter() - } catch (err) { - Counters.databaseErrors.labels(Labels.update).inc() - logger.error(ErrorMessage.DATABASE_UPDATE_FAILURE) - logger.error(err) - disableDomainMeter() - throw err - } finally { - disableDomainMeter() - } -} - -export async function getDomainState( - domain: Domain, - logger: Logger -): Promise { - const getDomainStateMeter = Histograms.dbOpsInstrumentation.labels('getDomainState').startTimer() - const hash = domainHash(domain).toString('hex') - logger.debug('Getting domain state from db', { hash, domain }) - try { - const result = await domainsStates() - .where(DOMAINS_STATES_COLUMNS.domainHash, hash) - .first() - .timeout(DB_TIMEOUT) - getDomainStateMeter() - return result ?? null - } catch (err) { - Counters.databaseErrors.labels(Labels.read).inc() - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - getDomainStateMeter() - throw err - } finally { - getDomainStateMeter() - } -} - -export async function getDomainStateWithLock( - domain: Domain, - trx: Transaction, - logger: Logger -): Promise { - const getDomainStateWithLockMeter = Histograms.dbOpsInstrumentation - .labels('getDomainStateWithLock') - .startTimer() - const hash = domainHash(domain).toString('hex') - logger.debug('Getting domain state from db with lock', { hash, domain }) - try { - const result = await domainsStates() - .transacting(trx) - .forUpdate() - .where(DOMAINS_STATES_COLUMNS.domainHash, hash) - .first() - .timeout(DB_TIMEOUT) - getDomainStateWithLockMeter() - return result ?? null - } catch (err) { - Counters.databaseErrors.labels(Labels.read).inc() - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - getDomainStateWithLockMeter() - throw err - } finally { - getDomainStateWithLockMeter() - } -} - -export async function updateDomainState( - domain: Domain, - domainState: DomainStateRecord, - trx: Transaction, - logger: Logger -): Promise { - const updateDomainStateMeter = Histograms.dbOpsInstrumentation - .labels('updateDomainState') - .startTimer() - const hash = domainHash(domain).toString('hex') - logger.debug('Update domain state', { hash, domain, domainState }) - try { - // Check whether the domain is already in the database. - // TODO(victor): Usage of this in the signature flow results in redudant queries of the current - // state. It would be good to refactor this to avoid making more than one SELECT. - const result = await domainsStates() - .transacting(trx) - .forUpdate() - .where(DOMAINS_STATES_COLUMNS.domainHash, hash) - .first() - .timeout(DB_TIMEOUT) - - // Insert or update the domain state record. - if (!result) { - await insertDomainState(domainState, trx, logger) - } else { - await domainsStates() - .transacting(trx) - .where(DOMAINS_STATES_COLUMNS.domainHash, hash) - .update(domainState) - .timeout(DB_TIMEOUT) - } - updateDomainStateMeter() - } catch (err) { - Counters.databaseErrors.labels(Labels.update).inc() - logger.error(ErrorMessage.DATABASE_UPDATE_FAILURE) - logger.error(err) - updateDomainStateMeter() - throw err - } finally { - updateDomainStateMeter() - } -} - -export async function insertDomainState( - domainState: DomainStateRecord, - trx: Transaction, - logger: Logger -): Promise { - const insertDomainStateMeter = Histograms.dbOpsInstrumentation - .labels('insertDomainState') - .startTimer() - logger.debug('Insert domain state', { domainState }) - try { - await domainsStates().transacting(trx).insert(domainState).timeout(DB_TIMEOUT) - - insertDomainStateMeter() - - return domainState - } catch (err) { - Counters.databaseErrors.labels(Labels.insert).inc() - logger.error(ErrorMessage.DATABASE_INSERT_FAILURE) - logger.error(err) - insertDomainStateMeter() - throw err - } finally { - insertDomainStateMeter() - } -} diff --git a/packages/phone-number-privacy/signer/src/database/wrappers/request.ts b/packages/phone-number-privacy/signer/src/database/wrappers/request.ts deleted file mode 100644 index 6b4dc7b6f49..00000000000 --- a/packages/phone-number-privacy/signer/src/database/wrappers/request.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { DB_TIMEOUT, ErrorMessage } from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { Counters, Histograms, Labels } from '../../common/metrics' -import { GetBlindedMessagePartialSigRequest } from '../../signing/get-partial-signature' -import { getDatabase } from '../database' -import { Request, REQUESTS_COLUMNS, REQUESTS_TABLE } from '../models/request' - -function requests() { - return getDatabase()(REQUESTS_TABLE) -} - -export async function getRequestExists( - request: GetBlindedMessagePartialSigRequest, - logger: Logger -): Promise { - logger.debug({ request }, 'Checking if request exists') - const getRequestExistsMeter = Histograms.dbOpsInstrumentation - .labels('getRequestExists') - .startTimer() - try { - const existingRequest = await requests() - .where({ - [REQUESTS_COLUMNS.address]: request.account, - [REQUESTS_COLUMNS.blindedQuery]: request.blindedQueryPhoneNumber, - }) - .first() - .timeout(DB_TIMEOUT) - getRequestExistsMeter() - return !!existingRequest - } catch (err) { - Counters.databaseErrors.labels(Labels.read).inc() - logger.error(ErrorMessage.DATABASE_GET_FAILURE) - logger.error(err) - getRequestExistsMeter() - return false - } -} - -export async function storeRequest(request: GetBlindedMessagePartialSigRequest, logger: Logger) { - const storeRequestMeter = Histograms.dbOpsInstrumentation.labels('storeRequest').startTimer() - logger.debug({ request }, 'Storing salt request') - try { - await requests().insert(new Request(request)).timeout(DB_TIMEOUT) - storeRequestMeter() - return true - } catch (err) { - Counters.databaseErrors.labels(Labels.update).inc() - logger.error(ErrorMessage.DATABASE_UPDATE_FAILURE) - logger.error(err) - storeRequestMeter() - return null - } -} diff --git a/packages/phone-number-privacy/signer/src/domain/auth/domainAuth.interface.ts b/packages/phone-number-privacy/signer/src/domain/auth/domainAuth.interface.ts deleted file mode 100644 index 3a05d7e3087..00000000000 --- a/packages/phone-number-privacy/signer/src/domain/auth/domainAuth.interface.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IDomainAuthService { - authCheck(): boolean // TODO Add params -} diff --git a/packages/phone-number-privacy/signer/src/domain/auth/domainAuth.service.ts b/packages/phone-number-privacy/signer/src/domain/auth/domainAuth.service.ts deleted file mode 100644 index da8bd9d2ff2..00000000000 --- a/packages/phone-number-privacy/signer/src/domain/auth/domainAuth.service.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { IDomainAuthService } from './domainAuth.interface' - -export class DomainAuthService implements IDomainAuthService { - // TODO real impl - public authCheck(): boolean { - return true - } -} diff --git a/packages/phone-number-privacy/signer/src/domain/domain.interface.ts b/packages/phone-number-privacy/signer/src/domain/domain.interface.ts deleted file mode 100644 index c84f2787141..00000000000 --- a/packages/phone-number-privacy/signer/src/domain/domain.interface.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { - DisableDomainRequest, - DomainQuotaStatusRequest, - DomainRestrictedSignatureRequest, -} from '@celo/phone-number-privacy-common' -import { Request, Response } from 'express' - -export interface IDomainService { - handleDisableDomain( - request: Request<{}, {}, DisableDomainRequest>, - response: Response - ): Promise - handleGetDomainQuotaStatus( - request: Request<{}, {}, DomainQuotaStatusRequest>, - response: Response - ): Promise - handleGetDomainRestrictedSignature( - request: Request<{}, {}, DomainRestrictedSignatureRequest>, - response: Response - ): Promise -} diff --git a/packages/phone-number-privacy/signer/src/domain/domain.service.ts b/packages/phone-number-privacy/signer/src/domain/domain.service.ts deleted file mode 100644 index cd60134f091..00000000000 --- a/packages/phone-number-privacy/signer/src/domain/domain.service.ts +++ /dev/null @@ -1,270 +0,0 @@ -import { - disableDomainRequestSchema, - DisableDomainResponse, - Domain, - DomainEndpoint, - domainHash, - domainQuotaStatusRequestSchema, - DomainQuotaStatusResponse, - DomainQuotaStatusResponseSuccess, - DomainResponse, - domainRestrictedSignatureRequestSchema, - DomainRestrictedSignatureResponse, - DomainRestrictedSignatureResponseSuccess, - DomainSchema, - DomainState, - ErrorMessage, - WarningMessage, -} from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { Request, Response } from 'express' -import { computeBlindedSignature } from '../bls/bls-cryptography-client' -import { Counters } from '../common/metrics' -import { getVersion } from '../config' -import { getDatabase } from '../database/database' -import { DOMAINS_STATES_COLUMNS, DomainStateRecord } from '../database/models/domainState' -import { - getDomainState, - getDomainStateWithLock, - insertDomainState, - setDomainDisabled, -} from '../database/wrappers/domainState' -import { getKeyProvider } from '../key-management/key-provider' -import { IDomainAuthService } from './auth/domainAuth.interface' -import { IDomainService } from './domain.interface' -import { IDomainQuotaService } from './quota/domainQuota.interface' - -// TODO: De-dupe with common package -function respondWithError( - endpoint: DomainEndpoint, - res: Response, - status: number, - error: ErrorMessage | WarningMessage -) { - const response: DomainResponse = { - success: false, - version: getVersion(), - error, - } - - const logger: Logger = res.locals.logger - - if (error in WarningMessage) { - logger.warn({ error, status, response }, 'Responding with warning') - } else { - logger.error({ error, status, response }, 'Responding with error') - } - - Counters.responses.labels(endpoint, status.toString()).inc() - res.status(status).json(response) -} - -export class DomainService implements IDomainService { - public constructor( - private authService: IDomainAuthService, - private quotaService: IDomainQuotaService - ) {} - - public async handleDisableDomain( - request: Request<{}, {}, unknown>, - response: Response - ): Promise { - Counters.requests.labels(DomainEndpoint.DISABLE_DOMAIN).inc() - - // Check that the body contains the correct request type. - if (!disableDomainRequestSchema(DomainSchema).is(request.body)) { - respondWithError(DomainEndpoint.DISABLE_DOMAIN, response, 400, WarningMessage.INVALID_INPUT) - return - } - - const logger = response.locals.logger - const domain = request.body.domain - if (!this.authenticateRequest(domain, response, DomainEndpoint.DISABLE_DOMAIN, logger)) { - // authenticateRequest returns a response to the user internally. Nothing left to do. - return - } - - logger.info('Processing request to disable domain', { - name: domain.name, - version: domain.version, - hash: domainHash(domain), - }) - try { - // Inside a database transaction, update or create the domain to mark it disabled. - await getDatabase().transaction(async (trx) => { - const domainState = await getDomainStateWithLock(domain, trx, logger) - if (!domainState) { - // If the domain is not currently recorded in the state database, add it now. - await insertDomainState(DomainStateRecord.createEmptyDomainState(domain), trx, logger) - } - if (!(domainState?.disabled ?? false)) { - await setDomainDisabled(domain, trx, logger) - } - }) - - response.status(200).send({ success: true, version: getVersion() }) - } catch (error) { - logger.error('Error while disabling domain', error) - respondWithError( - DomainEndpoint.DISABLE_DOMAIN, - response, - 500, - ErrorMessage.DATABASE_UPDATE_FAILURE - ) - } - } - - public async handleGetDomainQuotaStatus( - request: Request<{}, {}, unknown>, - response: Response - ): Promise { - Counters.requests.labels(DomainEndpoint.DOMAIN_QUOTA_STATUS).inc() - - // Check that the body contains the correct request type. - if (!domainQuotaStatusRequestSchema(DomainSchema).is(request.body)) { - respondWithError( - DomainEndpoint.DOMAIN_QUOTA_STATUS, - response, - 400, - WarningMessage.INVALID_INPUT - ) - return - } - - const logger = response.locals.logger - const domain = request.body.domain - if (!this.authenticateRequest(domain, response, DomainEndpoint.DOMAIN_QUOTA_STATUS, logger)) { - // authenticateRequest returns a response to the user internally. Nothing left to do. - return - } - - logger.info('Processing request to get domain quota status', { - name: domain.name, - version: domain.version, - hash: domainHash(domain), - }) - try { - const domainState = await getDomainState(domain, logger) - let quotaStatus: DomainState - if (domainState) { - quotaStatus = { - counter: domainState[DOMAINS_STATES_COLUMNS.counter] ?? 0, - disabled: domainState[DOMAINS_STATES_COLUMNS.disabled], - timer: domainState[DOMAINS_STATES_COLUMNS.timer] ?? 0, - } - } else { - quotaStatus = { - counter: 0, - disabled: false, - timer: 0, - } - } - - const resultResponse: DomainQuotaStatusResponseSuccess = { - success: true, - version: getVersion(), - status: quotaStatus, - } - response.status(200).send(resultResponse) - } catch (error) { - logger.error('Error while getting domain status', error) - respondWithError( - DomainEndpoint.DOMAIN_QUOTA_STATUS, - response, - 500, - ErrorMessage.DATABASE_GET_FAILURE - ) - } - } - - public async handleGetDomainRestrictedSignature( - request: Request<{}, {}, unknown>, - response: Response - ): Promise { - Counters.requests.labels(DomainEndpoint.DOMAIN_SIGN).inc() - - // Check that the body contains the correct request type. - if (!domainRestrictedSignatureRequestSchema(DomainSchema).is(request.body)) { - respondWithError(DomainEndpoint.DOMAIN_SIGN, response, 400, WarningMessage.INVALID_INPUT) - return - } - - const logger = response.locals.logger - const domain = request.body.domain - const blindedMessage = request.body.blindedMessage - if (!this.authenticateRequest(domain, response, DomainEndpoint.DOMAIN_SIGN, logger)) { - // authenticateRequest returns a response to the user internally. Nothing left to do. - return - } - logger.info('Processing request to get domain signature ', { - name: domain.name, - version: domain.version, - hash: domainHash(domain), - }) - - try { - let signature: string | undefined - await getDatabase().transaction(async (trx) => { - // Get the current domain state record, or use an empty record one does not exist. - const domainState = - (await getDomainStateWithLock(domain, trx, logger)) ?? - DomainStateRecord.createEmptyDomainState(domain) - - const quotaState = await this.quotaService.checkAndUpdateQuota( - domain, - domainState, - trx, - logger - ) - - if (!quotaState.sufficient) { - logger.warn(`Exceeded quota`, { - name: domain.name, - version: domain.version, - hash: domainHash(domain), - }) - respondWithError(DomainEndpoint.DOMAIN_SIGN, response, 429, WarningMessage.EXCEEDED_QUOTA) - return - } - - // Compute the signature inside the transaction such that it will rollback on error. - const keyProvider = getKeyProvider() - const privateKey = keyProvider.getPrivateKey() - signature = computeBlindedSignature(blindedMessage, privateKey, logger) - }) - - // TODO(victor): Checking the existance of the sigature to determine whether this operation - // succeeded is a little clunky. Refactor this to improve the flow. - if (signature) { - const signMessageResponseSuccess: DomainRestrictedSignatureResponseSuccess = { - success: true, - version: getVersion(), - signature, - } - response.status(200).json(signMessageResponseSuccess) - } - } catch (err) { - logger.error('Failed to get signature for a domain') - logger.error(err) - respondWithError(DomainEndpoint.DOMAIN_SIGN, response, 500, ErrorMessage.UNKNOWN_ERROR) - } - } - - private authenticateRequest( - domain: Domain, - response: Response, - endpoint: DomainEndpoint, - logger: Logger - ): boolean { - if (!this.authService.authCheck()) { - logger.warn(`Received unauthorized request to ${endpoint} `, { - name: domain.name, - version: domain.version, - }) - respondWithError(endpoint, response, 403, WarningMessage.UNAUTHENTICATED_USER) - return false - } - - return true - } -} diff --git a/packages/phone-number-privacy/signer/src/domain/endpoints/disable/action.ts b/packages/phone-number-privacy/signer/src/domain/endpoints/disable/action.ts new file mode 100644 index 00000000000..779685b0123 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/endpoints/disable/action.ts @@ -0,0 +1,63 @@ +import { timeout } from '@celo/base' +import { DisableDomainRequest, domainHash } from '@celo/phone-number-privacy-common' +import { Knex } from 'knex' +import { Action } from '../../../common/action' +import { toSequentialDelayDomainState } from '../../../common/database/models/domain-state' +import { + createEmptyDomainStateRecord, + getDomainStateRecord, + insertDomainStateRecord, + setDomainDisabled, +} from '../../../common/database/wrappers/domain-state' +import { SignerConfig } from '../../../config' +import { DomainSession } from '../../session' +import { DomainDisableIO } from './io' + +export class DomainDisableAction implements Action { + constructor(readonly db: Knex, readonly config: SignerConfig, readonly io: DomainDisableIO) {} + + public async perform( + session: DomainSession, + timeoutError: symbol + ): Promise { + const domain = session.request.body.domain + session.logger.info( + { + name: domain.name, + version: domain.version, + hash: domainHash(domain).toString('hex'), + }, + 'Processing request to disable domain' + ) + // Inside a database transaction, update or create the domain to mark it disabled. + const res = await this.db.transaction(async (trx) => { + const disableDomainHandler = async () => { + const domainStateRecord = + (await getDomainStateRecord(this.db, domain, session.logger, trx)) ?? + (await insertDomainStateRecord( + this.db, + createEmptyDomainStateRecord(domain, true), + trx, + session.logger + )) + if (!domainStateRecord.disabled) { + await setDomainDisabled(this.db, domain, trx, session.logger) + domainStateRecord.disabled = true + } + return { + success: true, + status: 200, + domainStateRecord, + } + } + // Ensure timeouts roll back DB trx + return timeout(disableDomainHandler, [], this.config.timeout, timeoutError) + }) + + this.io.sendSuccess( + res.status, + session.response, + toSequentialDelayDomainState(res.domainStateRecord) + ) + } +} diff --git a/packages/phone-number-privacy/signer/src/domain/endpoints/disable/io.ts b/packages/phone-number-privacy/signer/src/domain/endpoints/disable/io.ts new file mode 100644 index 00000000000..f77a9e8cd34 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/endpoints/disable/io.ts @@ -0,0 +1,78 @@ +import { + DisableDomainRequest, + disableDomainRequestSchema, + DisableDomainResponse, + DisableDomainResponseFailure, + DisableDomainResponseSuccess, + DomainSchema, + DomainState, + ErrorType, + send, + SignerEndpoint, + verifyDisableDomainRequestAuthenticity, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import { IO } from '../../../common/io' +import { Counters } from '../../../common/metrics' +import { getSignerVersion } from '../../../config' +import { DomainSession } from '../../session' + +export class DomainDisableIO extends IO { + readonly endpoint = SignerEndpoint.DISABLE_DOMAIN + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + // Input checks sends a response to the user internally. + if (!super.inputChecks(request, response)) { + return null + } + if (!(await this.authenticate(request))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + return new DomainSession(request, response) + } + + validate(request: Request<{}, {}, unknown>): request is Request<{}, {}, DisableDomainRequest> { + return disableDomainRequestSchema(DomainSchema).is(request.body) + } + + authenticate(request: Request<{}, {}, DisableDomainRequest>): Promise { + return Promise.resolve(verifyDisableDomainRequestAuthenticity(request.body)) + } + + sendSuccess( + status: number, + response: Response, + domainState: DomainState + ) { + send( + response, + { + success: true, + version: getSignerVersion(), + status: domainState, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } + + sendFailure(error: ErrorType, status: number, response: Response) { + send( + response, + { + success: false, + version: getSignerVersion(), + error, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } +} diff --git a/packages/phone-number-privacy/signer/src/domain/endpoints/quota/action.ts b/packages/phone-number-privacy/signer/src/domain/endpoints/quota/action.ts new file mode 100644 index 00000000000..babddd4a7cf --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/endpoints/quota/action.ts @@ -0,0 +1,35 @@ +import { timeout } from '@celo/base' +import { domainHash, DomainQuotaStatusRequest } from '@celo/phone-number-privacy-common' +import { Action } from '../../../common/action' +import { toSequentialDelayDomainState } from '../../../common/database/models/domain-state' +import { SignerConfig } from '../../../config' +import { DomainQuotaService } from '../../services/quota' +import { DomainSession } from '../../session' +import { DomainQuotaIO } from './io' + +export class DomainQuotaAction implements Action { + constructor( + readonly config: SignerConfig, + readonly quotaService: DomainQuotaService, + readonly io: DomainQuotaIO + ) {} + + public async perform( + session: DomainSession, + timeoutError: symbol + ): Promise { + const domain = session.request.body.domain + session.logger.info('Processing request to get domain quota status', { + name: domain.name, + version: domain.version, + hash: domainHash(domain).toString('hex'), + }) + const domainStateRecord = await timeout( + () => this.quotaService.getQuotaStatus(session), + [], + this.config.timeout, + timeoutError + ) + this.io.sendSuccess(200, session.response, toSequentialDelayDomainState(domainStateRecord)) + } +} diff --git a/packages/phone-number-privacy/signer/src/domain/endpoints/quota/io.ts b/packages/phone-number-privacy/signer/src/domain/endpoints/quota/io.ts new file mode 100644 index 00000000000..8dca82b76bf --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/endpoints/quota/io.ts @@ -0,0 +1,83 @@ +import { + DomainQuotaStatusRequest, + domainQuotaStatusRequestSchema, + DomainQuotaStatusResponse, + DomainQuotaStatusResponseFailure, + DomainQuotaStatusResponseSuccess, + DomainSchema, + DomainState, + ErrorType, + send, + SignerEndpoint, + verifyDomainQuotaStatusRequestAuthenticity, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import { IO } from '../../../common/io' +import { Counters } from '../../../common/metrics' +import { getSignerVersion } from '../../../config' +import { DomainSession } from '../../session' + +export class DomainQuotaIO extends IO { + readonly endpoint = SignerEndpoint.DOMAIN_QUOTA_STATUS + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!(await this.authenticate(request))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + return new DomainSession(request, response) + } + + validate( + request: Request<{}, {}, unknown> + ): request is Request<{}, {}, DomainQuotaStatusRequest> { + return domainQuotaStatusRequestSchema(DomainSchema).is(request.body) + } + + authenticate(request: Request<{}, {}, DomainQuotaStatusRequest>): Promise { + return Promise.resolve(verifyDomainQuotaStatusRequestAuthenticity(request.body)) + } + + sendSuccess( + status: number, + response: Response, + domainState: DomainState + ) { + send( + response, + { + success: true, + version: getSignerVersion(), + status: domainState, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } + + sendFailure( + error: ErrorType, + status: number, + response: Response + ) { + send( + response, + { + success: false, + version: getSignerVersion(), + error, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } +} diff --git a/packages/phone-number-privacy/signer/src/domain/endpoints/sign/action.ts b/packages/phone-number-privacy/signer/src/domain/endpoints/sign/action.ts new file mode 100644 index 00000000000..446baa506cb --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/endpoints/sign/action.ts @@ -0,0 +1,175 @@ +import { timeout } from '@celo/base' +import { + Domain, + domainHash, + DomainRestrictedSignatureRequest, + ErrorType, + getRequestKeyVersion, + ThresholdPoprfServer, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { EIP712Optional } from '@celo/utils/lib/sign-typed-data-utils' +import { Knex } from 'knex' +import { Action, Session } from '../../../common/action' +import { + DomainStateRecord, + toSequentialDelayDomainState, +} from '../../../common/database/models/domain-state' +import { DefaultKeyName, Key, KeyProvider } from '../../../common/key-management/key-provider-base' +import { SignerConfig } from '../../../config' +import { DomainQuotaService } from '../../services/quota' +import { DomainSession } from '../../session' +import { DomainSignIO } from './io' + +type TrxResult = + | { + success: false + status: number + domainStateRecord: DomainStateRecord + error: ErrorType + } + | { + success: true + status: number + domainStateRecord: DomainStateRecord + key: Key + signature: string + } + +export class DomainSignAction implements Action { + constructor( + readonly db: Knex, + readonly config: SignerConfig, + readonly quota: DomainQuotaService, + readonly keyProvider: KeyProvider, + readonly io: DomainSignIO + ) {} + + public async perform( + session: DomainSession, + timeoutError: symbol + ): Promise { + const domain = session.request.body.domain + session.logger.info( + { + name: domain.name, + version: domain.version, + hash: domainHash(domain).toString('hex'), + }, + 'Processing request to get domain signature ' + ) + const res: TrxResult = await this.db.transaction(async (trx) => { + const domainSignHandler = async (): Promise => { + // Get the current domain state record, or use an empty record if one does not exist. + const domainStateRecord = await this.quota.getQuotaStatus(session, trx) + + // Note that this action occurs in the same transaction as the remainder of the siging + // action. As a result, this is included here rather than in the authentication function. + if (!this.nonceCheck(domainStateRecord, session)) { + return { + success: false, + status: 401, + domainStateRecord, + error: WarningMessage.INVALID_NONCE, + } + } + + const quotaStatus = await this.quota.checkAndUpdateQuotaStatus( + domainStateRecord, + session, + trx + ) + + if (!quotaStatus.sufficient) { + session.logger.warn( + { + name: domain.name, + version: domain.version, + hash: domainHash(domain), + }, + `Exceeded quota` + ) + return { + success: false, + status: 429, + domainStateRecord: quotaStatus.state, + error: WarningMessage.EXCEEDED_QUOTA, + } + } + + const key: Key = { + version: + getRequestKeyVersion(session.request, session.logger) ?? + this.config.keystore.keys.domains.latest, + name: DefaultKeyName.DOMAINS, + } + + // Compute evaluation inside transaction so it will rollback on error. + const evaluation = await this.eval( + domain, + session.request.body.blindedMessage, + key, + session + ) + + return { + success: true, + status: 200, + domainStateRecord: quotaStatus.state, + key, + signature: evaluation.toString('base64'), + } + } + // Ensure timeouts roll back DB trx + return timeout(domainSignHandler, [], this.config.timeout, timeoutError) + }) + + if (res.success) { + this.io.sendSuccess( + res.status, + session.response, + res.key, + res.signature, + toSequentialDelayDomainState(res.domainStateRecord) + ) + } else { + this.io.sendFailure( + res.error, + res.status, + session.response, + toSequentialDelayDomainState(res.domainStateRecord) + ) + } + } + + private nonceCheck( + domainStateRecord: DomainStateRecord, + session: DomainSession + ): boolean { + const nonce: EIP712Optional = session.request.body.options.nonce + if (!nonce.defined) { + session.logger.info('Nonce is undefined') + return false + } + return nonce.value >= domainStateRecord.counter + } + + private async eval( + domain: Domain, + blindedMessage: string, + key: Key, + session: Session + ): Promise { + let privateKey: string + try { + privateKey = await this.keyProvider.getPrivateKeyOrFetchFromStore(key) + } catch (err) { + session.logger.error({ key }, 'Requested key version not supported') + session.logger.error(err) + throw new Error(WarningMessage.INVALID_KEY_VERSION_REQUEST) + } + + const server = new ThresholdPoprfServer(Buffer.from(privateKey, 'hex')) + return server.blindPartialEval(domainHash(domain), Buffer.from(blindedMessage, 'base64')) + } +} diff --git a/packages/phone-number-privacy/signer/src/domain/endpoints/sign/io.ts b/packages/phone-number-privacy/signer/src/domain/endpoints/sign/io.ts new file mode 100644 index 00000000000..a55a0f9f396 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/endpoints/sign/io.ts @@ -0,0 +1,96 @@ +import { + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestSchema, + DomainRestrictedSignatureResponse, + DomainRestrictedSignatureResponseFailure, + DomainRestrictedSignatureResponseSuccess, + DomainSchema, + DomainState, + ErrorType, + KEY_VERSION_HEADER, + requestHasValidKeyVersion, + send, + SignerEndpoint, + verifyDomainRestrictedSignatureRequestAuthenticity, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Request, Response } from 'express' +import { IO } from '../../../common/io' +import { Key } from '../../../common/key-management/key-provider-base' +import { Counters } from '../../../common/metrics' +import { getSignerVersion } from '../../../config' +import { DomainSession } from '../../session' + +export class DomainSignIO extends IO { + readonly endpoint = SignerEndpoint.DOMAIN_SIGN + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + if (!super.inputChecks(request, response)) { + return null + } + if (!requestHasValidKeyVersion(request, response.locals.logger)) { + this.sendFailure(WarningMessage.INVALID_KEY_VERSION_REQUEST, 400, response) + return null + } + if (!(await this.authenticate(request))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + return new DomainSession(request, response) + } + + validate( + request: Request<{}, {}, unknown> + ): request is Request<{}, {}, DomainRestrictedSignatureRequest> { + return domainRestrictedSignatureRequestSchema(DomainSchema).is(request.body) + } + + authenticate(request: Request<{}, {}, DomainRestrictedSignatureRequest>): Promise { + return Promise.resolve(verifyDomainRestrictedSignatureRequestAuthenticity(request.body)) + } + + sendSuccess( + status: number, + response: Response, + key: Key, + signature: string, + domainState: DomainState + ) { + response.set(KEY_VERSION_HEADER, key.version.toString()) + send( + response, + { + success: true, + version: getSignerVersion(), + signature, + status: domainState, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } + + sendFailure( + error: ErrorType, + status: number, + response: Response, + domainState?: DomainState + ) { + send( + response, + { + success: false, + version: getSignerVersion(), + error, + status: domainState, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } +} diff --git a/packages/phone-number-privacy/signer/src/domain/quota/domainQuota.interface.ts b/packages/phone-number-privacy/signer/src/domain/quota/domainQuota.interface.ts deleted file mode 100644 index 6caef1b0c07..00000000000 --- a/packages/phone-number-privacy/signer/src/domain/quota/domainQuota.interface.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Domain } from '@celo/phone-number-privacy-common/lib/domains' -import Logger from 'bunyan' -import { Transaction } from 'knex' -import { DomainStateRecord } from '../../database/models/domainState' - -export interface IDomainQuotaService { - checkAndUpdateQuota: ( - domain: Domain, - domainState: DomainStateRecord, - trx: Transaction, - logger: Logger - ) => Promise<{ sufficient: boolean; newState: DomainStateRecord }> -} diff --git a/packages/phone-number-privacy/signer/src/domain/quota/domainQuota.service.ts b/packages/phone-number-privacy/signer/src/domain/quota/domainQuota.service.ts deleted file mode 100644 index 42010963a10..00000000000 --- a/packages/phone-number-privacy/signer/src/domain/quota/domainQuota.service.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { ErrorMessage } from '@celo/phone-number-privacy-common' -import { Domain, isSequentialDelayDomain } from '@celo/phone-number-privacy-common/lib/domains' -import { checkSequentialDelayRateLimit } from '@celo/phone-number-privacy-common/lib/domains/sequential-delay' -import Logger from 'bunyan' -import { Transaction } from 'knex' -import { toSequentialDelayDomainState } from '../../common/domain/domainState.mapper' -import { DOMAINS_STATES_COLUMNS, DomainStateRecord } from '../../database/models/domainState' -import { updateDomainState } from '../../database/wrappers/domainState' -import { IDomainQuotaService } from './domainQuota.interface' - -export class DomainQuotaService implements IDomainQuotaService { - public async checkAndUpdateQuota( - domain: Domain, - domainState: DomainStateRecord, - trx: Transaction, - logger: Logger - ): Promise<{ sufficient: boolean; newState: DomainStateRecord }> { - if (isSequentialDelayDomain(domain)) { - return this.handleSequentialDelayDomain(domain, domainState, trx, logger) - } else { - throw new Error(ErrorMessage.UNSUPPORTED_DOMAIN) - } - } - - private async handleSequentialDelayDomain( - domain: Domain, - domainState: DomainStateRecord, - trx: Transaction, - logger: Logger - ) { - const result = checkSequentialDelayRateLimit( - domain, - // Divide by 1000 to convert the current time in ms to seconds. - Date.now() / 1000, - toSequentialDelayDomainState(domainState) - ) - - // If the result indicates insufficient quota, return a failure. - // Note that the database will not be updated. - if (!result.accepted || !result.state) { - return { sufficient: false, newState: domainState } - } - - // Convert the result to a database record. - const newState: DomainStateRecord = { - timer: result.state.timer, - counter: result.state.counter, - domainHash: domainState[DOMAINS_STATES_COLUMNS.domainHash], - disabled: domainState[DOMAINS_STATES_COLUMNS.disabled], - } - - // Persist the updated domain quota to the database. - // This will trigger an insert if this is the first update to the domain. - await updateDomainState(domain, newState, trx, logger) - - return { - sufficient: true, - newState, - } - } -} diff --git a/packages/phone-number-privacy/signer/src/domain/services/quota.ts b/packages/phone-number-privacy/signer/src/domain/services/quota.ts new file mode 100644 index 00000000000..475be753afa --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/services/quota.ts @@ -0,0 +1,63 @@ +import { + checkSequentialDelayRateLimit, + DomainQuotaStatusRequest, + DomainRestrictedSignatureRequest, + ErrorMessage, + isSequentialDelayDomain, +} from '@celo/phone-number-privacy-common' +import { Knex } from 'knex' +import { + DomainStateRecord, + toDomainStateRecord, + toSequentialDelayDomainState, +} from '../../common/database/models/domain-state' +import { + getDomainStateRecordOrEmpty, + updateDomainStateRecord, +} from '../../common/database/wrappers/domain-state' +import { OdisQuotaStatusResult, QuotaService } from '../../common/quota' +import { DomainSession } from '../session' + +declare type QuotaDependentDomainRequest = + | DomainQuotaStatusRequest + | DomainRestrictedSignatureRequest + +export class DomainQuotaService implements QuotaService { + constructor(readonly db: Knex) {} + + async checkAndUpdateQuotaStatus( + state: DomainStateRecord, + session: DomainSession, + trx: Knex.Transaction, + attemptTime?: number + ): Promise> { + const { domain } = session.request.body + // Timestamp precision is lowered to seconds to reduce the chance of effective timing attacks. + attemptTime = attemptTime ?? Math.floor(Date.now() / 1000) + if (isSequentialDelayDomain(domain)) { + const result = checkSequentialDelayRateLimit( + domain, + attemptTime, + toSequentialDelayDomainState(state, attemptTime) + ) + if (result.accepted) { + const newState = toDomainStateRecord(domain, result.state) + // Persist the updated domain quota to the database. + // This will trigger an insert if its the first update to the domain instance. + await updateDomainStateRecord(this.db, domain, newState, trx, session.logger) + return { sufficient: true, state: newState } + } + // If the result was rejected, the domainStateRecord does not change + return { sufficient: false, state } + } else { + throw new Error(ErrorMessage.UNSUPPORTED_DOMAIN) + } + } + + async getQuotaStatus( + session: DomainSession, + trx?: Knex.Transaction + ): Promise { + return getDomainStateRecordOrEmpty(this.db, session.request.body.domain, session.logger, trx) + } +} diff --git a/packages/phone-number-privacy/signer/src/domain/session.ts b/packages/phone-number-privacy/signer/src/domain/session.ts new file mode 100644 index 00000000000..3d9080aab1d --- /dev/null +++ b/packages/phone-number-privacy/signer/src/domain/session.ts @@ -0,0 +1,14 @@ +import { DomainRequest, OdisResponse } from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' + +export class DomainSession { + readonly logger: Logger + + public constructor( + readonly request: Request<{}, {}, R>, + readonly response: Response> + ) { + this.logger = response.locals.logger + } +} diff --git a/packages/phone-number-privacy/signer/src/index.ts b/packages/phone-number-privacy/signer/src/index.ts index 7c03b0d4226..29c531d8a09 100644 --- a/packages/phone-number-privacy/signer/src/index.ts +++ b/packages/phone-number-privacy/signer/src/index.ts @@ -1,27 +1,37 @@ -import { rootLogger as logger } from '@celo/phone-number-privacy-common' -import config, { DEV_MODE } from './config' -import { initDatabase } from './database/database' -import { initKeyProvider } from './key-management/key-provider' -import { createServer } from './server' +import { getContractKit, rootLogger } from '@celo/phone-number-privacy-common' +import { initDatabase } from './common/database/database' +import { initKeyProvider } from './common/key-management/key-provider' +import { KeyProvider } from './common/key-management/key-provider-base' +import { config, DEV_MODE } from './config' +import { startSigner } from './server' -async function start() { - logger().info(`Starting. Dev mode: ${DEV_MODE}`) - await initDatabase() - await initKeyProvider() +require('dotenv').config() - const server = createServer() - logger().info('Starting server') - const port = config.server.port +async function start() { + const logger = rootLogger(config.serviceName) + logger.info(`Starting. Dev mode: ${DEV_MODE}`) + const db = await initDatabase(config) + const keyProvider: KeyProvider = await initKeyProvider(config) + const server = startSigner(config, db, keyProvider, getContractKit(config.blockchain)) + logger.info('Starting server') + const port = config.server.port ?? 0 const backupTimeout = config.timeout * 1.2 server .listen(port, () => { - logger().info(`Server is listening on port ${port}`) + logger.info(`Server is listening on port ${port}`) }) .setTimeout(backupTimeout) } -start().catch((err) => { - logger().info('Fatal error occured. Exiting') - logger().error(err) - process.exit(1) -}) +if (!DEV_MODE) { + start().catch((err) => { + const logger = rootLogger(config.serviceName) + logger.error({ err }, 'Fatal error occured. Exiting') + process.exit(1) + }) +} + +export { initDatabase } from './common/database/database' +export { initKeyProvider } from './common/key-management/key-provider' +export { config, SupportedDatabase, SupportedKeystore } from './config' +export * from './server' diff --git a/packages/phone-number-privacy/signer/src/key-management/aws-key-provider.ts b/packages/phone-number-privacy/signer/src/key-management/aws-key-provider.ts deleted file mode 100644 index 07eb9463e69..00000000000 --- a/packages/phone-number-privacy/signer/src/key-management/aws-key-provider.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { ErrorMessage, rootLogger as logger } from '@celo/phone-number-privacy-common' -import { SecretsManager } from 'aws-sdk' -import config from '../config' -import { KeyProviderBase } from './key-provider-base' - -interface SecretStringResult { - [key: string]: string -} - -export class AWSKeyProvider extends KeyProviderBase { - public async fetchPrivateKeyFromStore() { - try { - // Credentials are managed by AWS client as described in https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html - const { region, secretName, secretKey } = config.keystore.aws - - const client = new SecretsManager({ region }) - client.config.update({ region }) - - const response = await client - .getSecretValue({ - SecretId: secretName, - }) - .promise() - - let privateKey - if (response.SecretString) { - privateKey = this.tryParseSecretString(response.SecretString, secretKey) - } else if (response.SecretBinary) { - // @ts-ignore AWS sdk typings not quite correct - const buff = new Buffer(response.SecretBinary, 'base64') - privateKey = buff.toString('ascii') - } else { - throw new Error('Response has neither string nor binary') - } - - if (!privateKey) { - throw new Error('Secret is empty or undefined') - } - this.setPrivateKey(privateKey) - } catch (err) { - logger().info('Error retrieving key') - logger().error(err) - throw new Error(ErrorMessage.KEY_FETCH_ERROR) - } - } - - private tryParseSecretString(secretString: string, key: string) { - if (!secretString) { - throw new Error('Cannot parse empty string') - } - if (!key) { - throw new Error('Cannot parse secret without key') - } - - try { - const secret = JSON.parse(secretString) as SecretStringResult - return secret[key] - } catch (e) { - throw new Error('Expecting JSON, secret string is not valid JSON') - } - } -} diff --git a/packages/phone-number-privacy/signer/src/key-management/azure-key-provider.ts b/packages/phone-number-privacy/signer/src/key-management/azure-key-provider.ts deleted file mode 100644 index 735641d0bce..00000000000 --- a/packages/phone-number-privacy/signer/src/key-management/azure-key-provider.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ErrorMessage, rootLogger as logger } from '@celo/phone-number-privacy-common' -import { AzureKeyVaultClient } from '@celo/wallet-hsm-azure' -import config from '../config' -import { KeyProviderBase } from './key-provider-base' - -export class AzureKeyProvider extends KeyProviderBase { - public async fetchPrivateKeyFromStore() { - try { - const { vaultName, secretName } = config.keystore.azure - - const keyVaultClient = new AzureKeyVaultClient(vaultName) - const privateKey = await keyVaultClient.getSecret(secretName) - this.setPrivateKey(privateKey) - } catch (err) { - logger().info('Error retrieving key') - logger().error(err) - throw new Error(ErrorMessage.KEY_FETCH_ERROR) - } - } -} diff --git a/packages/phone-number-privacy/signer/src/key-management/google-key-provider.ts b/packages/phone-number-privacy/signer/src/key-management/google-key-provider.ts deleted file mode 100644 index 23e82f7c363..00000000000 --- a/packages/phone-number-privacy/signer/src/key-management/google-key-provider.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { ErrorMessage, rootLogger as logger } from '@celo/phone-number-privacy-common' -import { SecretManagerServiceClient } from '@google-cloud/secret-manager' -import config from '../config' -import { KeyProviderBase } from './key-provider-base' - -export class GoogleKeyProvider extends KeyProviderBase { - public async fetchPrivateKeyFromStore() { - try { - const { projectId, secretName, secretVersion } = config.keystore.google - - const client = new SecretManagerServiceClient() - const [version] = await client.accessSecretVersion({ - name: `projects/${projectId}/secrets/${secretName}/versions/${secretVersion}`, - }) - - // Extract the payload as a string. - const privateKey = version?.payload?.data?.toString() - - if (!privateKey) { - throw new Error('Key is empty or undefined') - } - - this.setPrivateKey(privateKey) - } catch (err) { - logger().info('Error retrieving key') - logger().error(err) - throw new Error(ErrorMessage.KEY_FETCH_ERROR) - } - } -} diff --git a/packages/phone-number-privacy/signer/src/key-management/key-provider-base.ts b/packages/phone-number-privacy/signer/src/key-management/key-provider-base.ts deleted file mode 100644 index 03f0246a195..00000000000 --- a/packages/phone-number-privacy/signer/src/key-management/key-provider-base.ts +++ /dev/null @@ -1,28 +0,0 @@ -export interface KeyProvider { - fetchPrivateKeyFromStore: () => Promise - getPrivateKey: () => string -} - -const PRIVATE_KEY_SIZE = 72 - -export abstract class KeyProviderBase implements KeyProvider { - protected privateKey: string | null = null - - public getPrivateKey() { - if (!this.privateKey) { - throw new Error('Private key is empty, provider not properly initialized') - } - - return this.privateKey - } - - public abstract fetchPrivateKeyFromStore(): Promise - - protected setPrivateKey(key: string) { - key = key ? key.trim() : '' - if (key.length !== PRIVATE_KEY_SIZE) { - throw new Error('Invalid private key') - } - this.privateKey = key - } -} diff --git a/packages/phone-number-privacy/signer/src/key-management/key-provider.ts b/packages/phone-number-privacy/signer/src/key-management/key-provider.ts deleted file mode 100644 index c1164ba4ea6..00000000000 --- a/packages/phone-number-privacy/signer/src/key-management/key-provider.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { rootLogger } from '@celo/phone-number-privacy-common' -import config, { SupportedKeystore } from '../config' -import { AWSKeyProvider } from './aws-key-provider' -import { AzureKeyProvider } from './azure-key-provider' -import { GoogleKeyProvider } from './google-key-provider' -import { KeyProvider } from './key-provider-base' -import { MockKeyProvider } from './mock-key-provider' - -const logger = rootLogger() - -let keyProvider: KeyProvider - -export async function initKeyProvider() { - logger.info('Initializing keystore') - const type = config.keystore.type - if (type === SupportedKeystore.AzureKeyVault) { - logger.info('Using Azure key vault') - keyProvider = new AzureKeyProvider() - } else if (type === SupportedKeystore.GoogleSecretManager) { - logger.info('Using Google Secret Manager') - keyProvider = new GoogleKeyProvider() - } else if (type === SupportedKeystore.AWSSecretManager) { - logger.info('Using AWS Secret Manager') - keyProvider = new AWSKeyProvider() - } else if (type === SupportedKeystore.MockSecretManager) { - logger.info('Using Mock Secret Manager') - keyProvider = new MockKeyProvider() - } else { - throw new Error('Valid keystore type must be provided') - } - logger.info('Fetching key') - await keyProvider.fetchPrivateKeyFromStore() - logger.info('Done fetching key. Key provider initialized successfully.') -} - -export function getKeyProvider() { - if (!keyProvider) { - throw new Error('Key provider has not been properly initialized') - } - - return keyProvider -} diff --git a/packages/phone-number-privacy/signer/src/key-management/mock-key-provider.ts b/packages/phone-number-privacy/signer/src/key-management/mock-key-provider.ts deleted file mode 100644 index a5b2d64f0c3..00000000000 --- a/packages/phone-number-privacy/signer/src/key-management/mock-key-provider.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { DEV_PRIVATE_KEY } from '../config' -import { KeyProviderBase } from './key-provider-base' - -export class MockKeyProvider extends KeyProviderBase { - public async fetchPrivateKeyFromStore() { - this.setPrivateKey(DEV_PRIVATE_KEY) - } -} diff --git a/packages/phone-number-privacy/signer/src/migrations/20210421212301_create-indices.ts b/packages/phone-number-privacy/signer/src/migrations/20210421212301_create-indices.ts deleted file mode 100644 index 1f80052c00f..00000000000 --- a/packages/phone-number-privacy/signer/src/migrations/20210421212301_create-indices.ts +++ /dev/null @@ -1,17 +0,0 @@ -import * as Knex from 'knex' -import { ACCOUNTS_COLUMNS, ACCOUNTS_TABLE } from '../database/models/account' - -export async function up(knex: Knex): Promise { - if (!(await knex.schema.hasTable(ACCOUNTS_TABLE))) { - throw new Error('Unexpected error: Could not find ACCOUNTS_TABLE') - } - return knex.schema.alterTable(ACCOUNTS_TABLE, (t) => { - t.index(ACCOUNTS_COLUMNS.address) - }) -} - -export async function down(knex: Knex): Promise { - return knex.schema.alterTable(ACCOUNTS_TABLE, (t) => { - t.dropIndex(ACCOUNTS_COLUMNS.address) - }) -} diff --git a/packages/phone-number-privacy/signer/src/migrations/20210921173354_create-domain-state.ts b/packages/phone-number-privacy/signer/src/migrations/20210921173354_create-domain-state.ts deleted file mode 100644 index 2e8719c7430..00000000000 --- a/packages/phone-number-privacy/signer/src/migrations/20210921173354_create-domain-state.ts +++ /dev/null @@ -1,20 +0,0 @@ -import * as Knex from 'knex' - -import { DOMAINS_STATES_COLUMNS, DOMAINS_STATES_TABLE } from '../database/models/domainState' - -export async function up(knex: Knex): Promise { - if (!(await knex.schema.hasTable(DOMAINS_STATES_TABLE))) { - return knex.schema.createTable(DOMAINS_STATES_TABLE, (t) => { - t.string(DOMAINS_STATES_COLUMNS.domainHash).notNullable().primary() - t.integer(DOMAINS_STATES_COLUMNS.counter).nullable() - t.boolean(DOMAINS_STATES_COLUMNS.disabled).notNullable().defaultTo(false) - t.integer(DOMAINS_STATES_COLUMNS.timer).nullable() - }) - } - - return null -} - -export async function down(knex: Knex): Promise { - return knex.schema.dropTable(DOMAINS_STATES_TABLE) -} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/action.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/action.ts new file mode 100644 index 00000000000..cb114f53858 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/action.ts @@ -0,0 +1,43 @@ +import { timeout } from '@celo/base' +import { + ErrorMessage, + LegacyPnpQuotaRequest, + PnpQuotaRequest, +} from '@celo/phone-number-privacy-common' +import { Action } from '../../../common/action' +import { SignerConfig } from '../../../config' +import { PnpQuotaService } from '../../services/quota' +import { PnpSession } from '../../session' +import { PnpQuotaIO } from './io' +import { LegacyPnpQuotaIO } from './io.legacy' + +export class PnpQuotaAction implements Action { + constructor( + readonly config: SignerConfig, + readonly quota: PnpQuotaService, + readonly io: PnpQuotaIO | LegacyPnpQuotaIO + ) {} + + public async perform( + session: PnpSession, + timeoutError: symbol + ): Promise { + const quotaStatus = await timeout( + () => this.quota.getQuotaStatus(session), + [], + this.config.timeout, + timeoutError + ) + if (quotaStatus.performedQueryCount > -1 && quotaStatus.totalQuota > -1) { + this.io.sendSuccess(200, session.response, quotaStatus, session.errors) + return + } + this.io.sendFailure( + quotaStatus.performedQueryCount === -1 + ? ErrorMessage.FAILURE_TO_GET_PERFORMED_QUERY_COUNT + : ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA, + 500, + session.response + ) + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.legacy.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.legacy.ts new file mode 100644 index 00000000000..b9cb4e9e7fc --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.legacy.ts @@ -0,0 +1,103 @@ +import { ContractKit } from '@celo/contractkit' +import { + authenticateUser, + ErrorType, + hasValidAccountParam, + identifierIsValidIfExists, + isBodyReasonablySized, + LegacyPnpQuotaRequest, + LegacyPnpQuotaRequestSchema, + PnpQuotaResponse, + PnpQuotaResponseFailure, + PnpQuotaResponseSuccess, + PnpQuotaStatus, + send, + SignerEndpoint, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import { IO } from '../../../common/io' +import { Counters } from '../../../common/metrics' +import { getSignerVersion } from '../../../config' +import { PnpSession } from '../../session' + +export class LegacyPnpQuotaIO extends IO { + readonly endpoint = SignerEndpoint.LEGACY_PNP_QUOTA + + constructor( + readonly enabled: boolean, + readonly shouldFailOpen: boolean, + readonly kit: ContractKit + ) { + super(enabled) + } + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + const warnings: ErrorType[] = [] + if (!super.inputChecks(request, response)) { + return null + } + if (!(await this.authenticate(request, warnings, response.locals.logger))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const session = new PnpSession(request, response) + session.errors.push(...warnings) + return session + } + + validate(request: Request<{}, {}, unknown>): request is Request<{}, {}, LegacyPnpQuotaRequest> { + return ( + LegacyPnpQuotaRequestSchema.is(request.body) && + hasValidAccountParam(request.body) && + identifierIsValidIfExists(request.body) && + isBodyReasonablySized(request.body) + ) + } + + async authenticate( + request: Request<{}, {}, LegacyPnpQuotaRequest>, + warnings: ErrorType[], + logger: Logger + ): Promise { + return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings) + } + + sendSuccess( + status: number, + response: Response, + quotaStatus: PnpQuotaStatus, + warnings: string[] + ) { + send( + response, + { + success: true, + version: getSignerVersion(), + ...quotaStatus, + warnings, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } + + sendFailure(error: ErrorType, status: number, response: Response) { + send( + response, + { + success: false, + version: getSignerVersion(), + error, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.ts new file mode 100644 index 00000000000..3a367fae728 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/quota/io.ts @@ -0,0 +1,101 @@ +import { ContractKit } from '@celo/contractkit' +import { + authenticateUser, + ErrorType, + hasValidAccountParam, + isBodyReasonablySized, + PnpQuotaRequest, + PnpQuotaRequestSchema, + PnpQuotaResponse, + PnpQuotaResponseFailure, + PnpQuotaResponseSuccess, + PnpQuotaStatus, + send, + SignerEndpoint, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import { IO } from '../../../common/io' +import { Counters } from '../../../common/metrics' +import { getSignerVersion } from '../../../config' +import { PnpSession } from '../../session' + +export class PnpQuotaIO extends IO { + readonly endpoint = SignerEndpoint.PNP_QUOTA + + constructor( + readonly enabled: boolean, + readonly shouldFailOpen: boolean, + readonly kit: ContractKit + ) { + super(enabled) + } + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + const warnings: ErrorType[] = [] + if (!super.inputChecks(request, response)) { + return null + } + if (!(await this.authenticate(request, warnings, response.locals.logger))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const session = new PnpSession(request, response) + session.errors.push(...warnings) + return session + } + + validate(request: Request<{}, {}, unknown>): request is Request<{}, {}, PnpQuotaRequest> { + return ( + PnpQuotaRequestSchema.is(request.body) && + hasValidAccountParam(request.body) && + isBodyReasonablySized(request.body) + ) + } + + async authenticate( + request: Request<{}, {}, PnpQuotaRequest>, + warnings: ErrorType[], + logger: Logger + ): Promise { + return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings) + } + + sendSuccess( + status: number, + response: Response, + quotaStatus: PnpQuotaStatus, + warnings: string[] + ) { + send( + response, + { + success: true, + version: getSignerVersion(), + ...quotaStatus, + warnings, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } + + sendFailure(error: ErrorType, status: number, response: Response) { + send( + response, + { + success: false, + version: getSignerVersion(), + error, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.legacy.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.legacy.ts new file mode 100644 index 00000000000..642ad9781cd --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.legacy.ts @@ -0,0 +1,21 @@ +import { Knex } from 'knex' +import { REQUESTS_TABLE } from '../../../common/database/models/request' +import { KeyProvider } from '../../../common/key-management/key-provider-base' +import { SignerConfig } from '../../../config' +import { PnpQuotaService } from '../../services/quota' +import { PnpSignAction } from './action' +import { LegacyPnpSignIO } from './io.legacy' + +export class LegacyPnpSignAction extends PnpSignAction { + protected readonly requestsTable = REQUESTS_TABLE.LEGACY + + constructor( + readonly db: Knex, + readonly config: SignerConfig, + readonly quota: PnpQuotaService, + readonly keyProvider: KeyProvider, + readonly io: LegacyPnpSignIO + ) { + super(db, config, quota, keyProvider, io) + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.onchain.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.onchain.ts new file mode 100644 index 00000000000..5cd93b41962 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.onchain.ts @@ -0,0 +1,21 @@ +import { Knex } from 'knex' +import { REQUESTS_TABLE } from '../../../common/database/models/request' +import { KeyProvider } from '../../../common/key-management/key-provider-base' +import { SignerConfig } from '../../../config' +import { PnpQuotaService } from '../../services/quota' +import { PnpSignAction } from './action' +import { PnpSignIO } from './io' + +export class OnChainPnpSignAction extends PnpSignAction { + protected readonly requestsTable = REQUESTS_TABLE.ONCHAIN + + constructor( + readonly db: Knex, + readonly config: SignerConfig, + readonly quota: PnpQuotaService, + readonly keyProvider: KeyProvider, + readonly io: PnpSignIO + ) { + super(db, config, quota, keyProvider, io) + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.ts new file mode 100644 index 00000000000..af636279d80 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/action.ts @@ -0,0 +1,160 @@ +import { timeout } from '@celo/base' +import { + ErrorMessage, + getRequestKeyVersion, + LegacySignMessageRequest, + SignMessageRequest, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { Knex } from 'knex' +import { Action, Session } from '../../../common/action' +import { computeBlindedSignature } from '../../../common/bls/bls-cryptography-client' +import { REQUESTS_TABLE } from '../../../common/database/models/request' +import { getRequestExists } from '../../../common/database/wrappers/request' +import { DefaultKeyName, Key, KeyProvider } from '../../../common/key-management/key-provider-base' +import { Counters } from '../../../common/metrics' +import { SignerConfig } from '../../../config' +import { PnpQuotaService } from '../../services/quota' +import { PnpSession } from '../../session' +import { PnpSignIO } from './io' +import { LegacyPnpSignIO } from './io.legacy' + +export abstract class PnpSignAction + implements Action +{ + protected abstract readonly requestsTable: REQUESTS_TABLE + + constructor( + readonly db: Knex, + readonly config: SignerConfig, + readonly quota: PnpQuotaService, + readonly keyProvider: KeyProvider, + readonly io: PnpSignIO | LegacyPnpSignIO + ) {} + + public async perform( + session: PnpSession, + timeoutError: symbol + ): Promise { + // Compute quota lookup, update, and signing within transaction + // so that these occur atomically and rollback on error. + await this.db.transaction(async (trx) => { + const pnpSignHandler = async () => { + const quotaStatus = await this.quota.getQuotaStatus(session, trx) + + let isDuplicateRequest = false + try { + isDuplicateRequest = await getRequestExists( + this.db, + this.requestsTable, + session.request.body.account, + session.request.body.blindedQueryPhoneNumber, + session.logger, + trx + ) + } catch (err) { + session.logger.error(err, 'Failed to check if request already exists in db') + } + + if (isDuplicateRequest) { + Counters.duplicateRequests.inc() + session.logger.info( + 'Request already exists in db. Will service request without charging quota.' + ) + session.errors.push(WarningMessage.DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG) + } else { + // In the case of a database connection failure, performedQueryCount will be -1 + if (quotaStatus.performedQueryCount === -1) { + this.io.sendFailure( + ErrorMessage.DATABASE_GET_FAILURE, + 500, + session.response, + quotaStatus + ) + return + } + // In the case of a blockchain connection failure, totalQuota will be -1 + if (quotaStatus.totalQuota === -1) { + if (this.io.shouldFailOpen) { + // We fail open and service requests on full-node errors to not block the user. + // Error messages are stored in the session and included along with the signature in the response. + quotaStatus.totalQuota = Number.MAX_SAFE_INTEGER + session.logger.warn( + { warning: ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA }, + ErrorMessage.FAILING_OPEN + ) + Counters.requestsFailingOpen.inc() + } else { + session.logger.warn( + { warning: ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA }, + ErrorMessage.FAILING_CLOSED + ) + Counters.requestsFailingClosed.inc() + this.io.sendFailure(ErrorMessage.FULL_NODE_ERROR, 500, session.response, quotaStatus) + return + } + } + + // TODO(after 2.0.0) add more specific error messages on DB and key version + // https://github.com/celo-org/celo-monorepo/issues/9882 + // quotaStatus is updated in place; throws on failure to update + const { sufficient } = await this.quota.checkAndUpdateQuotaStatus( + quotaStatus, + session, + trx + ) + if (!sufficient) { + this.io.sendFailure(WarningMessage.EXCEEDED_QUOTA, 403, session.response, quotaStatus) + return + } + } + + const key: Key = { + version: + getRequestKeyVersion(session.request, session.logger) ?? + this.config.keystore.keys.phoneNumberPrivacy.latest, + name: DefaultKeyName.PHONE_NUMBER_PRIVACY, + } + + try { + const signature = await this.sign( + session.request.body.blindedQueryPhoneNumber, + key, + session + ) + this.io.sendSuccess(200, session.response, key, signature, quotaStatus, session.errors) + return + } catch (err) { + session.logger.error({ err }) + quotaStatus.performedQueryCount-- + this.io.sendFailure( + ErrorMessage.SIGNATURE_COMPUTATION_FAILURE, + 500, + session.response, + quotaStatus + ) + // Note that errors thrown after rollback will have no effect, hence doing this last + await trx.rollback() + return + } + } + await timeout(pnpSignHandler, [], this.config.timeout, timeoutError) + }) + } + + private async sign( + blindedMessage: string, + key: Key, + session: Session + ): Promise { + let privateKey: string + try { + privateKey = await this.keyProvider.getPrivateKeyOrFetchFromStore(key) + } catch (err) { + session.logger.info({ key }, 'Requested key version not supported') + session.logger.error(err) + throw new Error(WarningMessage.INVALID_KEY_VERSION_REQUEST) + } + return computeBlindedSignature(blindedMessage, privateKey, session.logger) + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.legacy.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.legacy.ts new file mode 100644 index 00000000000..70d8068aa07 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.legacy.ts @@ -0,0 +1,125 @@ +import { ContractKit } from '@celo/contractkit' +import { + authenticateUser, + ErrorType, + hasValidAccountParam, + hasValidBlindedPhoneNumberParam, + identifierIsValidIfExists, + isBodyReasonablySized, + KEY_VERSION_HEADER, + LegacySignMessageRequest, + LegacySignMessageRequestSchema, + PnpQuotaStatus, + requestHasValidKeyVersion, + send, + SignerEndpoint, + SignMessageResponse, + SignMessageResponseFailure, + SignMessageResponseSuccess, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import { IO } from '../../../common/io' +import { Key } from '../../../common/key-management/key-provider-base' +import { Counters } from '../../../common/metrics' +import { getSignerVersion } from '../../../config' +import { PnpSession } from '../../session' + +export class LegacyPnpSignIO extends IO { + readonly endpoint = SignerEndpoint.LEGACY_PNP_SIGN + + constructor( + readonly enabled: boolean, + readonly shouldFailOpen: boolean, + readonly kit: ContractKit + ) { + super(enabled) + } + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + const logger = response.locals.logger + const warnings: ErrorType[] = [] + if (!super.inputChecks(request, response)) { + return null + } + if (!requestHasValidKeyVersion(request, logger)) { + this.sendFailure(WarningMessage.INVALID_KEY_VERSION_REQUEST, 400, response) + return null + } + if (!(await this.authenticate(request, warnings, logger))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const session = new PnpSession(request, response) + session.errors.push(...warnings) + return session + } + + validate( + request: Request<{}, {}, unknown> + ): request is Request<{}, {}, LegacySignMessageRequest> { + return ( + LegacySignMessageRequestSchema.is(request.body) && + hasValidAccountParam(request.body) && + hasValidBlindedPhoneNumberParam(request.body) && + identifierIsValidIfExists(request.body) && + isBodyReasonablySized(request.body) + ) + } + + async authenticate( + request: Request<{}, {}, LegacySignMessageRequest>, + warnings: ErrorType[], + logger: Logger + ): Promise { + return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings) + } + + sendSuccess( + status: number, + response: Response, + key: Key, + signature: string, + quotaStatus: PnpQuotaStatus, + warnings: string[] + ) { + response.set(KEY_VERSION_HEADER, key.version.toString()) + send( + response, + { + success: true, + version: getSignerVersion(), + signature, + ...quotaStatus, + warnings, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } + + sendFailure( + error: string, + status: number, + response: Response, + quotaStatus?: PnpQuotaStatus + ) { + send( + response, + { + success: false, + version: getSignerVersion(), + error, + ...quotaStatus, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.ts b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.ts new file mode 100644 index 00000000000..7e522defd0a --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.ts @@ -0,0 +1,121 @@ +import { ContractKit } from '@celo/contractkit' +import { + authenticateUser, + ErrorType, + hasValidAccountParam, + hasValidBlindedPhoneNumberParam, + isBodyReasonablySized, + KEY_VERSION_HEADER, + PnpQuotaStatus, + requestHasValidKeyVersion, + send, + SignerEndpoint, + SignMessageRequest, + SignMessageRequestSchema, + SignMessageResponse, + SignMessageResponseFailure, + SignMessageResponseSuccess, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' +import { IO } from '../../../common/io' +import { Key } from '../../../common/key-management/key-provider-base' +import { Counters } from '../../../common/metrics' +import { getSignerVersion } from '../../../config' +import { PnpSession } from '../../session' + +export class PnpSignIO extends IO { + readonly endpoint = SignerEndpoint.PNP_SIGN + + constructor( + readonly enabled: boolean, + readonly shouldFailOpen: boolean, + readonly kit: ContractKit + ) { + super(enabled) + } + + async init( + request: Request<{}, {}, unknown>, + response: Response + ): Promise | null> { + const logger = response.locals.logger + const warnings: ErrorType[] = [] + if (!super.inputChecks(request, response)) { + return null + } + if (!requestHasValidKeyVersion(request, logger)) { + this.sendFailure(WarningMessage.INVALID_KEY_VERSION_REQUEST, 400, response) + return null + } + if (!(await this.authenticate(request, warnings, logger))) { + this.sendFailure(WarningMessage.UNAUTHENTICATED_USER, 401, response) + return null + } + const session = new PnpSession(request, response) + session.errors.push(...warnings) + return session + } + + validate(request: Request<{}, {}, unknown>): request is Request<{}, {}, SignMessageRequest> { + return ( + SignMessageRequestSchema.is(request.body) && + hasValidAccountParam(request.body) && + hasValidBlindedPhoneNumberParam(request.body) && + isBodyReasonablySized(request.body) + ) + } + + async authenticate( + request: Request<{}, {}, SignMessageRequest>, + warnings: ErrorType[], + logger: Logger + ): Promise { + return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings) + } + + sendSuccess( + status: number, + response: Response, + key: Key, + signature: string, + quotaStatus: PnpQuotaStatus, + warnings: string[] + ) { + response.set(KEY_VERSION_HEADER, key.version.toString()) + send( + response, + { + success: true, + version: getSignerVersion(), + signature, + ...quotaStatus, + warnings, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } + + sendFailure( + error: string, + status: number, + response: Response, + quotaStatus?: PnpQuotaStatus + ) { + send( + response, + { + success: false, + version: getSignerVersion(), + error, + ...quotaStatus, + }, + status, + response.locals.logger + ) + Counters.responses.labels(this.endpoint, status.toString()).inc() + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/services/quota.legacy.ts b/packages/phone-number-privacy/signer/src/pnp/services/quota.legacy.ts new file mode 100644 index 00000000000..0900437ef04 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/services/quota.legacy.ts @@ -0,0 +1,280 @@ +import { NULL_ADDRESS } from '@celo/base' +import { StableToken } from '@celo/contractkit' +import { + ErrorMessage, + isVerified, + LegacyPnpQuotaRequest, + LegacySignMessageRequest, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { ACCOUNTS_TABLE } from '../../common/database/models/account' +import { REQUESTS_TABLE } from '../../common/database/models/request' +import { Counters, Histograms, meter } from '../../common/metrics' +import { QuotaService } from '../../common/quota' +import { + getCeloBalance, + getStableTokenBalance, + getTransactionCount, + getWalletAddress, +} from '../../common/web3/contracts' +import { config } from '../../config' +import { PnpSession } from '../session' +import { PnpQuotaService } from './quota' + +export class LegacyPnpQuotaService + extends PnpQuotaService + implements QuotaService +{ + protected readonly requestsTable = REQUESTS_TABLE.LEGACY + protected readonly accountsTable = ACCOUNTS_TABLE.LEGACY + + protected async getWalletAddressAndIsVerified( + session: PnpSession + ): Promise<{ walletAddress: string; isAccountVerified: boolean }> { + const { account, hashedPhoneNumber } = session.request.body + const [walletAddressResult, isVerifiedResult] = await meter( + (_session: PnpSession) => + Promise.allSettled([ + getWalletAddress(this.kit, session.logger, account, session.request.url), + hashedPhoneNumber + ? isVerified(account, hashedPhoneNumber, this.kit, session.logger) + : Promise.resolve(false), + ]), + [session], + (err: any) => { + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getWalletAddressAndIsVerified', session.request.url] + ) + let hadFullNodeError = false, + isAccountVerified = false, + walletAddress = NULL_ADDRESS + if (walletAddressResult.status === 'fulfilled') { + walletAddress = walletAddressResult.value + } else { + session.logger.error(walletAddressResult.reason) + hadFullNodeError = true + } + if (isVerifiedResult.status === 'fulfilled') { + isAccountVerified = isVerifiedResult.value + } else { + session.logger.error(isVerifiedResult.reason) + hadFullNodeError = true + } + if (hadFullNodeError) { + session.errors.push(ErrorMessage.FULL_NODE_ERROR) + } + + if (account.toLowerCase() === walletAddress.toLowerCase()) { + session.logger.debug('walletAddress is the same as accountAddress') + walletAddress = NULL_ADDRESS // So we don't double count quota + } + + return { isAccountVerified, walletAddress } + } + + protected async getBalances( + session: PnpSession, + ...addresses: string[] + ) { + const [cUSDAccountBalanceResult, cEURAccountBalanceResult, celoAccountBalanceResult] = + await meter( + (logger: Logger, ..._addresses: string[]) => + Promise.allSettled([ + getStableTokenBalance( + this.kit, + StableToken.cUSD, + logger, + session.request.url, + ..._addresses + ), + getStableTokenBalance( + this.kit, + StableToken.cEUR, + logger, + session.request.url, + ..._addresses + ), + getCeloBalance(this.kit, logger, session.request.url, ..._addresses), + ]), + [session.logger, ...addresses], + (err: any) => { + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getBalances', session.request.url] + ) + + let hadFullNodeError = false + let cUSDAccountBalance, cEURAccountBalance, celoAccountBalance + if (cUSDAccountBalanceResult.status === 'fulfilled') { + cUSDAccountBalance = cUSDAccountBalanceResult.value + } else { + session.logger.error(cUSDAccountBalanceResult.reason) + hadFullNodeError = true + } + if (cEURAccountBalanceResult.status === 'fulfilled') { + cEURAccountBalance = cEURAccountBalanceResult.value + } else { + session.logger.error(cEURAccountBalanceResult.reason) + hadFullNodeError = true + } + if (celoAccountBalanceResult.status === 'fulfilled') { + celoAccountBalance = celoAccountBalanceResult.value + } else { + session.logger.error(celoAccountBalanceResult.reason) + hadFullNodeError = true + } + if (hadFullNodeError) { + session.errors.push(ErrorMessage.FULL_NODE_ERROR) + } + + return { cUSDAccountBalance, cEURAccountBalance, celoAccountBalance } + } + + /* + * Calculates how many queries the caller has unlocked based on the algorithm + * unverifiedQueryCount + verifiedQueryCount + (queryPerTransaction * transactionCount) + * If the caller is not verified, they must have a minimum balance to get the unverifiedQueryMax. + */ + protected async getTotalQuotaWithoutMeter( + session: PnpSession + ): Promise { + const { + unverifiedQueryMax, + additionalVerifiedQueryMax, + queryPerTransaction, + minDollarBalance, + minEuroBalance, + minCeloBalance, + } = config.quota + + const { account } = session.request.body + + const { walletAddress, isAccountVerified } = await this.getWalletAddressAndIsVerified(session) + + if (walletAddress !== NULL_ADDRESS) { + Counters.requestsWithWalletAddress.inc() + } + + const transactionCount = await getTransactionCount( + this.kit, + session.logger, + session.request.url, + account, + walletAddress + ) + session.logger.debug({ account, transactionCount }) + + if (isAccountVerified) { + Counters.requestsWithVerifiedAccount.inc() + session.logger.debug({ account }, 'Account is verified') + return this.calculateQuotaForVerifiedAccount( + account, + unverifiedQueryMax, + additionalVerifiedQueryMax, + queryPerTransaction, + transactionCount, + session.logger + ) + } + + session.logger.debug({ account }, 'Account is not verified. Checking if min balance is met.') + + const { cUSDAccountBalance, cEURAccountBalance, celoAccountBalance } = await this.getBalances( + session, + account, + walletAddress + ) + + // Min balance can be in either cUSD, cEUR or CELO + if ( + cUSDAccountBalance?.isGreaterThanOrEqualTo(minDollarBalance) || + cEURAccountBalance?.isGreaterThanOrEqualTo(minEuroBalance) || + celoAccountBalance?.isGreaterThanOrEqualTo(minCeloBalance) + ) { + Counters.requestsWithUnverifiedAccountWithMinBalance.inc() + session.logger.debug( + { + account, + cUSDAccountBalance, + cEURAccountBalance, + celoAccountBalance, + minDollarBalance, + minEuroBalance, + minCeloBalance, + }, + 'Account is not verified but meets min balance' + ) + + return this.calculateQuotaForUnverifiedAccountWithMinBalance( + account, + unverifiedQueryMax, + queryPerTransaction, + transactionCount, + session.logger + ) + } + + session.logger.debug({ account }, 'Account is not verified and does not meet min balance') + + const quota = 0 + + session.logger.trace({ + account, + cUSDAccountBalance, + cEURAccountBalance, + celoAccountBalance, + minDollarBalance, + minEuroBalance, + minCeloBalance, + quota, + }) + + return quota + } + + private calculateQuotaForVerifiedAccount( + account: string, + unverifiedQueryMax: number, + additionalVerifiedQueryMax: number, + queryPerTransaction: number, + transactionCount: number, + logger: Logger + ): number { + const quota = + unverifiedQueryMax + additionalVerifiedQueryMax + queryPerTransaction * transactionCount + + logger.trace({ + account, + unverifiedQueryMax, + additionalVerifiedQueryMax, + queryPerTransaction, + transactionCount, + quota, + }) + + return quota + } + + private calculateQuotaForUnverifiedAccountWithMinBalance( + account: string, + unverifiedQueryMax: number, + queryPerTransaction: number, + transactionCount: number, + logger: Logger + ): number { + const quota = unverifiedQueryMax + queryPerTransaction * transactionCount + + logger.trace({ + account, + unverifiedQueryMax, + queryPerTransaction, + transactionCount, + quota, + }) + + return quota + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/services/quota.onchain.ts b/packages/phone-number-privacy/signer/src/pnp/services/quota.onchain.ts new file mode 100644 index 00000000000..d995f1b316b --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/services/quota.onchain.ts @@ -0,0 +1,39 @@ +import { PnpQuotaRequest, SignMessageRequest } from '@celo/phone-number-privacy-common' +import BigNumber from 'bignumber.js' +import { ACCOUNTS_TABLE } from '../../common/database/models/account' +import { REQUESTS_TABLE } from '../../common/database/models/request' +import { QuotaService } from '../../common/quota' +import { getOnChainOdisPayments } from '../../common/web3/contracts' +import { config } from '../../config' +import { PnpSession } from '../session' +import { PnpQuotaService } from './quota' + +export class OnChainPnpQuotaService + extends PnpQuotaService + implements QuotaService +{ + protected readonly requestsTable = REQUESTS_TABLE.ONCHAIN + protected readonly accountsTable = ACCOUNTS_TABLE.ONCHAIN + /* + * Calculates how many queries the caller has unlocked based on the total + * amount of funds paid to the OdisPayments.sol contract on-chain. + */ + protected async getTotalQuotaWithoutMeter( + session: PnpSession + ): Promise { + const { queryPriceInCUSD } = config.quota + const { account } = session.request.body + const totalPaidInWei = await getOnChainOdisPayments( + this.kit, + session.logger, + account, + session.request.url + ) + const totalQuota = totalPaidInWei + .div(queryPriceInCUSD.times(new BigNumber(1e18))) + .integerValue(BigNumber.ROUND_DOWN) + // If any account hits an overflow here, we need to redesign how + // quota/queries are computed anyways. + return totalQuota.toNumber() + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/services/quota.ts b/packages/phone-number-privacy/signer/src/pnp/services/quota.ts new file mode 100644 index 00000000000..c815cdd5e76 --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/services/quota.ts @@ -0,0 +1,157 @@ +import { ContractKit } from '@celo/contractkit' +import { + ErrorMessage, + PnpQuotaRequest, + PnpQuotaStatus, + SignMessageRequest, +} from '@celo/phone-number-privacy-common' +import { Knex } from 'knex' +import { ACCOUNTS_TABLE } from '../../common/database/models/account' +import { REQUESTS_TABLE } from '../../common/database/models/request' +import { getPerformedQueryCount, incrementQueryCount } from '../../common/database/wrappers/account' +import { storeRequest } from '../../common/database/wrappers/request' +import { Counters, Histograms, meter } from '../../common/metrics' +import { OdisQuotaStatusResult, QuotaService } from '../../common/quota' +import { getBlockNumber } from '../../common/web3/contracts' +import { config } from '../../config' +import { PnpSession } from '../session' + +export abstract class PnpQuotaService + implements QuotaService +{ + protected abstract readonly requestsTable: REQUESTS_TABLE + protected abstract readonly accountsTable: ACCOUNTS_TABLE + + constructor(readonly db: Knex, readonly kit: ContractKit) {} + + public async checkAndUpdateQuotaStatus( + state: PnpQuotaStatus, + session: PnpSession, + trx: Knex.Transaction + ): Promise> { + const remainingQuota = state.totalQuota - state.performedQueryCount + Histograms.userRemainingQuotaAtRequest.labels(session.request.url).observe(remainingQuota) + let sufficient = remainingQuota > 0 + if (!sufficient) { + session.logger.warn({ ...state }, 'No remaining quota') + if (this.bypassQuotaForE2ETesting(session.request.body)) { + Counters.testQuotaBypassedRequests.inc() + session.logger.info(session.request.body, 'Request will bypass quota check for e2e testing') + sufficient = true + } + } else { + await Promise.all([ + storeRequest( + this.db, + this.requestsTable, + session.request.body.account, + session.request.body.blindedQueryPhoneNumber, + session.logger, + trx + ), + incrementQueryCount( + this.db, + this.accountsTable, + session.request.body.account, + session.logger, + trx + ), + ]) + state.performedQueryCount++ + } + return { sufficient, state } + } + + public async getQuotaStatus( + session: PnpSession, + trx?: Knex.Transaction + ): Promise { + const { account } = session.request.body + const [performedQueryCountResult, totalQuotaResult, blockNumberResult] = await meter( + (_session: PnpSession) => + Promise.allSettled([ + getPerformedQueryCount(this.db, this.accountsTable, account, session.logger, trx), + this.getTotalQuota(_session), + getBlockNumber(this.kit), + ]), + [session], + (err: any) => { + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getQuotaStatus', session.request.url] + ) + + const quotaStatus: PnpQuotaStatus = { + // TODO(future) consider making totalQuota,performedQueryCount undefined + totalQuota: -1, + performedQueryCount: -1, + blockNumber: undefined, + } + if (performedQueryCountResult.status === 'fulfilled') { + quotaStatus.performedQueryCount = performedQueryCountResult.value + } else { + session.logger.error( + { err: performedQueryCountResult.reason }, + ErrorMessage.FAILURE_TO_GET_PERFORMED_QUERY_COUNT + ) + session.errors.push( + ErrorMessage.DATABASE_GET_FAILURE, + ErrorMessage.FAILURE_TO_GET_PERFORMED_QUERY_COUNT + ) + } + let hadFullNodeError = false + if (totalQuotaResult.status === 'fulfilled') { + quotaStatus.totalQuota = totalQuotaResult.value + } else { + session.logger.error( + { err: totalQuotaResult.reason }, + ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA + ) + hadFullNodeError = true + session.errors.push(ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA) + } + if (blockNumberResult.status === 'fulfilled') { + quotaStatus.blockNumber = blockNumberResult.value + } else { + session.logger.error( + { err: blockNumberResult.reason }, + ErrorMessage.FAILURE_TO_GET_BLOCK_NUMBER + ) + hadFullNodeError = true + session.errors.push(ErrorMessage.FAILURE_TO_GET_BLOCK_NUMBER) + } + if (hadFullNodeError) { + session.errors.push(ErrorMessage.FULL_NODE_ERROR) + } + + return quotaStatus + } + + protected async getTotalQuota( + session: PnpSession + ): Promise { + return meter( + this.getTotalQuotaWithoutMeter.bind(this), + [session], + (err: any) => { + throw err + }, + Histograms.getRemainingQueryCountInstrumentation, + ['getTotalQuota', session.request.url] + ) + } + + /* + * Calculates how many queries the caller has unlocked; + * must be implemented by subclasses. + */ + protected abstract getTotalQuotaWithoutMeter( + session: PnpSession + ): Promise + + private bypassQuotaForE2ETesting(requestBody: SignMessageRequest): boolean { + const sessionID = Number(requestBody.sessionID) + return !Number.isNaN(sessionID) && sessionID % 100 < config.test_quota_bypass_percentage + } +} diff --git a/packages/phone-number-privacy/signer/src/pnp/session.ts b/packages/phone-number-privacy/signer/src/pnp/session.ts new file mode 100644 index 00000000000..a6d80c764ae --- /dev/null +++ b/packages/phone-number-privacy/signer/src/pnp/session.ts @@ -0,0 +1,19 @@ +import { + ErrorType, + PhoneNumberPrivacyRequest, + PhoneNumberPrivacyResponse, +} from '@celo/phone-number-privacy-common' +import Logger from 'bunyan' +import { Request, Response } from 'express' + +export class PnpSession { + readonly logger: Logger + readonly errors: ErrorType[] = [] + + public constructor( + readonly request: Request<{}, {}, R>, + readonly response: Response> + ) { + this.logger = response.locals.logger + } +} diff --git a/packages/phone-number-privacy/signer/src/server.ts b/packages/phone-number-privacy/signer/src/server.ts index 6d82be563fb..7b0ba8d472b 100644 --- a/packages/phone-number-privacy/signer/src/server.ts +++ b/packages/phone-number-privacy/signer/src/server.ts @@ -1,51 +1,170 @@ -import { timeout } from '@celo/base' -import { Endpoint, loggerMiddleware, rootLogger as logger } from '@celo/phone-number-privacy-common' +import { ContractKit } from '@celo/contractkit' +import { + ErrorMessage, + getContractKit, + loggerMiddleware, + rootLogger, + SignerEndpoint, +} from '@celo/phone-number-privacy-common' import Logger from 'bunyan' import express, { Request, Response } from 'express' import fs from 'fs' import https from 'https' +import { Knex } from 'knex' import * as PromClient from 'prom-client' -import { Counters, Histograms } from './common/metrics' -import config, { getVersion } from './config' -import { handleGetBlindedMessagePartialSig } from './signing/get-partial-signature' -import { handleGetQuota } from './signing/query-quota' +import { Controller } from './common/controller' +import { KeyProvider } from './common/key-management/key-provider-base' +import { Counters } from './common/metrics' +import { getSignerVersion, SignerConfig } from './config' +import { DomainDisableAction } from './domain/endpoints/disable/action' +import { DomainDisableIO } from './domain/endpoints/disable/io' +import { DomainQuotaAction } from './domain/endpoints/quota/action' +import { DomainQuotaIO } from './domain/endpoints/quota/io' +import { DomainSignAction } from './domain/endpoints/sign/action' +import { DomainSignIO } from './domain/endpoints/sign/io' +import { DomainQuotaService } from './domain/services/quota' +import { PnpQuotaAction } from './pnp/endpoints/quota/action' +import { PnpQuotaIO } from './pnp/endpoints/quota/io' +import { LegacyPnpQuotaIO } from './pnp/endpoints/quota/io.legacy' +import { LegacyPnpSignAction } from './pnp/endpoints/sign/action.legacy' +import { OnChainPnpSignAction } from './pnp/endpoints/sign/action.onchain' +import { PnpSignIO } from './pnp/endpoints/sign/io' +import { LegacyPnpSignIO } from './pnp/endpoints/sign/io.legacy' +import { LegacyPnpQuotaService } from './pnp/services/quota.legacy' +import { OnChainPnpQuotaService } from './pnp/services/quota.onchain' require('events').EventEmitter.defaultMaxListeners = 15 -export function createServer() { - // const domainService = new DomainService(new DomainAuthService(), new DomainQuotaService()) +export function startSigner( + config: SignerConfig, + db: Knex, + keyProvider: KeyProvider, + kit?: ContractKit +) { + const logger = rootLogger(config.serviceName) + + kit = kit ?? getContractKit(config.blockchain) - logger().info('Creating express server') + logger.info('Creating signer express server') const app = express() - app.use(express.json({ limit: '0.2mb' }), loggerMiddleware) + app.use(express.json({ limit: '0.2mb' }), loggerMiddleware(config.serviceName)) - app.get(Endpoint.STATUS, (_req, res) => { + app.get(SignerEndpoint.STATUS, (_req, res) => { res.status(200).json({ - version: getVersion(), + version: getSignerVersion(), }) }) - app.get(Endpoint.METRICS, (_req, res) => { + app.get(SignerEndpoint.METRICS, (_req, res) => { res.send(PromClient.register.metrics()) }) - const addMeteredEndpoint = ( - endpoint: Endpoint, - handler: (req: Request, res: Response) => Promise, - method: 'post' | 'get' = 'post' + const addEndpoint = ( + endpoint: SignerEndpoint, + handler: (req: Request, res: Response) => Promise ) => - app[method](endpoint, async (req, res) => { - await callAndMeterLatency(endpoint, handler, req, res) + app.post(endpoint, async (req, res) => { + const childLogger: Logger = res.locals.logger + try { + await handler(req, res) + } catch (err: any) { + // Handle any errors that otherwise managed to escape the proper handlers + childLogger.error(ErrorMessage.CAUGHT_ERROR_IN_ENDPOINT_HANDLER) + childLogger.error(err) + Counters.errorsCaughtInEndpointHandler.inc() + if (!res.headersSent) { + childLogger.info('Responding with error in outer endpoint handler') + res.status(500).json({ + success: false, + error: ErrorMessage.UNKNOWN_ERROR, + }) + } else { + // Getting to this error likely indicates that the `perform` process + // does not terminate after sending a response, and then throws an error. + childLogger.error(ErrorMessage.ERROR_AFTER_RESPONSE_SENT) + Counters.errorsThrownAfterResponseSent.inc() + } + } }) - // EG. curl -v "http://localhost:8080/getBlindedMessagePartialSig" -H "Authorization: 0xdaf63ea42a092e69b2001db3826bc81dc859bffa4d51ce8943fddc8ccfcf6b2b1f55d64e4612e7c028791528796f5a62c1d2865b184b664589696a08c83fc62a00" -d '{"hashedPhoneNumber":"0x5f6e88c3f724b3a09d3194c0514426494955eff7127c29654e48a361a19b4b96","blindedQueryPhoneNumber":"n/I9srniwEHm5o6t3y0tTUB5fn7xjxRrLP1F/i8ORCdqV++WWiaAzUo3GA2UNHiB","account":"0x588e4b68193001e4d10928660aB4165b813717C0"}' -H 'Content-Type: application/json' - addMeteredEndpoint(Endpoint.GET_BLINDED_MESSAGE_PARTIAL_SIG, handleGetBlindedMessagePartialSig) - addMeteredEndpoint(Endpoint.GET_QUOTA, handleGetQuota) - // addMeteredEndpoint(Endpoints.DOMAIN_QUOTA_STATUS, domainService.handleGetDomainQuotaStatus) - // addMeteredEndpoint(Endpoints.DOMAIN_SIGN, domainService.handleGetDomainRestrictedSignature) - // addMeteredEndpoint(Endpoints.DISABLE_DOMAIN, domainService.handleDisableDomain) + const pnpQuotaService = new OnChainPnpQuotaService(db, kit) + const legacyPnpQuotaService = new LegacyPnpQuotaService(db, kit) + const domainQuotaService = new DomainQuotaService(db) + + const pnpQuota = new Controller( + new PnpQuotaAction( + config, + pnpQuotaService, + new PnpQuotaIO( + config.api.phoneNumberPrivacy.enabled, + config.api.phoneNumberPrivacy.shouldFailOpen, // TODO (https://github.com/celo-org/celo-monorepo/issues/9862) consider refactoring config to make the code cleaner + kit + ) + ) + ) + const pnpSign = new Controller( + new OnChainPnpSignAction( + db, + config, + pnpQuotaService, + keyProvider, + new PnpSignIO( + config.api.phoneNumberPrivacy.enabled, + config.api.phoneNumberPrivacy.shouldFailOpen, + kit + ) + ) + ) + const legacyPnpSign = new Controller( + new LegacyPnpSignAction( + db, + config, + legacyPnpQuotaService, + keyProvider, + new LegacyPnpSignIO( + config.api.legacyPhoneNumberPrivacy.enabled, + config.api.legacyPhoneNumberPrivacy.shouldFailOpen, + kit + ) + ) + ) + const legacyPnpQuota = new Controller( + new PnpQuotaAction( + config, + legacyPnpQuotaService, + new LegacyPnpQuotaIO( + config.api.legacyPhoneNumberPrivacy.enabled, + config.api.legacyPhoneNumberPrivacy.shouldFailOpen, + kit + ) + ) + ) + const domainQuota = new Controller( + new DomainQuotaAction(config, domainQuotaService, new DomainQuotaIO(config.api.domains.enabled)) + ) + const domainSign = new Controller( + new DomainSignAction( + db, + config, + domainQuotaService, + keyProvider, + new DomainSignIO(config.api.domains.enabled) + ) + ) + const domainDisable = new Controller( + new DomainDisableAction(db, config, new DomainDisableIO(config.api.domains.enabled)) + ) + logger.info('Right before adding meteredSignerEndpoints') + addEndpoint(SignerEndpoint.PNP_SIGN, pnpSign.handle.bind(pnpSign)) + addEndpoint(SignerEndpoint.PNP_QUOTA, pnpQuota.handle.bind(pnpQuota)) + addEndpoint(SignerEndpoint.DOMAIN_QUOTA_STATUS, domainQuota.handle.bind(domainQuota)) + addEndpoint(SignerEndpoint.DOMAIN_SIGN, domainSign.handle.bind(domainSign)) + addEndpoint(SignerEndpoint.DISABLE_DOMAIN, domainDisable.handle.bind(domainDisable)) + + addEndpoint(SignerEndpoint.LEGACY_PNP_SIGN, legacyPnpSign.handle.bind(legacyPnpSign)) + addEndpoint(SignerEndpoint.LEGACY_PNP_QUOTA, legacyPnpQuota.handle.bind(legacyPnpQuota)) - const sslOptions = getSslOptions() + const sslOptions = getSslOptions(config) if (sslOptions) { return https.createServer(sslOptions, app) } else { @@ -53,35 +172,17 @@ export function createServer() { } } -async function callAndMeterLatency( - endpoint: Endpoint, - handler: (req: Request, res: Response) => Promise, - req: Request, - res: Response -) { - const childLogger: Logger = res.locals.logger - const end = Histograms.responseLatency.labels(endpoint).startTimer() - const timeoutRes = Symbol() - await timeout(handler, [req, res], config.timeout, timeoutRes) - .catch((error: any) => { - if (error === timeoutRes) { - Counters.timeouts.inc() - childLogger.warn(`Timed out after ${config.timeout}ms`) - } - }) - .finally(end) -} - -function getSslOptions() { +function getSslOptions(config: SignerConfig) { + const logger = rootLogger(config.serviceName) const { sslKeyPath, sslCertPath } = config.server if (!sslKeyPath || !sslCertPath) { - logger().info('No SSL configs specified') + logger.info('No SSL configs specified') return null } if (!fs.existsSync(sslKeyPath) || !fs.existsSync(sslCertPath)) { - logger().error('SSL cert files not found') + logger.error('SSL cert files not found') return null } diff --git a/packages/phone-number-privacy/signer/src/signing/get-partial-signature.ts b/packages/phone-number-privacy/signer/src/signing/get-partial-signature.ts deleted file mode 100644 index 92c44d504be..00000000000 --- a/packages/phone-number-privacy/signer/src/signing/get-partial-signature.ts +++ /dev/null @@ -1,209 +0,0 @@ -import { - authenticateUser, - Endpoint, - ErrorMessage, - GetBlindedMessageSigRequest, - hasValidAccountParam, - hasValidBlindedPhoneNumberParam, - identifierIsValidIfExists, - isBodyReasonablySized, - SignMessageResponse, - SignMessageResponseFailure, - WarningMessage, -} from '@celo/phone-number-privacy-common' -import Logger from 'bunyan' -import { Request, Response } from 'express' -import allSettled from 'promise.allsettled' -import { computeBlindedSignature } from '../bls/bls-cryptography-client' -import { respondWithError } from '../common/error-utils' -import { Counters, Histograms } from '../common/metrics' -import config, { getVersion } from '../config' -import { incrementQueryCount } from '../database/wrappers/account' -import { getRequestExists, storeRequest } from '../database/wrappers/request' -import { getKeyProvider } from '../key-management/key-provider' -import { getBlockNumber, getContractKit } from '../web3/contracts' -import { getRemainingQueryCount } from './query-quota' - -allSettled.shim() - -export type GetBlindedMessagePartialSigRequest = GetBlindedMessageSigRequest - -export async function handleGetBlindedMessagePartialSig( - request: Request<{}, {}, GetBlindedMessagePartialSigRequest>, - response: Response -) { - Counters.requests.labels(Endpoint.GET_BLINDED_MESSAGE_PARTIAL_SIG).inc() - - const logger: Logger = response.locals.logger - logger.info({ request: request.body }, 'Request received') - logger.debug('Begin handleGetBlindedMessagePartialSig') - - try { - if (!isValidGetSignatureInput(request.body)) { - respondWithError( - Endpoint.GET_BLINDED_MESSAGE_PARTIAL_SIG, - response, - 400, - WarningMessage.INVALID_INPUT - ) - return - } - - const meterAuthenticateUser = Histograms.getBlindedSigInstrumentation - .labels('authenticateUser') - .startTimer() - if ( - !(await authenticateUser(request, getContractKit(), logger).finally(meterAuthenticateUser)) - ) { - respondWithError( - Endpoint.GET_BLINDED_MESSAGE_PARTIAL_SIG, - response, - 401, - WarningMessage.UNAUTHENTICATED_USER - ) - return - } - - const { account, blindedQueryPhoneNumber, hashedPhoneNumber } = request.body - - const errorMsgs: string[] = [] - // In the case of a blockchain connection failure, don't block user - // but set the error status accordingly - // - const meterGetQueryCountAndBlockNumber = Histograms.getBlindedSigInstrumentation - .labels('getQueryCountAndBlockNumber') - .startTimer() - const [_queryCount, _blockNumber] = await Promise.allSettled([ - // Note: The database read of the user's performedQueryCount - // included here resolves to 0 on error - getRemainingQueryCount(logger, account, hashedPhoneNumber), - getBlockNumber(), - ]).finally(meterGetQueryCountAndBlockNumber) - - let totalQuota = -1 - let performedQueryCount = -1 - let blockNumber = -1 - let hadBlockchainError = false - if (_queryCount.status === 'fulfilled') { - performedQueryCount = _queryCount.value.performedQueryCount - totalQuota = _queryCount.value.totalQuota - } else { - logger.error(_queryCount.reason) - hadBlockchainError = true - } - if (_blockNumber.status === 'fulfilled') { - blockNumber = _blockNumber.value - } else { - logger.error(_blockNumber.reason) - hadBlockchainError = true - } - - if (hadBlockchainError) { - errorMsgs.push(ErrorMessage.CONTRACT_GET_FAILURE) - } - - if (_queryCount.status === 'fulfilled' && performedQueryCount >= totalQuota) { - logger.debug('No remaining query count') - if (bypassQuotaForTesting(request.body)) { - Counters.testQuotaBypassedRequests.inc() - logger.info({ request: request.body }, 'Request will bypass quota check for testing') - } else { - respondWithError( - Endpoint.GET_BLINDED_MESSAGE_PARTIAL_SIG, - response, - 403, - WarningMessage.EXCEEDED_QUOTA, - performedQueryCount, - totalQuota, - blockNumber - ) - return - } - } - - const meterGenerateSignature = Histograms.getBlindedSigInstrumentation - .labels('generateSignature') - .startTimer() - let keyProvider - let privateKey - let signature - try { - keyProvider = getKeyProvider() - privateKey = keyProvider.getPrivateKey() - signature = computeBlindedSignature(blindedQueryPhoneNumber, privateKey, logger) - } catch (err) { - meterGenerateSignature() - throw err - } - meterGenerateSignature() - - if (await getRequestExists(request.body, logger)) { - Counters.duplicateRequests.inc() - logger.debug( - 'Signature request already exists in db. Will not store request or increment query count.' - ) - errorMsgs.push(WarningMessage.DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG) - } else { - const meterDbWriteOps = Histograms.getBlindedSigInstrumentation - .labels('dbWriteOps') - .startTimer() - const [requestStored, queryCountIncremented] = await Promise.all([ - storeRequest(request.body, logger), - incrementQueryCount(account, logger), - ]).finally(meterDbWriteOps) - if (!requestStored) { - logger.debug('Did not store request.') - errorMsgs.push(ErrorMessage.FAILURE_TO_STORE_REQUEST) - } - if (!queryCountIncremented) { - logger.debug('Did not increment query count.') - errorMsgs.push(ErrorMessage.FAILURE_TO_INCREMENT_QUERY_COUNT) - } else { - performedQueryCount++ - } - } - - let signMessageResponse: SignMessageResponse - const signMessageResponseSuccess: SignMessageResponse = { - success: !errorMsgs.length, - signature, - version: getVersion(), - performedQueryCount, - totalQuota, - blockNumber, - } - if (errorMsgs.length) { - const signMessageResponseFailure = signMessageResponseSuccess as SignMessageResponseFailure - signMessageResponseFailure.error = errorMsgs.join(', ') - signMessageResponse = signMessageResponseFailure - } else { - signMessageResponse = signMessageResponseSuccess - } - Counters.responses.labels(Endpoint.GET_BLINDED_MESSAGE_PARTIAL_SIG, '200').inc() - logger.info({ response: signMessageResponse }, 'Signature retrieval success') - response.json(signMessageResponse) - } catch (err) { - logger.error('Failed to get signature') - logger.error(err) - respondWithError( - Endpoint.GET_BLINDED_MESSAGE_PARTIAL_SIG, - response, - 500, - ErrorMessage.UNKNOWN_ERROR - ) - } -} - -function isValidGetSignatureInput(requestBody: GetBlindedMessagePartialSigRequest): boolean { - return ( - hasValidAccountParam(requestBody) && - hasValidBlindedPhoneNumberParam(requestBody) && - identifierIsValidIfExists(requestBody) && - isBodyReasonablySized(requestBody) - ) -} - -function bypassQuotaForTesting(requestBody: GetBlindedMessagePartialSigRequest) { - const sessionID = Number(requestBody.sessionID) - return sessionID && sessionID % 100 < config.test_quota_bypass_percentage -} diff --git a/packages/phone-number-privacy/signer/src/signing/query-quota.ts b/packages/phone-number-privacy/signer/src/signing/query-quota.ts deleted file mode 100644 index b4c18b3108a..00000000000 --- a/packages/phone-number-privacy/signer/src/signing/query-quota.ts +++ /dev/null @@ -1,335 +0,0 @@ -import { retryAsyncWithBackOffAndTimeout } from '@celo/base' -import { NULL_ADDRESS, StableToken } from '@celo/contractkit' -import { - authenticateUser, - Endpoint, - ErrorMessage, - FULL_NODE_TIMEOUT_IN_MS, - GetQuotaRequest, - hasValidAccountParam, - identifierIsValidIfExists, - isBodyReasonablySized, - isVerified, - RETRY_COUNT, - RETRY_DELAY_IN_MS, - WarningMessage, -} from '@celo/phone-number-privacy-common' -import { BigNumber } from 'bignumber.js' -import Logger from 'bunyan' -import { Request, Response } from 'express' -import allSettled from 'promise.allsettled' -import { respondWithError } from '../common/error-utils' -import { Counters, Histograms, Labels } from '../common/metrics' -import config, { getVersion } from '../config' -import { getPerformedQueryCount } from '../database/wrappers/account' -import { getContractKit } from '../web3/contracts' - -allSettled.shim() - -export async function handleGetQuota( - request: Request<{}, {}, GetQuotaRequest>, - response: Response -) { - Counters.requests.labels(Endpoint.GET_QUOTA).inc() - const logger: Logger = response.locals.logger - logger.info({ request: request.body }, 'Request received') - logger.debug('Begin handleGetQuota') - try { - if (!isValidGetQuotaInput(request.body)) { - respondWithError(Endpoint.GET_QUOTA, response, 400, WarningMessage.INVALID_INPUT) - return - } - if (!(await authenticateUser(request, getContractKit() as any, logger))) { - respondWithError(Endpoint.GET_QUOTA, response, 401, WarningMessage.UNAUTHENTICATED_USER) - return - } - - const { account, hashedPhoneNumber } = request.body - - const queryCount = await getRemainingQueryCount(logger, account, hashedPhoneNumber) - - const queryQuotaResponse = { - success: true, - version: getVersion(), - performedQueryCount: queryCount.performedQueryCount, - totalQuota: queryCount.totalQuota, - } - - Counters.responses.labels(Endpoint.GET_QUOTA, '200').inc() - logger.info({ response: queryQuotaResponse }, 'Query quota retrieval success') - response.status(200).json(queryQuotaResponse) - } catch (err) { - logger.error('Failed to get user quota') - logger.error(err) - respondWithError(Endpoint.GET_QUOTA, response, 500, ErrorMessage.DATABASE_GET_FAILURE) - } -} - -function isValidGetQuotaInput(requestBody: GetQuotaRequest): boolean { - return ( - hasValidAccountParam(requestBody) && - identifierIsValidIfExists(requestBody) && - isBodyReasonablySized(requestBody) - ) -} - -/* - * Returns the number of queries already performed and the calculated query quota. - */ -export async function getRemainingQueryCount( - logger: Logger, - account: string, - hashedPhoneNumber?: string -): Promise<{ performedQueryCount: number; totalQuota: number }> { - logger.debug({ account }, 'Retrieving remaining query count') - const meterGetRemainingQueryCount = Histograms.getRemainingQueryCountInstrumentation - .labels('getRemainingQueryCount') - .startTimer() - const [totalQuota, performedQueryCount] = await Promise.all([ - getQueryQuota(logger, account, hashedPhoneNumber), - getPerformedQueryCount(account, logger), - ]).finally(meterGetRemainingQueryCount) - Histograms.userRemainingQuotaAtRequest.observe(totalQuota - performedQueryCount) - return { performedQueryCount, totalQuota } -} - -async function getQueryQuota(logger: Logger, account: string, hashedPhoneNumber?: string) { - const getQueryQuotaMeter = Histograms.getRemainingQueryCountInstrumentation - .labels('getQueryQuota') - .startTimer() - return _getQueryQuota(logger, account, hashedPhoneNumber).finally(getQueryQuotaMeter) -} - -/* - * Calculates how many queries the caller has unlocked based on the algorithm - * unverifiedQueryCount + verifiedQueryCount + (queryPerTransaction * transactionCount) - * If the caller is not verified, they must have a minimum balance to get the unverifiedQueryMax. - */ -async function _getQueryQuota(logger: Logger, account: string, hashedPhoneNumber?: string) { - const getWalletAddressAndIsVerifiedMeter = Histograms.getRemainingQueryCountInstrumentation - .labels('getWalletAddressAndIsVerified') - .startTimer() - const [_walletAddress, _isAccountVerified] = await Promise.allSettled([ - getWalletAddress(logger, account), - new Promise((resolve) => - resolve( - hashedPhoneNumber - ? isVerified(account, hashedPhoneNumber, getContractKit() as any, logger) - : false - ) - ), - ]).finally(getWalletAddressAndIsVerifiedMeter) - - let walletAddress = _walletAddress.status === 'fulfilled' ? _walletAddress.value : NULL_ADDRESS - const isAccountVerified = - _isAccountVerified.status === 'fulfilled' ? _isAccountVerified.value : false - - logger.debug({ account, walletAddress }, 'begin getQueryQuota') - - if (account.toLowerCase() === walletAddress.toLowerCase()) { - logger.debug('walletAddress is the same as accountAddress') - walletAddress = NULL_ADDRESS - } - - if (walletAddress !== NULL_ADDRESS) { - Counters.requestsWithWalletAddress.inc() - } - - if (isAccountVerified) { - Counters.requestsWithVerifiedAccount.inc() - logger.debug({ account }, 'Account is verified') - const transactionCount = await getTransactionCount(logger, account, walletAddress) - const quota = - config.quota.unverifiedQueryMax + - config.quota.additionalVerifiedQueryMax + - config.quota.queryPerTransaction * transactionCount - - logger.trace({ - unverifiedQueryMax: config.quota.unverifiedQueryMax, - additionalVerifiedQueryMax: config.quota.additionalVerifiedQueryMax, - queryPerTransaction: config.quota.queryPerTransaction, - transactionCount, - quota, - }) - - return quota - } - - const getBalancesMeter = Histograms.getRemainingQueryCountInstrumentation - .labels('balances') - .startTimer() - let cUSDAccountBalance = new BigNumber(0) - let cEURAccountBalance = new BigNumber(0) - let celoAccountBalance = new BigNumber(0) - - await Promise.all([ - new Promise((resolve) => { - resolve(getStableTokenBalance(StableToken.cUSD, logger, account, walletAddress)) - }), - new Promise((resolve) => { - resolve(getStableTokenBalance(StableToken.cEUR, logger, account, walletAddress)) - }), - new Promise((resolve) => { - resolve(getCeloBalance(logger, account, walletAddress)) - }), - ]) - .then((values) => { - cUSDAccountBalance = values[0] as BigNumber - cEURAccountBalance = values[1] as BigNumber - celoAccountBalance = values[2] as BigNumber - }) - .finally(getBalancesMeter) - - // Min balance can be in either cUSD, cEUR or CELO - if ( - cUSDAccountBalance.isGreaterThanOrEqualTo(config.quota.minDollarBalance) || - cEURAccountBalance.isGreaterThanOrEqualTo(config.quota.minEuroBalance) || - celoAccountBalance.isGreaterThanOrEqualTo(config.quota.minCeloBalance) - ) { - Counters.requestsWithUnverifiedAccountWithMinBalance.inc() - logger.debug( - { - account, - cUSDAccountBalance, - cEURAccountBalance, - celoAccountBalance, - minDollarBalance: config.quota.minDollarBalance, - minEuroBalance: config.quota.minEuroBalance, - minCeloBalance: config.quota.minCeloBalance, - }, - 'Account is not verified but meets min balance' - ) - const transactionCount = await getTransactionCount(logger, account, walletAddress) - - const quota = - config.quota.unverifiedQueryMax + config.quota.queryPerTransaction * transactionCount - - logger.trace({ - unverifiedQueryMax: config.quota.unverifiedQueryMax, - queryPerTransaction: config.quota.queryPerTransaction, - transactionCount, - quota, - }) - return quota - } - - logger.trace({ - account, - cUSDAccountBalance, - cEURAccountBalance, - celoAccountBalance, - minDollarBalance: config.quota.minDollarBalance, - minEuroBalance: config.quota.minEuroBalance, - minCeloBalance: config.quota.minCeloBalance, - quota: 0, - }) - logger.debug({ account }, 'Account is not verified and does not meet min balance') - return 0 -} - -export async function getTransactionCount(logger: Logger, ...addresses: string[]): Promise { - const getTransactionCountMeter = Histograms.getRemainingQueryCountInstrumentation - .labels('getTransactionCount') - .startTimer() - const res = Promise.all( - addresses - .filter((address) => address !== NULL_ADDRESS) - .map((address) => - retryAsyncWithBackOffAndTimeout( - () => getContractKit().connection.getTransactionCount(address), - RETRY_COUNT, - [], - RETRY_DELAY_IN_MS, - undefined, - FULL_NODE_TIMEOUT_IN_MS - ).catch((err) => { - Counters.blockchainErrors.labels(Labels.read).inc() - throw err - }) - ) - ) - .then((values) => { - logger.trace({ addresses, txCounts: values }, 'Fetched txCounts for addresses') - return values.reduce((a, b) => a + b) - }) - .finally(getTransactionCountMeter) - return res -} - -export async function getStableTokenBalance( - stableToken: StableToken, - logger: Logger, - ...addresses: string[] -): Promise { - return Promise.all( - addresses - .filter((address) => address !== NULL_ADDRESS) - .map((address) => - retryAsyncWithBackOffAndTimeout( - async () => - (await getContractKit().contracts.getStableToken(stableToken)).balanceOf(address), - RETRY_COUNT, - [], - RETRY_DELAY_IN_MS, - undefined, - FULL_NODE_TIMEOUT_IN_MS - ).catch((err) => { - Counters.blockchainErrors.labels(Labels.read).inc() - throw err - }) - ) - ).then((values) => { - logger.trace( - { addresses, balances: values.map((bn) => bn.toString()) }, - `Fetched ${stableToken} balances for addresses` - ) - return values.reduce((a, b) => a.plus(b)) - }) -} - -export async function getCeloBalance(logger: Logger, ...addresses: string[]): Promise { - return Promise.all( - addresses - .filter((address) => address !== NULL_ADDRESS) - .map((address) => - retryAsyncWithBackOffAndTimeout( - async () => (await getContractKit().contracts.getGoldToken()).balanceOf(address), - RETRY_COUNT, - [], - RETRY_DELAY_IN_MS, - undefined, - FULL_NODE_TIMEOUT_IN_MS - ).catch((err) => { - Counters.blockchainErrors.labels(Labels.read).inc() - throw err - }) - ) - ).then((values) => { - logger.trace( - { addresses, balances: values.map((bn) => bn.toString()) }, - 'Fetched celo balances for addresses' - ) - return values.reduce((a, b) => a.plus(b)) - }) -} - -export async function getWalletAddress(logger: Logger, account: string): Promise { - const getWalletAddressMeter = Histograms.getRemainingQueryCountInstrumentation - .labels('getWalletAddress') - .startTimer() - return retryAsyncWithBackOffAndTimeout( - async () => (await getContractKit().contracts.getAccounts()).getWalletAddress(account), - RETRY_COUNT, - [], - RETRY_DELAY_IN_MS, - undefined, - FULL_NODE_TIMEOUT_IN_MS - ) - .catch((err: any) => { - logger.error({ account }, 'failed to get wallet address for account') - logger.error(err) - Counters.blockchainErrors.labels(Labels.read).inc() - return NULL_ADDRESS - }) - .finally(getWalletAddressMeter) -} diff --git a/packages/phone-number-privacy/signer/src/web3/contracts.ts b/packages/phone-number-privacy/signer/src/web3/contracts.ts deleted file mode 100644 index 668e5c7fbbb..00000000000 --- a/packages/phone-number-privacy/signer/src/web3/contracts.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { retryAsyncWithBackOffAndTimeout } from '@celo/base' -import { ContractKit, newKit, newKitWithApiKey } from '@celo/contractkit' -import { - FULL_NODE_TIMEOUT_IN_MS, - RETRY_COUNT, - RETRY_DELAY_IN_MS, -} from '@celo/phone-number-privacy-common' -import { Counters, Histograms, Labels } from '../common/metrics' -import config from '../config' - -const contractKit = config.blockchain.apiKey - ? newKitWithApiKey(config.blockchain.provider, config.blockchain.apiKey) - : newKit(config.blockchain.provider) - -export function getContractKit(): ContractKit { - return contractKit -} - -export async function getBlockNumber(): Promise { - const getBlockNumberMeter = Histograms.getBlindedSigInstrumentation - .labels('getBlockNumber') - .startTimer() - const res = retryAsyncWithBackOffAndTimeout( - () => getContractKit().connection.getBlockNumber(), - RETRY_COUNT, - [], - RETRY_DELAY_IN_MS, - undefined, - FULL_NODE_TIMEOUT_IN_MS - ) - .catch((err) => { - Counters.blockchainErrors.labels(Labels.read).inc() - throw err - }) - .finally(getBlockNumberMeter) - - return res -} diff --git a/packages/phone-number-privacy/signer/test/domain/domain.test.ts b/packages/phone-number-privacy/signer/test/domain/domain.test.ts deleted file mode 100644 index cf046eca2f7..00000000000 --- a/packages/phone-number-privacy/signer/test/domain/domain.test.ts +++ /dev/null @@ -1,174 +0,0 @@ -import { WasmBlsBlindingClient } from '@celo/identity/lib/odis/bls-blinding-client' -import { - DomainIdentifiers, - DomainRestrictedSignatureRequest, - DomainQuotaStatusRequest, - DisableDomainRequest, - genSessionID, - SequentialDelayDomain, - rootLogger, -} from '@celo/phone-number-privacy-common' -import { defined, noBool, noString } from '@celo/utils/lib/sign-typed-data-utils' -import { LocalWallet } from '@celo/wallet-local' -import { Request, Response } from 'express' -import { anyNumber, instance, mock, reset, verify, when } from 'ts-mockito' -import config, { DEV_PUBLIC_KEY, SupportedDatabase, SupportedKeystore } from '../../src/config' -import { closeDatabase, initDatabase } from '../../src/database/database' -import { DomainService } from '../../src/domain/domain.service' -import { DomainAuthService } from '../../src/domain/auth/domainAuth.service' -import { DomainQuotaService } from '../../src/domain/quota/domainQuota.service' -import { initKeyProvider } from '../../src/key-management/key-provider' - -// We will be using a Sqlite in-memory database for tests. -config.db.type = SupportedDatabase.Sqlite -config.keystore.type = SupportedKeystore.MockSecretManager - -describe('domainService', () => { - const requestMock = mock() - const request = instance(requestMock) - - const responseMock = mock() - const response = instance(responseMock) - - // TODO(victor): Use the real auth service by default, once implemented, for this test. - const authServiceMock = mock(DomainAuthService) - const authService = instance(authServiceMock) - - const domainService = new DomainService(authService, new DomainQuotaService()) - - const wallet = new LocalWallet() - wallet.addAccount('0x00000000000000000000000000000000000000000000000000000000deadbeef') - const walletAddress = wallet.getAccounts()[0]! - - const authenticatedDomain: SequentialDelayDomain = { - name: DomainIdentifiers.SequentialDelay, - version: '1', - stages: [{ delay: 0, resetTimer: noBool, batchSize: defined(2), repetitions: defined(10) }], - address: defined(walletAddress), - salt: noString, - } - - const signatureRequest = async (): Promise< - DomainRestrictedSignatureRequest - > => { - const blsBlindingClient = new WasmBlsBlindingClient(DEV_PUBLIC_KEY) - - return { - domain: authenticatedDomain, - options: { - signature: noString, - nonce: defined(0), - }, - blindedMessage: await blsBlindingClient.blindMessage('test message'), - sessionID: defined(genSessionID()), - } - } - - const quotaRequest = (): DomainQuotaStatusRequest => ({ - domain: authenticatedDomain, - options: { - signature: noString, - nonce: defined(0), - }, - sessionID: defined(genSessionID()), - }) - - const disableRequest = (): DisableDomainRequest => ({ - domain: authenticatedDomain, - options: { - signature: noString, - nonce: defined(0), - }, - sessionID: defined(genSessionID()), - }) - - beforeAll(async () => { - response.locals = { logger: rootLogger() } - await initKeyProvider() - }) - - beforeEach(async () => { - // Create a new in-memory database for each test. - await initDatabase() - reset(authServiceMock) - reset(responseMock) - reset(requestMock) - - // Allows for call chaining after setting the status. - when(responseMock.status(anyNumber())).thenReturn(response) - }) - - afterEach(async () => { - // Close and destroy the in-memory database. - // Note: If tests start to be too slow, this could be replaced with more complicated logic to - // reset the database state without destroying and recreting it for each test. - await closeDatabase() - }) - - describe('.handleDisableDomain', () => { - it('Should respond with 200 on valid request', async () => { - when(authServiceMock.authCheck()).thenReturn(true) - - when(requestMock.body).thenReturn(disableRequest()) - await domainService.handleDisableDomain(request, response) - - verify(responseMock.status(200)).once() - }) - - it('Should respond with 200 on repeated valid requests', async () => { - when(authServiceMock.authCheck()).thenReturn(true) - - when(requestMock.body).thenReturn(disableRequest()) - await domainService.handleDisableDomain(request, response) - - when(requestMock.body).thenReturn(disableRequest()) - await domainService.handleDisableDomain(request, response) - - verify(responseMock.status(200)).twice() - }) - - it('Should respond with 403 on failed auth', async () => { - when(authServiceMock.authCheck()).thenReturn(false) - - when(requestMock.body).thenReturn(disableRequest()) - await domainService.handleDisableDomain(request, response) - - verify(responseMock.status(403)).once() - }) - - it('Should respond with 400 on unknown domain', async () => { - when(authServiceMock.authCheck()).thenReturn(true) - - const req = disableRequest() - when(requestMock.body).thenReturn({ - ...req, - domain: { ...req.domain, name: 'UnknownDomain' }, - }) - await domainService.handleDisableDomain(request, response) - - verify(responseMock.status(400)).once() - }) - }) - - describe('.handleGetDomainQuotaStatus', () => { - it('Should respond with 200 on valid request', async () => { - when(authServiceMock.authCheck()).thenReturn(true) - - when(requestMock.body).thenReturn(quotaRequest()) - await domainService.handleGetDomainQuotaStatus(request, response) - - verify(responseMock.status(200)).once() - }) - }) - - describe('.handleGetDomainRestrictedSignature', () => { - it('Should respond with 200 on valid request', async () => { - when(authServiceMock.authCheck()).thenReturn(true) - - when(requestMock.body).thenReturn(await signatureRequest()) - await domainService.handleGetDomainRestrictedSignature(request, response) - - verify(responseMock.status(200)).once() - }) - }) -}) diff --git a/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts new file mode 100644 index 00000000000..735ae257ba4 --- /dev/null +++ b/packages/phone-number-privacy/signer/test/end-to-end/disabled-apis.test.ts @@ -0,0 +1,261 @@ +import { + DisableDomainRequest, + disableDomainRequestEIP712, + DisableDomainResponse, + DomainIdentifiers, + DomainQuotaStatusRequest, + domainQuotaStatusRequestEIP712, + DomainQuotaStatusResponse, + DomainRequestTypeTag, + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestEIP712, + genSessionID, + PnpQuotaRequest, + PnpQuotaResponse, + SequentialDelayDomain, + SignerEndpoint, + SignMessageRequest, + TestUtils, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils' +import { LocalWallet } from '@celo/wallet-local' +import 'isomorphic-fetch' + +require('dotenv').config() + +const { ACCOUNT_ADDRESS1, BLINDED_PHONE_NUMBER, PRIVATE_KEY1 } = TestUtils.Values +const { getPnpRequestAuthorization } = TestUtils.Utils + +const ODIS_SIGNER = process.env.ODIS_SIGNER_SERVICE_URL + +jest.setTimeout(30000) + +const expectedVersion = process.env.DEPLOYED_SIGNER_SERVICE_VERSION! + +// These tests should be run when the individual APIs are disabled. +// When run against enabled APIs, they should fail. +describe('Running against a deployed service with disabled APIs', () => { + beforeAll(() => { + console.log('ODIS_SIGNER: ' + ODIS_SIGNER) + }) + + it('Service is deployed at correct version', async () => { + const response = await fetch(ODIS_SIGNER + SignerEndpoint.STATUS, { method: 'GET' }) + const body = await response.json() + // This checks against local package.json version, change if necessary + expect(response.status).toBe(200) + expect(body.version).toBe(expectedVersion) + }) + + describe('when DOMAINS API is disabled', () => { + const wallet = new LocalWallet() + wallet.addAccount(PRIVATE_KEY1) + const walletAddress = wallet.getAccounts()[0] + + const authenticatedDomain: SequentialDelayDomain = { + name: DomainIdentifiers.SequentialDelay, + version: '1', + stages: [{ delay: 0, resetTimer: noBool, batchSize: defined(2), repetitions: defined(10) }], + address: defined(walletAddress), + salt: defined('himalayanPink'), + } + + it(`${SignerEndpoint.DISABLE_DOMAIN} should respond with 503`, async () => { + const req: DisableDomainRequest = { + type: DomainRequestTypeTag.DISABLE, + domain: authenticatedDomain, + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, disableDomainRequestEIP712(req)) + ) + const body = JSON.stringify(req) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.DISABLE_DOMAIN, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body, + }) + expect(response.status).toBe(503) + const responseBody: DisableDomainResponse = await response.json() + expect(responseBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + it(`${SignerEndpoint.DOMAIN_QUOTA_STATUS} should respond with 503`, async () => { + const req: DomainQuotaStatusRequest = { + type: DomainRequestTypeTag.QUOTA, + domain: authenticatedDomain, + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, domainQuotaStatusRequestEIP712(req)) + ) + const body = JSON.stringify(req) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.DOMAIN_QUOTA_STATUS, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body, + }) + expect(response.status).toBe(503) + const responseBody: DomainQuotaStatusResponse = await response.json() + expect(responseBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + it(`${SignerEndpoint.DOMAIN_SIGN} should respond with 503`, async () => { + const req: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, + domain: authenticatedDomain, + options: { + signature: noString, + nonce: noNumber, + }, + // The message shouldn't actually matter here + blindedMessage: BLINDED_PHONE_NUMBER, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, domainRestrictedSignatureRequestEIP712(req)) + ) + const body = JSON.stringify(req) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.DOMAIN_SIGN, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body, + }) + expect(response.status).toBe(503) + const responseBody: DomainQuotaStatusResponse = await response.json() + expect(responseBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + }) + + describe('when PNP API is disabled', () => { + it(`${SignerEndpoint.PNP_QUOTA} should respond with 503`, async () => { + const req: PnpQuotaRequest = { + account: ACCOUNT_ADDRESS1, + } + const body = JSON.stringify(req) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.PNP_QUOTA, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: authorization, + }, + body, + }) + expect(response.status).toBe(503) + const responseBody: PnpQuotaResponse = await response.json() + expect(responseBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + it(`${SignerEndpoint.PNP_SIGN} should respond with 503`, async () => { + const req: SignMessageRequest = { + account: ACCOUNT_ADDRESS1, + blindedQueryPhoneNumber: BLINDED_PHONE_NUMBER, + } + const body = JSON.stringify(req) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.PNP_SIGN, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: authorization, + }, + body, + }) + expect(response.status).toBe(503) + const responseBody: PnpQuotaResponse = await response.json() + expect(responseBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + }) + + describe('when LEGACY_PNP API is disabled', () => { + it(`${SignerEndpoint.LEGACY_PNP_QUOTA} should respond with 503`, async () => { + const req: PnpQuotaRequest = { + account: ACCOUNT_ADDRESS1, + } + const body = JSON.stringify(req) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.LEGACY_PNP_QUOTA, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: authorization, + }, + body, + }) + expect(response.status).toBe(503) + const responseBody: PnpQuotaResponse = await response.json() + expect(responseBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + it(`${SignerEndpoint.LEGACY_PNP_SIGN} should respond with 503`, async () => { + const req: SignMessageRequest = { + account: ACCOUNT_ADDRESS1, + blindedQueryPhoneNumber: BLINDED_PHONE_NUMBER, + } + const body = JSON.stringify(req) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.LEGACY_PNP_SIGN, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: authorization, + }, + body, + }) + expect(response.status).toBe(503) + const responseBody: PnpQuotaResponse = await response.json() + expect(responseBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts new file mode 100644 index 00000000000..d467f2742e8 --- /dev/null +++ b/packages/phone-number-privacy/signer/test/end-to-end/domain.test.ts @@ -0,0 +1,620 @@ +import { + DisableDomainRequest, + disableDomainRequestEIP712, + DisableDomainResponseFailure, + DisableDomainResponseSuccess, + DomainEndpoint, + domainHash, + DomainIdentifiers, + DomainQuotaStatusRequest, + domainQuotaStatusRequestEIP712, + DomainQuotaStatusResponseFailure, + DomainQuotaStatusResponseSuccess, + DomainRequestTypeTag, + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestEIP712, + DomainRestrictedSignatureResponseFailure, + DomainRestrictedSignatureResponseSuccess, + genSessionID, + KEY_VERSION_HEADER, + SequentialDelayDomain, + SequentialDelayStage, + SignerEndpoint, + TestUtils, + ThresholdPoprfClient, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { DomainRequest } from '@celo/phone-number-privacy-common/src' +import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils' +import { LocalWallet } from '@celo/wallet-local' +import 'isomorphic-fetch' +import { getTestParamsForContext } from './utils' +const { ACCOUNT_ADDRESS1, PRIVATE_KEY1 } = TestUtils.Values + +require('dotenv').config() + +jest.setTimeout(60000) + +const expectedVersion = process.env.DEPLOYED_SIGNER_SERVICE_VERSION! + +const ODIS_SIGNER_URL = process.env.ODIS_SIGNER_SERVICE_URL + +const contextSpecificParams = getTestParamsForContext() +console.log(`Blockchain provider: ${contextSpecificParams.blockchainProviderURL}`) +console.log(`Domains public polynomial: ${contextSpecificParams.domainsPolynomial}`) +console.log(`Domains pubKey: ${contextSpecificParams.domainsPubKey}`) + +describe(`Running against service deployed at ${ODIS_SIGNER_URL}`, () => { + const wallet = new LocalWallet() + wallet.addAccount(PRIVATE_KEY1) + + const disableSalt = 'himalayanPink-disable' + const quotaSalt = 'himalayanPink-quota' + const signSalt = 'himalayanPink-sign' + + it('Service is deployed at correct version', async () => { + const response = await fetch(ODIS_SIGNER_URL + SignerEndpoint.STATUS, { + method: 'GET', + }) + expect(response.status).toBe(200) + const body = await response.json() + // This checks against local package.json version, change if necessary + expect(body.version).toBe(expectedVersion) + }) + + describe(`${SignerEndpoint.DISABLE_DOMAIN}`, () => { + it('Should respond with 200 on valid request for new domain', async () => { + const req = await disableRequest(wallet, ACCOUNT_ADDRESS1, `${disableSalt}-${Date.now()}`) + const res = await queryDomainEndpoint(req, SignerEndpoint.DISABLE_DOMAIN) + expect(res.status).toBe(200) + const resBody: DisableDomainResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: resBody.version, + status: { + disabled: true, + counter: 0, + timer: 0, + now: resBody.status.now, + }, + }) + }) + + it('Should respond with 200 on valid request for already disabled domain', async () => { + const req = await disableRequest(wallet, ACCOUNT_ADDRESS1, disableSalt) + const res = await queryDomainEndpoint(req, SignerEndpoint.DISABLE_DOMAIN) + expect(res.status).toBe(200) + const resBody: DisableDomainResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: resBody.version, + status: { + disabled: true, + counter: 0, + timer: 0, + now: resBody.status.now, + }, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = await disableRequest(wallet, ACCOUNT_ADDRESS1, disableSalt) + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DISABLE_DOMAIN) + expect(res.status).toBe(400) + const resBody: DisableDomainResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: resBody.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + const badRequest = await disableRequest(wallet, ACCOUNT_ADDRESS1, disableSalt) + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + badRequest.domain.name = 'UnknownDomain' + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DISABLE_DOMAIN) + expect(res.status).toBe(400) + const resBody: DisableDomainResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: resBody.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const badRequest = await disableRequest(wallet, ACCOUNT_ADDRESS1, disableSalt) + // @ts-ignore Intentionally not JSON + badRequest.domain = 'Freddy' + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DISABLE_DOMAIN) + expect(res.status).toBe(400) + const resBody: DisableDomainResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: resBody.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + const badRequest = await disableRequest(wallet, ACCOUNT_ADDRESS1, disableSalt) + badRequest.domain.salt = defined('badSalt') + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DISABLE_DOMAIN) + expect(res.status).toBe(401) + const resBody: DisableDomainResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: resBody.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + }) + + describe(`${SignerEndpoint.DOMAIN_QUOTA_STATUS}`, () => { + // This request gets repeated over time + it('Should respond with 200 on valid request', async () => { + const req = await quotaRequest(wallet, ACCOUNT_ADDRESS1, quotaSalt) + const res = await queryDomainEndpoint(req, SignerEndpoint.DOMAIN_QUOTA_STATUS) + expect(res.status).toBe(200) + const resBody: DomainQuotaStatusResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + status: { disabled: false, counter: 0, timer: 0, now: resBody.status.now }, + }) + }) + + it('Should respond with 200 on valid request for disabled domain', async () => { + const req = await quotaRequest(wallet, ACCOUNT_ADDRESS1, disableSalt) + const res = await queryDomainEndpoint(req, SignerEndpoint.DOMAIN_QUOTA_STATUS) + expect(res.status).toBe(200) + const resBody: DomainQuotaStatusResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + status: { disabled: true, counter: 0, timer: 0, now: resBody.status.now }, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = await quotaRequest(wallet, ACCOUNT_ADDRESS1, quotaSalt) + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_QUOTA_STATUS) + expect(res.status).toBe(400) + const resBody: DomainQuotaStatusResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + const badRequest = await quotaRequest(wallet, ACCOUNT_ADDRESS1, quotaSalt) + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + badRequest.domain.name = 'UnknownDomain' + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_QUOTA_STATUS) + expect(res.status).toBe(400) + const resBody: DomainQuotaStatusResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const badRequest = await quotaRequest(wallet, ACCOUNT_ADDRESS1, quotaSalt) + // @ts-ignore Intentionally not JSON + badRequest.domain = 'Freddy' + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_QUOTA_STATUS) + expect(res.status).toBe(400) + const resBody: DomainQuotaStatusResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + const badRequest = await quotaRequest(wallet, ACCOUNT_ADDRESS1, quotaSalt) + badRequest.domain.salt = defined('badSalt') + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_QUOTA_STATUS) + expect(res.status).toBe(401) + const resBody: DomainQuotaStatusResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + }) + + describe(`${SignerEndpoint.DOMAIN_SIGN}`, () => { + const signSaltNew = `${signSalt}-${Date.now()}` + let req: DomainRestrictedSignatureRequest + let poprf: ThresholdPoprfClient + beforeAll(async () => { + ;[req, poprf] = await signatureRequest(wallet, ACCOUNT_ADDRESS1, signSaltNew) + }) + it('[Signer configuration test] Should respond with 200 on valid request for new domain', async () => { + const res = await queryDomainEndpoint(req, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(200) + const resBody: DomainRestrictedSignatureResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + status: { + disabled: false, + counter: 1, + timer: resBody.status.timer, + now: resBody.status.now, + }, + }) + expect(res.headers.get(KEY_VERSION_HEADER)).toEqual(contextSpecificParams.domainsKeyVersion) + poprf.unblindPartialResponse( + // throws if verification fails + Buffer.from(resBody.signature, 'base64') + ) + }) + + it('Should respond with 401 on invalid nonce', async () => { + // Replay exactly the same first request + const res = await queryDomainEndpoint(req, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(401) + const resBody: DomainRestrictedSignatureResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_NONCE, + status: { + disabled: false, + counter: 1, + timer: resBody.status!.timer, + now: resBody.status!.now, + }, + }) + }) + + it('Should respond with 200 on repeated valid requests with nonce updated', async () => { + // submit identical request with nonce set to 1 + req.options.nonce = defined(1) + req.options.signature = noString + req.options.signature = defined( + await wallet.signTypedData(ACCOUNT_ADDRESS1, domainRestrictedSignatureRequestEIP712(req)) + ) + + // TODO(ODIS 2.0.0 e2e fix) clean up this duplicated logic + const headers: any = { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: 'ignore', + } + const res = await fetch(ODIS_SIGNER_URL + SignerEndpoint.DOMAIN_SIGN, { + method: 'POST', + headers, + body: JSON.stringify(req), + }) + expect(res.status).toBe(200) + const resBody: DomainRestrictedSignatureResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + status: { + disabled: false, + counter: 2, + timer: resBody.status.timer, + now: resBody.status.now, + }, + }) + poprf.unblindPartialResponse(Buffer.from(resBody.signature, 'base64')) + }) + + it('Should respond with 200 if nonce > domainState', async () => { + const [newReq, _poprf] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now()}`, + undefined, + 5 + ) + const res = await queryDomainEndpoint(newReq, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(200) + const resBody: DomainRestrictedSignatureResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + status: { + disabled: false, + counter: 1, // counter gets incremented, not set to nonce value + timer: resBody.status.timer, + now: resBody.status.now, + }, + }) + _poprf.unblindPartialResponse(Buffer.from(resBody.signature, 'base64')) + }) + + it('Should respond with 200 on valid request with key version header', async () => { + const [newReq, _poprf] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now() + 1}` + ) + const res = await queryDomainEndpoint( + newReq, + SignerEndpoint.DOMAIN_SIGN, + contextSpecificParams.domainsKeyVersion + ) + expect(res.status).toBe(200) + const resBody: DomainRestrictedSignatureResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + status: { + disabled: false, + counter: 1, // counter gets incremented, not set to nonce value + timer: resBody.status.timer, + now: resBody.status.now, + }, + }) + expect(res.headers.get(KEY_VERSION_HEADER)).toEqual(contextSpecificParams.domainsKeyVersion) + _poprf.unblindPartialResponse(Buffer.from(resBody.signature, 'base64')) + }) + + it('Should respond with 400 on missing request fields', async () => { + const [badRequest, _] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now()}` + ) + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(400) + const resBody: DomainRestrictedSignatureResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const [badRequest, _] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now()}` + ) + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + badRequest.domain.name = 'UnknownDomain' + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(400) + const resBody: DomainRestrictedSignatureResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const [badRequest, _] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now()}` + ) + // @ts-ignore Intentionally not JSON + badRequest.domain = 'Freddy' + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(400) + const resBody: DomainRestrictedSignatureResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const [badRequest, _] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now()}` + ) + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_SIGN, 'a') + expect(res.status).toBe(400) + const resBody: DomainRestrictedSignatureResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + const [badRequest, _] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now()}` + ) + badRequest.domain.salt = defined('badSalt') + const res = await queryDomainEndpoint(badRequest, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(401) + const resBody: DomainRestrictedSignatureResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 429 on out of quota', async () => { + const salt = `${signSalt}-${Date.now()}` + const noQuotaDomain = authenticatedDomain(ACCOUNT_ADDRESS1, salt, [ + { delay: 0, resetTimer: noBool, batchSize: defined(0), repetitions: defined(0) }, + ]) + const [signReq, _] = await signatureRequest(wallet, ACCOUNT_ADDRESS1, salt, noQuotaDomain) + const res = await queryDomainEndpoint(signReq, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(429) + const resBody = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.EXCEEDED_QUOTA, + status: { + disabled: false, + counter: 0, + timer: 0, + now: resBody.status!.now, + }, + }) + }) + + it('Should respond with 429 on disabled domain', async () => { + const disableReq = await disableRequest(wallet, ACCOUNT_ADDRESS1, disableSalt) + const disableRes = await queryDomainEndpoint(disableReq, SignerEndpoint.DISABLE_DOMAIN) + expect(disableRes.status).toBe(200) + const [signReq, _] = await signatureRequest( + wallet, + ACCOUNT_ADDRESS1, + `${signSalt}-${Date.now()}`, + disableReq.domain + ) + const res = await queryDomainEndpoint(signReq, SignerEndpoint.DOMAIN_SIGN) + expect(res.status).toBe(429) + const resBody = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.EXCEEDED_QUOTA, + status: { + disabled: true, + counter: 0, + timer: 0, + now: resBody.status!.now, + }, + }) + }) + }) +}) + +async function queryDomainEndpoint( + req: DomainRequest, + endpoint: DomainEndpoint, + keyVersion?: string +): Promise { + const body = JSON.stringify(req) + const headers: any = { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: 'ignore', + } + + if (keyVersion !== undefined) { + headers[KEY_VERSION_HEADER] = keyVersion + } + + const res = await fetch(ODIS_SIGNER_URL + endpoint, { + method: 'POST', + headers, + body, + }) + return res +} + +// TODO(ODIS 2.0.0 e2e fix) clean up duplicate code +const domainStages = (): SequentialDelayStage[] => [ + { delay: 0, resetTimer: noBool, batchSize: defined(2), repetitions: defined(10) }, +] + +const authenticatedDomain = ( + address: string, + salt: string, + _stages?: SequentialDelayStage[] +): SequentialDelayDomain => ({ + name: DomainIdentifiers.SequentialDelay, + version: '1', + stages: _stages ?? domainStages(), + address: defined(address), + salt: defined(salt), +}) + +const quotaRequest = async ( + wallet: LocalWallet, + address: string, + salt: string +): Promise> => { + const req: DomainQuotaStatusRequest = { + type: DomainRequestTypeTag.QUOTA, + domain: authenticatedDomain(address, salt), + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(address, domainQuotaStatusRequestEIP712(req)) + ) + return req +} + +const disableRequest = async ( + wallet: LocalWallet, + address: string, + salt: string +): Promise> => { + const req: DisableDomainRequest = { + type: DomainRequestTypeTag.DISABLE, + domain: authenticatedDomain(address, salt), + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(address, disableDomainRequestEIP712(req)) + ) + return req +} + +const signatureRequest = async ( + wallet: LocalWallet, + address: string, + salt: string, + _domain?: SequentialDelayDomain, + _nonce?: number +): Promise<[DomainRestrictedSignatureRequest, ThresholdPoprfClient]> => { + const domain = _domain ?? authenticatedDomain(address, salt) + const thresholdPoprfClient = new ThresholdPoprfClient( + Buffer.from(contextSpecificParams.domainsPubKey, 'base64'), + Buffer.from(contextSpecificParams.domainsPolynomial, 'hex'), + domainHash(domain), + Buffer.from('test message', 'utf8') + ) + + const req: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, + domain: domain, + options: { + signature: noString, + nonce: defined(_nonce ?? 0), + }, + blindedMessage: thresholdPoprfClient.blindedMessage.toString('base64'), + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(address, domainRestrictedSignatureRequestEIP712(req)) + ) + return [req, thresholdPoprfClient] +} diff --git a/packages/phone-number-privacy/signer/test/end-to-end/get-blinded-sig.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/get-blinded-sig.test.ts index e7ce1ca5c05..3586763a0ef 100644 --- a/packages/phone-number-privacy/signer/test/end-to-end/get-blinded-sig.test.ts +++ b/packages/phone-number-privacy/signer/test/end-to-end/get-blinded-sig.test.ts @@ -1,21 +1,21 @@ import { newKitFromWeb3 } from '@celo/contractkit' import { - Endpoints, - GetQuotaResponse, - rootLogger as logger, + KEY_VERSION_HEADER, + PnpQuotaResponse, + rootLogger, + SignerEndpoint, SignMessageResponseFailure, SignMessageResponseSuccess, TestUtils, } from '@celo/phone-number-privacy-common' -import { getBlindedPhoneNumber } from '@celo/phone-number-privacy-common/lib/test/utils' -import { PHONE_NUMBER } from '@celo/phone-number-privacy-common/lib/test/values' import { serializeSignature, signMessage } from '@celo/utils/lib/signatureUtils' import threshold_bls from 'blind-threshold-bls' import { randomBytes } from 'crypto' import 'isomorphic-fetch' import Web3 from 'web3' -import config, { getVersion } from '../../src/config' -import { getWalletAddress } from '../../src/signing/query-quota' +import { getWalletAddress } from '../../src/common/web3/contracts' +import { config } from '../../src/config' +import { getBlindedPhoneNumber, getTestParamsForContext } from './utils' require('dotenv').config() @@ -25,6 +25,7 @@ const { ACCOUNT_ADDRESS3, BLINDED_PHONE_NUMBER, IDENTIFIER, + PHONE_NUMBER, PRIVATE_KEY1, PRIVATE_KEY2, PRIVATE_KEY3, @@ -32,13 +33,15 @@ const { const { replenishQuota, registerWalletAddress } = TestUtils.Utils const ODIS_SIGNER = process.env.ODIS_SIGNER_SERVICE_URL -const ODIS_PUBLIC_POLYNOMIAL = process.env.ODIS_PUBLIC_POLYNOMIAL as string +const expectedVersion = process.env.DEPLOYED_SIGNER_SERVICE_VERSION! + +// Keep these checks as is to ensure backwards compatibility const SIGN_MESSAGE_ENDPOINT = '/getBlindedMessagePartialSig' const GET_QUOTA_ENDPOINT = '/getQuota' -const DEFAULT_FORNO_URL = config.blockchain.provider +const contextSpecificParams = getTestParamsForContext() -const web3 = new Web3(new Web3.providers.HttpProvider(DEFAULT_FORNO_URL)) +const web3 = new Web3(new Web3.providers.HttpProvider(contextSpecificParams.blockchainProviderURL)) const contractkit = newKitFromWeb3(web3) contractkit.addAccount(PRIVATE_KEY1) contractkit.addAccount(PRIVATE_KEY2) @@ -52,16 +55,18 @@ const getRandomBlindedPhoneNumber = () => { describe('Running against a deployed service', () => { beforeAll(() => { - console.log('FORNO_URL: ' + DEFAULT_FORNO_URL) + console.log('Blockchain Provider URL: ' + contextSpecificParams.blockchainProviderURL) console.log('ODIS_SIGNER: ' + ODIS_SIGNER) - console.log('ODIS_PUBLIC_POLYNOMIAL: ' + ODIS_PUBLIC_POLYNOMIAL) + console.log('PNP Public Polynomial: ' + contextSpecificParams.pnpPolynomial) + console.log('Key Version:' + contextSpecificParams.pnpKeyVersion) }) it('Service is deployed at correct version', async () => { - const response = await fetch(ODIS_SIGNER + Endpoints.STATUS, { method: 'GET' }) + const response = await fetch(ODIS_SIGNER + SignerEndpoint.STATUS, { method: 'GET' }) const body = await response.json() // This checks against local package.json version, change if necessary - expect(body.version).toBe(getVersion()) + expect(response.status).toBe(200) + expect(body.version).toBe(expectedVersion) }) describe('Returns status 400 with invalid input', () => { @@ -113,7 +118,11 @@ describe('Running against a deployed service', () => { }) it('Returns 403 error when querying out of quota', async () => { - const response = await postToSignMessage(BLINDED_PHONE_NUMBER, ACCOUNT_ADDRESS1, Date.now()) + const response = await postToSignMessage( + getRandomBlindedPhoneNumber(), + ACCOUNT_ADDRESS1, + Date.now() + ) expect(response.status).toBe(403) }) @@ -201,10 +210,19 @@ describe('Running against a deployed service', () => { it('Check that accounts are set up correctly', async () => { expect(await getQuota(ACCOUNT_ADDRESS2, IDENTIFIER)).toBeLessThan(initialQuota) - expect(await getWalletAddress(logger(), ACCOUNT_ADDRESS3)).toBe(ACCOUNT_ADDRESS2) + expect( + await getWalletAddress( + contractkit, + rootLogger(config.serviceName), + ACCOUNT_ADDRESS3, + SignerEndpoint.LEGACY_PNP_SIGN + ) + ).toBe(ACCOUNT_ADDRESS2) }) - it('Returns sig when querying succeeds with unused request', async () => { + // Note: Use this test to check the signers' key configuration. Modify .env to try out different + // key/version combinations + it('[Signer configuration test] Returns sig when querying succeeds with unused request', async () => { await replenishQuota(ACCOUNT_ADDRESS2, contractkit) const blindedPhoneNumber = getRandomBlindedPhoneNumber() const response = await postToSignMessage(blindedPhoneNumber, ACCOUNT_ADDRESS3) @@ -215,9 +233,15 @@ describe('Running against a deployed service', () => { const data = await response.text() const signResponse = JSON.parse(data) as SignerResponse expect(signResponse.success).toBeTruthy() - const sigBuffer = Buffer.from(signResponse.signature as string, 'base64') - const isValid = isValidSignature(sigBuffer, blindedPhoneNumber, ODIS_PUBLIC_POLYNOMIAL) - expect(isValid).toBeTruthy() + if (signResponse.success) { + const sigBuffer = Buffer.from(signResponse.signature as string, 'base64') + const isValid = isValidSignature( + sigBuffer, + blindedPhoneNumber, + contextSpecificParams.pnpPolynomial + ) + expect(isValid).toBeTruthy() + } }) it('Returns count when querying with unused request increments query count', async () => { @@ -244,7 +268,7 @@ async function getQuota( authHeader?: string ): Promise { const res = await queryQuotaEndpoint(account, hashedPhoneNumber, authHeader) - return res.totalQuota + return res.success ? res.totalQuota ?? 0 : 0 } async function getQueryCount( @@ -253,14 +277,14 @@ async function getQueryCount( authHeader?: string ): Promise { const res = await queryQuotaEndpoint(account, hashedPhoneNumber, authHeader) - return res.performedQueryCount + return res.success ? res.performedQueryCount ?? 0 : 0 } async function queryQuotaEndpoint( account: string, hashedPhoneNumber?: string, authHeader?: string -): Promise { +): Promise { const body = JSON.stringify({ account, hashedPhoneNumber, @@ -285,7 +309,8 @@ async function postToSignMessage( base64BlindedMessage: string, account: string, timestamp?: number, - authHeader?: string + authHeader?: string, + keyVersion: string = contextSpecificParams.pnpKeyVersion ): Promise { const body = JSON.stringify({ hashedPhoneNumber: IDENTIFIER, @@ -302,6 +327,7 @@ async function postToSignMessage( Accept: 'application/json', 'Content-Type': 'application/json', Authorization: authorization, + [KEY_VERSION_HEADER]: keyVersion, }, body, }) @@ -317,7 +343,8 @@ function isValidSignature(signature: Buffer, blindedMessage: string, polynomial: signature ) return true - } catch { + } catch (err) { + console.log(err) return false } } diff --git a/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts new file mode 100644 index 00000000000..0a36158c807 --- /dev/null +++ b/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts @@ -0,0 +1,502 @@ +import { newKit, StableToken } from '@celo/contractkit' +import { + AuthenticationMethod, + KEY_VERSION_HEADER, + PnpQuotaRequest, + PnpQuotaResponseFailure, + PnpQuotaResponseSuccess, + SignerEndpoint, + SignMessageRequest, + SignMessageResponseFailure, + SignMessageResponseSuccess, + TestUtils, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import threshold_bls from 'blind-threshold-bls' +import { randomBytes } from 'crypto' +import 'isomorphic-fetch' +import { config } from '../../src/config' +import { getBlindedPhoneNumber, getTestParamsForContext } from './utils' + +require('dotenv').config() + +const { + ACCOUNT_ADDRESS1, // zero OdisPayments balance/quota + ACCOUNT_ADDRESS2, // non-zero OdisPayments balance/quota + DEK_PRIVATE_KEY, + DEK_PUBLIC_KEY, + PHONE_NUMBER, + PRIVATE_KEY1, + PRIVATE_KEY2, + PRIVATE_KEY3, +} = TestUtils.Values +const { getPnpQuotaRequest, getPnpRequestAuthorization, getPnpSignRequest } = TestUtils.Utils + +const ODIS_SIGNER_URL = process.env.ODIS_SIGNER_SERVICE_URL +const contextSpecificParams = getTestParamsForContext() + +const kit = newKit(contextSpecificParams.blockchainProviderURL) +kit.addAccount(PRIVATE_KEY1) +kit.addAccount(PRIVATE_KEY2) +kit.addAccount(PRIVATE_KEY3) + +jest.setTimeout(60000) + +const expectedVersion = process.env.DEPLOYED_SIGNER_SERVICE_VERSION! + +describe(`Running against service deployed at ${ODIS_SIGNER_URL}`, () => { + const singleQueryCost = config.quota.queryPriceInCUSD.times(1e18).toString() + + beforeAll(async () => { + const accountsWrapper = await kit.contracts.getAccounts() + if ((await accountsWrapper.getDataEncryptionKey(ACCOUNT_ADDRESS2)) !== DEK_PUBLIC_KEY) { + await accountsWrapper + .setAccountDataEncryptionKey(DEK_PUBLIC_KEY) + .sendAndWaitForReceipt({ from: ACCOUNT_ADDRESS2 }) + } + }) + + it('Service is deployed at correct version', async () => { + const response = await fetch(ODIS_SIGNER_URL + SignerEndpoint.STATUS, { + method: 'GET', + }) + expect(response.status).toBe(200) + const body = await response.json() + // This checks against local package.json version, change if necessary + expect(body.version).toBe(expectedVersion) + }) + + describe(`${SignerEndpoint.PNP_QUOTA}`, () => { + it('Should respond with 200 on valid request', async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await queryPnpQuotaEndpoint(req, authorization) + expect(res.status).toBe(200) + const resBody: PnpQuotaResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: 0, + blockNumber: resBody.blockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on valid request when authenticated with DEK', async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS2, AuthenticationMethod.ENCRYPTION_KEY) + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + const res = await queryPnpQuotaEndpoint(req, authorization) + expect(res.status).toBe(200) + const resBody: PnpQuotaResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: resBody.performedQueryCount, + totalQuota: resBody.totalQuota, + blockNumber: resBody.blockNumber, + warnings: [], + }) + expect(resBody.totalQuota).toBeGreaterThan(0) + }) + + it('Should respond with 200 and more quota after payment sent to OdisPayments.sol', async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS2) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY2) + const res = await queryPnpQuotaEndpoint(req, authorization) + expect(res.status).toBe(200) + const resBody: PnpQuotaResponseSuccess = await res.json() + await sendCUSDToOdisPayments(singleQueryCost, ACCOUNT_ADDRESS2, ACCOUNT_ADDRESS2) + + const res2 = await queryPnpQuotaEndpoint(req, authorization) + expect(res2.status).toBe(200) + const res2Body: PnpQuotaResponseSuccess = await res2.json() + expect(res2Body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: resBody.performedQueryCount, + totalQuota: resBody.totalQuota + 1, + blockNumber: res2Body.blockNumber, + warnings: [], + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + // @ts-ignore Intentionally deleting required field + delete badRequest.account + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpQuotaEndpoint(badRequest, authorization) + expect(res.status).toBe(400) + const resBody: PnpQuotaResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + const badRequest = getPnpQuotaRequest(ACCOUNT_ADDRESS2, AuthenticationMethod.WALLET_KEY) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpQuotaEndpoint(badRequest, authorization) + expect(res.status).toBe(401) + const resBody: PnpQuotaResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth when DEK is set for account', async () => { + const badRequest = getPnpQuotaRequest(ACCOUNT_ADDRESS2, AuthenticationMethod.ENCRYPTION_KEY) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY2) + const res = await queryPnpQuotaEndpoint(badRequest, authorization) + expect(res.status).toBe(401) + const resBody: PnpQuotaResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth when DEK is not set for account', async () => { + const badRequest = getPnpQuotaRequest(ACCOUNT_ADDRESS1, AuthenticationMethod.ENCRYPTION_KEY) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpQuotaEndpoint(badRequest, authorization) + expect(res.status).toBe(401) + const resBody: PnpQuotaResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + }) + + describe(`${SignerEndpoint.PNP_SIGN}`, () => { + describe('success cases', () => { + let startingPerformedQueryCount: number + + beforeEach(async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS2) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY2) + const res = await queryPnpQuotaEndpoint(req, authorization) + expect(res.status).toBe(200) + const resBody: PnpQuotaResponseSuccess = await res.json() + startingPerformedQueryCount = resBody.performedQueryCount + }) + + it('[Signer configuration test] Should respond with 200 on valid request', async () => { + const blindedMessage = getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)) + const req = getPnpSignRequest( + ACCOUNT_ADDRESS2, + blindedMessage, + AuthenticationMethod.WALLET_KEY + ) + await sendCUSDToOdisPayments(singleQueryCost, ACCOUNT_ADDRESS2, ACCOUNT_ADDRESS2) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY2) + const res = await queryPnpSignEndpoint(req, authorization) + expect(res.status).toBe(200) + const resBody: SignMessageResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + performedQueryCount: startingPerformedQueryCount + 1, + totalQuota: resBody.totalQuota, + blockNumber: resBody.blockNumber, + warnings: [], + }) + expect(res.headers.get(KEY_VERSION_HEADER)).toEqual(contextSpecificParams.pnpKeyVersion) + expect( + threshold_bls.partialVerifyBlindSignature( + Buffer.from(contextSpecificParams.pnpPolynomial, 'hex'), + Buffer.from(blindedMessage, 'base64'), + Buffer.from(resBody.signature, 'base64') + ) + ) + }) + + it(`Should respond with 200 on valid request with key version ${contextSpecificParams.pnpKeyVersion}`, async () => { + // This value can also be modified but needs to be manually inspected in the signer logs + // (on staging) since a valid key version that does not exist in the keystore + // will default to the secretName stored in `KEYSTORE_AZURE_SECRET_NAME` + const keyVersion = contextSpecificParams.pnpKeyVersion + const blindedMessage = getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)) + const req = getPnpSignRequest( + ACCOUNT_ADDRESS2, + blindedMessage, + AuthenticationMethod.WALLET_KEY + ) + await sendCUSDToOdisPayments(singleQueryCost, ACCOUNT_ADDRESS2, ACCOUNT_ADDRESS2) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY2) + const res = await queryPnpSignEndpoint(req, authorization, keyVersion) + expect(res.status).toBe(200) + const resBody: SignMessageResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + performedQueryCount: startingPerformedQueryCount + 1, + totalQuota: resBody.totalQuota, + blockNumber: resBody.blockNumber, + warnings: [], + }) + expect(res.headers.get(KEY_VERSION_HEADER)).toEqual(keyVersion) + expect( + threshold_bls.partialVerifyBlindSignature( + Buffer.from(contextSpecificParams.pnpPolynomial, 'hex'), + Buffer.from(blindedMessage, 'base64'), + Buffer.from(resBody.signature, 'base64') + ) + ) + }) + + it('Should respond with 200 and warning on repeated valid requests', async () => { + await sendCUSDToOdisPayments(singleQueryCost, ACCOUNT_ADDRESS2, ACCOUNT_ADDRESS2) + const blindedMessage = getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)) + const req = getPnpSignRequest( + ACCOUNT_ADDRESS2, + blindedMessage, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY2) + const res = await queryPnpSignEndpoint(req, authorization) + expect(res.status).toBe(200) + const resBody: SignMessageResponseSuccess = await res.json() + expect(resBody).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + performedQueryCount: startingPerformedQueryCount + 1, + totalQuota: resBody.totalQuota, + blockNumber: resBody.blockNumber, + warnings: [], + }) + expect(res.headers.get(KEY_VERSION_HEADER)).toEqual(contextSpecificParams.pnpKeyVersion) + expect( + threshold_bls.partialVerifyBlindSignature( + Buffer.from(contextSpecificParams.pnpPolynomial, 'hex'), + Buffer.from(blindedMessage, 'base64'), + Buffer.from(resBody.signature, 'base64') + ) + ) + const res2 = await queryPnpSignEndpoint(req, authorization) + expect(res2.status).toBe(200) + const res2Body: SignMessageResponseSuccess = await res2.json() + expect(res2Body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: resBody.signature, + performedQueryCount: resBody.performedQueryCount, // Not incremented + totalQuota: resBody.totalQuota, + blockNumber: res2Body.blockNumber, + warnings: [WarningMessage.DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG], + }) + }) + }) + + describe('failure cases', () => { + const blindedMessage = getBlindedPhoneNumber(PHONE_NUMBER, randomBytes(32)) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS2, + blindedMessage, + AuthenticationMethod.WALLET_KEY + ) + // @ts-ignore Intentionally deleting required field + delete badRequest.blindedQueryPhoneNumber + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpSignEndpoint(badRequest, authorization) + expect(res.status).toBe(400) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on on invalid key version', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS2, + blindedMessage, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpSignEndpoint(badRequest, authorization, 'asd') + expect(res.status).toBe(400) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 400 on on invalid blinded message', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS2, + PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpSignEndpoint(badRequest, authorization) + expect(res.status).toBe(400) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on invalid address', async () => { + const badRequest = getPnpSignRequest( + '0xnotanaddress', + blindedMessage, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpSignEndpoint(badRequest, authorization) + expect(res.status).toBe(400) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS2, + blindedMessage, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpSignEndpoint(badRequest, authorization) + expect(res.status).toBe(401) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth when DEK is set for account', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS2, + blindedMessage, + AuthenticationMethod.ENCRYPTION_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY2) + const res = await queryPnpSignEndpoint(badRequest, authorization) + expect(res.status).toBe(401) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth when DEK is not set for account', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS1, + blindedMessage, + AuthenticationMethod.ENCRYPTION_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await queryPnpSignEndpoint(badRequest, authorization) + expect(res.status).toBe(401) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 403 on out of quota', async () => { + const quotaReq = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const quotaAuthorization = getPnpRequestAuthorization(quotaReq, PRIVATE_KEY1) + const quotaRes = await queryPnpQuotaEndpoint(quotaReq, quotaAuthorization) + expect(quotaRes.status).toBe(200) + const quotaResBody: PnpQuotaResponseSuccess = await quotaRes.json() + // Sanity check + expect(quotaResBody.performedQueryCount).toEqual(quotaResBody.totalQuota) + + const req = getPnpSignRequest(ACCOUNT_ADDRESS1, blindedMessage) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await queryPnpSignEndpoint(req, authorization) + expect(res.status).toBe(403) + const resBody: SignMessageResponseFailure = await res.json() + expect(resBody).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.EXCEEDED_QUOTA, + totalQuota: quotaResBody.totalQuota, + performedQueryCount: quotaResBody.performedQueryCount, + blockNumber: resBody.blockNumber, + }) + }) + }) + }) +}) + +async function queryPnpQuotaEndpoint( + req: PnpQuotaRequest, + authorization: string +): Promise { + const body = JSON.stringify(req) + return fetch(ODIS_SIGNER_URL + SignerEndpoint.PNP_QUOTA, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: authorization, + }, + body, + }) +} + +async function queryPnpSignEndpoint( + req: SignMessageRequest, + authorization: string, + keyVersion?: string +): Promise { + const body = JSON.stringify(req) + const headers: any = { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: authorization, + } + if (keyVersion !== undefined) { + headers[KEY_VERSION_HEADER] = keyVersion + } + const res = await fetch(ODIS_SIGNER_URL + SignerEndpoint.PNP_SIGN, { + method: 'POST', + headers, + body, + }) + return res +} + +async function sendCUSDToOdisPayments( + amountInWei: string | number, + recipient: string, + sender: string +) { + const stableToken = await kit.contracts.getStableToken(StableToken.cUSD) + const odisPayments = await kit.contracts.getOdisPayments() + await stableToken + .approve(odisPayments.address, amountInWei) + .sendAndWaitForReceipt({ from: sender }) + await odisPayments.payInCUSD(recipient, amountInWei).sendAndWaitForReceipt({ from: sender }) +} diff --git a/packages/phone-number-privacy/signer/test/end-to-end/utils.ts b/packages/phone-number-privacy/signer/test/end-to-end/utils.ts new file mode 100644 index 00000000000..59b9972715c --- /dev/null +++ b/packages/phone-number-privacy/signer/test/end-to-end/utils.ts @@ -0,0 +1,53 @@ +import threshold_bls from 'blind-threshold-bls' + +require('dotenv').config() + +export function getBlindedPhoneNumber(phoneNumber: string, blindingFactor: Buffer): string { + const blindedPhoneNumber = threshold_bls.blind(Buffer.from(phoneNumber), blindingFactor).message + return Buffer.from(blindedPhoneNumber).toString('base64') +} + +export type E2ETestParams = { + blockchainProviderURL: string + pnpPolynomial: string + pnpKeyVersion: string + domainsPolynomial: string + domainsPubKey: string + domainsKeyVersion: string +} + +// Once context-specific params are located in the common package, +// consider using that instead of redefining the specifics here. +export function getTestParamsForContext(): E2ETestParams { + switch (process.env.CONTEXT_NAME) { + case 'staging': + return { + blockchainProviderURL: process.env.STAGING_ODIS_BLOCKCHAIN_PROVIDER!, + pnpPolynomial: process.env.STAGING_POLYNOMIAL!, + pnpKeyVersion: process.env.ODIS_PNP_TEST_KEY_VERSION!, + domainsPolynomial: process.env.STAGING_POLYNOMIAL!, + domainsPubKey: process.env.STAGING_DOMAINS_PUBKEY!, + domainsKeyVersion: process.env.ODIS_DOMAINS_TEST_KEY_VERSION!, + } + case 'alfajores': + return { + blockchainProviderURL: process.env.ALFAJORES_ODIS_BLOCKCHAIN_PROVIDER!, + pnpPolynomial: process.env.ALFAJORES_PHONE_NUMBER_PRIVACY_POLYNOMIAL!, + pnpKeyVersion: process.env.ODIS_PNP_TEST_KEY_VERSION!, + domainsPolynomial: process.env.ALFAJORES_DOMAINS_POLYNOMIAL!, + domainsPubKey: process.env.ALFAJORES_DOMAINS_PUBKEY!, + domainsKeyVersion: process.env.ODIS_DOMAINS_TEST_KEY_VERSION!, + } + case 'mainnet': + return { + blockchainProviderURL: process.env.MAINNET_ODIS_BLOCKCHAIN_PROVIDER!, + pnpPolynomial: process.env.MAINNET_PHONE_NUMBER_PRIVACY_POLYNOMIAL!, + pnpKeyVersion: process.env.ODIS_PNP_TEST_KEY_VERSION!, + domainsPolynomial: process.env.MAINNET_DOMAINS_POLYNOMIAL!, + domainsPubKey: process.env.MAINNET_DOMAINS_PUBKEY!, + domainsKeyVersion: process.env.ODIS_DOMAINS_TEST_KEY_VERSION!, + } + default: + throw new Error(`No parameter settings stored for context: ${process.env.CONTEXT_NAME}`) + } +} diff --git a/packages/phone-number-privacy/signer/test/index.test.ts b/packages/phone-number-privacy/signer/test/index.test.ts deleted file mode 100644 index 05dcb7b2b16..00000000000 --- a/packages/phone-number-privacy/signer/test/index.test.ts +++ /dev/null @@ -1,245 +0,0 @@ -import { authenticateUser } from '@celo/phone-number-privacy-common' -import BigNumber from 'bignumber.js' -import request from 'supertest' -import { ErrorMessage, WarningMessage } from '../../common/src/interfaces/error-utils' -import { - ContractRetrieval, - createMockAccounts, - createMockAttestation, - createMockContractKit, - createMockToken, - createMockWeb3, -} from '../../common/src/test/utils' -import { BLINDED_PHONE_NUMBER } from '../../common/src/test/values' -import { computeBlindedSignature } from '../src/bls/bls-cryptography-client' -import { DEV_PRIVATE_KEY, getVersion } from '../src/config' -import { incrementQueryCount } from '../src/database/wrappers/account' -import { getRequestExists, storeRequest } from '../src/database/wrappers/request' -import { getKeyProvider } from '../src/key-management/key-provider' -import { createServer } from '../src/server' -import { getRemainingQueryCount, getWalletAddress } from '../src/signing/query-quota' -import { getBlockNumber, getContractKit } from '../src/web3/contracts' - -const BLS_SIGNATURE = '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A' - -jest.setTimeout(10000) - -jest.mock('@celo/phone-number-privacy-common', () => ({ - ...jest.requireActual('@celo/phone-number-privacy-common'), - authenticateUser: jest.fn(), -})) -const mockAuthenticateUser = authenticateUser as jest.Mock - -jest.mock('../src/signing/query-quota') -const mockGetRemainingQueryCount = getRemainingQueryCount as jest.Mock -const mockGetWalletAddress = getWalletAddress as jest.Mock - -jest.mock('../src/key-management/key-provider') -const mockGetKeyProvider = getKeyProvider as jest.Mock - -jest.mock('../src/bls/bls-cryptography-client') -const mockComputeBlindedSignature = computeBlindedSignature as jest.Mock - -jest.mock('../src/database/wrappers/account') -const mockIncrementQueryCount = incrementQueryCount as jest.Mock - -jest.mock('../src/database/wrappers/request') -const mockStoreRequest = storeRequest as jest.Mock -const mockGetRequestExists = getRequestExists as jest.Mock - -jest.mock('../src/web3/contracts') -const mockGetBlockNumber = getBlockNumber as jest.Mock -const mockGetContractKit = getContractKit as jest.Mock - -describe(`POST /getBlindedMessageSignature endpoint`, () => { - const app = createServer() - - beforeEach(() => { - const mockContractKit = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(3, 3), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(0) - ) - mockGetContractKit.mockImplementation(() => mockContractKit) - mockAuthenticateUser.mockResolvedValue(true) - mockGetKeyProvider.mockReturnValue({ getPrivateKey: jest.fn(() => DEV_PRIVATE_KEY) }) - mockComputeBlindedSignature.mockReturnValue(BLS_SIGNATURE) - mockIncrementQueryCount.mockReturnValue(true) - mockStoreRequest.mockReturnValue(true) - mockGetRequestExists.mockReturnValue(false) - mockGetWalletAddress.mockResolvedValue('0x0') - }) - - const validRequest = { - blindedQueryPhoneNumber: BLINDED_PHONE_NUMBER, - hashedPhoneNumber: '0x5f6e88c3f724b3a09d3194c0514426494955eff7127c29654e48a361a19b4b96', - account: '0x78dc5D2D739606d31509C31d654056A45185ECb6', - } - - describe('with valid input', () => { - it('provides signature', (done) => { - mockGetRemainingQueryCount.mockResolvedValue({ performedQueryCount: 0, totalQuota: 10 }) - mockGetBlockNumber.mockResolvedValue(10000) - request(app) - .post('/getBlindedMessagePartialSig') - .send(validRequest) - .expect('Content-Type', /json/) - .expect( - 200, - { - success: true, - signature: BLS_SIGNATURE, - version: getVersion(), - performedQueryCount: 1, - totalQuota: 10, - blockNumber: 10000, - }, - done - ) - }) - // Backwards compatibility check - it('provides signature w/ expired timestamp', (done) => { - mockGetRemainingQueryCount.mockResolvedValue({ performedQueryCount: 0, totalQuota: 10 }) - mockGetBlockNumber.mockResolvedValue(10000) - request(app) - .post('/getBlindedMessagePartialSig') - .send({ ...validRequest, timestamp: Date.now() - 10 * 60 * 1000 }) // 10 minutes ago - .expect('Content-Type', /json/) - .expect( - 200, - { - success: true, - signature: BLS_SIGNATURE, - version: getVersion(), - performedQueryCount: 1, - totalQuota: 10, - blockNumber: 10000, - }, - done - ) - }) - it('returns 403 on query count 0', (done) => { - mockGetRemainingQueryCount.mockResolvedValue({ performedQueryCount: 10, totalQuota: 10 }) - request(app) - .post('/getBlindedMessagePartialSig') - .send(validRequest) - .expect('Content-Type', /json/) - .expect(403, done) - }) - // We don't want to block the user on DB or blockchain query failure - it('returns 200 on DB query failure', (done) => { - mockGetRemainingQueryCount.mockRejectedValue(undefined) - request(app) - .post('/getBlindedMessagePartialSig') - .send(validRequest) - .expect('Content-Type', /json/) - .expect(200, done) - }) - it('returns 500 on bls error', (done) => { - mockGetRemainingQueryCount.mockResolvedValue({ performedQueryCount: 0, totalQuota: 10 }) - mockComputeBlindedSignature.mockImplementation(() => { - throw Error() - }) - request(app) - .post('/getBlindedMessagePartialSig') - .send(validRequest) - .expect('Content-Type', /json/) - .expect(500, done) - }) - it('returns 200 with warning on replayed request', (done) => { - mockGetRemainingQueryCount.mockResolvedValue({ performedQueryCount: 0, totalQuota: 10 }) - mockGetRequestExists.mockReturnValue(true) - request(app) - .post('/getBlindedMessagePartialSig') - .send(validRequest) - .expect('Content-Type', /json/) - .expect( - 200, - { - success: false, - signature: BLS_SIGNATURE, - version: getVersion(), - performedQueryCount: 0, - error: WarningMessage.DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG, - totalQuota: 10, - blockNumber: 10000, - }, - done - ) - }) - it('returns 200 with warning on failure to increment query count', (done) => { - mockGetRemainingQueryCount.mockResolvedValue({ performedQueryCount: 0, totalQuota: 10 }) - mockIncrementQueryCount.mockReturnValue(false) - request(app) - .post('/getBlindedMessagePartialSig') - .send(validRequest) - .expect('Content-Type', /json/) - .expect( - 200, - { - success: false, - signature: BLS_SIGNATURE, - version: getVersion(), - performedQueryCount: 0, - error: ErrorMessage.FAILURE_TO_INCREMENT_QUERY_COUNT, - totalQuota: 10, - blockNumber: 10000, - }, - done - ) - }) - it('returns 200 with warning on failure to store request', (done) => { - mockGetRemainingQueryCount.mockResolvedValue({ performedQueryCount: 0, totalQuota: 10 }) - mockStoreRequest.mockReturnValue(false) - request(app) - .post('/getBlindedMessagePartialSig') - .send(validRequest) - .expect('Content-Type', /json/) - .expect( - 200, - { - success: false, - signature: BLS_SIGNATURE, - version: getVersion(), - performedQueryCount: 1, - error: ErrorMessage.FAILURE_TO_STORE_REQUEST, - totalQuota: 10, - blockNumber: 10000, - }, - done - ) - }) - }) - describe('with invalid input', () => { - it('invalid address returns 400', (done) => { - const mockRequestData = { - ...validRequest, - account: 'd31509C31d654056A45185ECb6', - } - - request(app).post('/getBlindedMessagePartialSig').send(mockRequestData).expect(400, done) - }) - - it('invalid hashedPhoneNumber returns 400', (done) => { - const mockRequestData = { - ...validRequest, - hashedPhoneNumber: '+1234567890', - } - - request(app).post('/getBlindedMessagePartialSig').send(mockRequestData).expect(400, done) - }) - - it('invalid blinded phone number returns 400', (done) => { - const mockRequestData = { - ...validRequest, - blindedQueryPhoneNumber: '1234567890', - } - - request(app).post('/getBlindedMessagePartialSig').send(mockRequestData).expect(400, done) - }) - }) -}) diff --git a/packages/phone-number-privacy/signer/test/integration/domain.test.ts b/packages/phone-number-privacy/signer/test/integration/domain.test.ts new file mode 100644 index 00000000000..9299916a37c --- /dev/null +++ b/packages/phone-number-privacy/signer/test/integration/domain.test.ts @@ -0,0 +1,1044 @@ +import { + DisableDomainRequest, + disableDomainRequestEIP712, + DisableDomainResponse, + DisableDomainResponseSuccess, + domainHash, + DomainIdentifiers, + DomainQuotaStatusRequest, + domainQuotaStatusRequestEIP712, + DomainQuotaStatusResponse, + DomainRequestTypeTag, + DomainRestrictedSignatureRequest, + domainRestrictedSignatureRequestEIP712, + DomainRestrictedSignatureResponse, + ErrorMessage, + genSessionID, + KEY_VERSION_HEADER, + rootLogger, + SequentialDelayDomain, + SequentialDelayStage, + SignerEndpoint, + TestUtils, + ThresholdPoprfClient, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { defined, noBool, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils' +import { LocalWallet } from '@celo/wallet-local' +import { Knex } from 'knex' +import request from 'supertest' +import { initDatabase } from '../../src/common/database/database' +import { countAndThrowDBError } from '../../src/common/database/utils' +import { + createEmptyDomainStateRecord, + getDomainStateRecord, +} from '../../src/common/database/wrappers/domain-state' +import { initKeyProvider } from '../../src/common/key-management/key-provider' +import { KeyProvider } from '../../src/common/key-management/key-provider-base' +import { config, getSignerVersion, SupportedDatabase, SupportedKeystore } from '../../src/config' +import { startSigner } from '../../src/server' + +jest.setTimeout(20000) + +describe('domain', () => { + const wallet = new LocalWallet() + wallet.addAccount('0x00000000000000000000000000000000000000000000000000000000deadbeef') + const walletAddress = wallet.getAccounts()[0]! + + const expectedVersion = getSignerVersion() + + const domainStages = (): SequentialDelayStage[] => [ + { delay: 0, resetTimer: noBool, batchSize: defined(2), repetitions: defined(10) }, + ] + + const authenticatedDomain = (_stages?: SequentialDelayStage[]): SequentialDelayDomain => ({ + name: DomainIdentifiers.SequentialDelay, + version: '1', + stages: _stages ?? domainStages(), + address: defined(walletAddress), + salt: defined('himalayanPink'), + }) + + const signatureRequest = async ( + _domain?: SequentialDelayDomain, + _nonce?: number, + keyVersion: number = config.keystore.keys.domains.latest + ): Promise<[DomainRestrictedSignatureRequest, ThresholdPoprfClient]> => { + const domain = _domain ?? authenticatedDomain() + const thresholdPoprfClient = new ThresholdPoprfClient( + Buffer.from(TestUtils.Values.DOMAINS_THRESHOLD_DEV_PUBKEYS[keyVersion - 1], 'base64'), + Buffer.from(TestUtils.Values.DOMAINS_THRESHOLD_DEV_POLYNOMIALS[keyVersion - 1], 'hex'), + domainHash(domain), + Buffer.from('test message', 'utf8') + ) + + const req: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, + domain: domain, + options: { + signature: noString, + nonce: defined(_nonce ?? 0), + }, + blindedMessage: thresholdPoprfClient.blindedMessage.toString('base64'), + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, domainRestrictedSignatureRequestEIP712(req)) + ) + return [req, thresholdPoprfClient] + } + + const quotaRequest = async (): Promise> => { + const req: DomainQuotaStatusRequest = { + type: DomainRequestTypeTag.QUOTA, + domain: authenticatedDomain(), + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, domainQuotaStatusRequestEIP712(req)) + ) + return req + } + + // Build and sign an example disable domain request. + const disableRequest = async (): Promise> => { + const req: DisableDomainRequest = { + type: DomainRequestTypeTag.DISABLE, + domain: authenticatedDomain(), + options: { + signature: noString, + nonce: noNumber, + }, + sessionID: defined(genSessionID()), + } + req.options.signature = defined( + await wallet.signTypedData(walletAddress, disableDomainRequestEIP712(req)) + ) + return req + } + + let keyProvider: KeyProvider + let app: any + let db: Knex + + // create deep copy + const _config: typeof config = JSON.parse(JSON.stringify(config)) + _config.db.type = SupportedDatabase.Sqlite + _config.keystore.type = SupportedKeystore.MOCK_SECRET_MANAGER + _config.api.domains.enabled = true + + beforeAll(async () => { + keyProvider = await initKeyProvider(_config) + }) + + beforeEach(async () => { + // Create a new in-memory database for each test. + db = await initDatabase(_config) + app = startSigner(_config, db, keyProvider) + }) + + afterEach(async () => { + // Close and destroy the in-memory database. + // Note: If tests start to be too slow, this could be replaced with more complicated logic to + // reset the database state without destroying and recreating it for each test. + + await db?.destroy() + }) + + describe(`${SignerEndpoint.STATUS}`, () => { + it('Should return 200 and correct version', async () => { + const res = await request(app).get(SignerEndpoint.STATUS) + expect(res.status).toBe(200) + expect(res.body.version).toBe(expectedVersion) + }) + }) + + describe(`${SignerEndpoint.DISABLE_DOMAIN}`, () => { + it('Should respond with 200 on valid request', async () => { + const res = await request(app) + .post(SignerEndpoint.DISABLE_DOMAIN) + .send(await disableRequest()) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { + disabled: true, + counter: 0, + timer: 0, + now: res.body.status.now, + }, + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const req = await disableRequest() + const res1 = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(req) + expect(res1.status).toBe(200) + const expectedResponse: DisableDomainResponseSuccess = { + success: true, + version: res1.body.version, + status: { + disabled: true, + counter: 0, + timer: 0, + now: res1.body.status.now, + }, + } + expect(res1.body).toStrictEqual(expectedResponse) + const res2 = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(req) + expect(res2.status).toBe(200) + // Avoid flakiness due to mismatching times between res1 & res2 + expectedResponse.status.now = res2.body.status.now + expect(res2.body).toStrictEqual(expectedResponse) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = await disableRequest() + // @ts-ignore Intentionally adding an extra field to the request type + req.options.extraField = noString + + const res = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { + disabled: true, + counter: 0, + timer: 0, + now: res.body.status.now, + }, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = await disableRequest() + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + + const res = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + // Create a request with an invalid domain identifier. + const unknownRequest = await disableRequest() + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + unknownRequest.domain.name = 'UnknownDomain' + + const res = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(unknownRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const badRequest1 = await disableRequest() + // @ts-ignore Intentionally not JSON + badRequest1.domain = 'Freddy' + + const res1 = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(badRequest1) + + expect(res1.status).toBe(400) + expect(res1.body).toStrictEqual({ + success: false, + version: res1.body.version, + error: WarningMessage.INVALID_INPUT, + }) + + const badRequest2 = '' + + const res2 = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(badRequest2) + + expect(res2.status).toBe(400) + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + // Create a manipulated request, which will have a bad signature. + const badRequest = await disableRequest() + badRequest.domain.salt = defined('badSalt') + + const res = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(badRequest) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithApiDisabled.api.domains.enabled = false + const appWithApiDisabled = startSigner(configWithApiDisabled, db, keyProvider) + + const req = await disableRequest() + + const res = await request(appWithApiDisabled).post(SignerEndpoint.DISABLE_DOMAIN).send(req) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should respond with 500 on DB insertDomainStateRecord failure', async () => { + const req = await disableRequest() + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/domain-state'), + 'insertDomainStateRecord' + ) + .mockImplementationOnce(() => { + // Handle errors in the same way as in insertDomainStateRecord + countAndThrowDBError( + new Error(), + rootLogger(_config.serviceName), + ErrorMessage.DATABASE_INSERT_FAILURE + ) + }) + const res = await request(app).post(SignerEndpoint.DISABLE_DOMAIN).send(req) + spy.mockRestore() + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_INSERT_FAILURE, + }) + expect(await getDomainStateRecord(db, req.domain, rootLogger(_config.serviceName))).toBe( + null + ) + }) + + it('Should respond with 500 on signer timeout', async () => { + const testTimeoutMS = 0 + const delay = 200 + + const configWithShortTimeout = JSON.parse(JSON.stringify(_config)) + configWithShortTimeout.timeout = testTimeoutMS + const appWithShortTimeout = startSigner(configWithShortTimeout, db, keyProvider) + + const req = await disableRequest() + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/domain-state'), + 'getDomainStateRecord' + ) + .mockImplementationOnce(async () => { + await new Promise((resolve) => setTimeout(resolve, testTimeoutMS + delay)) + return null + }) + + const res = await request(appWithShortTimeout).post(SignerEndpoint.DISABLE_DOMAIN).send(req) + spy.mockRestore() + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + error: ErrorMessage.TIMEOUT_FROM_SIGNER, + version: expectedVersion, + }) + // Allow time for non-killed processes to finish + await new Promise((resolve) => setTimeout(resolve, delay)) + // Check that DB state was not updated on timeout + expect(await getDomainStateRecord(db, req.domain, rootLogger(_config.serviceName))).toBe( + null + ) + }) + }) + }) + + describe(`${SignerEndpoint.DOMAIN_QUOTA_STATUS}`, () => { + it('Should respond with 200 on valid request', async () => { + const res = await request(app) + .post(SignerEndpoint.DOMAIN_QUOTA_STATUS) + .send(await quotaRequest()) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const res1 = await request(app) + .post(SignerEndpoint.DOMAIN_QUOTA_STATUS) + .send(await quotaRequest()) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: res1.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res1.body.status.now }, + }) + + const res2 = await request(app) + .post(SignerEndpoint.DOMAIN_QUOTA_STATUS) + .send(await quotaRequest()) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual({ + success: true, + version: res2.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res2.body.status.now }, + }) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = await quotaRequest() + // @ts-ignore Intentionally adding an extra field to the request type + req.options.extraField = noString + + const res = await request(app).post(SignerEndpoint.DOMAIN_QUOTA_STATUS).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + status: { disabled: false, counter: 0, timer: 0, now: res.body.status.now }, + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = await quotaRequest() + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + + const res = await request(app).post(SignerEndpoint.DOMAIN_QUOTA_STATUS).send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + // Create a request with an invalid domain identifier. + const unknownRequest = await quotaRequest() + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + unknownRequest.domain.name = 'UnknownDomain' + + const res = await request(app).post(SignerEndpoint.DOMAIN_QUOTA_STATUS).send(unknownRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const badRequest1 = await quotaRequest() + // @ts-ignore Intentionally not JSON + badRequest1.domain = 'Freddy' + + const res1 = await request(app).post(SignerEndpoint.DOMAIN_QUOTA_STATUS).send(badRequest1) + + expect(res1.status).toBe(400) + expect(res1.body).toStrictEqual({ + success: false, + version: res1.body.version, + error: WarningMessage.INVALID_INPUT, + }) + + const badRequest2 = '' + + const res2 = await request(app).post(SignerEndpoint.DOMAIN_QUOTA_STATUS).send(badRequest2) + + expect(res2.status).toBe(400) + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + // Create a manipulated request, which will have a bad signature. + const badRequest = await quotaRequest() + badRequest.domain.salt = defined('badSalt') + + const res = await request(app).post(SignerEndpoint.DOMAIN_QUOTA_STATUS).send(badRequest) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithApiDisabled.api.domains.enabled = false + const appWithApiDisabled = startSigner(configWithApiDisabled, db, keyProvider) + + const req = await quotaRequest() + + const res = await request(appWithApiDisabled) + .post(SignerEndpoint.DOMAIN_QUOTA_STATUS) + .send(req) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should respond with 500 on DB getDomainStateRecordOrEmpty failure', async () => { + const req = await quotaRequest() + // Mocking getDomainStateRecord directly but requiring the real version of + // getDomainStateRecordOrEmpty does not easily work, + // which is why we mock the outer call here & use the countAndThrowDBError + // helper to get as close as possible to testing a real error. + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/domain-state'), + 'getDomainStateRecordOrEmpty' + ) + .mockImplementationOnce(() => { + countAndThrowDBError( + new Error(), + rootLogger(_config.serviceName), + ErrorMessage.DATABASE_GET_FAILURE + ) + }) + const res = await request(app).post(SignerEndpoint.DOMAIN_QUOTA_STATUS).send(req) + spy.mockRestore() + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_GET_FAILURE, + }) + expect(await getDomainStateRecord(db, req.domain, rootLogger(_config.serviceName))).toBe( + null + ) + }) + }) + + it('Should respond with 500 on signer timeout', async () => { + const testTimeoutMS = 0 + const delay = 200 + + const configWithShortTimeout = JSON.parse(JSON.stringify(_config)) + configWithShortTimeout.timeout = testTimeoutMS + const appWithShortTimeout = startSigner(configWithShortTimeout, db, keyProvider) + + const req = await quotaRequest() + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/domain-state'), + 'getDomainStateRecordOrEmpty' + ) + .mockImplementationOnce(async () => { + await new Promise((resolve) => setTimeout(resolve, testTimeoutMS + delay)) + return createEmptyDomainStateRecord(req.domain) + }) + + const res = await request(appWithShortTimeout) + .post(SignerEndpoint.DOMAIN_QUOTA_STATUS) + .send(req) + + spy.mockRestore() + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + error: ErrorMessage.TIMEOUT_FROM_SIGNER, + version: expectedVersion, + }) + // Allow time for non-killed processes to finish + await new Promise((resolve) => setTimeout(resolve, delay)) + }) + }) + + describe(`${SignerEndpoint.DOMAIN_SIGN}`, () => { + const expectedEvals: string[] = [ + 'AQAAALSWngdNIqyApv+AGj50OJxj9fSFPjvGlNZ+oAMykmgfVZd0o59MugofDPrBrUm9AFrr2uPXxKwL6PR2Uo3ch2jfOhRBE9amUTQV9U2gV8b1fFy2uFqnaT6ahV/GE956Aa4n8hiyRD36YL62YELtmGnNo4ODMl98ovirR6BoWp0yOhm42vq2SVRh3O69GYmHAd35Q/jYH9cOXnpNyUf1Pw4WmcbsTc+kwVe+226QJYMGtqafMIFR2AGnTiZji5SOAM7TTCDfZWKj+vtvrlFs3nSRI7AKFBzyx6KIyboljHvtBjhA1EGEzrqEJHLLU+iFASY3vqctLoONWcn6t8puaT5g4bmL3WqHiP+pF/0paLrHyQlxt3NJBcgWXv4GWMh7APDNFXpQ9O/skdlBPED433vMj7ZjXnybkdq7LFuMOua5rY8MEuTtoWizBtoErzBnADb5kWQCYgog94pCuYOYxCoK/+cl2DxVVnt0tarkG4mGK2BY+N6cwHhhYppED3GJAP70+R/nrjWhTp2xwKOd/uJByi/9ORHU16USrVsgka+LrGl/fy3P6BEtoK7cu6JfAXcx54Ojo0eUVsD5W6iHfrgllFk3jSgAvWUJ3I3IG8pTPuKX5eO6c9yL4/PVDY4/AAEkyf5vTG5f5dRd9akptsnVz2dmegSTAcj4md0gDugXzLEitduXF5lsqH6BFo9/AWDTgx2JzBSnSr8HSgSWk0ZKni2UIl1F1Eyb+CN45+5TQDiDv1fsl/0tumMikom1AA==', + 'AQAAAFd54JZz5xv1zf7+U8ZpjfLQQ4kZr5jl8R0/nWUqTcQyiO25awk09nh3elLvd6VkAOxnY0oiHASh7uzDJsi/XuDBJrp1oKoZ85eoCP90/RzGTuGDsHEmKtgDk/lAesQvAeGPjrhyjVleFcdnFq+czoT3aoOrYhdAin2lGU6nWAehbJwUyj5uvI+uEfcvk0KGAVbhZzC1L7jjGaLj+3SmhMfP71kqS5DeaSuyzu0byXum548HT1NRoO96icdfDtUBAfSw/FDzGfrFYf6WdUAObehnGt49AMpkVtGaMOsnETPL/nlbMizK4vMas+NlwyqgAZdCQaGX/FixHYpTDJ6NlBvWHwryoSJFse9XVLg5OizlEYh2ASLxFsZKqMCs7c6TAOYhwSWBeIkJCb0PQBsEMk2/vvnTY5RDAcBYW8aJ118IX/hcO9gO+lLathT+CKlDADGMQTVn1wqFapYZ677Gcsb4JDhUOaQjJCYu7JXlcyhLOe3/0AwI1LjI+ClA+TupADL+qQWTxyfcCfBb9XdcD6klzzFNs0aUfEwgjDyBUVbGrMBSQyE8ErDJYII7j1J4AeacepfWb54q2SLFBIIaoQiWhgeh527QOVbDBYQy0KutYBxEdp/RmJ3vIJL/u/PBAB/5gedsqPzRxIH3yTYoHX5U0bOL6XTmZVNaNZ9rnXn58IXiWORNudbwdA4DGZMOAPUtu1ze8sTUE/PsjNzVPNwhwJz8cQbt4tGC3luRUctkx26K+nZgn8GkCQV9AtByAQ==', + 'AQAAADri1djYjhPpolB6aRwD6ptKRz4EGNAYWba0TYfM/TgQxeoSTupAfJLIJdYEWAEdATyCz9VWW7lC1InwUUCq7vARCWClyAoBQ8LdMAi9bYFy4MrEj+urzTmUgmZL1r39AJOhT9H+SuGv1uBET1Hv49aWZReTo0NhK4U6Oh6y8tHou+P3LC155ZZHLRrmcyGDARnOhBs25CHMjrvkLwcLsJNnK7Y0QXO4/6YEVTBBcsN+F/BGLgtP5GaiPdtDXuYEAFhZW+a0pZIlUzaYZaiXFMQ6pJJbCsMJTK+khfWBSAFuVVkG2wIKTGiTqOkw+o8SAeooTBoO0NJJZcpP+jY++zRziX+X7fyixmBlcStbmVU4gwA1kG/4kvEsrIh+kEygAWvxw/2JZcIDZRRAkhHu+uZwSflSwFFW8omtI36t7YmYmOMpXxTHFNdJyh2mMS29AP7dzScfrKa4NObq/UN85PjIvBTR5otWCFrsT0gNSDnEiGO6cXFIHMexyPRTLYSpAVJra/z283B8DjejVN1qyQFRi9upU5M1vxVLJo5y48IDJM8q+ZKDvokwY2icPxewAJZ2OtyGW55weDMTousWVEJoJ9oBiaXCb/ZOROJ8+Oyv8cR4Xbc8AZV3Ec4tusAcAFYoE7YCOwkSj7Beq7B3p16bfFcso8nA3GgGXx16qTCmEeCCS4alWFPE73AHlWknAaetWLlMMZIw6SURpkwSoALXe8DkvelkROc/uFlo2wypEswzLVW/dYpbHrU0U92OAQ==', + ] + const expectedEval = expectedEvals[_config.keystore.keys.domains.latest - 1] + + it('Should respond with 200 on valid request', async () => { + const [req, thresholdPoprfClient] = await signatureRequest() + + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = thresholdPoprfClient.unblindPartialResponse( + Buffer.from(res.body.signature, 'base64') + ) + expect(evaluation.toString('base64')).toEqual(expectedEval) + expect(res.get(KEY_VERSION_HEADER)).toEqual(_config.keystore.keys.domains.latest.toString()) + }) + + for (let i = 1; i <= 3; i++) { + it(`Should respond with 200 on valid request with key version header ${i}`, async () => { + const [req, thresholdPoprfClient] = await signatureRequest(undefined, undefined, i) + + const res = await request(app) + .post(SignerEndpoint.DOMAIN_SIGN) + .set(KEY_VERSION_HEADER, i.toString()) + .send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = thresholdPoprfClient.unblindPartialResponse( + Buffer.from(res.body.signature, 'base64') + ) + expect(evaluation.toString('base64')).toEqual(expectedEvals[i - 1]) + expect(res.get(KEY_VERSION_HEADER)).toEqual(i.toString()) + }) + } + + it('Should respond with 200 on repeated valid requests with nonce updated', async () => { + const [req, thresholdPoprfClient] = await signatureRequest() + + const res1 = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req) + + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: res1.body.version, + signature: res1.body.signature, + status: { + disabled: false, + counter: 1, + timer: res1.body.status.timer, + now: res1.body.status.now, + }, + }) + const eval1 = thresholdPoprfClient.unblindPartialResponse( + Buffer.from(res1.body.signature, 'base64') + ) + expect(eval1.toString('base64')).toEqual(expectedEval) + + // submit identical request with nonce set to 1 + req.options.nonce = defined(1) + // This is how + req.options.signature = noString + req.options.signature = defined( + await wallet.signTypedData(walletAddress, domainRestrictedSignatureRequestEIP712(req)) + ) + const res2 = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual({ + success: true, + version: res2.body.version, + signature: res2.body.signature, + status: { + disabled: false, + counter: 2, + timer: res2.body.status.timer, + now: res2.body.status.now, + }, + }) + const eval2 = thresholdPoprfClient.unblindPartialResponse( + Buffer.from(res2.body.signature, 'base64') + ) + expect(eval2).toEqual(eval1) + }) + + it('Should respond with 200 if nonce > domainState', async () => { + const [req, thresholdPoprfClient] = await signatureRequest(undefined, 2) + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, // counter gets incremented, not set to nonce value + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = thresholdPoprfClient.unblindPartialResponse( + Buffer.from(res.body.signature, 'base64') + ) + expect(evaluation.toString('base64')).toEqual(expectedEval) + }) + + it('Should respond with 200 on extra request fields', async () => { + const [req, thresholdPoprfClient] = await signatureRequest() + // @ts-ignore Intentionally adding an extra field to the request type + req.options.extraField = noString + + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + signature: res.body.signature, + status: { + disabled: false, + counter: 1, + timer: res.body.status.timer, + now: res.body.status.now, + }, + }) + const evaluation = thresholdPoprfClient.unblindPartialResponse( + Buffer.from(res.body.signature, 'base64') + ) + expect(evaluation.toString('base64')).toEqual(expectedEval) + }) + + it('Should respond with 400 on missing request fields', async () => { + const [badRequest, _] = await signatureRequest() + // @ts-ignore Intentionally deleting required field + delete badRequest.domain.version + + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on unknown domain', async () => { + // Create a request with an invalid domain identifier. + const [unknownRequest, _] = await signatureRequest() + // @ts-ignore UnknownDomain is (intentionally) not a valid domain identifier. + unknownRequest.domain.name = 'UnknownDomain' + + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(unknownRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on bad encoding', async () => { + const [badRequest1, _] = await signatureRequest() + // @ts-ignore Intentionally not JSON + badRequest1.domain = 'Freddy' + + const res1 = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(badRequest1) + + expect(res1.status).toBe(400) + expect(res1.body).toStrictEqual({ + success: false, + version: res1.body.version, + error: WarningMessage.INVALID_INPUT, + }) + + const badRequest2 = '' + + const res2 = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(badRequest2) + + expect(res2.status).toBe(400) + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on invalid key version', async () => { + const [badRequest, _] = await signatureRequest() + + const res = await request(app) + .post(SignerEndpoint.DOMAIN_SIGN) + .set(KEY_VERSION_HEADER, 'a') + .send(badRequest) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 401 on failed auth', async () => { + // Create a manipulated request, which will have a bad signature. + const [badRequest, _] = await signatureRequest() + badRequest.domain.salt = defined('badSalt') + + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond 401 on invalid nonce', async () => { + // Request must be sent first since nonce check is >= 0 + const [req1, _] = await signatureRequest() + const res1 = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req1) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: res1.body.version, + signature: res1.body.signature, + status: { + disabled: false, + counter: 1, + timer: res1.body.status.timer, + now: res1.body.status.now, + }, + }) + const res2 = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req1) + expect(res2.status).toBe(401) + + expect(res2.body).toStrictEqual({ + success: false, + version: res2.body.version, + error: WarningMessage.INVALID_NONCE, + status: { + disabled: false, + counter: 1, + timer: res1.body.status.timer, // Timer should be same as from first request + now: res2.body.status.now, + }, + }) + }) + + it('Should respond with 429 on out of quota', async () => { + const noQuotaDomain = authenticatedDomain([ + { delay: 0, resetTimer: noBool, batchSize: defined(0), repetitions: defined(0) }, + ]) + const [badRequest, _] = await signatureRequest(noQuotaDomain) + + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(429) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.EXCEEDED_QUOTA, + status: { + disabled: false, + counter: 0, + timer: 0, + now: res.body.status.now, + }, + }) + }) + + it('Should respond with 429 on request too early', async () => { + // This domain won't accept requests until ~10 seconds after test execution + const noQuotaDomain = authenticatedDomain([ + { + delay: Math.floor(Date.now() / 1000) + 10, + resetTimer: noBool, + batchSize: defined(2), + repetitions: defined(1), + }, + ]) + const [badRequest, _] = await signatureRequest(noQuotaDomain) + + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(badRequest) + + expect(res.status).toBe(429) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.EXCEEDED_QUOTA, + status: { + disabled: false, + counter: 0, + timer: 0, + now: res.body.status.now, + }, + }) + }) + + it('Should respond with 500 on unsupported key version', async () => { + const [req, _] = await signatureRequest(undefined, undefined, 4) + + const res = await request(app) + .post(SignerEndpoint.DOMAIN_SIGN) + .set(KEY_VERSION_HEADER, '4') + .send(req) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithApiDisabled.api.domains.enabled = false + const appWithApiDisabled = startSigner(configWithApiDisabled, db, keyProvider) + + const [req, _] = await signatureRequest() + + const res = await request(appWithApiDisabled).post(SignerEndpoint.DOMAIN_SIGN).send(req) + + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should respond with 500 on DB getDomainStateRecord query failure', async () => { + const [req, _] = await signatureRequest() + // Mocking getDomainStateRecord directly but requiring the real version of + // getDomainStateRecordOrEmpty does not easily work, + // which is why we mock the outer call here & use the countAndThrowDBError + // helper to get as close as possible to testing a real error. + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/domain-state'), + 'getDomainStateRecordOrEmpty' + ) + .mockImplementationOnce(() => { + countAndThrowDBError( + new Error(), + rootLogger(_config.serviceName), + ErrorMessage.DATABASE_GET_FAILURE + ) + }) + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req) + spy.mockRestore() + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_GET_FAILURE, + }) + expect(await getDomainStateRecord(db, req.domain, rootLogger(_config.serviceName))).toBe( + null + ) + }) + + it('Should respond with 500 on DB updateDomainStateRecord failure', async () => { + const [req, _] = await signatureRequest() + // Same as above (re: getDomainStateRecord, but with insertDomainStateRecord) + // which is why we mock the outer call here & use the countAndThrowDBError + // helper to get as close as possible to testing a real error. + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/domain-state'), + 'updateDomainStateRecord' + ) + .mockImplementationOnce(() => { + countAndThrowDBError( + new Error(), + rootLogger(_config.serviceName), + ErrorMessage.DATABASE_UPDATE_FAILURE + ) + }) + const res = await request(app).post(SignerEndpoint.DOMAIN_SIGN).send(req) + spy.mockRestore() + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_UPDATE_FAILURE, + }) + expect(await getDomainStateRecord(db, req.domain, rootLogger(_config.serviceName))).toBe( + null + ) + }) + + it('Should respond with 500 on signer timeout', async () => { + const [req, _] = await signatureRequest() + const testTimeoutMS = 0 + const delay = 200 + + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/domain-state'), + 'getDomainStateRecordOrEmpty' + ) + .mockImplementationOnce(async () => { + await new Promise((resolve) => setTimeout(resolve, testTimeoutMS + delay)) + return createEmptyDomainStateRecord(req.domain) + }) + + const configWithShortTimeout = JSON.parse(JSON.stringify(_config)) + configWithShortTimeout.timeout = testTimeoutMS + const appWithShortTimeout = startSigner(configWithShortTimeout, db, keyProvider) + + const res = await request(appWithShortTimeout).post(SignerEndpoint.DOMAIN_SIGN).send(req) + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + error: ErrorMessage.TIMEOUT_FROM_SIGNER, + version: expectedVersion, + }) + spy.mockRestore() + // Allow time for non-killed processes to finish + await new Promise((resolve) => setTimeout(resolve, delay)) + // Check that DB state was not updated on timeout + expect(await getDomainStateRecord(db, req.domain, rootLogger(_config.serviceName))).toBe( + null + ) + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/signer/test/integration/legacypnp.test.ts b/packages/phone-number-privacy/signer/test/integration/legacypnp.test.ts new file mode 100644 index 00000000000..e72bc1f7a7d --- /dev/null +++ b/packages/phone-number-privacy/signer/test/integration/legacypnp.test.ts @@ -0,0 +1,1795 @@ +import { newKit, StableToken } from '@celo/contractkit' +import { + AuthenticationMethod, + ErrorMessage, + KEY_VERSION_HEADER, + PhoneNumberPrivacyRequest, + PnpQuotaResponseFailure, + PnpQuotaResponseSuccess, + rootLogger, + SignerEndpoint, + SignMessageResponseFailure, + SignMessageResponseSuccess, + TestUtils, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { + AttestationsStatus, + createMockOdisPayments, + getPnpSignRequest, +} from '@celo/phone-number-privacy-common/lib/test/utils' +import BigNumber from 'bignumber.js' +import { Knex } from 'knex' +import request from 'supertest' +import { initDatabase } from '../../src/common/database/database' +import { ACCOUNTS_TABLE } from '../../src/common/database/models/account' +import { REQUESTS_TABLE } from '../../src/common/database/models/request' +import { countAndThrowDBError } from '../../src/common/database/utils' +import { + getPerformedQueryCount, + incrementQueryCount, +} from '../../src/common/database/wrappers/account' +import { getRequestExists } from '../../src/common/database/wrappers/request' +import { initKeyProvider } from '../../src/common/key-management/key-provider' +import { KeyProvider } from '../../src/common/key-management/key-provider-base' +import { config, getSignerVersion, SupportedDatabase, SupportedKeystore } from '../../src/config' +import { startSigner } from '../../src/server' + +const { + ContractRetrieval, + createMockContractKit, + createMockAccounts, + createMockToken, + createMockWeb3, + getLegacyPnpQuotaRequest, + getPnpRequestAuthorization, + createMockAttestation, + getLegacyPnpSignRequest, +} = TestUtils.Utils +const { + IDENTIFIER, + PRIVATE_KEY1, + ACCOUNT_ADDRESS1, + mockAccount, + BLINDED_PHONE_NUMBER, + DEK_PRIVATE_KEY, + DEK_PUBLIC_KEY, +} = TestUtils.Values + +jest.setTimeout(20000) + +const testBlockNumber = 1000000 + +const mockBalanceOfCUSD = jest.fn() +const mockBalanceOfCEUR = jest.fn() +const mockBalanceOfCELO = jest.fn() +const mockGetVerifiedStatus = jest.fn() +const mockGetWalletAddress = jest.fn() +const mockGetDataEncryptionKey = jest.fn() +const mockOdisPaymentsTotalPaidCUSD = jest.fn() + +const mockContractKit = createMockContractKit( + { + // getWalletAddress stays constant across all old query-quota.test.ts unit tests + [ContractRetrieval.getAccounts]: createMockAccounts( + mockGetWalletAddress, + mockGetDataEncryptionKey + ), + [ContractRetrieval.getStableToken]: jest.fn(), + [ContractRetrieval.getGoldToken]: createMockToken(mockBalanceOfCELO), + [ContractRetrieval.getAttestations]: createMockAttestation(mockGetVerifiedStatus), + [ContractRetrieval.getOdisPayments]: createMockOdisPayments(mockOdisPaymentsTotalPaidCUSD), + }, + createMockWeb3(5, testBlockNumber) +) + +// Necessary for distinguishing between mocked stable tokens +mockContractKit.contracts[ContractRetrieval.getStableToken] = jest.fn( + (stableToken: StableToken) => { + switch (stableToken) { + case StableToken.cUSD: + return createMockToken(mockBalanceOfCUSD) + case StableToken.cEUR: + return createMockToken(mockBalanceOfCEUR) + default: + return createMockToken(jest.fn().mockReturnValue(new BigNumber(0))) + } + } +) + +jest.mock('@celo/contractkit', () => ({ + ...jest.requireActual('@celo/contractkit'), + newKit: jest.fn().mockImplementation(() => mockContractKit), +})) + +// Indexes correspond to keyVersion - 1 +const expectedSignatures: string[] = [ + 'MAAAAAAAAACEVdw1ULDwAiTcZuPnZxHHh38PNa+/g997JgV10QnEq9yeuLxbM9l7vk0EAicV7IAAAAAA', + 'MAAAAAAAAAAmUJY0s9p7fMfs7GIoSiGJoObAN8ZpA7kRqeC9j/Q23TBrG3Jtxc8xWibhNVZhbYEAAAAA', + 'MAAAAAAAAAC4aBbzhHvt6l/b+8F7cILmWxZZ5Q7S6R4RZ/IgZR7Pfb9B1Wg9fsDybgxVTSv5BYEAAAAA', +] + +describe('legacyPNP', () => { + let keyProvider: KeyProvider + let app: any + let db: Knex + + const expectedVersion = getSignerVersion() + + // create deep copy + const _config: typeof config = JSON.parse(JSON.stringify(config)) + _config.db.type = SupportedDatabase.Sqlite + _config.keystore.type = SupportedKeystore.MOCK_SECRET_MANAGER + _config.api.legacyPhoneNumberPrivacy.enabled = true + + const expectedSignature = expectedSignatures[_config.keystore.keys.phoneNumberPrivacy.latest - 1] + + beforeAll(async () => { + keyProvider = await initKeyProvider(_config) + }) + + beforeEach(async () => { + // Create a new in-memory database for each test. + db = await initDatabase(_config) + app = startSigner(_config, db, keyProvider, newKit('dummyKit')) + }) + + afterEach(async () => { + // Close and destroy the in-memory database. + // Note: If tests start to be too slow, this could be replaced with more complicated logic to + // reset the database state without destroying and recreating it for each test. + await db?.destroy() + }) + + describe(`${SignerEndpoint.STATUS}`, () => { + it('Should return 200 and correct version', async () => { + const res = await request(app).get(SignerEndpoint.STATUS) + expect(res.status).toBe(200) + expect(res.body.version).toBe(expectedVersion) + }) + }) + + const zeroBalance = new BigNumber(0) + const twentyCents = new BigNumber(200000000000000000) + + type legacyPnpQuotaCalculationTestCase = { + it: string + account: string + performedQueryCount: number + transactionCount: number + balanceCUSD: BigNumber + balanceCEUR: BigNumber + balanceCELO: BigNumber + isVerified: boolean + identifier: string | undefined + expectedPerformedQueryCount: number + expectedTotalQuota: number + } // To be re-used against both the signature and quota endpoints + const quotaCalculationTestCases: legacyPnpQuotaCalculationTestCase[] = [ + { + it: 'should calculate correct quota for verified account', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 2, + transactionCount: 5, + balanceCUSD: zeroBalance, + balanceCEUR: zeroBalance, + balanceCELO: zeroBalance, + isVerified: true, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 2, + expectedTotalQuota: 60, + }, + { + it: 'should calculate correct quota for unverified account with no transactions or balance', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 0, + transactionCount: 0, + balanceCUSD: zeroBalance, + balanceCEUR: zeroBalance, + balanceCELO: zeroBalance, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 0, + expectedTotalQuota: 0, + }, + { + it: 'should calculate correct quota for unverified account with balance but no transactions', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 1, + transactionCount: 0, + balanceCUSD: twentyCents, + balanceCEUR: twentyCents, + balanceCELO: twentyCents, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 1, + expectedTotalQuota: 10, + }, + { + it: 'should calculate correct quota for verified account with many txs and balance', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 10, + transactionCount: 100, + balanceCUSD: twentyCents, + balanceCEUR: twentyCents, + balanceCELO: twentyCents, + isVerified: true, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 10, + expectedTotalQuota: 440, + }, + { + it: 'should calculate correct quota for unverified account with many txs and balance', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 0, + transactionCount: 100, + balanceCUSD: twentyCents, + balanceCEUR: twentyCents, + balanceCELO: twentyCents, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 0, + expectedTotalQuota: 410, + }, + { + it: 'should calculate correct quota for unverified account without any balance (with txs)', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 0, + transactionCount: 100, + balanceCUSD: zeroBalance, + balanceCEUR: zeroBalance, + balanceCELO: zeroBalance, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 0, + expectedTotalQuota: 0, + }, + { + it: 'should calculate correct quota for unverified account with only cUSD balance (no txs)', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 1, + transactionCount: 0, + balanceCUSD: twentyCents, + balanceCEUR: zeroBalance, + balanceCELO: zeroBalance, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 1, + expectedTotalQuota: 10, + }, + { + it: 'should calculate correct quota for unverified account with only cEUR balance (no txs)', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 1, + transactionCount: 0, + balanceCUSD: zeroBalance, + balanceCEUR: twentyCents, + balanceCELO: zeroBalance, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 1, + expectedTotalQuota: 10, + }, + { + it: 'should calculate correct quota for unverified account with only CELO balance (no txs)', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 1, + transactionCount: 0, + balanceCUSD: zeroBalance, + balanceCEUR: zeroBalance, + balanceCELO: twentyCents, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 1, + expectedTotalQuota: 10, + }, + { + it: 'should calculate correct quota for account with min balance when no phone number hash is provided', + account: ACCOUNT_ADDRESS1, + performedQueryCount: 1, + transactionCount: 0, + balanceCUSD: twentyCents, + balanceCEUR: twentyCents, + balanceCELO: twentyCents, + isVerified: false, + identifier: IDENTIFIER, + expectedPerformedQueryCount: 1, + expectedTotalQuota: 10, + }, + ] + + const prepMocks = async ( + account: string, + performedQueryCount: number, + transactionCount: number, + isVerified: boolean, + balanceCUSD: BigNumber, + balanceCEUR: BigNumber, + balanceCELO: BigNumber, + dekPubKey: string = DEK_PUBLIC_KEY, + walletAddress: string = mockAccount + ) => { + ;[ + mockContractKit.connection.getTransactionCount, + mockGetVerifiedStatus, + mockBalanceOfCUSD, + mockBalanceOfCEUR, + mockBalanceOfCELO, + mockGetWalletAddress, + mockGetDataEncryptionKey, + ].forEach((mockFn) => mockFn.mockReset()) + + await db.transaction(async (trx) => { + for (let i = 0; i < performedQueryCount; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + account, + rootLogger(_config.serviceName), + trx + ) + } + }) + + mockContractKit.connection.getTransactionCount.mockReturnValue(transactionCount) + mockGetVerifiedStatus.mockReturnValue( + // only the isVerified value below matters + { isVerified, completed: 1, total: 1, numAttestationsRemaining: 1 } + ) + mockBalanceOfCUSD.mockReturnValue(balanceCUSD) + mockBalanceOfCEUR.mockReturnValue(balanceCEUR) + mockBalanceOfCELO.mockReturnValue(balanceCELO) + mockGetWalletAddress.mockReturnValue(walletAddress) + mockGetDataEncryptionKey.mockReturnValue(dekPubKey) + } + + const sendRequest = async ( + req: PhoneNumberPrivacyRequest, + authorization: string, + endpoint: SignerEndpoint, + keyVersionHeader?: string, + signerApp: any = app + ) => { + const _req = request(signerApp).post(endpoint).set('Authorization', authorization) + + if (keyVersionHeader !== undefined) { + _req.set(KEY_VERSION_HEADER, keyVersionHeader) + } + + return _req.send(req) + } + + describe(`${SignerEndpoint.LEGACY_PNP_QUOTA}`, () => { + describe('quota calculation logic', () => { + const runLegacyQuotaTestCase = async (testCase: legacyPnpQuotaCalculationTestCase) => { + await prepMocks( + testCase.account, + testCase.performedQueryCount, + testCase.transactionCount, + testCase.isVerified, + testCase.balanceCUSD, + testCase.balanceCEUR, + testCase.balanceCELO + ) + + const req = getLegacyPnpQuotaRequest( + testCase.account, + AuthenticationMethod.WALLET_KEY, + testCase.identifier + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: testCase.expectedPerformedQueryCount, + totalQuota: testCase.expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + } + + quotaCalculationTestCases.forEach((testCase) => { + it(testCase.it, async () => { + await runLegacyQuotaTestCase(testCase) + }) + }) + }) + + describe('endpoint functionality', () => { + // Use values from 'unverified account with no transactions' logic test case + const performedQueryCount = 1 + const expectedQuota = 10 + + beforeEach(async () => { + await prepMocks( + ACCOUNT_ADDRESS1, + performedQueryCount, + 0, + false, + twentyCents, + twentyCents, + twentyCents + ) + }) + + it('Should respond with 200 on valid request', async () => { + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1, IDENTIFIER) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on valid request when authenticated with DEK', async () => { + const req = getLegacyPnpQuotaRequest( + ACCOUNT_ADDRESS1, + AuthenticationMethod.ENCRYPTION_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1, IDENTIFIER) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + + const res1 = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: res1.body.version, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const res2 = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual(res1.body) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1, IDENTIFIER) + // @ts-ignore Intentionally adding an extra field to the request type + req.extraField = 'dummyString' + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 if performedQueryCount is greater than totalQuota', async () => { + const expectedRemainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i <= expectedRemainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + performedQueryCount: expectedQuota + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1, IDENTIFIER) + // @ts-ignore Intentionally deleting required field + delete badRequest.account + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + const badRequest = getLegacyPnpQuotaRequest( + ACCOUNT_ADDRESS1, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(badRequest, differentPk) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth', async () => { + const badRequest = getLegacyPnpQuotaRequest( + ACCOUNT_ADDRESS1, + AuthenticationMethod.ENCRYPTION_KEY, + IDENTIFIER + ) + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(badRequest, differentPk) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithApiDisabled.api.legacyPhoneNumberPrivacy.enabled = false + const appWithApiDisabled = startSigner( + configWithApiDisabled, + db, + keyProvider, + newKit('dummyKit') + ) + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1, IDENTIFIER) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_QUOTA, + undefined, + appWithApiDisabled + ) + expect.assertions(2) + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should respond with 200 on failure to fetch DEK when shouldFailOpen is true', async () => { + const configWithFailOpenEnabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenEnabled.api.legacyPhoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startSigner( + configWithFailOpenEnabled, + db, + keyProvider, + newKit('dummyKit') + ) + mockGetDataEncryptionKey.mockImplementation(() => { + throw new Error() + }) + + const req = getLegacyPnpQuotaRequest( + ACCOUNT_ADDRESS1, + AuthenticationMethod.ENCRYPTION_KEY, + IDENTIFIER + ) + + // NOT the dek private key, so authentication would fail if getDataEncryptionKey succeeded + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_QUOTA, + '1', + appWithFailOpenEnabled + ) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_DEK, ErrorMessage.FAILING_OPEN], + }) + }) + + it('Should respond with 500 on DB performedQueryCount query failure', async () => { + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockRejectedValueOnce(new Error()) + + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1, IDENTIFIER) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.FAILURE_TO_GET_PERFORMED_QUERY_COUNT, + }) + + spy.mockRestore() + }) + + it('Should respond with 500 on blockchain totalQuota query failure', async () => { + mockContractKit.connection.getTransactionCount.mockRejectedValue(new Error()) + + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1, IDENTIFIER) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_QUOTA) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA, + }) + }) + + it('Should respond with 500 on signer timeout', async () => { + const testTimeoutMS = 0 + const delay = 100 + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockImplementation(async () => { + await new Promise((resolve) => setTimeout(resolve, testTimeoutMS + delay)) + return expectedQuota + }) + + const configWithShortTimeout = JSON.parse(JSON.stringify(_config)) + configWithShortTimeout.timeout = testTimeoutMS + const appWithShortTimeout = startSigner( + configWithShortTimeout, + db, + keyProvider, + newKit('dummyKit') + ) + const req = getLegacyPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_QUOTA, + undefined, + appWithShortTimeout + ) + // Ensure that this is restored before test can fail on assertions + // to prevent failures in other tests + spy.mockRestore() + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + error: ErrorMessage.TIMEOUT_FROM_SIGNER, + version: expectedVersion, + }) + // Allow time for non-killed processes to finish + await new Promise((resolve) => setTimeout(resolve, delay)) + }) + }) + }) + }) + + describe(`${SignerEndpoint.LEGACY_PNP_SIGN}`, () => { + describe('quota calculation logic', () => { + const runLegacyPnpSignQuotaTestCase = async (testCase: legacyPnpQuotaCalculationTestCase) => { + await prepMocks( + testCase.account, + testCase.performedQueryCount, + testCase.transactionCount, + testCase.isVerified, + testCase.balanceCUSD, + testCase.balanceCEUR, + testCase.balanceCELO + ) + + const req = getLegacyPnpSignRequest( + testCase.account, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + testCase.identifier + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + + const { expectedPerformedQueryCount, expectedTotalQuota } = testCase + const shouldSucceed = expectedPerformedQueryCount < expectedTotalQuota + + if (shouldSucceed) { + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: expectedPerformedQueryCount + 1, // incremented for signature request + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + } else { + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: expectedPerformedQueryCount, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + } + } + + quotaCalculationTestCases.forEach((testCase) => { + it(testCase.it, async () => { + await runLegacyPnpSignQuotaTestCase(testCase) + }) + }) + }) + + describe('endpoint functionality', () => { + // Use values from 'unverified account with balance but no transactions' logic test case + const performedQueryCount = 1 + const expectedQuota = 10 + + beforeEach(async () => { + await prepMocks( + ACCOUNT_ADDRESS1, + performedQueryCount, + 0, + false, + twentyCents, + twentyCents, + twentyCents + ) + }) + + it('Should respond with 200 on valid request', async () => { + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(res.get(KEY_VERSION_HEADER)).toEqual( + _config.keystore.keys.phoneNumberPrivacy.latest.toString() + ) + }) + + it('Should respond with 200 on valid request when authenticated with DEK', async () => { + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.ENCRYPTION_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + for (let i = 1; i <= 3; i++) { + it(`Should respond with 200 on valid request with key version header ${i}`, async () => { + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + i.toString() + ) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignatures[i - 1], + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(res.get(KEY_VERSION_HEADER)).toEqual(i.toString()) + }) + } + + it('Should respond with 200 and warning on repeated valid requests', async () => { + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const res2 = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res2.status).toBe(200) + res1.body.warnings.push(WarningMessage.DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG) + expect(res2.body).toStrictEqual(res1.body) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + // @ts-ignore Intentionally adding an extra field to the request type + req.extraField = 'dummyString' + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + // @ts-ignore Intentionally deleting required field + delete badRequest.account + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on invalid key version', async () => { + const badRequest = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest( + badRequest, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + 'a' + ) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 400 on invalid identifier', async () => { + const badRequest = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + '+1234567890' + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on invalid blinded message', async () => { + const badRequest = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + '+1234567890', + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on invalid address', async () => { + const badRequest = getLegacyPnpSignRequest( + '0xnotanaddress', + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + const badRequest = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(badRequest, differentPk) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth', async () => { + const badRequest = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.ENCRYPTION_KEY, + IDENTIFIER + ) + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(badRequest, differentPk) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 403 on out of quota', async () => { + // deplete user's quota + const remainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i < remainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: expectedQuota, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 403 if totalQuota and performedQueryCount are zero', async () => { + await prepMocks(ACCOUNT_ADDRESS1, 0, 0, false, zeroBalance, zeroBalance, zeroBalance) + + const spy = jest // for convenience so we don't have to refactor or reset the db just for this test + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockResolvedValueOnce(0) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: 0, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + + spy.mockRestore() + }) + + it('Should respond with 403 if performedQueryCount is greater than totalQuota', async () => { + const expectedRemainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i <= expectedRemainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + + // It is possible to reach this state due to our fail-open logic + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: expectedQuota + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 500 on unsupported key version', async () => { + const badRequest = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest( + badRequest, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + '4' + ) + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.SIGNATURE_COMPUTATION_FAILURE, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithApiDisabled.api.legacyPhoneNumberPrivacy.enabled = false + const appWithApiDisabled = startSigner( + configWithApiDisabled, + db, + keyProvider, + newKit('dummyKit') + ) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + undefined, + appWithApiDisabled + ) + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('interactions between legacy and new endpoints', () => { + const configWithPNPEnabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithPNPEnabled.api.phoneNumberPrivacy.enabled = true + let appWithPNPEnabled: any + + beforeEach(() => { + appWithPNPEnabled = startSigner(configWithPNPEnabled, db, keyProvider, newKit('dummyKit')) + }) + + // Keep both of these cases with the legacy test suite + // since once this endpoint is deprecated, these tests will no longer be needed + it('Should not be affected by requests and queries from the new endpoint', async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(new BigNumber(1e18)) + const expectedQuotaOnChain = 1000 + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_SIGN, + undefined, + appWithPNPEnabled + ) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuotaOnChain, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(res.get(KEY_VERSION_HEADER)).toEqual( + _config.keystore.keys.phoneNumberPrivacy.latest.toString() + ) + const legacyReq = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const legacyAuthorization = getPnpRequestAuthorization(legacyReq, PRIVATE_KEY1) + const legacyRes = await sendRequest( + legacyReq, + legacyAuthorization, + SignerEndpoint.LEGACY_PNP_SIGN, + undefined, + appWithPNPEnabled + ) + expect(legacyRes.status).toBe(200) + expect(legacyRes.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: legacyRes.body.totalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(legacyRes.get(KEY_VERSION_HEADER)).toEqual( + _config.keystore.keys.phoneNumberPrivacy.latest.toString() + ) + }) + + it('Should not affect the requests and queries to the new endpoint', async () => { + const legacyReq = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const legacyAuthorization = getPnpRequestAuthorization(legacyReq, PRIVATE_KEY1) + const legacyRes = await sendRequest( + legacyReq, + legacyAuthorization, + SignerEndpoint.LEGACY_PNP_SIGN, + undefined, + appWithPNPEnabled + ) + expect(legacyRes.status).toBe(200) + expect(legacyRes.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: legacyRes.body.totalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(legacyRes.get(KEY_VERSION_HEADER)).toEqual( + _config.keystore.keys.phoneNumberPrivacy.latest.toString() + ) + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(new BigNumber(1e18)) + const expectedQuotaOnChain = 1000 + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_SIGN, + undefined, + appWithPNPEnabled + ) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, + totalQuota: expectedQuotaOnChain, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(res.get(KEY_VERSION_HEADER)).toEqual( + _config.keystore.keys.phoneNumberPrivacy.latest.toString() + ) + }) + }) + + describe('functionality in case of errors', () => { + it('Should return 500 on DB performedQueryCount query failure', async () => { + // deplete user's quota + const remainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i < remainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + // sanity check + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName) + ) + ).toBe(expectedQuota) + + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockRejectedValueOnce(new Error()) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: -1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.DATABASE_GET_FAILURE, + }) + + spy.mockRestore() + }) + + it('Should return 200 w/ warning on blockchain totalQuota query failure when shouldFailOpen is true', async () => { + const configWithFailOpenEnabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenEnabled.api.legacyPhoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startSigner( + configWithFailOpenEnabled, + db, + keyProvider, + newKit('dummyKit') + ) + + // deplete user's quota + const remainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i < remainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + // sanity check + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName) + ) + ).toBe(expectedQuota) + + mockContractKit.connection.getTransactionCount.mockRejectedValue(new Error()) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + '1', + appWithFailOpenEnabled + ) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: expectedQuota + 1, // bc we depleted the user's quota above + totalQuota: Number.MAX_SAFE_INTEGER, + blockNumber: testBlockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA, ErrorMessage.FULL_NODE_ERROR], + }) + + // check DB state: performedQueryCount was incremented and request was stored + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName) + ) + ).toBe(expectedQuota + 1) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.LEGACY, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(_config.serviceName) + ) + ).toBe(true) + }) + + it('Should return 500 on blockchain totalQuota query failure when shouldFailOpen is false', async () => { + mockContractKit.connection.getTransactionCount.mockRejectedValue(new Error()) + + const configWithFailOpenDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenDisabled.api.legacyPhoneNumberPrivacy.shouldFailOpen = false + const appWithFailOpenDisabled = startSigner( + configWithFailOpenDisabled, + db, + keyProvider, + newKit('dummyKit') + ) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + '1', + appWithFailOpenDisabled + ) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: -1, + blockNumber: testBlockNumber, + error: ErrorMessage.FULL_NODE_ERROR, + }) + }) + + it('Should return 500 on failure to increment query count', async () => { + const logger = rootLogger(_config.serviceName) + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'incrementQueryCount' + ) + .mockImplementationOnce(() => { + countAndThrowDBError(new Error(), logger, ErrorMessage.DATABASE_UPDATE_FAILURE) + }) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_UPDATE_FAILURE, + }) + + spy.mockRestore() + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount(db, ACCOUNTS_TABLE.LEGACY, ACCOUNT_ADDRESS1, logger) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.LEGACY, + req.account, + req.blindedQueryPhoneNumber, + logger + ) + ).toBe(false) + }) + + it('Should return 500 on failure to store request', async () => { + const logger = rootLogger(_config.serviceName) + const spy = jest + .spyOn(jest.requireActual('../../src/common/database/wrappers/request'), 'storeRequest') + .mockImplementationOnce(() => { + countAndThrowDBError(new Error(), logger, ErrorMessage.DATABASE_INSERT_FAILURE) + }) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_INSERT_FAILURE, + }) + + spy.mockRestore() + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount(db, ACCOUNTS_TABLE.LEGACY, ACCOUNT_ADDRESS1, logger) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.LEGACY, + req.account, + req.blindedQueryPhoneNumber, + logger + ) + ).toBe(false) + }) + + it('Should return 200 on failure to fetch DEK when shouldFailOpen is true', async () => { + mockGetDataEncryptionKey.mockImplementation(() => { + throw new Error() + }) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.ENCRYPTION_KEY, + IDENTIFIER + ) + + const configWithFailOpenEnabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenEnabled.api.legacyPhoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startSigner( + configWithFailOpenEnabled, + db, + keyProvider, + newKit('dummyKit') + ) + + // NOT the dek private key, so authentication would fail if getDataEncryptionKey succeeded + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + '1', + appWithFailOpenEnabled + ) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_DEK, ErrorMessage.FAILING_OPEN], + }) + }) + + it('Should return 500 on bls signing error', async () => { + const spy = jest + .spyOn(jest.requireActual('blind-threshold-bls'), 'partialSignBlindedMessage') + .mockImplementationOnce(() => { + throw new Error() + }) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.SIGNATURE_COMPUTATION_FAILURE, + }) + + spy.mockRestore() + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName) + ) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.LEGACY, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(_config.serviceName) + ) + ).toBe(false) + }) + + it('Should return 500 on generic error in sign', async () => { + const spy = jest + .spyOn( + jest.requireActual('../../src/common/bls/bls-cryptography-client'), + 'computeBlindedSignature' + ) + .mockImplementationOnce(() => { + // Trigger a generic error in .sign to trigger the default error returned. + throw new Error() + }) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY, + IDENTIFIER + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.LEGACY_PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.SIGNATURE_COMPUTATION_FAILURE, + }) + + spy.mockRestore() + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(config.serviceName) + ) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.LEGACY, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(config.serviceName) + ) + ).toBe(false) + }) + + it('Should respond with 500 on signer timeout', async () => { + const testTimeoutMS = 0 + const delay = 200 + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockImplementationOnce(async () => { + await new Promise((resolve) => setTimeout(resolve, testTimeoutMS + delay)) + return performedQueryCount + }) + + const configWithShortTimeout = JSON.parse(JSON.stringify(_config)) + configWithShortTimeout.timeout = testTimeoutMS + const appWithShortTimeout = startSigner( + configWithShortTimeout, + db, + keyProvider, + newKit('dummyKit') + ) + + const req = getLegacyPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.LEGACY_PNP_SIGN, + undefined, + appWithShortTimeout + ) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + error: ErrorMessage.TIMEOUT_FROM_SIGNER, + version: expectedVersion, + }) + spy.mockRestore() + // Allow time for non-killed processes to finish + await new Promise((resolve) => setTimeout(resolve, delay)) + // Check that DB was not updated + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.LEGACY, + ACCOUNT_ADDRESS1, + rootLogger(config.serviceName) + ) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.LEGACY, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(config.serviceName) + ) + ).toBe(false) + }) + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/signer/test/integration/pnp.test.ts b/packages/phone-number-privacy/signer/test/integration/pnp.test.ts new file mode 100644 index 00000000000..59012e0d0a5 --- /dev/null +++ b/packages/phone-number-privacy/signer/test/integration/pnp.test.ts @@ -0,0 +1,1368 @@ +import { newKit } from '@celo/contractkit' +import { + AuthenticationMethod, + ErrorMessage, + KEY_VERSION_HEADER, + PhoneNumberPrivacyRequest, + PnpQuotaResponseFailure, + PnpQuotaResponseSuccess, + rootLogger, + SignerEndpoint, + SignMessageResponseFailure, + SignMessageResponseSuccess, + TestUtils, + WarningMessage, +} from '@celo/phone-number-privacy-common' +import { BLINDED_PHONE_NUMBER } from '@celo/phone-number-privacy-common/lib/test/values' +import BigNumber from 'bignumber.js' +import { Knex } from 'knex' +import request from 'supertest' +import { initDatabase } from '../../src/common/database/database' +import { ACCOUNTS_TABLE } from '../../src/common/database/models/account' +import { REQUESTS_TABLE } from '../../src/common/database/models/request' +import { countAndThrowDBError } from '../../src/common/database/utils' +import { + getPerformedQueryCount, + incrementQueryCount, +} from '../../src/common/database/wrappers/account' +import { getRequestExists } from '../../src/common/database/wrappers/request' +import { initKeyProvider } from '../../src/common/key-management/key-provider' +import { KeyProvider } from '../../src/common/key-management/key-provider-base' +import { config, getSignerVersion, SupportedDatabase, SupportedKeystore } from '../../src/config' +import { startSigner } from '../../src/server' + +const { + ContractRetrieval, + createMockContractKit, + createMockAccounts, + createMockOdisPayments, + createMockWeb3, + getPnpQuotaRequest, + getPnpRequestAuthorization, + getPnpSignRequest, +} = TestUtils.Utils +const { PRIVATE_KEY1, ACCOUNT_ADDRESS1, mockAccount, DEK_PRIVATE_KEY, DEK_PUBLIC_KEY } = + TestUtils.Values + +jest.setTimeout(20000) + +const testBlockNumber = 1000000 +const zeroBalance = new BigNumber(0) + +const mockOdisPaymentsTotalPaidCUSD = jest.fn() +const mockGetWalletAddress = jest.fn() +const mockGetDataEncryptionKey = jest.fn() + +const mockContractKit = createMockContractKit( + { + [ContractRetrieval.getAccounts]: createMockAccounts( + mockGetWalletAddress, + mockGetDataEncryptionKey + ), + [ContractRetrieval.getOdisPayments]: createMockOdisPayments(mockOdisPaymentsTotalPaidCUSD), + }, + createMockWeb3(5, testBlockNumber) +) +jest.mock('@celo/contractkit', () => ({ + ...jest.requireActual('@celo/contractkit'), + newKit: jest.fn().mockImplementation(() => mockContractKit), +})) + +// Indexes correspond to keyVersion - 1 +const expectedSignatures: string[] = [ + 'MAAAAAAAAACEVdw1ULDwAiTcZuPnZxHHh38PNa+/g997JgV10QnEq9yeuLxbM9l7vk0EAicV7IAAAAAA', + 'MAAAAAAAAAAmUJY0s9p7fMfs7GIoSiGJoObAN8ZpA7kRqeC9j/Q23TBrG3Jtxc8xWibhNVZhbYEAAAAA', + 'MAAAAAAAAAC4aBbzhHvt6l/b+8F7cILmWxZZ5Q7S6R4RZ/IgZR7Pfb9B1Wg9fsDybgxVTSv5BYEAAAAA', +] + +describe('pnp', () => { + let keyProvider: KeyProvider + let app: any + let db: Knex + + const onChainBalance = new BigNumber(1e18) + const expectedQuota = 1000 + const expectedVersion = getSignerVersion() + + // create deep copy + const _config: typeof config = JSON.parse(JSON.stringify(config)) + _config.db.type = SupportedDatabase.Sqlite + _config.keystore.type = SupportedKeystore.MOCK_SECRET_MANAGER + _config.api.phoneNumberPrivacy.enabled = true + + const expectedSignature = expectedSignatures[_config.keystore.keys.phoneNumberPrivacy.latest - 1] + + beforeAll(async () => { + keyProvider = await initKeyProvider(_config) + }) + + beforeEach(async () => { + // Create a new in-memory database for each test. + db = await initDatabase(_config) + app = startSigner(_config, db, keyProvider, newKit('dummyKit')) + mockOdisPaymentsTotalPaidCUSD.mockReset() + mockGetDataEncryptionKey.mockReset().mockReturnValue(DEK_PUBLIC_KEY) + mockGetWalletAddress.mockReset().mockReturnValue(mockAccount) + }) + + afterEach(async () => { + // Close and destroy the in-memory database. + // Note: If tests start to be too slow, this could be replaced with more complicated logic to + // reset the database state without destroying and recreting it for each test. + await db?.destroy() + }) + + describe(`${SignerEndpoint.STATUS}`, () => { + it('Should return 200 and correct version', async () => { + const res = await request(app).get(SignerEndpoint.STATUS) + expect(res.status).toBe(200) + expect(res.body.version).toBe(expectedVersion) + }) + }) + + const sendRequest = async ( + req: PhoneNumberPrivacyRequest, + authorization: string, + endpoint: SignerEndpoint, + keyVersionHeader?: string, + signerApp: any = app + ) => { + const _req = request(signerApp).post(endpoint).set('Authorization', authorization) + + if (keyVersionHeader !== undefined) { + _req.set(KEY_VERSION_HEADER, keyVersionHeader) + } + + return _req.send(req) + } + + type pnpQuotaTestCase = { + cusdOdisPaymentInWei: BigNumber + expectedTotalQuota: number + } + const quotaCalculationTestCases: pnpQuotaTestCase[] = [ + { + cusdOdisPaymentInWei: new BigNumber(0), + expectedTotalQuota: 0, + }, + { + cusdOdisPaymentInWei: new BigNumber(1), + expectedTotalQuota: 0, + }, + { + cusdOdisPaymentInWei: new BigNumber(1.56e18), + expectedTotalQuota: 1560, + }, + { + // Sanity check for the default values to be used in endpoint setup tests + cusdOdisPaymentInWei: onChainBalance, + expectedTotalQuota: expectedQuota, + }, + { + // Unrealistically large amount paid for ODIS quota + cusdOdisPaymentInWei: new BigNumber(1.23456789e26), + expectedTotalQuota: 123456789000, + }, + ] + + describe(`${SignerEndpoint.PNP_QUOTA}`, () => { + describe('quota calculation logic', () => { + quotaCalculationTestCases.forEach(({ cusdOdisPaymentInWei, expectedTotalQuota }) => { + it(`Should get totalQuota=${expectedTotalQuota} + for cUSD (wei) payment=${cusdOdisPaymentInWei.toString()}`, async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(cusdOdisPaymentInWei) + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + }) + }) + + describe('endpoint functionality', () => { + // Use values already tested in quota logic tests, [onChainBalance, expectedQuota] + beforeEach(async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(onChainBalance) + }) + + it('Should respond with 200 on valid request', async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + performedQueryCount: 0, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on repeated valid requests', async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + + const res1 = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: res1.body.version, + performedQueryCount: 0, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const res2 = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + expect(res2.status).toBe(200) + expect(res2.body).toStrictEqual(res1.body) + }) + + it('Should respond with 200 on valid request when authenticated with DEK', async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1, AuthenticationMethod.ENCRYPTION_KEY) + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + performedQueryCount: 0, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + // @ts-ignore Intentionally adding an extra field to the request type + req.extraField = 'dummyString' + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 200 if performedQueryCount is greater than totalQuota', async () => { + await db.transaction(async (trx) => { + for (let i = 0; i <= expectedQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(config.serviceName), + trx + ) + } + }) + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: res.body.version, + performedQueryCount: expectedQuota + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + // @ts-ignore Intentionally deleting required field + delete badRequest.account + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_QUOTA) + + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + // Request from one account, signed by another account + const badRequest = getPnpQuotaRequest(mockAccount, AuthenticationMethod.WALLET_KEY) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_QUOTA) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: res.body.version, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth', async () => { + const badRequest = getPnpQuotaRequest(ACCOUNT_ADDRESS1, AuthenticationMethod.ENCRYPTION_KEY) + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(badRequest, differentPk) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_QUOTA) + + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithApiDisabled.api.phoneNumberPrivacy.enabled = false + const appWithApiDisabled = startSigner( + configWithApiDisabled, + db, + keyProvider, + newKit('dummyKit') + ) + + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_QUOTA, + undefined, + appWithApiDisabled + ) + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should respond with 200 on failure to fetch DEK when shouldFailOpen is true', async () => { + mockGetDataEncryptionKey.mockImplementation(() => { + throw new Error() + }) + + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1, AuthenticationMethod.ENCRYPTION_KEY) + + const configWithFailOpenEnabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenEnabled.api.phoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startSigner( + configWithFailOpenEnabled, + db, + keyProvider, + newKit('dummyKit') + ) + + // NOT the dek private key, so authentication would fail if getDataEncryptionKey succeeded + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_QUOTA, + '1', + appWithFailOpenEnabled + ) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_DEK, ErrorMessage.FAILING_OPEN], + }) + }) + + it('Should respond with 500 on DB performedQueryCount query failure', async () => { + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockRejectedValueOnce(new Error()) + + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.FAILURE_TO_GET_PERFORMED_QUERY_COUNT, + }) + + spy.mockRestore() + }) + + it('Should respond with 500 on blockchain totalQuota query failure', async () => { + mockOdisPaymentsTotalPaidCUSD.mockImplementation(() => { + throw new Error('dummy error') + }) + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_QUOTA) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA, + }) + }) + + it('Should respond with 500 on signer timeout', async () => { + const testTimeoutMS = 0 + const delay = 100 + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockImplementation(async () => { + await new Promise((resolve) => setTimeout(resolve, testTimeoutMS + delay)) + return expectedQuota + }) + + const configWithShortTimeout = JSON.parse(JSON.stringify(_config)) + configWithShortTimeout.timeout = testTimeoutMS + const appWithShortTimeout = startSigner( + configWithShortTimeout, + db, + keyProvider, + newKit('dummyKit') + ) + const req = getPnpQuotaRequest(ACCOUNT_ADDRESS1) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_QUOTA, + undefined, + appWithShortTimeout + ) + // Ensure that this is restored before test can fail on assertions + // to prevent failures in other tests + spy.mockRestore() + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + error: ErrorMessage.TIMEOUT_FROM_SIGNER, + version: expectedVersion, + }) + // Allow time for non-killed processes to finish + await new Promise((resolve) => setTimeout(resolve, delay)) + }) + }) + }) + }) + + describe(`${SignerEndpoint.PNP_SIGN}`, () => { + describe('quota calculation logic', () => { + quotaCalculationTestCases.forEach(({ expectedTotalQuota, cusdOdisPaymentInWei }) => { + it(`Should get totalQuota=${expectedTotalQuota} + for cUSD (wei) payment=${cusdOdisPaymentInWei.toString()}`, async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(cusdOdisPaymentInWei) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + + const shouldSucceed = expectedTotalQuota > 0 + + if (shouldSucceed) { + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: 1, // incremented for signature request + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + } else { + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: expectedTotalQuota, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + } + }) + }) + }) + + describe('endpoint functionality', () => { + // Use values already tested in quota logic tests, [onChainBalance, expectedQuota] + const performedQueryCount = 2 + + beforeEach(async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(onChainBalance) + await db.transaction(async (trx) => { + for (let i = 0; i < performedQueryCount; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + }) + + it('Should respond with 200 on valid request', async () => { + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(res.get(KEY_VERSION_HEADER)).toEqual( + _config.keystore.keys.phoneNumberPrivacy.latest.toString() + ) + }) + + it('Should respond with 200 on valid request when authenticated with DEK', async () => { + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.ENCRYPTION_KEY + ) + const authorization = getPnpRequestAuthorization(req, DEK_PRIVATE_KEY) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + for (let i = 1; i <= 3; i++) { + it(`Should respond with 200 on valid request with key version header ${i}`, async () => { + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN, i.toString()) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignatures[i - 1], + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + expect(res.get(KEY_VERSION_HEADER)).toEqual(i.toString()) + }) + } + + it('Should respond with 200 and warning on repeated valid requests', async () => { + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res1 = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res1.status).toBe(200) + expect(res1.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + const res2 = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res2.status).toBe(200) + res1.body.warnings.push(WarningMessage.DUPLICATE_REQUEST_TO_GET_PARTIAL_SIG) + expect(res2.body).toStrictEqual(res1.body) + }) + + it('Should respond with 200 on extra request fields', async () => { + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + // @ts-ignore Intentionally adding an extra field to the request type + req.extraField = 'dummyString' + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [], + }) + }) + + it('Should respond with 400 on missing request fields', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + // @ts-ignore Intentionally deleting required field + delete badRequest.account + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on invalid key version', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_SIGN, 'a') + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_KEY_VERSION_REQUEST, + }) + }) + + it('Should respond with 400 on invalid blinded message', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS1, + '+1234567890', + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 400 on invalid address', async () => { + const badRequest = getPnpSignRequest( + '0xnotanaddress', + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(400) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.INVALID_INPUT, + }) + }) + + it('Should respond with 401 on failed WALLET_KEY auth', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(badRequest, differentPk) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 401 on failed DEK auth', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.ENCRYPTION_KEY + ) + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(badRequest, differentPk) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(401) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.UNAUTHENTICATED_USER, + }) + }) + + it('Should respond with 403 on out of quota', async () => { + // deplete user's quota + const remainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i < remainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: expectedQuota, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 403 if totalQuota and performedQueryCount are zero', async () => { + mockOdisPaymentsTotalPaidCUSD.mockReturnValue(zeroBalance) + const spy = jest // for convenience so we don't have to refactor or reset the db just for this test + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockResolvedValueOnce(0) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: 0, + totalQuota: 0, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + + spy.mockRestore() + }) + + it('Should respond with 403 if performedQueryCount is greater than totalQuota', async () => { + const expectedRemainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i <= expectedRemainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + + // It is possible to reach this state due to our fail-open logic + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + expect(res.status).toBe(403) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: expectedQuota + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: WarningMessage.EXCEEDED_QUOTA, + }) + }) + + it('Should respond with 500 on unsupported key version', async () => { + const badRequest = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(badRequest, PRIVATE_KEY1) + const res = await sendRequest(badRequest, authorization, SignerEndpoint.PNP_SIGN, '4') + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.SIGNATURE_COMPUTATION_FAILURE, + }) + }) + + it('Should respond with 503 on disabled api', async () => { + const configWithApiDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithApiDisabled.api.phoneNumberPrivacy.enabled = false + const appWithApiDisabled = startSigner( + configWithApiDisabled, + db, + keyProvider, + newKit('dummyKit') + ) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_SIGN, + '1', + appWithApiDisabled + ) + expect(res.status).toBe(503) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: WarningMessage.API_UNAVAILABLE, + }) + }) + + describe('functionality in case of errors', () => { + it('Should return 500 on DB performedQueryCount query failure', async () => { + // deplete user's quota + const remainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i < remainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + // sanity check + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName) + ) + ).toBe(expectedQuota) + + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockRejectedValueOnce(new Error()) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: -1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.DATABASE_GET_FAILURE, + }) + + spy.mockRestore() + }) + + it('Should respond with 500 on signer timeout', async () => { + const testTimeoutMS = 0 + const delay = 200 + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'getPerformedQueryCount' + ) + .mockImplementationOnce(async () => { + await new Promise((resolve) => setTimeout(resolve, testTimeoutMS + delay)) + return performedQueryCount + }) + + const configWithShortTimeout = JSON.parse(JSON.stringify(_config)) + configWithShortTimeout.timeout = testTimeoutMS + const appWithShortTimeout = startSigner( + configWithShortTimeout, + db, + keyProvider, + newKit('dummyKit') + ) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_SIGN, + undefined, + appWithShortTimeout + ) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + error: ErrorMessage.TIMEOUT_FROM_SIGNER, + version: expectedVersion, + }) + spy.mockRestore() + // Allow time for non-killed processes to finish + await new Promise((resolve) => setTimeout(resolve, delay)) + // Check that DB was not updated + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(config.serviceName) + ) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.ONCHAIN, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(config.serviceName) + ) + ).toBe(false) + }) + + it('Should return 200 w/ warning on blockchain totalQuota query failure when shouldFailOpen is true', async () => { + const configWithFailOpenEnabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenEnabled.api.phoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startSigner( + configWithFailOpenEnabled, + db, + keyProvider, + newKit('dummyKit') + ) + + // deplete user's quota + const remainingQuota = expectedQuota - performedQueryCount + await db.transaction(async (trx) => { + for (let i = 0; i < remainingQuota; i++) { + await incrementQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName), + trx + ) + } + }) + // sanity check + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName) + ) + ).toBe(expectedQuota) + + mockOdisPaymentsTotalPaidCUSD.mockImplementation(() => { + throw new Error('dummy error') + }) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_SIGN, + '1', + appWithFailOpenEnabled + ) + + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: expectedQuota + 1, // bc we depleted the user's quota above + totalQuota: Number.MAX_SAFE_INTEGER, + blockNumber: testBlockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_TOTAL_QUOTA, ErrorMessage.FULL_NODE_ERROR], + }) + + // check DB state: performedQueryCount was incremented and request was stored + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(config.serviceName) + ) + ).toBe(expectedQuota + 1) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.ONCHAIN, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(config.serviceName) + ) + ).toBe(true) + }) + + it('Should return 500 on blockchain totalQuota query failure when shouldFailOpen is false', async () => { + mockOdisPaymentsTotalPaidCUSD.mockImplementation(() => { + throw new Error('dummy error') + }) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + + const configWithFailOpenDisabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenDisabled.api.phoneNumberPrivacy.shouldFailOpen = false + const appWithFailOpenDisabled = startSigner( + configWithFailOpenDisabled, + db, + keyProvider, + newKit('dummyKit') + ) + + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_SIGN, + '1', + appWithFailOpenDisabled + ) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: -1, + blockNumber: testBlockNumber, + error: ErrorMessage.FULL_NODE_ERROR, + }) + }) + + it('Should return 500 on failure to increment query count', async () => { + const logger = rootLogger(_config.serviceName) + const spy = jest + .spyOn( + jest.requireActual('../../src/common/database/wrappers/account'), + 'incrementQueryCount' + ) + .mockImplementationOnce(() => { + countAndThrowDBError(new Error(), logger, ErrorMessage.DATABASE_UPDATE_FAILURE) + }) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + spy.mockRestore() + + expect.assertions(4) + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_UPDATE_FAILURE, + }) + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount(db, ACCOUNTS_TABLE.ONCHAIN, ACCOUNT_ADDRESS1, logger) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.ONCHAIN, + req.account, + req.blindedQueryPhoneNumber, + logger + ) + ).toBe(false) + }) + + it('Should return 500 on failure to store request', async () => { + const logger = rootLogger(_config.serviceName) + const spy = jest + .spyOn(jest.requireActual('../../src/common/database/wrappers/request'), 'storeRequest') + .mockImplementationOnce(() => { + countAndThrowDBError(new Error(), logger, ErrorMessage.DATABASE_INSERT_FAILURE) + }) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + spy.mockRestore() + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + error: ErrorMessage.DATABASE_INSERT_FAILURE, + }) + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount(db, ACCOUNTS_TABLE.ONCHAIN, ACCOUNT_ADDRESS1, logger) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.ONCHAIN, + req.account, + req.blindedQueryPhoneNumber, + logger + ) + ).toBe(false) + }) + + it('Should return 200 on failure to fetch DEK when shouldFailOpen is true', async () => { + mockGetDataEncryptionKey.mockImplementation(() => { + throw new Error() + }) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.ENCRYPTION_KEY + ) + + const configWithFailOpenEnabled: typeof _config = JSON.parse(JSON.stringify(_config)) + configWithFailOpenEnabled.api.phoneNumberPrivacy.shouldFailOpen = true + const appWithFailOpenEnabled = startSigner( + configWithFailOpenEnabled, + db, + keyProvider, + newKit('dummyKit') + ) + + // NOT the dek private key, so authentication would fail if getDataEncryptionKey succeeded + const differentPk = '0x00000000000000000000000000000000000000000000000000000000ddddbbbb' + const authorization = getPnpRequestAuthorization(req, differentPk) + const res = await sendRequest( + req, + authorization, + SignerEndpoint.PNP_SIGN, + '1', + appWithFailOpenEnabled + ) + expect(res.status).toBe(200) + expect(res.body).toStrictEqual({ + success: true, + version: expectedVersion, + signature: expectedSignature, + performedQueryCount: performedQueryCount + 1, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + warnings: [ErrorMessage.FAILURE_TO_GET_DEK, ErrorMessage.FAILING_OPEN], + }) + }) + + it('Should return 500 on bls signing error', async () => { + const spy = jest + .spyOn(jest.requireActual('blind-threshold-bls'), 'partialSignBlindedMessage') + .mockImplementationOnce(() => { + throw new Error() + }) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.SIGNATURE_COMPUTATION_FAILURE, + }) + + spy.mockRestore() + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(_config.serviceName) + ) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.ONCHAIN, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(_config.serviceName) + ) + ).toBe(false) + }) + + it('Should return 500 on generic error in sign', async () => { + const spy = jest + .spyOn( + jest.requireActual('../../src/common/bls/bls-cryptography-client'), + 'computeBlindedSignature' + ) + .mockImplementationOnce(() => { + // Trigger a generic error in .sign to trigger the default error returned. + throw new Error() + }) + + const req = getPnpSignRequest( + ACCOUNT_ADDRESS1, + BLINDED_PHONE_NUMBER, + AuthenticationMethod.WALLET_KEY + ) + const authorization = getPnpRequestAuthorization(req, PRIVATE_KEY1) + const res = await sendRequest(req, authorization, SignerEndpoint.PNP_SIGN) + + expect(res.status).toBe(500) + expect(res.body).toStrictEqual({ + success: false, + version: expectedVersion, + performedQueryCount: performedQueryCount, + totalQuota: expectedQuota, + blockNumber: testBlockNumber, + error: ErrorMessage.SIGNATURE_COMPUTATION_FAILURE, + }) + + spy.mockRestore() + + // check DB state: performedQueryCount was not incremented and request was not stored + expect( + await getPerformedQueryCount( + db, + ACCOUNTS_TABLE.ONCHAIN, + ACCOUNT_ADDRESS1, + rootLogger(config.serviceName) + ) + ).toBe(performedQueryCount) + expect( + await getRequestExists( + db, + REQUESTS_TABLE.ONCHAIN, + req.account, + req.blindedQueryPhoneNumber, + rootLogger(config.serviceName) + ) + ).toBe(false) + }) + }) + }) + }) +}) diff --git a/packages/phone-number-privacy/signer/test/key-management/aws-key-provider.test.ts b/packages/phone-number-privacy/signer/test/key-management/aws-key-provider.test.ts index 85d5342e8fe..ca870fb161b 100644 --- a/packages/phone-number-privacy/signer/test/key-management/aws-key-provider.test.ts +++ b/packages/phone-number-privacy/signer/test/key-management/aws-key-provider.test.ts @@ -1,4 +1,5 @@ -import { AWSKeyProvider } from '../../src/key-management/aws-key-provider' +import { AWSKeyProvider } from '../../src/common/key-management/aws-key-provider' +import { DefaultKeyName, Key } from '../../src/common/key-management/key-provider-base' const mockKey = '010101010101010101010101010101010101010101010101010101010101010101010101' const mockResponse = { SecretString: `{"mockSecretKey":"${mockKey}"}` } @@ -7,12 +8,29 @@ const mockBinaryResponse = { SecretBinary: Buffer.from(mockKey).toString('base64 const mockInvalidResponse1 = { foo: 'bar' } const mockInvalidResponse2 = { SecretString: 'totally not a json string' } +const key: Key = { + name: DefaultKeyName.PHONE_NUMBER_PRIVACY, + version: 1, +} + jest.mock('../../src/config', () => ({ - keystore: { - aws: { - region: 'mockRegion', - secretName: 'mockSecretName', - secretKey: 'mockSecretKey', + config: { + serviceName: 'odis-signer', + keystore: { + keys: { + phoneNumberPrivacy: { + name: 'phoneNumberPrivacy', + latest: 1, + }, + domains: { + name: 'domains', + latest: 1, + }, + }, + aws: { + region: 'mockRegion', + secretKey: 'mockSecretKey', + }, }, }, })) @@ -34,16 +52,16 @@ describe('AWSKeyProvider', () => { getSecretValue.mockReturnValue({ promise: jest.fn().mockResolvedValue(mockResponse) }) const provider = new AWSKeyProvider() - await provider.fetchPrivateKeyFromStore() - expect(provider.getPrivateKey()).toBe(mockKey) + await provider.fetchPrivateKeyFromStore(key) + expect(provider.getPrivateKey(key)).toBe(mockKey) }) it('parses binary keys correctly', async () => { getSecretValue.mockReturnValue({ promise: jest.fn().mockResolvedValue(mockBinaryResponse) }) const provider = new AWSKeyProvider() - await provider.fetchPrivateKeyFromStore() - expect(provider.getPrivateKey()).toBe(mockKey) + await provider.fetchPrivateKeyFromStore(key) + expect(provider.getPrivateKey(key)).toBe(mockKey) }) }) @@ -58,8 +76,8 @@ describe('AWSKeyProvider', () => { const provider = new AWSKeyProvider() expect.assertions(2) - await expect(provider.fetchPrivateKeyFromStore()).rejects.toThrow() - await expect(provider.fetchPrivateKeyFromStore()).rejects.toThrow() + await expect(provider.fetchPrivateKeyFromStore(key)).rejects.toThrow() + await expect(provider.fetchPrivateKeyFromStore(key)).rejects.toThrow() }) it('empty key is handled correctly', async () => { @@ -69,7 +87,7 @@ describe('AWSKeyProvider', () => { const provider = new AWSKeyProvider() expect.assertions(1) - await expect(provider.fetchPrivateKeyFromStore()).rejects.toThrow() + await expect(provider.fetchPrivateKeyFromStore(key)).rejects.toThrow() }) }) }) diff --git a/packages/phone-number-privacy/signer/test/key-management/azure-key-provider.test.ts b/packages/phone-number-privacy/signer/test/key-management/azure-key-provider.test.ts index 6713bf5c720..393abcdc385 100644 --- a/packages/phone-number-privacy/signer/test/key-management/azure-key-provider.test.ts +++ b/packages/phone-number-privacy/signer/test/key-management/azure-key-provider.test.ts @@ -1,15 +1,33 @@ -import { AzureKeyProvider } from '../../src/key-management/azure-key-provider' +import { AzureKeyProvider } from '../../src/common/key-management/azure-key-provider' +import { DefaultKeyName, Key } from '../../src/common/key-management/key-provider-base' const mockKey = '030303030303030303030303030303030303030303030303030303030303030303030303' +const key: Key = { + name: DefaultKeyName.PHONE_NUMBER_PRIVACY, + version: 1, +} + jest.mock('../../src/config', () => ({ - keystore: { - azure: { - clientID: 'mockClientID', - clientSecret: 'mockClientSecret', - tenant: 'mockTenant', - vaultName: 'mockVaultName', - secretName: 'mockSecretName', + config: { + serviceName: 'odis-signer', + keystore: { + keys: { + phoneNumberPrivacy: { + name: 'phoneNumberPrivacy', + latest: 1, + }, + domains: { + name: 'domains', + latest: 1, + }, + }, + azure: { + clientID: 'mockClientID', + clientSecret: 'mockClientSecret', + tenant: 'mockTenant', + vaultName: 'mockVaultName', + }, }, }, })) @@ -25,8 +43,8 @@ describe('AzureKeyProvider', () => { getSecret.mockResolvedValue(mockKey) const provider = new AzureKeyProvider() - await provider.fetchPrivateKeyFromStore() - expect(provider.getPrivateKey()).toBe(mockKey) + await provider.fetchPrivateKeyFromStore(key) + expect(provider.getPrivateKey(key)).toBe(mockKey) }) it('handles exceptions correctly', async () => { @@ -34,6 +52,6 @@ describe('AzureKeyProvider', () => { const provider = new AzureKeyProvider() expect.assertions(1) - await expect(provider.fetchPrivateKeyFromStore()).rejects.toThrow() + await expect(provider.fetchPrivateKeyFromStore(key)).rejects.toThrow() }) }) diff --git a/packages/phone-number-privacy/signer/test/key-management/google-key-provider.test.ts b/packages/phone-number-privacy/signer/test/key-management/google-key-provider.test.ts index 0c616b66a5e..284d6ffb431 100644 --- a/packages/phone-number-privacy/signer/test/key-management/google-key-provider.test.ts +++ b/packages/phone-number-privacy/signer/test/key-management/google-key-provider.test.ts @@ -1,23 +1,39 @@ -import { GoogleKeyProvider } from '../../src/key-management/google-key-provider' +import { GoogleKeyProvider } from '../../src/common/key-management/google-key-provider' +import { DefaultKeyName, Key } from '../../src/common/key-management/key-provider-base' const mockKey = '020202020202020202020202020202020202020202020202020202020202020202020202' const mockResponse = [{ payload: { data: `${mockKey}` } }] const emptyMockResponse = [{ payload: {} }] const invalidMockResponse = [{ payload: { data: '123' } }] +const key: Key = { + name: DefaultKeyName.PHONE_NUMBER_PRIVACY, + version: 1, +} jest.mock('../../src/config', () => ({ - keystore: { - google: { - projectId: 'mockProject', - secretName: 'mockSecretName', - secretVersion: 'mockSecretVersion', + config: { + serviceName: 'odis-signer', + keystore: { + keys: { + phoneNumberPrivacy: { + name: 'phoneNumberPrivacy', + latest: 1, + }, + domains: { + name: 'domains', + latest: 1, + }, + }, + google: { + projectId: 'mockProject', + }, }, }, })) const accessSecretVersion = jest.fn() -jest.mock('@google-cloud/secret-manager', () => ({ +jest.mock('@google-cloud/secret-manager/build/src/v1', () => ({ SecretManagerServiceClient: jest.fn(() => ({ accessSecretVersion })), })) @@ -26,8 +42,8 @@ describe('GoogleKeyProvider', () => { accessSecretVersion.mockResolvedValue(mockResponse) const provider = new GoogleKeyProvider() - await provider.fetchPrivateKeyFromStore() - expect(provider.getPrivateKey()).toBe(mockKey) + await provider.fetchPrivateKeyFromStore(key) + expect(provider.getPrivateKey(key)).toBe(mockKey) }) it('handles errors correctly', async () => { @@ -35,7 +51,7 @@ describe('GoogleKeyProvider', () => { const provider = new GoogleKeyProvider() expect.assertions(1) - await expect(provider.fetchPrivateKeyFromStore()).rejects.toThrow() + await expect(provider.fetchPrivateKeyFromStore(key)).rejects.toThrow() }) it('unitialized provider throws', () => { @@ -43,7 +59,7 @@ describe('GoogleKeyProvider', () => { const provider = new GoogleKeyProvider() expect.assertions(1) - expect(() => provider.getPrivateKey()).toThrow() + expect(() => provider.getPrivateKey(key)).toThrow() }) it('set invalid private key throws', async () => { @@ -51,6 +67,6 @@ describe('GoogleKeyProvider', () => { const provider = new GoogleKeyProvider() expect.assertions(1) - await expect(provider.fetchPrivateKeyFromStore()).rejects.toThrow() + await expect(provider.fetchPrivateKeyFromStore(key)).rejects.toThrow() }) }) diff --git a/packages/phone-number-privacy/signer/test/signing/bls-signature.test.ts b/packages/phone-number-privacy/signer/test/signing/bls-signature.test.ts index 0c74f01099a..75a26a3da85 100644 --- a/packages/phone-number-privacy/signer/test/signing/bls-signature.test.ts +++ b/packages/phone-number-privacy/signer/test/signing/bls-signature.test.ts @@ -1,7 +1,7 @@ +import { rootLogger, TestUtils } from '@celo/phone-number-privacy-common' import threshold_bls from 'blind-threshold-bls' -import { computeBlindedSignature } from '../../src/bls/bls-cryptography-client' -import { DEV_POLYNOMIAL, DEV_PRIVATE_KEY, DEV_PUBLIC_KEY } from '../../src/config' -import { rootLogger } from '@celo/phone-number-privacy-common' +import { computeBlindedSignature } from '../../src/common/bls/bls-cryptography-client' +import { config } from '../../src/config' describe(`BLS service computes signature`, () => { it('provides blinded signature', async () => { @@ -14,14 +14,18 @@ describe(`BLS service computes signature`, () => { const blindedMsgResult = threshold_bls.blind(message, userSeed) const blindedMsg = Buffer.from(blindedMsgResult.message).toString('base64') - const actual = await computeBlindedSignature(blindedMsg, DEV_PRIVATE_KEY, rootLogger()) + const actual = computeBlindedSignature( + blindedMsg, + TestUtils.Values.PNP_DEV_SIGNER_PRIVATE_KEY, + rootLogger(config.serviceName) + ) expect(actual).toEqual( 'MAAAAAAAAADDilSaA/xvbtE4NV3agMzHIf8PGPQ83Cu8gQy5E2mRWyUIges8bjE4EBe1L7pcY4AAAAAA' ) expect( threshold_bls.partialVerifyBlindSignature( - Buffer.from(DEV_POLYNOMIAL, 'hex'), + Buffer.from(TestUtils.Values.PNP_DEV_ODIS_POLYNOMIAL, 'hex'), blindedMsgResult.message, Buffer.from(actual, 'base64') ) @@ -32,7 +36,7 @@ describe(`BLS service computes signature`, () => { combinedSignature, blindedMsgResult.blindingFactor ) - const publicKey = Buffer.from(DEV_PUBLIC_KEY, 'hex') + const publicKey = Buffer.from(TestUtils.Values.PNP_DEV_ODIS_PUBLIC_KEY, 'base64') expect(threshold_bls.verify(publicKey, message, unblindedSignedMessage)) }) @@ -40,6 +44,12 @@ describe(`BLS service computes signature`, () => { const blindedMsg = Buffer.from('invalid blinded message').toString('base64') expect.assertions(1) - await expect(() => computeBlindedSignature(blindedMsg, DEV_PRIVATE_KEY, rootLogger())).toThrow() + expect(() => + computeBlindedSignature( + blindedMsg, + TestUtils.Values.PNP_DEV_SIGNER_PRIVATE_KEY, + rootLogger(config.serviceName) + ) + ).toThrow() }) }) diff --git a/packages/phone-number-privacy/signer/test/signing/query-quota.test.ts b/packages/phone-number-privacy/signer/test/signing/query-quota.test.ts deleted file mode 100644 index 6bdc41cac0d..00000000000 --- a/packages/phone-number-privacy/signer/test/signing/query-quota.test.ts +++ /dev/null @@ -1,208 +0,0 @@ -import { StableToken } from '@celo/contractkit' -import { isVerified, rootLogger, TestUtils } from '@celo/phone-number-privacy-common' -import BigNumber from 'bignumber.js' -import allSettled from 'promise.allsettled' -import { getPerformedQueryCount } from '../../src/database/wrappers/account' -import { getRemainingQueryCount } from '../../src/signing/query-quota' -import { getContractKit } from '../../src/web3/contracts' - -allSettled.shim() - -const { - ContractRetrieval, - createMockAccounts, - createMockAttestation, - createMockContractKit, - createMockToken, - createMockWeb3, -} = TestUtils.Utils -const { mockAccount, mockPhoneNumber } = TestUtils.Values - -jest.mock('../../src/web3/contracts') -const mockGetContractKit = getContractKit as jest.Mock -jest.mock('../../src/database/wrappers/account') -const mockPerformedQueryCount = getPerformedQueryCount as jest.Mock -jest.mock('@celo/phone-number-privacy-common', () => ({ - ...jest.requireActual('@celo/phone-number-privacy-common'), - isVerified: jest.fn(), -})) -const mockIsVerified = isVerified as jest.Mock -// tslint:disable-next-line: no-object-literal-type-assertion - -describe(getRemainingQueryCount, () => { - it('Calculates remaining query count for verified account', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(3, 3), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(5) - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(2))) - mockIsVerified.mockReturnValue(true) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 2, - totalQuota: 60, - }) - }) - it('Calculates remaining query count for unverified account', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(0, 0), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(0) - ) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(1))) - mockIsVerified.mockReturnValue(false) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 1, - totalQuota: 10, - }) - }) - it('Calculates remaining query count for verified account with many txs', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(3, 3), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(100) - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(10))) - mockIsVerified.mockReturnValue(true) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 10, - totalQuota: 440, - }) - }) - it('Calculates remaining query count for unverified account with many txs', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(0, 0), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(100) - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(0))) - mockIsVerified.mockReturnValue(false) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 0, - totalQuota: 410, - }) - }) - it('Calculates remaining query count for unverified account without any balance', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(0, 0), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(0)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(0)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(100) - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(0))) - mockIsVerified.mockReturnValue(false) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 0, - totalQuota: 0, - }) - }) - it('Calculates remaining query count for unverified account with cUSD balance', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(0, 0), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(0)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(0)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(0) - ) - contractKitVerifiedNoTx.contracts[ContractRetrieval.getStableToken] = jest.fn( - (stableToken: StableToken) => { - return stableToken === StableToken.cUSD - ? createMockToken(new BigNumber(200000000000000000)) - : createMockToken(new BigNumber(0)) - } - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(1))) - mockIsVerified.mockReturnValue(false) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 1, - totalQuota: 10, - }) - }) - it('Calculates remaining query count for unverified account with cEUR balance', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(0, 0), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(0)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(0)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(0) - ) - contractKitVerifiedNoTx.contracts[ContractRetrieval.getStableToken] = jest.fn( - (stableToken: StableToken) => { - return stableToken === StableToken.cEUR - ? createMockToken(new BigNumber(200000000000000000)) - : createMockToken(new BigNumber(0)) - } - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(1))) - mockIsVerified.mockReturnValue(false) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 1, - totalQuota: 10, - }) - }) - it('Calculates remaining query count for unverified account with only CELO balance', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(0, 0), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(0)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(0) - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(1))) - mockIsVerified.mockReturnValue(false) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, mockPhoneNumber)).toEqual({ - performedQueryCount: 1, - totalQuota: 10, - }) - }) - it('No phone number hash when request own phone number', async () => { - const contractKitVerifiedNoTx = createMockContractKit( - { - [ContractRetrieval.getAttestations]: createMockAttestation(0, 0), - [ContractRetrieval.getStableToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getGoldToken]: createMockToken(new BigNumber(200000000000000000)), - [ContractRetrieval.getAccounts]: createMockAccounts('0x0'), - }, - createMockWeb3(0) - ) - mockPerformedQueryCount.mockImplementation(() => new Promise((resolve) => resolve(0))) - mockGetContractKit.mockImplementation(() => contractKitVerifiedNoTx) - expect(await getRemainingQueryCount(rootLogger(), mockAccount, undefined)).toEqual({ - performedQueryCount: 0, - totalQuota: 10, - }) - }) -}) diff --git a/packages/protocol/.solhintignore b/packages/protocol/.solhintignore index c2658d7d1b3..ca20ece92b6 100644 --- a/packages/protocol/.solhintignore +++ b/packages/protocol/.solhintignore @@ -1 +1,2 @@ node_modules/ +./contracts/uniswap \ No newline at end of file diff --git a/packages/protocol/contracts/common/FeeBurner.sol b/packages/protocol/contracts/common/FeeBurner.sol new file mode 100644 index 00000000000..725c3255b5c --- /dev/null +++ b/packages/protocol/contracts/common/FeeBurner.sol @@ -0,0 +1,434 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/math/SafeMath.sol"; +import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; +import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; + +import "./UsingRegistry.sol"; +import "../common/Freezable.sol"; +import "../common/FixidityLib.sol"; +import "../common/Initializable.sol"; + +// TODO move to IStableToken when it adds method getExchangeRegistryId +import "../stability/StableToken.sol"; +import "../common/interfaces/ICeloVersionedContract.sol"; +import "../common/interfaces/ICeloToken.sol"; +import "../stability/interfaces/IExchange.sol"; +import "../stability/interfaces/ISortedOracles.sol"; + +// Using the minimal required signatures in the interfaces so more contracts could be compatible +import "../uniswap/interfaces/IUniswapV2RouterMin.sol"; +import "../uniswap/interfaces/IUniswapV2FactoryMin.sol"; + +contract FeeBurner is Ownable, Initializable, UsingRegistry, ICeloVersionedContract, Freezable { + using SafeMath for uint256; + using FixidityLib for FixidityLib.Fraction; + + uint256 constant MAX_TIMESTAMP_BLOCK_EXCHANGE = 20; + uint256 public constant FIXED1_UINT = 1000000000000000000000000; + + // Min units that can be burned + uint256 public constant MIN_BURN = 200; + // Historical amounts burned by this contract + mapping(address => uint256) public pastBurn; + // Max amounts that can be burned in a day for a token + mapping(address => uint256) public dailyBurnLimit; + // Max amounts that can be burned today for a token + mapping(address => uint256) public currentDayLimit; + // last day the daily limits were updated + uint256 public lastLimitDay; + // router addresses that can be set for a token + mapping(address => address[]) public routerAddresses; + + // Max slippage that can be accepted when burning a token + mapping(address => FixidityLib.Fraction) public maxSlippage; + + event SoldAndBurnedToken(address token, uint256 value); + event DailyLimitSet(address tokenAddress, uint256 newLimit); + event DailyLimitHit(address token, uint256 burning); + event MaxSlippageSet(address token, uint256 maxSlippage); + event DailyLimitUpdated(uint256 amount); + event RouterAddressSet(address token, address router); + event RouterAddressRemoved(address token, address router); + event RouterUsed(address router); + event ReceivedQuote(address router, uint256 quote); + + /** + * @notice Sets initialized == true on implementation contracts. + * @param test Set to true to skip implementation initialisation. + */ + constructor(bool test) public Initializable(test) {} + + /** + * @notice Used in place of the constructor to allow the contract to be upgradable via proxy. + * @param _registryAddress The address of the registry core smart contract. + * @param tokens A list of tokens whose parameters should be set. + * @param newLimits A list of daily burn limits, corresponding with the same order as in the + argument tokens. + * @param newMaxSlippages A list of max acceptable slippage, corresponding with the same order as + in the argument tokens. + * @param newRouters A list of routers, corresponding with the same order as in the argument + tokens. + */ + function initialize( + address _registryAddress, + address[] calldata tokens, + uint256[] calldata newLimits, + uint256[] calldata newMaxSlippages, + address[] calldata newRouters + ) external initializer { + require(tokens.length == newLimits.length, "limits length should match tokens'"); + require(tokens.length == newMaxSlippages.length, "maxSlippage length should match tokens'"); + require(tokens.length == newRouters.length, "maxSlippage length should match tokens'"); + + _transferOwnership(msg.sender); + setRegistry(_registryAddress); + + for (uint256 i = 0; i < tokens.length; i++) { + _setDailyBurnLimit(tokens[i], newLimits[i]); + _setMaxSplippage(tokens[i], newMaxSlippages[i]); + // Mento tokens don't need to set a router + if (newRouters[i] != address(0)) { + _setRouter(tokens[i], newRouters[i]); + } + } + } + + /** + * @notice Returns the storage, major, minor, and patch version of the contract. + * @return Storage version of the contract. + * @return Major version of the contract. + * @return Minor version of the contract. + * @return Patch version of the contract. + */ + function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { + return (1, 1, 0, 0); + } + + /** + * @notice Allows owner to set max slippage for a token. + * @param token Address of the token to set. + * @param newMax New sllipage to set, as Fixidity fraction. + */ + function setMaxSplippage(address token, uint256 newMax) external onlyOwner { + _setMaxSplippage(token, newMax); + } + + function _setMaxSplippage(address token, uint256 newMax) private { + maxSlippage[token] = FixidityLib.wrap(newMax); + emit MaxSlippageSet(token, newMax); + } + + /** + * @notice Allows owner to set the daily burn limit for a token. + * @param token Address of the token to set. + * @param newLimit The new limit to set, in the token units. + */ + function setDailyBurnLimit(address token, uint256 newLimit) external onlyOwner { + _setDailyBurnLimit(token, newLimit); + } + + function _setDailyBurnLimit(address token, uint256 newLimit) private { + dailyBurnLimit[token] = newLimit; + emit DailyLimitSet(token, newLimit); + } + + /** + * @notice Allows owner to set the router for a token. + * @param token Address of the token to set. + * @param router The new router. + */ + function setRouter(address token, address router) external onlyOwner { + _setRouter(token, router); + } + + function _setRouter(address token, address router) private { + require(router != address(0), "Router can't be address zero"); + routerAddresses[token].push(router); + emit RouterAddressSet(token, router); + } + + /** + * @notice Allows owner to remove a router for a token. + * @param token Address of the token. + * @param router Address of the router to remove. + * @param index The index of the router to remove. + */ + function removeRouter(address token, address router, uint256 index) external onlyOwner { + require(routerAddresses[token][index] == router, "Index does not match"); + + uint256 length = routerAddresses[token].length; + routerAddresses[token][index] = routerAddresses[token][length - 1]; + routerAddresses[token].pop(); + emit RouterAddressRemoved(token, router); + } + + /** + * @notice Get the list of routers for a token. + * @param token The address of the token to query. + * @return An array of all the allowed router. + */ + function getRoutersForToken(address token) external view returns (address[] memory) { + return routerAddresses[token]; + } + + /** + * @notice Burns all the Celo balance of this contract. + */ + function burnAllCelo() public { + ICeloToken celo = ICeloToken(registry.getAddressForOrDie(GOLD_TOKEN_REGISTRY_ID)); + celo.burn(celo.balanceOf(address(this))); + } + + /** + * @param token The address of the token to query. + * @return The amount burned for a token. + */ + function getPastBurnForToken(address token) external view returns (uint256) { + return pastBurn[token]; + } + + /** + * @param token The address of the token to query. + * @param amountToBurn The amount of the token to burn. + * @return Returns true if burning amountToBurn would exceed the daily limit. + */ + function dailyBurnLimitHit(address token, uint256 amountToBurn) public returns (bool) { + if (dailyBurnLimit[token] == 0) { + // if no limit set, assume uncapped + return false; + } + + uint256 currentDay = now / 1 days; + // Pattern borrowed from Reserve.sol + if (currentDay > lastLimitDay) { + lastLimitDay = currentDay; + currentDayLimit[token] = dailyBurnLimit[token]; + } + + return amountToBurn >= currentDayLimit[token]; + } + + /** + * @notice Updates the current day limit for a token. + * @param token The address of the token to query. + * @param amountBurned the amount of the token that was burned. + */ + function updateLimits(address token, uint256 amountBurned) private { + if (dailyBurnLimit[token] == 0) { + // if no limit set, assume uncapped + return; + } + currentDayLimit[token] = currentDayLimit[token].sub(amountBurned); + emit DailyLimitUpdated(amountBurned); + return; + } + + /** + * @notice Burns the max possible of a Mento token. + * @dev Should be used in case the loop fails because a swap is reverting or Out of Gas (OOG). + * @param tokenAddress The address of the token to burn. + */ + function burnSingleMentoToken(address tokenAddress) public onlyWhenNotFrozen { + StableToken stableToken = StableToken(tokenAddress); + uint256 balanceToBurn = stableToken.balanceOf(address(this)); + + if (dailyBurnLimitHit(tokenAddress, balanceToBurn)) { + // in case the limit is hit, burn the max possible + balanceToBurn = currentDayLimit[tokenAddress]; + emit DailyLimitHit(tokenAddress, balanceToBurn); + } + + // small numbers cause rounding errors and zero case should be skipped + if (balanceToBurn <= MIN_BURN) { + return; + } + + address exchangeAddress = registry.getAddressForOrDie(stableToken.getExchangeRegistryId()); + + IExchange exchange = IExchange(exchangeAddress); + + uint256 minAmount = 0; + if (FixidityLib.unwrap(maxSlippage[tokenAddress]) != 0) { + // max slippage is set + // use sorted oracles as reference + ISortedOracles sortedOracles = getSortedOracles(); + (uint256 rateNumerator, uint256 rateDenominator) = sortedOracles.medianRate(tokenAddress); + minAmount = calculateMinAmount(rateNumerator, rateDenominator, tokenAddress, balanceToBurn); + } + + // TODO an upgrade would be to compare using routers as well + stableToken.approve(exchangeAddress, balanceToBurn); + exchange.sell(balanceToBurn, minAmount, false); + pastBurn[tokenAddress] = pastBurn[tokenAddress].add(balanceToBurn); + + updateLimits(tokenAddress, balanceToBurn); + + emit SoldAndBurnedToken(tokenAddress, balanceToBurn); + } + + /** + * @notice Burns the max possible amount of a token. + * @dev Should be used in case the loop fails because one token is reverting or + Out of Gas (OOG). + * @param tokenAddress The address of the token to burn. + */ + function burnSingleNonMentoToken(address tokenAddress) public onlyWhenNotFrozen { + // An improvement to this function would be to allow the user to pass a path as argument + // and if it generates a better outcome that the ones enabled that gets used + // and the user gets a reward + + address celoAddress = address(getGoldToken()); + + uint256 bestRouterIndex = 0; + uint256 bestRouterQuote = 0; + + address[] memory path = new address[](2); + address[] memory thisTokenRouterAddresses = routerAddresses[tokenAddress]; + + require(thisTokenRouterAddresses.length > 0, "routerAddresses should be non empty"); + + IERC20 token = IERC20(tokenAddress); + uint256 balanceToBurn = token.balanceOf(address(this)); + + if (dailyBurnLimitHit(tokenAddress, balanceToBurn)) { + // in case the limit is hit, burn the max possible + balanceToBurn = currentDayLimit[tokenAddress]; + emit DailyLimitHit(tokenAddress, balanceToBurn); + } + + // small numbers cause rounding errors and zero case should be skipped + if (balanceToBurn <= MIN_BURN) { + return; + } + + for (uint256 i = 0; i < thisTokenRouterAddresses.length; i++) { + address poolAddress = thisTokenRouterAddresses[i]; + IUniswapV2RouterMin router = IUniswapV2RouterMin(poolAddress); + + path[0] = tokenAddress; + path[1] = celoAddress; + + // using the second return value becuase it's the last argument + // the previous values show how many tokens are exchanged in each path + // so the first value would be equivalent to balanceToBurn + uint256 wouldGet = router.getAmountsOut(balanceToBurn, path)[1]; + emit ReceivedQuote(poolAddress, wouldGet); + if (wouldGet > bestRouterQuote) { + bestRouterQuote = wouldGet; + bestRouterIndex = i; + } + } + + // don't try to exchange on zero quotes + if (bestRouterQuote == 0) { + return; + } + + address bestRouterAddress = thisTokenRouterAddresses[bestRouterIndex]; + IUniswapV2RouterMin bestRouter = IUniswapV2RouterMin(bestRouterAddress); + + uint256 minAmount = 0; + if (FixidityLib.unwrap(maxSlippage[tokenAddress]) != 0) { + address pair = IUniswapV2FactoryMin(bestRouter.factory()).getPair(tokenAddress, celoAddress); + minAmount = calculateMinAmount( + token.balanceOf(pair), + getGoldToken().balanceOf(pair), + tokenAddress, + balanceToBurn + ); + } + + token.approve(bestRouterAddress, balanceToBurn); + bestRouter.swapExactTokensForTokens( + balanceToBurn, + minAmount, + path, + address(this), + block.timestamp + MAX_TIMESTAMP_BLOCK_EXCHANGE + ); + + pastBurn[tokenAddress] = pastBurn[tokenAddress].add(balanceToBurn); + updateLimits(tokenAddress, balanceToBurn); + + emit SoldAndBurnedToken(tokenAddress, balanceToBurn); + emit RouterUsed(bestRouterAddress); + } + + /** + * @notice Burns the max possible of all the Mento tokens in this contract. + * @dev If one token burn fails, burnSingleMentoToken should be used instead + */ + function burnMentoTokens() public { + // here it could also be checked that the tokens is whitelisted, but we assume everything + // that has already been sent here is due for burning + address[] memory mentoTokens = getReserve().getTokens(); + + for (uint256 i = 0; i < mentoTokens.length; i++) { + burnSingleMentoToken(mentoTokens[i]); + + } + + } + + /** + * @param midPriceNumerator The numerator of the price. + * @param midPriceDenominator The denominator of the price. + * @param tokenAddress The address of the token to query. + * @param amount The amount to swap. + * @return The minimal amount of tokens expected for a swap. + */ + function calculateMinAmount( + uint256 midPriceNumerator, + uint256 midPriceDenominator, + address tokenAddress, + uint256 amount + ) public view returns (uint256) { + FixidityLib.Fraction memory price = FixidityLib.newFixedFraction( + midPriceNumerator, + midPriceDenominator + ); + FixidityLib.Fraction memory amountFraction = FixidityLib.newFixed(amount); + FixidityLib.Fraction memory totalAmount = price.multiply(amountFraction); + + return + (price.multiply(amountFraction)) + .subtract((price.multiply(maxSlippage[tokenAddress])).multiply(amountFraction)) + .fromFixed(); + } + + /** + * @notice Burns the max possible of all the whitelisted non-Mento tokens in this contract. + * @dev If one token burn fails, burnSingleNonMentoToken should be used instead + */ + function burnNonMentoTokens() public { + address[] memory tokens = getFeeCurrencyWhitelistRegistry().getWhitelistNonMento(); + + // i is token index + for (uint256 i = 0; i < tokens.length; i++) { + burnSingleNonMentoToken(tokens[i]); + } + + } + + /** + * @notice Burns all the possible tokens this contract holds. + */ + function burn() external { + burnMentoTokens(); + burnNonMentoTokens(); + burnAllCelo(); + } + + /** + * @notice Allows owner to transfer tokens of this contract. It's meant for governance to + trigger use cases not contemplated in this contract + */ + function transfer(address token, address recipient, uint256 value) + external + onlyOwner + returns (bool) + { + return IERC20(token).transfer(recipient, value); + } +} diff --git a/packages/protocol/contracts/common/FeeCurrencyWhitelist.sol b/packages/protocol/contracts/common/FeeCurrencyWhitelist.sol index de6b385ca70..ced1502e05e 100644 --- a/packages/protocol/contracts/common/FeeCurrencyWhitelist.sol +++ b/packages/protocol/contracts/common/FeeCurrencyWhitelist.sol @@ -6,11 +6,28 @@ import "./interfaces/IFeeCurrencyWhitelist.sol"; import "../common/Initializable.sol"; +import "../common/interfaces/ICeloVersionedContract.sol"; + /** * @title Holds a whitelist of the ERC20+ tokens that can be used to pay for gas + * Not including the native Celo token */ -contract FeeCurrencyWhitelist is IFeeCurrencyWhitelist, Ownable, Initializable { +contract FeeCurrencyWhitelist is + IFeeCurrencyWhitelist, + Ownable, + Initializable, + ICeloVersionedContract +{ + // Array of all the tokens enabled address[] public whitelist; + // Array of all the non-Mento tokens enabled + address[] public nonMentoTokenWhitelist; + + event FeeCurrencyWhitelisted(address token); + event NonMentoFeeCurrencyWhitelisted(address token); + + event FeeCurrencyWhitelistRemoved(address token); + event NonMentoFeeCurrencyWhitelistRemoved(address token); /** * @notice Sets initialized == true on implementation contracts @@ -25,15 +42,83 @@ contract FeeCurrencyWhitelist is IFeeCurrencyWhitelist, Ownable, Initializable { _transferOwnership(msg.sender); } + /** + * @notice Returns the storage, major, minor, and patch version of the contract. + * @return Storage version of the contract. + * @return Major version of the contract. + * @return Minor version of the contract. + * @return Patch version of the contract. + */ + function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { + return (1, 1, 1, 0); + } + /** * @dev Add a token to the whitelist * @param tokenAddress The address of the token to add. */ + function addNonMentoToken(address tokenAddress) external onlyOwner { + nonMentoTokenWhitelist.push(tokenAddress); + whitelist.push(tokenAddress); + emit FeeCurrencyWhitelisted(tokenAddress); + emit NonMentoFeeCurrencyWhitelisted(tokenAddress); + } + + /** + * @notice Adds a non-Mento token as enabled fee currency. Tokens added with + * addNonMentoToken should be removed with this function. + * @param tokenAddress The address of the token to remove. + * @param index the index of the token in the whitelist array. + * @param indexNonMento the index of the token in the nonMentoTokenWhitelist array. + */ + function removeNonMentoToken(address tokenAddress, uint256 index, uint256 indexNonMento) + public + onlyOwner + { + require(nonMentoTokenWhitelist[indexNonMento] == tokenAddress, "Index does not match"); + + removeToken(tokenAddress, index); + + uint256 length = nonMentoTokenWhitelist.length; + nonMentoTokenWhitelist[indexNonMento] = nonMentoTokenWhitelist[length - 1]; + nonMentoTokenWhitelist.pop(); + emit NonMentoFeeCurrencyWhitelistRemoved(tokenAddress); + } + + /** + * @notice Removes a Mento token as enabled fee token. Tokens added with addToken should be + * removed with this function. + * @param tokenAddress The address of the token to remove. + * @param index The index of the token in the whitelist array. + */ + function removeToken(address tokenAddress, uint256 index) public onlyOwner { + require(whitelist[index] == tokenAddress, "Index does not match"); + uint256 length = whitelist.length; + whitelist[index] = whitelist[length - 1]; + whitelist.pop(); + emit FeeCurrencyWhitelistRemoved(tokenAddress); + } + + /** + * @dev Add a Mento token to the whitelist + * @param tokenAddress The address of the token to add. + */ function addToken(address tokenAddress) external onlyOwner { whitelist.push(tokenAddress); + emit FeeCurrencyWhitelisted(tokenAddress); } + /** + * @return a list of all Mento tokens enabled as gas fee currency. + */ function getWhitelist() external view returns (address[] memory) { return whitelist; } + + /** + * @return a list of all the non-Mento tokens enabled as gas fee currency. + */ + function getWhitelistNonMento() external view returns (address[] memory) { + return nonMentoTokenWhitelist; + } } diff --git a/packages/protocol/contracts/common/GoldToken.sol b/packages/protocol/contracts/common/GoldToken.sol index 2226c092c52..e09db1133fe 100644 --- a/packages/protocol/contracts/common/GoldToken.sol +++ b/packages/protocol/contracts/common/GoldToken.sol @@ -31,6 +31,9 @@ contract GoldToken is mapping(address => mapping(address => uint256)) internal allowed; + // Burn address is 0xdEaD because truffle is having buggy behaviour with the zero address + address constant BURN_ADDRESS = address(0x000000000000000000000000000000000000dEaD); + event Transfer(address indexed from, address indexed to, uint256 value); event TransferComment(string comment); @@ -51,7 +54,7 @@ contract GoldToken is * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 1, 1, 1); + return (1, 1, 2, 0); } /** @@ -72,7 +75,7 @@ contract GoldToken is */ // solhint-disable-next-line no-simple-event-func-name function transfer(address to, uint256 value) external returns (bool) { - return _transfer(to, value); + return _transferWithCheck(to, value); } /** @@ -91,6 +94,17 @@ contract GoldToken is return succeeded; } + /** + * @notice This function allows a user to burn a specific amount of tokens. + Burning is implemented by sending tokens to the burn address. + * @param value: The amount of CELO to burn. + * @return True if burn was successful. + */ + function burn(uint256 value) external returns (bool) { + // not using transferWithCheck as the burn address can potentially be the zero address + return _transfer(BURN_ADDRESS, value); + } + /** * @notice Approve a user to transfer CELO on behalf of another user. * @param spender The address which is being approved to spend CELO. @@ -200,12 +214,19 @@ contract GoldToken is } /** - * @return The total amount of CELO in existence. + * @return The total amount of CELO in existence, including what the burn address holds. */ - function totalSupply() external view returns (uint256) { + function totalSupply() public view returns (uint256) { return totalSupply_; } + /** + * @return The total amount of CELO in existence, not including what the burn address holds. + */ + function circulatingSupply() external view returns (uint256) { + return totalSupply().sub(getBurnedAmount()); + } + /** * @notice Gets the amount of owner's CELO allowed to be spent by spender. * @param owner The owner of the CELO. @@ -224,6 +245,14 @@ contract GoldToken is totalSupply_ = totalSupply_.add(amount); } + /** + * @notice Gets the amount of CELO that has been burned. + * @return The total amount of Celo that has been sent to the burn address. + */ + function getBurnedAmount() public view returns (uint256) { + return balanceOf(BURN_ADDRESS); + } + /** * @notice Gets the balance of the specified address. * @param owner The address to query the balance of. @@ -240,7 +269,6 @@ contract GoldToken is * @return True if the transaction succeeds. */ function _transfer(address to, uint256 value) internal returns (bool) { - require(to != address(0), "transfer attempted to reserved address 0x0"); require(value <= balanceOf(msg.sender), "transfer value exceeded balance of sender"); bool success; @@ -249,4 +277,15 @@ contract GoldToken is emit Transfer(msg.sender, to, value); return true; } + + /** + * @notice Internal CELO transfer from one address to another. + * @param to The address to transfer CELO to. Zero address will revert. + * @param value The amount of CELO to transfer. + * @return True if the transaction succeeds. + */ + function _transferWithCheck(address to, uint256 value) internal returns (bool) { + require(to != address(0), "transfer attempted to reserved address 0x0"); + return _transfer(to, value); + } } diff --git a/packages/protocol/contracts/common/interfaces/ICeloToken.sol b/packages/protocol/contracts/common/interfaces/ICeloToken.sol index fd054e4a909..4095083a42c 100644 --- a/packages/protocol/contracts/common/interfaces/ICeloToken.sol +++ b/packages/protocol/contracts/common/interfaces/ICeloToken.sol @@ -9,4 +9,7 @@ interface ICeloToken { function name() external view returns (string memory); function symbol() external view returns (string memory); function decimals() external view returns (uint8); + function burn(uint256 value) external returns (bool); + // TODO NOTE: duplicated with IERC20.sol, remove once interface inheritance is supported. + function balanceOf(address) external view returns (uint256); } diff --git a/packages/protocol/contracts/common/interfaces/IFeeCurrencyWhitelist.sol b/packages/protocol/contracts/common/interfaces/IFeeCurrencyWhitelist.sol index 4b102e208cc..1758717ef65 100644 --- a/packages/protocol/contracts/common/interfaces/IFeeCurrencyWhitelist.sol +++ b/packages/protocol/contracts/common/interfaces/IFeeCurrencyWhitelist.sol @@ -3,4 +3,5 @@ pragma solidity ^0.5.13; interface IFeeCurrencyWhitelist { function addToken(address) external; function getWhitelist() external view returns (address[] memory); + function getWhitelistNonMento() external view returns (address[] memory); } diff --git a/packages/protocol/contracts/common/proxies/FeeBurnerProxy.sol b/packages/protocol/contracts/common/proxies/FeeBurnerProxy.sol new file mode 100644 index 00000000000..120f0bc4f60 --- /dev/null +++ b/packages/protocol/contracts/common/proxies/FeeBurnerProxy.sol @@ -0,0 +1,6 @@ +pragma solidity ^0.5.13; + +import "../Proxy.sol"; + +/* solhint-disable-next-line no-empty-blocks */ +contract FeeBurnerProxy is Proxy {} diff --git a/packages/protocol/contracts/common/test/MockGoldToken.sol b/packages/protocol/contracts/common/test/MockGoldToken.sol index 19a65b060c2..8795d8ebcd1 100644 --- a/packages/protocol/contracts/common/test/MockGoldToken.sol +++ b/packages/protocol/contracts/common/test/MockGoldToken.sol @@ -1,16 +1,17 @@ pragma solidity ^0.5.13; // solhint-disable no-unused-vars +import "../GoldToken.sol"; + /** * @title A mock GoldToken for testing. */ -contract MockGoldToken { +contract MockGoldToken is GoldToken(true) { uint8 public constant decimals = 18; - uint256 public totalSupply; mapping(address => uint256) balances; function setTotalSupply(uint256 value) external { - totalSupply = value; + totalSupply_ = value; } function transfer(address to, uint256 amount) external returns (bool) { @@ -34,7 +35,7 @@ contract MockGoldToken { balances[a] = value; } - function balanceOf(address a) external view returns (uint256) { + function balanceOf(address a) public view returns (uint256) { return balances[a]; } diff --git a/packages/protocol/contracts/governance/Election.sol b/packages/protocol/contracts/governance/Election.sol index 0785899fc8d..53410fec9b4 100644 --- a/packages/protocol/contracts/governance/Election.sol +++ b/packages/protocol/contracts/governance/Election.sol @@ -97,6 +97,12 @@ contract Election is uint256 max; } + struct CachedVotes { + // group => votes + mapping(address => uint256) cachedVotesPerGroup; + uint256 totalVotes; + } + Votes private votes; // Governs the minimum and maximum number of validators that can be elected. ElectableValidators public electableValidators; @@ -106,8 +112,15 @@ contract Election is // elections. FixidityLib.Fraction public electabilityThreshold; + // If set to true for account, the account is able to vote for more + // than max number of groups voted for. + mapping(address => bool) public allowedToVoteOverMaxNumberOfGroups; + + mapping(address => CachedVotes) public cachedVotesByAccount; + event ElectableValidatorsSet(uint256 min, uint256 max); event MaxNumGroupsVotedForSet(uint256 maxNumGroupsVotedFor); + event AllowedToVoteOverMaxNumberOfGroups(address account, bool flag); event ElectabilityThresholdSet(uint256 electabilityThreshold); event ValidatorGroupMarkedEligible(address indexed group); event ValidatorGroupMarkedIneligible(address indexed group); @@ -139,7 +152,7 @@ contract Election is * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 1, 2, 1); + return (1, 1, 3, 0); } /** @@ -261,12 +274,15 @@ contract Election is alreadyVotedForGroup = alreadyVotedForGroup || groups[i] == group; } if (!alreadyVotedForGroup) { - require(groups.length < maxNumGroupsVotedFor, "Voted for too many groups"); + require( + allowedToVoteOverMaxNumberOfGroups[msg.sender] || groups.length < maxNumGroupsVotedFor, + "Voted for too many groups" + ); groups.push(group); } incrementPendingVotes(group, account, value); - incrementTotalVotes(group, value, lesser, greater); + incrementTotalVotes(account, group, value, lesser, greater); getLockedGold().decrementNonvotingAccountBalance(account, value); emit ValidatorGroupVoteCast(account, group, value); return true; @@ -344,7 +360,7 @@ contract Election is "Vote value larger than pending votes" ); decrementPendingVotes(group, account, value); - decrementTotalVotes(group, value, lesser, greater); + decrementTotalVotes(account, group, value, lesser, greater); getLockedGold().incrementNonvotingAccountBalance(account, value); if (getTotalVotesForGroupByAccount(group, account) == 0) { deleteElement(votes.groupsVotedFor[account], group, index); @@ -412,7 +428,7 @@ contract Election is "Vote value larger than active votes" ); uint256 units = decrementActiveVotes(group, account, value); - decrementTotalVotes(group, value, lesser, greater); + decrementTotalVotes(account, group, value, lesser, greater); getLockedGold().incrementNonvotingAccountBalance(account, value); if (getTotalVotesForGroupByAccount(group, account) == 0) { deleteElement(votes.groupsVotedFor[account], group, index); @@ -461,7 +477,7 @@ contract Election is } uint256 decrementedValue = maxValue.sub(remainingValue); if (decrementedValue > 0) { - decrementTotalVotes(group, decrementedValue, lesser, greater); + decrementTotalVotes(account, group, decrementedValue, lesser, greater); if (getTotalVotesForGroupByAccount(group, account) == 0) { deleteElement(votes.groupsVotedFor[account], group, index); } @@ -475,14 +491,33 @@ contract Election is * @return The total number of votes cast by an account. */ function getTotalVotesByAccount(address account) external view returns (uint256) { - uint256 total = 0; + bool allowedToVoteOverMaxNumberOfGroupsForAccount = allowedToVoteOverMaxNumberOfGroups[account]; address[] memory groups = votes.groupsVotedFor[account]; + + if (groups.length > maxNumGroupsVotedFor) { + return cachedVotesByAccount[account].totalVotes; + } + + uint256 total = 0; for (uint256 i = 0; i < groups.length; i = i.add(1)) { total = total.add(getTotalVotesForGroupByAccount(groups[i], account)); } return total; } + /** + * @notice Counts and caches account's votes for group. + * @param account The address of the voting account. + * @param group The address of the validator group. + */ + function updateTotalVotesByAccountForGroup(address account, address group) public { + cachedVotesByAccount[account].totalVotes -= cachedVotesByAccount[account] + .cachedVotesPerGroup[group]; + uint256 newTotalVotesForGroupByAccount = getTotalVotesForGroupByAccount(group, account); + cachedVotesByAccount[account].cachedVotesPerGroup[group] = newTotalVotesForGroupByAccount; + cachedVotesByAccount[account].totalVotes += newTotalVotesForGroupByAccount; + } + /** * @notice Returns the pending votes for `group` made by `account`. * @param group The address of the validator group. @@ -668,15 +703,24 @@ contract Election is * @param greater The group receiving more votes than the group for which the vote was cast, * or 0 if that group has the most votes of any validator group. */ - function incrementTotalVotes(address group, uint256 value, address lesser, address greater) - private - { + function incrementTotalVotes( + address account, + address group, + uint256 value, + address lesser, + address greater + ) private { uint256 newVoteTotal = votes.total.eligible.getValue(group).add(value); votes.total.eligible.update(group, newVoteTotal, lesser, greater); + + if (allowedToVoteOverMaxNumberOfGroups[account]) { + updateTotalVotesByAccountForGroup(account, group); + } } /** * @notice Decrements the number of total votes for `group` by `value`. + * @param account The address of the voting account. * @param group The validator group whose vote total should be decremented. * @param value The number of votes to decrement. * @param lesser The group receiving fewer votes than the group for which the vote was revoked, @@ -684,13 +728,21 @@ contract Election is * @param greater The group receiving more votes than the group for which the vote was revoked, * or 0 if that group has the most votes of any validator group. */ - function decrementTotalVotes(address group, uint256 value, address lesser, address greater) - private - { + function decrementTotalVotes( + address account, + address group, + uint256 value, + address lesser, + address greater + ) private { if (votes.total.eligible.contains(group)) { uint256 newVoteTotal = votes.total.eligible.getValue(group).sub(value); votes.total.eligible.update(group, newVoteTotal, lesser, greater); } + + if (allowedToVoteOverMaxNumberOfGroups[account]) { + updateTotalVotesByAccountForGroup(account, group); + } } /** @@ -1043,6 +1095,36 @@ contract Election is return res; } + /** + * @notice Allows to turn on/off voting over maxNumGroupsVotedFor. + * Once this is turned on and account voted for more than maxNumGroupsVotedFor, + * it is account's obligation to run updateTotalVotesByAccountForGroup once a day. + * If not run, voting power of account will not reflect rewards awarded. + * @param flag The on/off flag. + */ + function setAllowedToVoteOverMaxNumberOfGroups(bool flag) public { + address account = getAccounts().voteSignerToAccount(msg.sender); + IValidators validators = getValidators(); + require( + !validators.isValidator(account), + "Validators cannot vote for more than max number of groups" + ); + require( + !validators.isValidatorGroup(account), + "Validator groups cannot vote for more than max number of groups" + ); + + if (!flag) { + require( + votes.groupsVotedFor[account].length <= maxNumGroupsVotedFor, + "Too many groups voted for!" + ); + } + + allowedToVoteOverMaxNumberOfGroups[account] = flag; + emit AllowedToVoteOverMaxNumberOfGroups(account, flag); + } + // Struct to hold local variables for `forceDecrementVotes`. // Needed to prevent solc error of "stack too deep" from too many local vars. struct DecrementVotesInfo { diff --git a/packages/protocol/contracts/governance/Governance.sol b/packages/protocol/contracts/governance/Governance.sol index 72e31641820..33035a1b4a2 100644 --- a/packages/protocol/contracts/governance/Governance.sol +++ b/packages/protocol/contracts/governance/Governance.sol @@ -46,9 +46,12 @@ contract Governance is } struct VoteRecord { - Proposals.VoteValue value; + Proposals.VoteValue deprecated_value; // obsolete uint256 proposalId; - uint256 weight; + uint256 deprecated_weight; // obsolete + uint256 yesVotes; + uint256 noVotes; + uint256 abstainVotes; } struct Voter { @@ -146,6 +149,14 @@ contract Governance is uint256 weight ); + event ProposalVotedV2( + uint256 indexed proposalId, + address indexed account, + uint256 yesVotes, + uint256 noVotes, + uint256 abstainVotes + ); + event ProposalVoteRevoked( uint256 indexed proposalId, address indexed account, @@ -153,6 +164,14 @@ contract Governance is uint256 weight ); + event ProposalVoteRevokedV2( + uint256 indexed proposalId, + address indexed account, + uint256 yesVotes, + uint256 noVotes, + uint256 abstainVotes + ); + event ProposalExecuted(uint256 indexed proposalId); event ProposalExpired(uint256 indexed proposalId); @@ -486,7 +505,7 @@ contract Governance is { Proposals.Proposal storage proposal = proposals[proposalId]; require(_isDequeuedProposal(proposal, proposalId, index), "Proposal not dequeued"); - Proposals.Stage stage = proposal.getDequeuedStage(stageDurations); + Proposals.Stage stage = getProposalDequeuedStage(proposal); if (_isDequeuedProposalExpired(proposal, stage)) { deleteDequeuedProposal(proposal, proposalId, index); return (proposal, Proposals.Stage.Expiration); @@ -547,7 +566,7 @@ contract Governance is return _isQueuedProposalExpired(proposal) ? Proposals.Stage.Expiration : Proposals.Stage.Queued; } else { - Proposals.Stage stage = proposal.getDequeuedStage(stageDurations); + Proposals.Stage stage = getProposalDequeuedStage(proposal); return _isDequeuedProposalExpired(proposal, stage) ? Proposals.Stage.Expiration : stage; } } @@ -631,26 +650,138 @@ contract Governance is return false; } - address account = getAccounts().voteSignerToAccount(msg.sender); - Voter storage voter = voters[account]; - uint256 weight = getLockedGold().getAccountTotalLockedGold(account); require(stage == Proposals.Stage.Referendum, "Incorrect proposal state"); require(value != Proposals.VoteValue.None, "Vote value unset"); + + address account = getAccounts().voteSignerToAccount(msg.sender); + uint256 weight = getLockedGold().getAccountTotalLockedGold(account); require(weight > 0, "Voter weight zero"); - VoteRecord storage voteRecord = voter.referendumVotes[index]; - proposal.updateVote( - voteRecord.weight, - weight, - (voteRecord.proposalId == proposalId) ? voteRecord.value : Proposals.VoteValue.None, - value + + _vote( + proposal, + proposalId, + index, + account, + value == Proposals.VoteValue.Yes ? weight : 0, + value == Proposals.VoteValue.No ? weight : 0, + value == Proposals.VoteValue.Abstain ? weight : 0 ); + return true; + } + + /** + * @notice Votes partially on a proposal in the referendum stage. + * @param proposalId The ID of the proposal to vote on. + * @param index The index of the proposal ID in `dequeued`. + * @param yesVotes The yes votes weight. + * @param noVotes The no votes weight. + * @param abstainVotes The abstain votes weight. + * @return Whether or not the vote was cast successfully. + */ + /* solhint-disable code-complexity */ + function votePartially( + uint256 proposalId, + uint256 index, + uint256 yesVotes, + uint256 noVotes, + uint256 abstainVotes + ) external nonReentrant returns (bool) { + dequeueProposalsIfReady(); + (Proposals.Proposal storage proposal, Proposals.Stage stage) = requireDequeuedAndDeleteExpired( + proposalId, + index + ); + if (!proposal.exists()) { + return false; + } + require(stage == Proposals.Stage.Referendum, "Incorrect proposal state"); + + address account = getAccounts().voteSignerToAccount(msg.sender); + uint256 totalLockedGold = getLockedGold().getAccountTotalLockedGold(account); + + require( + totalLockedGold >= yesVotes.add(noVotes).add(abstainVotes), + "Voter doesn't have enough locked Celo (formerly known as Celo Gold)" + ); + _vote(proposal, proposalId, index, account, yesVotes, noVotes, abstainVotes); + + return true; + } + + /** + * @notice Votes on a proposal in the referendum stage. + * @param proposal The proposal struct. + * @param proposalId The ID of the proposal to vote on. + * @param index The index of the proposal ID in `dequeued`. + * @param account Account based on signer. + * @param yesVotes The yes votes weight. + * @param noVotes The no votes weight. + * @param abstainVotes The abstain votes weight. + * @return Whether or not the proposal is passing. + */ + function _vote( + Proposals.Proposal storage proposal, + uint256 proposalId, + uint256 index, + address account, + uint256 yesVotes, + uint256 noVotes, + uint256 abstainVotes + ) private { + Voter storage voter = voters[account]; + + VoteRecord storage previousVoteRecord = voter.referendumVotes[index]; + + if (previousVoteRecord.proposalId != proposalId) { + // VoteRecord is being stored based on index (in `dequeued`) rather than proposalId. + // It can happen that user voted on proposal that later gets deleted. + // VoteRecord will still stay in `referendumVotes` mapping. + // Once new proposal is created it might get same index as previous proposal. + // In such case we need to check whether existing VoteRecord is relevant to new + // proposal of whether it is just left over data. + proposal.updateVote(0, 0, 0, yesVotes, noVotes, abstainVotes); + } else if (previousVoteRecord.deprecated_weight != 0) { + // backward compatibility for transition period - this should be deleted later on + proposal.updateVote( + previousVoteRecord.deprecated_value == Proposals.VoteValue.Yes + ? previousVoteRecord.deprecated_weight + : 0, + previousVoteRecord.deprecated_value == Proposals.VoteValue.No + ? previousVoteRecord.deprecated_weight + : 0, + previousVoteRecord.deprecated_value == Proposals.VoteValue.Abstain + ? previousVoteRecord.deprecated_weight + : 0, + yesVotes, + noVotes, + abstainVotes + ); + + } else { + proposal.updateVote( + previousVoteRecord.yesVotes, + previousVoteRecord.noVotes, + previousVoteRecord.abstainVotes, + yesVotes, + noVotes, + abstainVotes + ); + } + proposal.networkWeight = getLockedGold().getTotalLockedGold(); - voter.referendumVotes[index] = VoteRecord(value, proposalId, weight); + voter.referendumVotes[index] = VoteRecord( + Proposals.VoteValue.None, + proposalId, + 0, + yesVotes, + noVotes, + abstainVotes + ); if (proposal.timestamp > proposals[voter.mostRecentReferendumProposal].timestamp) { voter.mostRecentReferendumProposal = proposalId; } - emit ProposalVoted(proposalId, account, uint256(value), weight); - return true; + + emit ProposalVotedV2(proposalId, account, yesVotes, noVotes, abstainVotes); } /* solhint-enable code-complexity */ @@ -672,7 +803,10 @@ contract Governance is // Skip proposals where there was no vote cast by the user AND // ensure vote record proposal matches identifier of dequeued index proposal. if ( - voteRecord.value != Proposals.VoteValue.None && + (voteRecord.yesVotes > 0 || + voteRecord.noVotes > 0 || + voteRecord.abstainVotes > 0 || + voteRecord.deprecated_weight > 0) && voteRecord.proposalId == dequeued[dequeueIndex] ) { (Proposals.Proposal storage proposal, Proposals.Stage stage) = @@ -680,14 +814,45 @@ contract Governance is // only revoke from proposals which are still in referendum if (stage == Proposals.Stage.Referendum) { - proposal.updateVote(voteRecord.weight, 0, voteRecord.value, Proposals.VoteValue.None); - proposal.networkWeight = getLockedGold().getTotalLockedGold(); - emit ProposalVoteRevoked( - voteRecord.proposalId, - account, - uint256(voteRecord.value), - voteRecord.weight - ); + if (voteRecord.deprecated_weight != 0) { + // backward compatibility for transition period - this should be deleted later on + uint256 previousYes = voteRecord.deprecated_value == Proposals.VoteValue.Yes + ? voteRecord.deprecated_weight + : 0; + uint256 previousNo = voteRecord.deprecated_value == Proposals.VoteValue.No + ? voteRecord.deprecated_weight + : 0; + uint256 previousAbstain = voteRecord.deprecated_value == Proposals.VoteValue.Abstain + ? voteRecord.deprecated_weight + : 0; + proposal.updateVote(previousYes, previousNo, previousAbstain, 0, 0, 0); + + proposal.networkWeight = getLockedGold().getTotalLockedGold(); + emit ProposalVoteRevokedV2( + voteRecord.proposalId, + account, + previousYes, + previousNo, + previousAbstain + ); + } else { + proposal.updateVote( + voteRecord.yesVotes, + voteRecord.noVotes, + voteRecord.abstainVotes, + 0, + 0, + 0 + ); + proposal.networkWeight = getLockedGold().getTotalLockedGold(); + emit ProposalVoteRevokedV2( + voteRecord.proposalId, + account, + voteRecord.yesVotes, + voteRecord.noVotes, + voteRecord.abstainVotes + ); + } } // always delete dequeue vote records for gas refund as they must be expired or revoked @@ -820,8 +985,7 @@ contract Governance is isQueued(upvotedProposal) && !isQueuedProposalExpired(upvotedProposal); Proposals.Proposal storage proposal = proposals[voter.mostRecentReferendumProposal]; - bool isVotingReferendum = (proposal.getDequeuedStage(stageDurations) == - Proposals.Stage.Referendum); + bool isVotingReferendum = (getProposalDequeuedStage(proposal) == Proposals.Stage.Referendum); return isVotingQueue || isVotingReferendum; } @@ -924,16 +1088,26 @@ contract Governance is * @param account The address of the account to get the record for. * @param index The index in `dequeued`. * @return The corresponding proposal ID, vote value, and weight. - * @return The corresponding vote value. - * @return The corresponding weight. + * @return The depreciated vote value. + * @return The deprecieated weight. + * @return The yes weight. + * @return The no weight. + * @return The abstain weight. */ function getVoteRecord(address account, uint256 index) external view - returns (uint256, uint256, uint256) + returns (uint256, uint256, uint256, uint256, uint256, uint256) { VoteRecord storage record = voters[account].referendumVotes[index]; - return (record.proposalId, uint256(record.value), record.weight); + return ( + record.proposalId, + uint256(record.deprecated_value), + record.deprecated_weight, + record.yesVotes, + record.noVotes, + record.abstainVotes + ); } /** @@ -1108,6 +1282,13 @@ contract Governance is FixidityLib.Fraction memory support = proposal.getSupportWithQuorumPadding( participationParameters.baseline.multiply(participationParameters.baselineQuorumFactor) ); + + if (proposal.transactions.length == 0) { + // default treshold + FixidityLib.Fraction memory threshold = _getConstitution(address(0), ""); + return support.gt(threshold); + } + for (uint256 i = 0; i < proposal.transactions.length; i = i.add(1)) { bytes4 functionId = ExtractFunctionSignature.extractFunctionSignature( proposal.transactions[i].data @@ -1156,7 +1337,7 @@ contract Governance is */ function isDequeuedProposalExpired(uint256 proposalId) external view returns (bool) { Proposals.Proposal storage proposal = proposals[proposalId]; - return _isDequeuedProposalExpired(proposal, proposal.getDequeuedStage(stageDurations)); + return _isDequeuedProposalExpired(proposal, getProposalDequeuedStage(proposal)); } /** @@ -1264,4 +1445,72 @@ contract Governance is } return threshold; } + + /** + * @notice Returns max number of votes cast by an account. + * @param account The address of the account. + * @return The total number of votes cast by an account. + */ + function getAmountOfGoldUsedForVoting(address account) public view returns (uint256) { + Voter storage voter = voters[account]; + + uint256 upvotedProposalId = voter.upvote.proposalId; + bool isVotingQueue = upvotedProposalId != 0 && + isQueued(upvotedProposalId) && + !isQueuedProposalExpired(upvotedProposalId); + + if (isVotingQueue) { + uint256 weight = getLockedGold().getAccountTotalLockedGold(account); + return weight; + } + + uint256 maxUsed = 0; + for (uint256 index = 0; index < dequeued.length; index = index.add(1)) { + Proposals.Proposal storage proposal = proposals[dequeued[index]]; + bool isVotingReferendum = (getProposalDequeuedStage(proposal) == Proposals.Stage.Referendum); + + if (!isVotingReferendum) { + continue; + } + + VoteRecord storage voteRecord = voter.referendumVotes[index]; + maxUsed = Math.max( + maxUsed, + voteRecord.yesVotes.add(voteRecord.noVotes).add(voteRecord.abstainVotes) + ); + } + return maxUsed; + } + + /** + * @notice Returns the stage of a dequeued proposal. + * @param proposal The proposal struct. + * @return The stage of the dequeued proposal. + * @dev Must be called on a dequeued proposal. + */ + function getProposalDequeuedStage(Proposals.Proposal storage proposal) + internal + view + returns (Proposals.Stage) + { + uint256 stageStartTime = proposal.timestamp.add(stageDurations.referendum).add( + stageDurations.execution + ); + // solhint-disable-next-line not-rely-on-time + if ( + now >= stageStartTime && + (proposal.transactions.length > 0 || + // proposals with 0 transactions can expire only when not approved or not passing + !proposal.isApproved() || + !_isProposalPassing(proposal)) + ) { + return Proposals.Stage.Expiration; + } + stageStartTime = stageStartTime.sub(stageDurations.execution); + // solhint-disable-next-line not-rely-on-time + if (now >= stageStartTime) { + return Proposals.Stage.Execution; + } + return Proposals.Stage.Referendum; + } } diff --git a/packages/protocol/contracts/governance/LockedGold.sol b/packages/protocol/contracts/governance/LockedGold.sol index 4f25880eb81..e4eff1e7d87 100644 --- a/packages/protocol/contracts/governance/LockedGold.sol +++ b/packages/protocol/contracts/governance/LockedGold.sol @@ -84,7 +84,7 @@ contract LockedGold is * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 1, 2, 0); + return (1, 1, 2, 1); } /** @@ -178,12 +178,18 @@ contract LockedGold is Balances storage account = balances[msg.sender]; // Prevent unlocking gold when voting on governance proposals so that the gold cannot be // used to vote more than once. - require(!getGovernance().isVoting(msg.sender), "Account locked"); + uint256 remainingLockedGold = getAccountTotalLockedGold(msg.sender).sub(value); + + uint256 totalReferendumVotes = getGovernance().getAmountOfGoldUsedForVoting(msg.sender); + require( + remainingLockedGold >= totalReferendumVotes, + "Not enough unlockable celo. Celo is locked in voting." + ); + uint256 balanceRequirement = getValidators().getAccountLockedGoldRequirement(msg.sender); require( - balanceRequirement == 0 || - balanceRequirement <= getAccountTotalLockedGold(msg.sender).sub(value), - "Trying to unlock too much gold" + balanceRequirement == 0 || balanceRequirement <= remainingLockedGold, + "Either account doesn't have enough locked Celo or locked Celo is being used for voting." ); _decrementNonvotingAccountBalance(msg.sender, value); uint256 available = now.add(unlockingPeriod); diff --git a/packages/protocol/contracts/governance/Proposals.sol b/packages/protocol/contracts/governance/Proposals.sol index 2beb77fb0fe..364d6064d2c 100644 --- a/packages/protocol/contracts/governance/Proposals.sol +++ b/packages/protocol/contracts/governance/Proposals.sol @@ -137,35 +137,31 @@ library Proposals { /** * @notice Adds or changes a vote on a proposal. * @param proposal The proposal struct. - * @param previousWeight The previous weight of the vote. - * @param currentWeight The current weight of the vote. - * @param previousVote The vote to be removed, or None for a new vote. - * @param currentVote The vote to be set. + * @param previousYesVotes The previous yes votes weight. + * @param previousNoVotes The previous no votes weight. + * @param previousAbstainVotes The previous abstain votes weight. + * @param yesVotes The current yes votes weight. + * @param noVotes The current no votes weight. + * @param abstainVotes The current abstain votes weight. */ function updateVote( Proposal storage proposal, - uint256 previousWeight, - uint256 currentWeight, - VoteValue previousVote, - VoteValue currentVote + uint256 previousYesVotes, + uint256 previousNoVotes, + uint256 previousAbstainVotes, + uint256 yesVotes, + uint256 noVotes, + uint256 abstainVotes ) public { // Subtract previous vote. - if (previousVote == VoteValue.Abstain) { - proposal.votes.abstain = proposal.votes.abstain.sub(previousWeight); - } else if (previousVote == VoteValue.Yes) { - proposal.votes.yes = proposal.votes.yes.sub(previousWeight); - } else if (previousVote == VoteValue.No) { - proposal.votes.no = proposal.votes.no.sub(previousWeight); - } + proposal.votes.yes = proposal.votes.yes.sub(previousYesVotes); + proposal.votes.no = proposal.votes.no.sub(previousNoVotes); + proposal.votes.abstain = proposal.votes.abstain.sub(previousAbstainVotes); // Add new vote. - if (currentVote == VoteValue.Abstain) { - proposal.votes.abstain = proposal.votes.abstain.add(currentWeight); - } else if (currentVote == VoteValue.Yes) { - proposal.votes.yes = proposal.votes.yes.add(currentWeight); - } else if (currentVote == VoteValue.No) { - proposal.votes.no = proposal.votes.no.add(currentWeight); - } + proposal.votes.yes = proposal.votes.yes.add(yesVotes); + proposal.votes.no = proposal.votes.no.add(noVotes); + proposal.votes.abstain = proposal.votes.abstain.add(abstainVotes); } /** @@ -228,33 +224,6 @@ library Proposals { return FixidityLib.newFixedFraction(yesVotes, yesVotes.add(noVotes)); } - /** - * @notice Returns the stage of a dequeued proposal. - * @param proposal The proposal struct. - * @param stageDurations The durations of the dequeued proposal stages. - * @return The stage of the dequeued proposal. - * @dev Must be called on a dequeued proposal. - */ - function getDequeuedStage(Proposal storage proposal, StageDurations storage stageDurations) - internal - view - returns (Stage) - { - uint256 stageStartTime = proposal.timestamp.add(stageDurations.referendum).add( - stageDurations.execution - ); - // solhint-disable-next-line not-rely-on-time - if (now >= stageStartTime) { - return Stage.Expiration; - } - stageStartTime = stageStartTime.sub(stageDurations.execution); - // solhint-disable-next-line not-rely-on-time - if (now >= stageStartTime) { - return Stage.Execution; - } - return Stage.Referendum; - } - /** * @notice Returns the number of votes cast on the proposal over the total number * of votes in the network as a fraction. diff --git a/packages/protocol/contracts/governance/Validators.sol b/packages/protocol/contracts/governance/Validators.sol index 70ea6dde5e7..c14eaedaa9f 100644 --- a/packages/protocol/contracts/governance/Validators.sol +++ b/packages/protocol/contracts/governance/Validators.sol @@ -166,7 +166,7 @@ contract Validators is * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 2, 0, 3); + return (1, 2, 0, 4); } /** @@ -356,6 +356,12 @@ contract Validators is bytes calldata blsPop ) external nonReentrant returns (bool) { address account = getAccounts().validatorSignerToAccount(msg.sender); + require( + // A Validator could avoid getting slashed by voting for a bunch of groups with very small + // amounts of CELO, causing the slash function to always run out of gas. + !getElection().allowedToVoteOverMaxNumberOfGroups(account), + "Validators cannot vote for more than max number of groups" + ); require(!isValidator(account) && !isValidatorGroup(account), "Already registered"); uint256 lockedGoldBalance = getLockedGold().getAccountTotalLockedGold(account); require(lockedGoldBalance >= validatorLockedGoldRequirements.value, "Deposit too small"); @@ -741,6 +747,10 @@ contract Validators is function registerValidatorGroup(uint256 commission) external nonReentrant returns (bool) { require(commission <= FixidityLib.fixed1().unwrap(), "Commission can't be greater than 100%"); address account = getAccounts().validatorSignerToAccount(msg.sender); + require( + !getElection().allowedToVoteOverMaxNumberOfGroups(account), + "Validator groups cannot vote for more than max number of groups" + ); require(!isValidator(account), "Already registered as validator"); require(!isValidatorGroup(account), "Already registered as group"); uint256 lockedGoldBalance = getLockedGold().getAccountTotalLockedGold(account); diff --git a/packages/protocol/contracts/governance/interfaces/IElection.sol b/packages/protocol/contracts/governance/interfaces/IElection.sol index 9215649caea..4404548748e 100644 --- a/packages/protocol/contracts/governance/interfaces/IElection.sol +++ b/packages/protocol/contracts/governance/interfaces/IElection.sol @@ -10,6 +10,7 @@ interface IElection { function revokePending(address, uint256, address, address, uint256) external returns (bool); function markGroupIneligible(address) external; function markGroupEligible(address, address, address) external; + function allowedToVoteOverMaxNumberOfGroups(address) external returns (bool); function forceDecrementVotes( address, uint256, diff --git a/packages/protocol/contracts/governance/interfaces/IGovernance.sol b/packages/protocol/contracts/governance/interfaces/IGovernance.sol index c205443e9ee..dc0c9410e2a 100644 --- a/packages/protocol/contracts/governance/interfaces/IGovernance.sol +++ b/packages/protocol/contracts/governance/interfaces/IGovernance.sol @@ -2,4 +2,5 @@ pragma solidity ^0.5.13; interface IGovernance { function isVoting(address) external view returns (bool); + function getAmountOfGoldUsedForVoting(address account) external view returns (uint256); } diff --git a/packages/protocol/contracts/governance/test/MockElection.sol b/packages/protocol/contracts/governance/test/MockElection.sol index 5b2140e2e15..52e4061a2ac 100644 --- a/packages/protocol/contracts/governance/test/MockElection.sol +++ b/packages/protocol/contracts/governance/test/MockElection.sol @@ -6,6 +6,7 @@ pragma solidity ^0.5.13; contract MockElection { mapping(address => bool) public isIneligible; mapping(address => bool) public isEligible; + mapping(address => bool) public allowedToVoteOverMaxNumberOfGroups; address[] public electedValidators; uint256 active; uint256 total; @@ -66,6 +67,10 @@ contract MockElection { return true; } + function setAllowedToVoteOverMaxNumberOfGroups(address account, bool flag) public { + allowedToVoteOverMaxNumberOfGroups[account] = flag; + } + function forceDecrementVotes( address, uint256 value, diff --git a/packages/protocol/contracts/governance/test/MockGovernance.sol b/packages/protocol/contracts/governance/test/MockGovernance.sol index fd70e55e7ff..669e3a5b6ef 100644 --- a/packages/protocol/contracts/governance/test/MockGovernance.sol +++ b/packages/protocol/contracts/governance/test/MockGovernance.sol @@ -7,10 +7,19 @@ import "../interfaces/IGovernance.sol"; */ contract MockGovernance is IGovernance { mapping(address => bool) public isVoting; + mapping(address => uint256) public totalVotes; function() external payable {} // solhint-disable no-empty-blocks function setVoting(address voter) external { isVoting[voter] = true; } + + function setTotalVotes(address voter, uint256 votes) external { + totalVotes[voter] = votes; + } + + function getAmountOfGoldUsedForVoting(address account) external view returns (uint256) { + return totalVotes[account]; + } } diff --git a/packages/protocol/contracts/identity/Attestations.sol b/packages/protocol/contracts/identity/Attestations.sol index d5aa43794fe..af5417a510f 100644 --- a/packages/protocol/contracts/identity/Attestations.sol +++ b/packages/protocol/contracts/identity/Attestations.sol @@ -180,125 +180,7 @@ contract Attestations is * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 1, 1, 2); - } - - /** - * @notice Commit to the attestation request of a hashed identifier. - * @param identifier The hash of the identifier to be attested. - * @param attestationsRequested The number of requested attestations for this request. - * @param attestationRequestFeeToken The address of the token with which the attestation fee will - * be paid. - * @dev Note that if an attestation expires before it is completed, the fee is forfeited. This is - * to prevent folks from attacking validators by requesting attestations that they do not - * complete, and to increase the cost of validators attempting to manipulate the attestations - * protocol. - */ - function request( - bytes32 identifier, - uint256 attestationsRequested, - address attestationRequestFeeToken - ) external nonReentrant { - require( - attestationRequestFees[attestationRequestFeeToken] > 0, - "Invalid attestationRequestFeeToken" - ); - require( - IERC20(attestationRequestFeeToken).transferFrom( - msg.sender, - address(this), - attestationRequestFees[attestationRequestFeeToken].mul(attestationsRequested) - ), - "Transfer of attestation request fees failed" - ); - - require(attestationsRequested > 0, "You have to request at least 1 attestation"); - require(attestationsRequested <= maxAttestations, "Too many attestations requested"); - - IdentifierState storage state = identifiers[identifier]; - - require( - state.unselectedRequests[msg.sender].blockNumber == 0 || - isAttestationExpired(state.unselectedRequests[msg.sender].blockNumber) || - !isAttestationRequestSelectable(state.unselectedRequests[msg.sender].blockNumber), - "There exists an unexpired, unselected attestation request" - ); - - state.unselectedRequests[msg.sender].blockNumber = block.number.toUint32(); - state.unselectedRequests[msg.sender].attestationsRequested = attestationsRequested.toUint32(); - state.unselectedRequests[msg.sender].attestationRequestFeeToken = attestationRequestFeeToken; - - state.attestations[msg.sender].requested = uint256(state.attestations[msg.sender].requested) - .add(attestationsRequested) - .toUint32(); - - emit AttestationsRequested( - identifier, - msg.sender, - attestationsRequested, - attestationRequestFeeToken - ); - } - - /** - * @notice Selects the issuers for the most recent attestation request. - * @param identifier The hash of the identifier to be attested. - */ - function selectIssuers(bytes32 identifier) external { - IdentifierState storage state = identifiers[identifier]; - - require( - state.unselectedRequests[msg.sender].blockNumber > 0, - "No unselected attestation request to select issuers for" - ); - - require( - !isAttestationExpired(state.unselectedRequests[msg.sender].blockNumber), - "The attestation request has expired" - ); - - addIncompleteAttestations(identifier); - delete state.unselectedRequests[msg.sender]; - } - - /** - * @notice Submit the secret message sent by the issuer to complete the attestation request. - * @param identifier The hash of the identifier for this attestation. - * @param v The recovery id of the incoming ECDSA signature. - * @param r Output value r of the ECDSA signature. - * @param s Output value s of the ECDSA signature. - * @dev Throws if there is no matching outstanding attestation request. - * @dev Throws if the attestation window has passed. - */ - function complete(bytes32 identifier, uint8 v, bytes32 r, bytes32 s) external { - address issuer = validateAttestationCode(identifier, msg.sender, v, r, s); - - Attestation storage attestation = identifiers[identifier].attestations[msg.sender] - .issuedAttestations[issuer]; - - address token = attestation.attestationRequestFeeToken; - - // solhint-disable-next-line not-rely-on-time - attestation.blockNumber = block.number.toUint32(); - attestation.status = AttestationStatus.Complete; - delete attestation.attestationRequestFeeToken; - AttestedAddress storage attestedAddress = identifiers[identifier].attestations[msg.sender]; - require( - attestedAddress.completed < attestedAddress.completed + 1, - "SafeMath32 integer overflow" - ); - attestedAddress.completed = attestedAddress.completed + 1; - - pendingWithdrawals[token][issuer] = pendingWithdrawals[token][issuer].add( - attestationRequestFees[token] - ); - - IdentifierState storage state = identifiers[identifier]; - if (identifiers[identifier].attestations[msg.sender].completed == 1) { - state.accounts.push(msg.sender); - } - - emit AttestationCompleted(identifier, msg.sender, issuer); + return (1, 2, 0, 0); } /** @@ -640,121 +522,6 @@ contract Attestations is return (matches, new address[](totalAddresses)); } - /** - * @notice Adds additional attestations given the current randomness. - * @param identifier The hash of the identifier to be attested. - */ - function addIncompleteAttestations(bytes32 identifier) internal { - AttestedAddress storage state = identifiers[identifier].attestations[msg.sender]; - UnselectedRequest storage unselectedRequest = identifiers[identifier].unselectedRequests[msg - .sender]; - - bytes32 seed = getRandom().getBlockRandomness( - uint256(unselectedRequest.blockNumber).add(selectIssuersWaitBlocks) - ); - IAccounts accounts = getAccounts(); - uint256 issuersLength = numberValidatorsInCurrentSet(); - uint256[] memory issuers = new uint256[](issuersLength); - for (uint256 i = 0; i < issuersLength; i = i.add(1)) issuers[i] = i; - - require(unselectedRequest.attestationsRequested <= issuersLength, "not enough issuers"); - - uint256 currentIndex = 0; - - // The length of the list (variable issuersLength) is decremented in each round, - // so the loop always terminates - while (currentIndex < unselectedRequest.attestationsRequested) { - require(issuersLength > 0, "not enough issuers"); - seed = keccak256(abi.encodePacked(seed)); - uint256 idx = uint256(seed) % issuersLength; - address signer = validatorSignerAddressFromCurrentSet(issuers[idx]); - address issuer = accounts.signerToAccount(signer); - - Attestation storage attestation = state.issuedAttestations[issuer]; - - if ( - attestation.status == AttestationStatus.None && - accounts.hasAuthorizedAttestationSigner(issuer) - ) { - currentIndex = currentIndex.add(1); - attestation.status = AttestationStatus.Incomplete; - attestation.blockNumber = unselectedRequest.blockNumber; - attestation.attestationRequestFeeToken = unselectedRequest.attestationRequestFeeToken; - state.selectedIssuers.push(issuer); - - emit AttestationIssuerSelected( - identifier, - msg.sender, - issuer, - unselectedRequest.attestationRequestFeeToken - ); - } - - // Remove the validator that was selected from the list, - // by replacing it by the last element in the list - issuersLength = issuersLength.sub(1); - issuers[idx] = issuers[issuersLength]; - } - } - - /** - * @notice Update the approval status of allowing an attestation identifier - * mapping to be transfered from an address to another. The "to" or "from" - * addresses must both approve. If the other has already approved, then the transfer - * is executed. - * @param identifier The identifier for this attestation. - * @param index The index of the account in the accounts array. - * @param from The current attestation address to which the identifier is mapped. - * @param to The new address to map to identifier. - * @param status The approval status - */ - function approveTransfer(bytes32 identifier, uint256 index, address from, address to, bool status) - external - { - require( - msg.sender == from || msg.sender == to, - "Approver must be sender or recipient of transfer" - ); - bytes32 key = keccak256(abi.encodePacked(identifier, from, to)); - address other = msg.sender == from ? to : from; - if (status && transferApprovals[other][key]) { - _transfer(identifier, index, from, to); - transferApprovals[other][key] = false; - } else { - transferApprovals[msg.sender][key] = status; - emit TransferApproval(msg.sender, identifier, from, to, status); - } - } - - /** - * @notice Transfer an attestation identifier mapping from the sender address to a - * replacement address. - * @param identifier The identifier for this attestation. - * @param index The index of the account in the accounts array. - * @param from The current attestation address to which the identifier is mapped. - * @param to The address to replace the sender address in the indentifier mapping. - * @dev Throws if index is out of bound for account array. - * @dev Throws if `from` is not in the account array at the given index. - * @dev Throws if `to` already has attestations - */ - function _transfer(bytes32 identifier, uint256 index, address from, address to) internal { - uint256 numAccounts = identifiers[identifier].accounts.length; - require(index < numAccounts, "Index is invalid"); - require(from == identifiers[identifier].accounts[index], "Index does not match from address"); - require( - identifiers[identifier].attestations[to].requested == 0, - "Address tranferring to has already requested attestations" - ); - - identifiers[identifier].accounts[index] = to; - identifiers[identifier].attestations[to] = identifiers[identifier].attestations[from]; - identifiers[identifier].unselectedRequests[to] = identifiers[identifier] - .unselectedRequests[from]; - delete identifiers[identifier].attestations[from]; - delete identifiers[identifier].unselectedRequests[from]; - emit AttestationsTransferred(identifier, from, to); - } - function isAttestationExpired(uint32 attestationRequestBlock) internal view returns (bool) { return block.number >= uint256(attestationRequestBlock).add(attestationExpiryBlocks); } diff --git a/packages/protocol/contracts/identity/interfaces/IAttestations.sol b/packages/protocol/contracts/identity/interfaces/IAttestations.sol index 30ae62d449c..6c81517af8c 100644 --- a/packages/protocol/contracts/identity/interfaces/IAttestations.sol +++ b/packages/protocol/contracts/identity/interfaces/IAttestations.sol @@ -1,12 +1,8 @@ pragma solidity ^0.5.13; interface IAttestations { - function request(bytes32, uint256, address) external; - function selectIssuers(bytes32) external; - function complete(bytes32, uint8, bytes32, bytes32) external; function revoke(bytes32, uint256) external; function withdraw(address) external; - function approveTransfer(bytes32, uint256, address, address, bool) external; // view functions function getUnselectedRequest(bytes32, address) external view returns (uint32, uint32, address); diff --git a/packages/protocol/contracts/identity/test/AttestationsTest.sol b/packages/protocol/contracts/identity/test/AttestationsTest.sol index d9a38714ffb..f870ac0daa0 100644 --- a/packages/protocol/contracts/identity/test/AttestationsTest.sol +++ b/packages/protocol/contracts/identity/test/AttestationsTest.sol @@ -21,4 +21,182 @@ contract AttestationsTest is Attestations(true) { function validatorSignerAddressFromCurrentSet(uint256 index) public view returns (address) { return __testValidators[index]; } + + // some deprecated functions are mocked here to ensure that the tests for + // revoke and withdraw can still run + + /** + * @notice Commit to the attestation request of a hashed identifier. + * @param identifier The hash of the identifier to be attested. + * @param attestationsRequested The number of requested attestations for this request. + * @param attestationRequestFeeToken The address of the token with which the attestation fee will + * be paid. + * @dev Note that if an attestation expires before it is completed, the fee is forfeited. This is + * to prevent folks from attacking validators by requesting attestations that they do not + * complete, and to increase the cost of validators attempting to manipulate the attestations + * protocol. + */ + function request( + bytes32 identifier, + uint256 attestationsRequested, + address attestationRequestFeeToken + ) external nonReentrant { + require( + attestationRequestFees[attestationRequestFeeToken] > 0, + "Invalid attestationRequestFeeToken" + ); + require( + IERC20(attestationRequestFeeToken).transferFrom( + msg.sender, + address(this), + attestationRequestFees[attestationRequestFeeToken].mul(attestationsRequested) + ), + "Transfer of attestation request fees failed" + ); + + require(attestationsRequested > 0, "You have to request at least 1 attestation"); + require(attestationsRequested <= maxAttestations, "Too many attestations requested"); + + IdentifierState storage state = identifiers[identifier]; + + require( + state.unselectedRequests[msg.sender].blockNumber == 0 || + isAttestationExpired(state.unselectedRequests[msg.sender].blockNumber) || + !isAttestationRequestSelectable(state.unselectedRequests[msg.sender].blockNumber), + "There exists an unexpired, unselected attestation request" + ); + + state.unselectedRequests[msg.sender].blockNumber = block.number.toUint32(); + state.unselectedRequests[msg.sender].attestationsRequested = attestationsRequested.toUint32(); + state.unselectedRequests[msg.sender].attestationRequestFeeToken = attestationRequestFeeToken; + + state.attestations[msg.sender].requested = uint256(state.attestations[msg.sender].requested) + .add(attestationsRequested) + .toUint32(); + + emit AttestationsRequested( + identifier, + msg.sender, + attestationsRequested, + attestationRequestFeeToken + ); + } + + /** + * @notice Selects the issuers for the most recent attestation request. + * @param identifier The hash of the identifier to be attested. + */ + function selectIssuers(bytes32 identifier) external { + IdentifierState storage state = identifiers[identifier]; + + require( + state.unselectedRequests[msg.sender].blockNumber > 0, + "No unselected attestation request to select issuers for" + ); + + require( + !isAttestationExpired(state.unselectedRequests[msg.sender].blockNumber), + "The attestation request has expired" + ); + + addIncompleteAttestations(identifier); + delete state.unselectedRequests[msg.sender]; + } + + /** + * @notice Submit the secret message sent by the issuer to complete the attestation request. + * @param identifier The hash of the identifier for this attestation. + * @param v The recovery id of the incoming ECDSA signature. + * @param r Output value r of the ECDSA signature. + * @param s Output value s of the ECDSA signature. + * @dev Throws if there is no matching outstanding attestation request. + * @dev Throws if the attestation window has passed. + */ + function complete(bytes32 identifier, uint8 v, bytes32 r, bytes32 s) external { + address issuer = validateAttestationCode(identifier, msg.sender, v, r, s); + + Attestation storage attestation = identifiers[identifier].attestations[msg.sender] + .issuedAttestations[issuer]; + + address token = attestation.attestationRequestFeeToken; + + // solhint-disable-next-line not-rely-on-time + attestation.blockNumber = block.number.toUint32(); + attestation.status = AttestationStatus.Complete; + delete attestation.attestationRequestFeeToken; + AttestedAddress storage attestedAddress = identifiers[identifier].attestations[msg.sender]; + require( + attestedAddress.completed < attestedAddress.completed + 1, + "SafeMath32 integer overflow" + ); + attestedAddress.completed = attestedAddress.completed + 1; + + pendingWithdrawals[token][issuer] = pendingWithdrawals[token][issuer].add( + attestationRequestFees[token] + ); + + IdentifierState storage state = identifiers[identifier]; + if (identifiers[identifier].attestations[msg.sender].completed == 1) { + state.accounts.push(msg.sender); + } + + emit AttestationCompleted(identifier, msg.sender, issuer); + } + + /** + * @notice Adds additional attestations given the current randomness. + * @param identifier The hash of the identifier to be attested. + */ + function addIncompleteAttestations(bytes32 identifier) internal { + AttestedAddress storage state = identifiers[identifier].attestations[msg.sender]; + UnselectedRequest storage unselectedRequest = identifiers[identifier].unselectedRequests[msg + .sender]; + + bytes32 seed = getRandom().getBlockRandomness( + uint256(unselectedRequest.blockNumber).add(selectIssuersWaitBlocks) + ); + IAccounts accounts = getAccounts(); + uint256 issuersLength = numberValidatorsInCurrentSet(); + uint256[] memory issuers = new uint256[](issuersLength); + for (uint256 i = 0; i < issuersLength; i = i.add(1)) issuers[i] = i; + + require(unselectedRequest.attestationsRequested <= issuersLength, "not enough issuers"); + + uint256 currentIndex = 0; + + // The length of the list (variable issuersLength) is decremented in each round, + // so the loop always terminates + while (currentIndex < unselectedRequest.attestationsRequested) { + require(issuersLength > 0, "not enough issuers"); + seed = keccak256(abi.encodePacked(seed)); + uint256 idx = uint256(seed) % issuersLength; + address signer = validatorSignerAddressFromCurrentSet(issuers[idx]); + address issuer = accounts.signerToAccount(signer); + + Attestation storage attestation = state.issuedAttestations[issuer]; + + if ( + attestation.status == AttestationStatus.None && + accounts.hasAuthorizedAttestationSigner(issuer) + ) { + currentIndex = currentIndex.add(1); + attestation.status = AttestationStatus.Incomplete; + attestation.blockNumber = unselectedRequest.blockNumber; + attestation.attestationRequestFeeToken = unselectedRequest.attestationRequestFeeToken; + state.selectedIssuers.push(issuer); + + emit AttestationIssuerSelected( + identifier, + msg.sender, + issuer, + unselectedRequest.attestationRequestFeeToken + ); + } + + // Remove the validator that was selected from the list, + // by replacing it by the last element in the list + issuersLength = issuersLength.sub(1); + issuers[idx] = issuers[issuersLength]; + } + } } diff --git a/packages/protocol/contracts/stability/Exchange.sol b/packages/protocol/contracts/stability/Exchange.sol index 96839f21ba0..e6e804f1eeb 100644 --- a/packages/protocol/contracts/stability/Exchange.sol +++ b/packages/protocol/contracts/stability/Exchange.sol @@ -2,7 +2,6 @@ pragma solidity ^0.5.13; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; -import "openzeppelin-solidity/contracts/math/Math.sol"; import "./interfaces/IExchange.sol"; import "./interfaces/ISortedOracles.sol"; import "./interfaces/IReserve.sol"; @@ -35,10 +34,8 @@ contract Exchange is event MinimumReportsSet(uint256 minimumReports); event StableTokenSet(address indexed stable); event SpreadSet(uint256 spread); - event StableBucketMaxFractionSet(uint256 stableBucketMaxFraction); event ReserveFractionSet(uint256 reserveFraction); event BucketsUpdated(uint256 goldBucket, uint256 stableBucket); - event MinSupplyForStableBucketCapSet(uint256 minSupplyForStableBucketCap); FixidityLib.Fraction public spread; @@ -59,9 +56,6 @@ contract Exchange is bytes32 public stableTokenRegistryId; - uint256 public minSupplyForStableBucketCap; - FixidityLib.Fraction public stableBucketMaxFraction; - modifier updateBucketsIfNecessary() { _updateBucketsIfNecessary(); _; @@ -75,7 +69,7 @@ contract Exchange is * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 3, 0, 0); + return (1, 2, 0, 0); } /** @@ -95,9 +89,6 @@ contract Exchange is * @param _minimumReports The minimum number of fresh reports that need to be * present in the oracle to update buckets * commit to the gold bucket - * @param _minSupplyForStableBucketCap The minimum amount of stabletoken supply - * considered for the stable token bucket cap - * @param _stableBucketMaxFraction The value for stable bucket Fraction CAP */ function initialize( address registryAddress, @@ -105,9 +96,7 @@ contract Exchange is uint256 _spread, uint256 _reserveFraction, uint256 _updateFrequency, - uint256 _minimumReports, - uint256 _minSupplyForStableBucketCap, - uint256 _stableBucketMaxFraction + uint256 _minimumReports ) external initializer { _transferOwnership(msg.sender); setRegistry(registryAddress); @@ -116,8 +105,6 @@ contract Exchange is setReserveFraction(_reserveFraction); setUpdateFrequency(_updateFrequency); setMinimumReports(_minimumReports); - setMinSupplyForStableBucketCap(_minSupplyForStableBucketCap); - setStableBucketMaxFraction(_stableBucketMaxFraction); } /** @@ -320,20 +307,6 @@ contract Exchange is emit SpreadSet(newSpread); } - /** - * @notice Allows owner to set the Stable Bucket Fraction Cap - * @param newStableBucketMaxFraction The new value for the Stable Bucket Fraction CAP - */ - function setStableBucketMaxFraction(uint256 newStableBucketMaxFraction) public onlyOwner { - stableBucketMaxFraction = FixidityLib.wrap(newStableBucketMaxFraction); - require( - stableBucketMaxFraction.lt(FixidityLib.fixed1()), - "Bucket fraction must be smaller than 1" - ); - require(newStableBucketMaxFraction > 0, "bucket fraction must be greather than 0"); - emit StableBucketMaxFractionSet(newStableBucketMaxFraction); - } - /** * @notice Allows owner to set the Reserve Fraction * @param newReserveFraction The new value for the reserve fraction @@ -344,20 +317,6 @@ contract Exchange is emit ReserveFractionSet(newReserveFraction); } - /** - * @notice Allows owner to set the minSupplyForStableBucketCap, - * the minimal stableToken supply considered for the stableToken cap - * @param newMinSupplyForStableBucketCap The new value for the minSupplyForStableBucketCap - */ - function setMinSupplyForStableBucketCap(uint256 newMinSupplyForStableBucketCap) public onlyOwner { - minSupplyForStableBucketCap = newMinSupplyForStableBucketCap; - require( - newMinSupplyForStableBucketCap > 0, - "Min supply for stable bucket cap must be greather than 0" - ); - emit MinSupplyForStableBucketCapSet(newMinSupplyForStableBucketCap); - } - function _setStableToken(address newStableToken) internal { stable = newStableToken; emit StableTokenSet(newStableToken); @@ -443,28 +402,9 @@ contract Exchange is uint256 updatedStableBucket = exchangeRateNumerator.mul(updatedGoldBucket).div( exchangeRateDenominator ); - uint256 maxStableBucketSize = getStableBucketCap(); - // Check if the bucket is bigger that the cap - if (updatedStableBucket > maxStableBucketSize) { - // Resize down CELO bucket - uint256 cappedUpdatedGoldBucket = exchangeRateDenominator.mul((maxStableBucketSize)).div( - exchangeRateNumerator - ); - return (cappedUpdatedGoldBucket, maxStableBucketSize); - } return (updatedGoldBucket, updatedStableBucket); } - /** - * @notice returns the max size the stableToken can be set during a bucket update. - * if the supply of stableToken is smaller than minSupplyForStableBucketCap, - * the cap is calculated based on minSupplyForStableBucketCap. - */ - function getStableBucketCap() public view returns (uint256) { - uint256 stableTokenSupply = Math.max(IERC20(stable).totalSupply(), minSupplyForStableBucketCap); - return FixidityLib.newFixed(stableTokenSupply).multiply(stableBucketMaxFraction).fromFixed(); - } - function getUpdatedGoldBucket() private view returns (uint256) { uint256 reserveGoldBalance = getReserve().getUnfrozenReserveGoldBalance(); return reserveFraction.multiply(FixidityLib.newFixed(reserveGoldBalance)).fromFixed(); diff --git a/packages/protocol/contracts/stability/ExchangeBRL.sol b/packages/protocol/contracts/stability/ExchangeBRL.sol index dec530f292e..06ebca5ec05 100644 --- a/packages/protocol/contracts/stability/ExchangeBRL.sol +++ b/packages/protocol/contracts/stability/ExchangeBRL.sol @@ -18,6 +18,6 @@ contract ExchangeBRL is Exchange { * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 3, 0, 0); + return (1, 2, 0, 0); } } diff --git a/packages/protocol/contracts/stability/ExchangeEUR.sol b/packages/protocol/contracts/stability/ExchangeEUR.sol index 0b6523fece3..c78fa230f64 100644 --- a/packages/protocol/contracts/stability/ExchangeEUR.sol +++ b/packages/protocol/contracts/stability/ExchangeEUR.sol @@ -18,6 +18,6 @@ contract ExchangeEUR is Exchange { * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 3, 0, 0); + return (1, 2, 0, 0); } } diff --git a/packages/protocol/contracts/stability/StableTokenRegistry.sol b/packages/protocol/contracts/stability/StableTokenRegistry.sol deleted file mode 100644 index f7d646888ef..00000000000 --- a/packages/protocol/contracts/stability/StableTokenRegistry.sol +++ /dev/null @@ -1,128 +0,0 @@ -pragma solidity ^0.5.13; - -import "openzeppelin-solidity/contracts/math/SafeMath.sol"; -import "../common/Initializable.sol"; -import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; - -/** - * @title contract that lists what stable coins are deployed as part of Celo's Stability protocol. - */ -contract StableTokenRegistry is Initializable, Ownable { - using SafeMath for uint256; - mapping(bytes => bytes) public stableTokens; - bytes[] public fiatTickers; - - /** - * @notice Returns the storage, major, minor, and patch version of the contract. - * @return Storage version of the contract. - * @return Major version of the contract. - * @return Minor version of the contract. - * @return Patch version of the contract. - */ - function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 1, 0, 0); - } - - /** - * @notice Sets initialized == true on implementation contracts - * @param test Set to true to skip implementation initialization - */ - constructor(bool test) public Initializable(test) {} - - /** - * @notice Used in place of the constructor to allow the contract to be upgradable via proxy. - * @param fiatTicker fiat currency issued. - * @param stableTokenContractName stable token smart contract name. - */ - function initialize(bytes calldata fiatTicker, bytes calldata stableTokenContractName) - external - initializer - { - _transferOwnership(msg.sender); - addNewStableToken(bytes("USD"), bytes("StableToken")); - addNewStableToken(bytes("EUR"), bytes("StableTokenEUR")); - addNewStableToken(bytes("BRL"), bytes("StableTokenBRL")); - if (fiatTicker.length != 0 && stableTokenContractName.length != 0) { - addNewStableToken(fiatTicker, stableTokenContractName); - } - } - - /** - * @notice Returns all the contract instances created. - * @return Collection of stable token contracts. - * @return Lengths of stable token contracts. - */ - function getContractInstances() external view returns (bytes memory, uint256[] memory) { - uint256 totalLength = 0; - for (uint256 i = 0; i < fiatTickers.length; i++) { - totalLength += stableTokens[fiatTickers[i]].length; - } - uint256 numOfContracts = fiatTickers.length; - bytes memory concatenated = new bytes(totalLength); - uint256 lastIndex = 0; - uint256[] memory lengths = new uint256[](numOfContracts); - for (uint256 i = 0; i < numOfContracts; i++) { - bytes storage contractName = stableTokens[fiatTickers[i]]; - lengths[i] = contractName.length; - for (uint256 j = 0; j < lengths[i]; j++) { - concatenated[lastIndex] = contractName[j]; - lastIndex++; - } - } - return (concatenated, lengths); - } - - /** - * @notice Removes unwamted token instances. - * @param fiatTicker The currency that is no longer supported. - * @param index The index in fiatTickers of fiatTicker. - */ - function removeStableToken(bytes calldata fiatTicker, uint256 index) external onlyOwner { - delete stableTokens[fiatTicker]; - uint256 numFiats = fiatTickers.length; - require(index < numFiats, "Index is invalid"); - for (uint256 i = 0; i < fiatTicker.length; i++) { - if (fiatTicker[i] != 0) { - require( - fiatTicker[i] == fiatTickers[index][i], - "source doesn't match the existing fiatTicker" - ); - } - } - uint256 newNumFiats = numFiats.sub(1); - - if (index != newNumFiats) { - fiatTickers[index] = fiatTickers[newNumFiats]; - } - delete fiatTickers[newNumFiats]; - fiatTickers.length = newNumFiats; - } - - /** - * @notice Adds new Fiat Ticker and Stable Token contract to the registry. - * @param fiatTicker The currency we are trying to add in the registry. - * @param stableTokenContractName The contract we are trying to add in the registry. - */ - function addNewStableToken(bytes memory fiatTicker, bytes memory stableTokenContractName) - public - onlyOwner - { - require(fiatTicker.length != 0, "fiatTicker cant be an empty string"); - require(stableTokenContractName.length != 0, "stableTokenContractName cant be an empty string"); - require(stableTokens[fiatTicker].length == 0, "This registry already exists"); - stableTokens[fiatTicker] = stableTokenContractName; - fiatTickers.push(fiatTicker); - } - - /** - * @notice Queries a corresponding StableToken contract name based on fiat ticker. - * @param fiatTicker Type of currency to query corresponding contract. - */ - function queryStableTokenContractNames(bytes memory fiatTicker) - public - view - returns (bytes memory) - { - return stableTokens[fiatTicker]; - } -} diff --git a/packages/protocol/contracts/stability/interfaces/IExchange.sol b/packages/protocol/contracts/stability/interfaces/IExchange.sol index 3da3620f217..c93ffad16b0 100644 --- a/packages/protocol/contracts/stability/interfaces/IExchange.sol +++ b/packages/protocol/contracts/stability/interfaces/IExchange.sol @@ -8,5 +8,4 @@ interface IExchange { function getBuyTokenAmount(uint256, bool) external view returns (uint256); function getSellTokenAmount(uint256, bool) external view returns (uint256); function getBuyAndSellBuckets(bool) external view returns (uint256, uint256); - function getStableBucketCap() external view returns (uint256); } diff --git a/packages/protocol/contracts/stability/proxies/StableTokenRegistryProxy.sol b/packages/protocol/contracts/stability/proxies/StableTokenRegistryProxy.sol deleted file mode 100644 index 4a4231b1199..00000000000 --- a/packages/protocol/contracts/stability/proxies/StableTokenRegistryProxy.sol +++ /dev/null @@ -1,6 +0,0 @@ -pragma solidity ^0.5.13; - -import "../../common/Proxy.sol"; - -/* solhint-disable-next-line no-empty-blocks */ -contract StableTokenRegistryProxy is Proxy {} diff --git a/packages/protocol/contracts/stability/test/MockReserve.sol b/packages/protocol/contracts/stability/test/MockReserve.sol index 4e28cdc4955..1917f340d65 100644 --- a/packages/protocol/contracts/stability/test/MockReserve.sol +++ b/packages/protocol/contracts/stability/test/MockReserve.sol @@ -8,6 +8,7 @@ import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; */ contract MockReserve { mapping(address => bool) public tokens; + address[] private _tokens; IERC20 public goldToken; @@ -30,9 +31,14 @@ contract MockReserve { function addToken(address token) external returns (bool) { tokens[token] = true; + _tokens.push(token); return true; } + function getTokens() external view returns (address[] memory) { + return _tokens; + } + function burnToken(address) external pure returns (bool) { return true; } diff --git a/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Callee.sol b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Callee.sol new file mode 100644 index 00000000000..bc743252f53 --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Callee.sol @@ -0,0 +1,6 @@ +pragma solidity >=0.5.0; + +interface IUniswapV2Callee { + function uniswapV2Call(address sender, uint256 amount0, uint256 amount1, bytes calldata data) + external; +} diff --git a/packages/protocol/contracts/uniswap/interfaces/IUniswapV2ERC20.sol b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2ERC20.sol new file mode 100644 index 00000000000..d7d78ca86d8 --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2ERC20.sol @@ -0,0 +1,31 @@ +pragma solidity >=0.5.0; + +interface IUniswapV2ERC20 { + event Approval(address indexed owner, address indexed spender, uint256 value); + event Transfer(address indexed from, address indexed to, uint256 value); + + function name() external pure returns (string memory); + function symbol() external pure returns (string memory); + function decimals() external pure returns (uint8); + function totalSupply() external view returns (uint256); + function balanceOf(address owner) external view returns (uint256); + function allowance(address owner, address spender) external view returns (uint256); + + function approve(address spender, uint256 value) external returns (bool); + function transfer(address to, uint256 value) external returns (bool); + function transferFrom(address from, address to, uint256 value) external returns (bool); + + function DOMAIN_SEPARATOR() external view returns (bytes32); + function PERMIT_TYPEHASH() external pure returns (bytes32); + function nonces(address owner) external view returns (uint256); + + function permit( + address owner, + address spender, + uint256 value, + uint256 deadline, + uint8 v, + bytes32 r, + bytes32 s + ) external; +} diff --git a/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Factory.sol b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Factory.sol new file mode 100644 index 00000000000..f682c23a942 --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Factory.sol @@ -0,0 +1,17 @@ +pragma solidity >=0.5.0; + +interface IUniswapV2Factory { + event PairCreated(address indexed token0, address indexed token1, address pair, uint256); + + function feeTo() external view returns (address); + function feeToSetter() external view returns (address); + + function getPair(address tokenA, address tokenB) external view returns (address pair); + function allPairs(uint256) external view returns (address pair); + function allPairsLength() external view returns (uint256); + + function createPair(address tokenA, address tokenB) external returns (address pair); + + function setFeeTo(address) external; + function setFeeToSetter(address) external; +} diff --git a/packages/protocol/contracts/uniswap/interfaces/IUniswapV2FactoryMin.sol b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2FactoryMin.sol new file mode 100644 index 00000000000..81123b6fef5 --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2FactoryMin.sol @@ -0,0 +1,5 @@ +pragma solidity >=0.5.0; + +interface IUniswapV2FactoryMin { + function getPair(address tokenA, address tokenB) external view returns (address pair); +} diff --git a/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Pair.sol b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Pair.sol new file mode 100644 index 00000000000..aee72cd73cd --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Pair.sol @@ -0,0 +1,63 @@ +pragma solidity >=0.5.0; + +interface IUniswapV2Pair { + event Approval(address indexed owner, address indexed spender, uint256 value); + event Transfer(address indexed from, address indexed to, uint256 value); + + function name() external pure returns (string memory); + function symbol() external pure returns (string memory); + function decimals() external pure returns (uint8); + function totalSupply() external view returns (uint256); + function balanceOf(address owner) external view returns (uint256); + function allowance(address owner, address spender) external view returns (uint256); + + function approve(address spender, uint256 value) external returns (bool); + function transfer(address to, uint256 value) external returns (bool); + function transferFrom(address from, address to, uint256 value) external returns (bool); + + function DOMAIN_SEPARATOR() external view returns (bytes32); + function PERMIT_TYPEHASH() external pure returns (bytes32); + function nonces(address owner) external view returns (uint256); + + function permit( + address owner, + address spender, + uint256 value, + uint256 deadline, + uint8 v, + bytes32 r, + bytes32 s + ) external; + + event Mint(address indexed sender, uint256 amount0, uint256 amount1); + event Burn(address indexed sender, uint256 amount0, uint256 amount1, address indexed to); + event Swap( + address indexed sender, + uint256 amount0In, + uint256 amount1In, + uint256 amount0Out, + uint256 amount1Out, + address indexed to + ); + event Sync(uint112 reserve0, uint112 reserve1); + + function MINIMUM_LIQUIDITY() external pure returns (uint256); + function factory() external view returns (address); + function token0() external view returns (address); + function token1() external view returns (address); + function getReserves() + external + view + returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast); + function price0CumulativeLast() external view returns (uint256); + function price1CumulativeLast() external view returns (uint256); + function kLast() external view returns (uint256); + + function mint(address to) external returns (uint256 liquidity); + function burn(address to) external returns (uint256 amount0, uint256 amount1); + function swap(uint256 amount0Out, uint256 amount1Out, address to, bytes calldata data) external; + function skim(address to) external; + function sync() external; + + function initialize(address, address) external; +} diff --git a/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Router02.sol b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Router02.sol new file mode 100644 index 00000000000..f8b45b7fc36 --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2Router02.sol @@ -0,0 +1,170 @@ +pragma solidity ^0.5.13; + +interface IUniswapV2Router02 { + function removeLiquidityETHSupportingFeeOnTransferTokens( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline + ) external returns (uint256 amountETH); + function removeLiquidityETHWithPermitSupportingFeeOnTransferTokens( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline, + bool approveMax, + uint8 v, + bytes32 r, + bytes32 s + ) external returns (uint256 amountETH); + + function swapExactTokensForTokensSupportingFeeOnTransferTokens( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external; + function swapExactETHForTokensSupportingFeeOnTransferTokens( + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external payable; + function swapExactTokensForETHSupportingFeeOnTransferTokens( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external; + + function factory() external pure returns (address); + function WETH() external pure returns (address); + + function addLiquidity( + address tokenA, + address tokenB, + uint256 amountADesired, + uint256 amountBDesired, + uint256 amountAMin, + uint256 amountBMin, + address to, + uint256 deadline + ) external returns (uint256 amountA, uint256 amountB, uint256 liquidity); + function addLiquidityETH( + address token, + uint256 amountTokenDesired, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline + ) external payable returns (uint256 amountToken, uint256 amountETH, uint256 liquidity); + function removeLiquidity( + address tokenA, + address tokenB, + uint256 liquidity, + uint256 amountAMin, + uint256 amountBMin, + address to, + uint256 deadline + ) external returns (uint256 amountA, uint256 amountB); + function removeLiquidityETH( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline + ) external returns (uint256 amountToken, uint256 amountETH); + function removeLiquidityWithPermit( + address tokenA, + address tokenB, + uint256 liquidity, + uint256 amountAMin, + uint256 amountBMin, + address to, + uint256 deadline, + bool approveMax, + uint8 v, + bytes32 r, + bytes32 s + ) external returns (uint256 amountA, uint256 amountB); + function removeLiquidityETHWithPermit( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline, + bool approveMax, + uint8 v, + bytes32 r, + bytes32 s + ) external returns (uint256 amountToken, uint256 amountETH); + function swapExactTokensForTokens( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external returns (uint256[] memory amounts); + function swapTokensForExactTokens( + uint256 amountOut, + uint256 amountInMax, + address[] calldata path, + address to, + uint256 deadline + ) external returns (uint256[] memory amounts); + function swapExactETHForTokens( + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external payable returns (uint256[] memory amounts); + function swapTokensForExactETH( + uint256 amountOut, + uint256 amountInMax, + address[] calldata path, + address to, + uint256 deadline + ) external returns (uint256[] memory amounts); + function swapExactTokensForETH( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external returns (uint256[] memory amounts); + function swapETHForExactTokens( + uint256 amountOut, + address[] calldata path, + address to, + uint256 deadline + ) external payable returns (uint256[] memory amounts); + + function quote(uint256 amountA, uint256 reserveA, uint256 reserveB) + external + pure + returns (uint256 amountB); + function getAmountOut(uint256 amountIn, uint256 reserveIn, uint256 reserveOut) + external + pure + returns (uint256 amountOut); + function getAmountIn(uint256 amountOut, uint256 reserveIn, uint256 reserveOut) + external + pure + returns (uint256 amountIn); + function getAmountsOut(uint256 amountIn, address[] calldata path) + external + view + returns (uint256[] memory amounts); + function getAmountsIn(uint256 amountOut, address[] calldata path) + external + view + returns (uint256[] memory amounts); +} diff --git a/packages/protocol/contracts/uniswap/interfaces/IUniswapV2RouterMin.sol b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2RouterMin.sol new file mode 100644 index 00000000000..a8715cc3ecc --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IUniswapV2RouterMin.sol @@ -0,0 +1,16 @@ +pragma solidity ^0.5.13; + +interface IUniswapV2RouterMin { + function factory() external pure returns (address); + function swapExactTokensForTokens( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external returns (uint256[] memory amounts); + function getAmountsOut(uint256 amountIn, address[] calldata path) + external + view + returns (uint256[] memory amounts); +} diff --git a/packages/protocol/contracts/uniswap/interfaces/IWETH.sol b/packages/protocol/contracts/uniswap/interfaces/IWETH.sol new file mode 100644 index 00000000000..bdc7443dbb2 --- /dev/null +++ b/packages/protocol/contracts/uniswap/interfaces/IWETH.sol @@ -0,0 +1,7 @@ +pragma solidity >=0.5.0; + +interface IWETH { + function deposit() external payable; + function transfer(address to, uint256 value) external returns (bool); + function withdraw(uint256) external; +} diff --git a/packages/protocol/contracts/uniswap/test/MockERC20.sol b/packages/protocol/contracts/uniswap/test/MockERC20.sol new file mode 100644 index 00000000000..db2e0a6f0ad --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/MockERC20.sol @@ -0,0 +1,10 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol"; + +contract MockERC20 is ERC20 { + function mint(address account, uint256 amount) external { + _mint(account, amount); + } + +} diff --git a/packages/protocol/contracts/uniswap/test/MockUniswapV2Factory.sol b/packages/protocol/contracts/uniswap/test/MockUniswapV2Factory.sol new file mode 100644 index 00000000000..eba03411ea8 --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/MockUniswapV2Factory.sol @@ -0,0 +1,53 @@ +pragma solidity ^0.5.13; + +import "../interfaces/IUniswapV2Factory.sol"; +import "./MockUniswapV2Pair.sol"; + +contract MockUniswapV2Factory is IUniswapV2Factory { + address public feeTo; + address public feeToSetter; + + mapping(address => mapping(address => address)) public getPair; + address[] public allPairs; + + bytes32 public constant INIT_CODE_PAIR_HASH = keccak256( + abi.encodePacked(type(MockUniswapV2Pair).creationCode) + ); + + event PairCreated(address indexed token0, address indexed token1, address pair, uint256); + + constructor(address _feeToSetter) public { + feeToSetter = _feeToSetter; + } + + function allPairsLength() external view returns (uint256) { + return allPairs.length; + } + + function createPair(address tokenA, address tokenB) external returns (address pair) { + require(tokenA != tokenB, "UniswapV2: IDENTICAL_ADDRESSES"); + (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA); + require(token0 != address(0), "UniswapV2: ZERO_ADDRESS"); + require(getPair[token0][token1] == address(0), "UniswapV2: PAIR_EXISTS"); // single check is sufficient + bytes memory bytecode = type(MockUniswapV2Pair).creationCode; + bytes32 salt = keccak256(abi.encodePacked(token0, token1)); + assembly { + pair := create2(0, add(bytecode, 32), mload(bytecode), salt) + } + IUniswapV2Pair(pair).initialize(token0, token1); + getPair[token0][token1] = pair; + getPair[token1][token0] = pair; // populate mapping in the reverse direction + allPairs.push(pair); + emit PairCreated(token0, token1, pair, allPairs.length); + } + + function setFeeTo(address _feeTo) external { + require(msg.sender == feeToSetter, "UniswapV2: FORBIDDEN"); + feeTo = _feeTo; + } + + function setFeeToSetter(address _feeToSetter) external { + require(msg.sender == feeToSetter, "UniswapV2: FORBIDDEN"); + feeToSetter = _feeToSetter; + } +} diff --git a/packages/protocol/contracts/uniswap/test/MockUniswapV2Pair.sol b/packages/protocol/contracts/uniswap/test/MockUniswapV2Pair.sol new file mode 100644 index 00000000000..9db236304b9 --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/MockUniswapV2Pair.sol @@ -0,0 +1,228 @@ +pragma solidity ^0.5.13; + +import "../interfaces/IUniswapV2Pair.sol"; +import "./UniswapV2ERC20.sol"; +import "./libraries/Math.sol"; +import "./libraries/UQ112x112.sol"; +import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; + +import "../interfaces/IUniswapV2Factory.sol"; +import "../interfaces/IUniswapV2Callee.sol"; + +contract MockUniswapV2Pair is IUniswapV2Pair, UniswapV2ERC20 { + using SafeMath for uint256; + using UQ112x112 for uint224; + + uint256 public constant MINIMUM_LIQUIDITY = 10**3; + bytes4 private constant SELECTOR = bytes4(keccak256(bytes("transfer(address,uint256)"))); + + address public factory; + address public token0; + address public token1; + + uint112 private reserve0; // uses single storage slot, accessible via getReserves + uint112 private reserve1; // uses single storage slot, accessible via getReserves + uint32 private blockTimestampLast; // uses single storage slot, accessible via getReserves + + uint256 public price0CumulativeLast; + uint256 public price1CumulativeLast; + uint256 public kLast; // reserve0 * reserve1, as of immediately after the most recent liquidity event + + uint256 private unlocked = 1; + modifier lock() { + require(unlocked == 1, "UniswapV2: LOCKED"); + unlocked = 0; + _; + unlocked = 1; + } + + function getReserves() + public + view + returns (uint112 _reserve0, uint112 _reserve1, uint32 _blockTimestampLast) + { + _reserve0 = reserve0; + _reserve1 = reserve1; + _blockTimestampLast = blockTimestampLast; + } + + function _safeTransfer(address token, address to, uint256 value) private { + (bool success, bytes memory data) = token.call(abi.encodeWithSelector(SELECTOR, to, value)); + require( + success && (data.length == 0 || abi.decode(data, (bool))), + "UniswapV2: TRANSFER_FAILED" + ); + } + + event Mint(address indexed sender, uint256 amount0, uint256 amount1); + event Burn(address indexed sender, uint256 amount0, uint256 amount1, address indexed to); + event Swap( + address indexed sender, + uint256 amount0In, + uint256 amount1In, + uint256 amount0Out, + uint256 amount1Out, + address indexed to + ); + event Sync(uint112 reserve0, uint112 reserve1); + + constructor() public { + factory = msg.sender; + } + + // called once by the factory at time of deployment + function initialize(address _token0, address _token1) external { + require(msg.sender == factory, "UniswapV2: FORBIDDEN"); // sufficient check + token0 = _token0; + token1 = _token1; + } + + // update reserves and, on the first call per block, price accumulators + function _update(uint256 balance0, uint256 balance1, uint112 _reserve0, uint112 _reserve1) + private + { + require(balance0 <= uint112(-1) && balance1 <= uint112(-1), "UniswapV2: OVERFLOW"); + uint32 blockTimestamp = uint32(block.timestamp % 2**32); + uint32 timeElapsed = blockTimestamp - blockTimestampLast; // overflow is desired + if (timeElapsed > 0 && _reserve0 != 0 && _reserve1 != 0) { + // * never overflows, and + overflow is desired + price0CumulativeLast += uint256(UQ112x112.encode(_reserve1).uqdiv(_reserve0)) * timeElapsed; + price1CumulativeLast += uint256(UQ112x112.encode(_reserve0).uqdiv(_reserve1)) * timeElapsed; + } + reserve0 = uint112(balance0); + reserve1 = uint112(balance1); + blockTimestampLast = blockTimestamp; + emit Sync(reserve0, reserve1); + } + + // if fee is on, mint liquidity equivalent to 1/6th of the growth in sqrt(k) + function _mintFee(uint112 _reserve0, uint112 _reserve1) private returns (bool feeOn) { + address feeTo = IUniswapV2Factory(factory).feeTo(); + feeOn = feeTo != address(0); + uint256 _kLast = kLast; // gas savings + if (feeOn) { + if (_kLast != 0) { + uint256 rootK = Math.sqrt(uint256(_reserve0).mul(_reserve1)); + uint256 rootKLast = Math.sqrt(_kLast); + if (rootK > rootKLast) { + uint256 numerator = totalSupply.mul(rootK.sub(rootKLast)); + uint256 denominator = rootK.mul(5).add(rootKLast); + uint256 liquidity = numerator / denominator; + if (liquidity > 0) _mint(feeTo, liquidity); + } + } + } else if (_kLast != 0) { + kLast = 0; + } + } + + // this low-level function should be called from a contract which performs important safety checks + function mint(address to) external lock returns (uint256 liquidity) { + (uint112 _reserve0, uint112 _reserve1, ) = getReserves(); // gas savings + uint256 balance0 = IERC20(token0).balanceOf(address(this)); + uint256 balance1 = IERC20(token1).balanceOf(address(this)); + uint256 amount0 = balance0.sub(_reserve0); + uint256 amount1 = balance1.sub(_reserve1); + + bool feeOn = _mintFee(_reserve0, _reserve1); + uint256 _totalSupply = totalSupply; // gas savings, must be defined here since totalSupply can update in _mintFee + if (_totalSupply == 0) { + liquidity = Math.sqrt(amount0.mul(amount1)).sub(MINIMUM_LIQUIDITY); + _mint(address(0), MINIMUM_LIQUIDITY); // permanently lock the first MINIMUM_LIQUIDITY tokens + } else { + liquidity = Math.min( + amount0.mul(_totalSupply) / _reserve0, + amount1.mul(_totalSupply) / _reserve1 + ); + } + require(liquidity > 0, "UniswapV2: INSUFFICIENT_LIQUIDITY_MINTED"); + _mint(to, liquidity); + + _update(balance0, balance1, _reserve0, _reserve1); + if (feeOn) kLast = uint256(reserve0).mul(reserve1); // reserve0 and reserve1 are up-to-date + emit Mint(msg.sender, amount0, amount1); + } + + // this low-level function should be called from a contract which performs important safety checks + function burn(address to) external lock returns (uint256 amount0, uint256 amount1) { + (uint112 _reserve0, uint112 _reserve1, ) = getReserves(); // gas savings + address _token0 = token0; // gas savings + address _token1 = token1; // gas savings + uint256 balance0 = IERC20(_token0).balanceOf(address(this)); + uint256 balance1 = IERC20(_token1).balanceOf(address(this)); + uint256 liquidity = balanceOf[address(this)]; + + bool feeOn = _mintFee(_reserve0, _reserve1); + uint256 _totalSupply = totalSupply; // gas savings, must be defined here since totalSupply can update in _mintFee + amount0 = liquidity.mul(balance0) / _totalSupply; // using balances ensures pro-rata distribution + amount1 = liquidity.mul(balance1) / _totalSupply; // using balances ensures pro-rata distribution + require(amount0 > 0 && amount1 > 0, "UniswapV2: INSUFFICIENT_LIQUIDITY_BURNED"); + _burn(address(this), liquidity); + _safeTransfer(_token0, to, amount0); + _safeTransfer(_token1, to, amount1); + balance0 = IERC20(_token0).balanceOf(address(this)); + balance1 = IERC20(_token1).balanceOf(address(this)); + + _update(balance0, balance1, _reserve0, _reserve1); + if (feeOn) kLast = uint256(reserve0).mul(reserve1); // reserve0 and reserve1 are up-to-date + emit Burn(msg.sender, amount0, amount1, to); + } + + // this low-level function should be called from a contract which performs important safety checks + function swap(uint256 amount0Out, uint256 amount1Out, address to, bytes calldata data) + external + lock + { + require(amount0Out > 0 || amount1Out > 0, "UniswapV2: INSUFFICIENT_OUTPUT_AMOUNT"); + (uint112 _reserve0, uint112 _reserve1, ) = getReserves(); // gas savings + require(amount0Out < _reserve0 && amount1Out < _reserve1, "UniswapV2: INSUFFICIENT_LIQUIDITY"); + + uint256 balance0; + uint256 balance1; + { + // scope for _token{0,1}, avoids stack too deep errors + address _token0 = token0; + address _token1 = token1; + require(to != _token0 && to != _token1, "UniswapV2: INVALID_TO"); + if (amount0Out > 0) _safeTransfer(_token0, to, amount0Out); // optimistically transfer tokens + if (amount1Out > 0) _safeTransfer(_token1, to, amount1Out); // optimistically transfer tokens + if (data.length > 0) + IUniswapV2Callee(to).uniswapV2Call(msg.sender, amount0Out, amount1Out, data); + balance0 = IERC20(_token0).balanceOf(address(this)); + balance1 = IERC20(_token1).balanceOf(address(this)); + } + uint256 amount0In = balance0 > _reserve0 - amount0Out ? balance0 - (_reserve0 - amount0Out) : 0; + uint256 amount1In = balance1 > _reserve1 - amount1Out ? balance1 - (_reserve1 - amount1Out) : 0; + require(amount0In > 0 || amount1In > 0, "UniswapV2: INSUFFICIENT_INPUT_AMOUNT"); + { + // scope for reserve{0,1}Adjusted, avoids stack too deep errors + uint256 balance0Adjusted = balance0.mul(1000).sub(amount0In.mul(3)); + uint256 balance1Adjusted = balance1.mul(1000).sub(amount1In.mul(3)); + require( + balance0Adjusted.mul(balance1Adjusted) >= uint256(_reserve0).mul(_reserve1).mul(1000**2), + "UniswapV2: K" + ); + } + + _update(balance0, balance1, _reserve0, _reserve1); + emit Swap(msg.sender, amount0In, amount1In, amount0Out, amount1Out, to); + } + + // force balances to match reserves + function skim(address to) external lock { + address _token0 = token0; // gas savings + address _token1 = token1; // gas savings + _safeTransfer(_token0, to, IERC20(_token0).balanceOf(address(this)).sub(reserve0)); + _safeTransfer(_token1, to, IERC20(_token1).balanceOf(address(this)).sub(reserve1)); + } + + // force reserves to match balances + function sync() external lock { + _update( + IERC20(token0).balanceOf(address(this)), + IERC20(token1).balanceOf(address(this)), + reserve0, + reserve1 + ); + } +} diff --git a/packages/protocol/contracts/uniswap/test/MockUniswapV2Router02.sol b/packages/protocol/contracts/uniswap/test/MockUniswapV2Router02.sol new file mode 100644 index 00000000000..379ab502e5f --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/MockUniswapV2Router02.sol @@ -0,0 +1,514 @@ +pragma solidity ^0.5.13; + +import "../interfaces/IUniswapV2Factory.sol"; +import ".//libraries/TransferHelper.sol"; + +import "../interfaces/IUniswapV2Router02.sol"; +import "./libraries/UniswapV2Library.sol"; +import "./libraries/SafeMath.sol"; +import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; +import "../interfaces/IWETH.sol"; + +contract MockUniswapV2Router02 is IUniswapV2Router02 { + using SafeMath for uint256; + + address public factory; // TODO changed by volpe + address public WETH; // TODO changed by volpe + + event Pair(address pair); + modifier ensure(uint256 deadline) { + require(deadline >= block.timestamp, "UniswapV2Router: EXPIRED"); + _; + } + + constructor(address _factory, address _WETH) public { + factory = _factory; + WETH = _WETH; + } + + // receive() external payable { + // assert(msg.sender == WETH); // only accept ETH via fallback from the WETH contract + // } + + // **** ADD LIQUIDITY **** + function _addLiquidity( + address tokenA, + address tokenB, + uint256 amountADesired, + uint256 amountBDesired, + uint256 amountAMin, + uint256 amountBMin + ) internal returns (uint256 amountA, uint256 amountB) { + // create the pair if it doesn't exist yet + if (IUniswapV2Factory(factory).getPair(tokenA, tokenB) == address(0)) { + IUniswapV2Factory(factory).createPair(tokenA, tokenB); + } + // emit Pair(UniswapV2Library.pairFor(factory, tokenA, tokenB)); + // require(false, "revert here"); + (amountA, amountA); + (uint256 reserveA, uint256 reserveB) = UniswapV2Library.getReserves(factory, tokenA, tokenB); + if (reserveA == 0 && reserveB == 0) { + (amountA, amountB) = (amountADesired, amountBDesired); + } else { + uint256 amountBOptimal = UniswapV2Library.quote(amountADesired, reserveA, reserveB); + if (amountBOptimal <= amountBDesired) { + require(amountBOptimal >= amountBMin, "UniswapV2Router: INSUFFICIENT_B_AMOUNT"); + (amountA, amountB) = (amountADesired, amountBOptimal); + } else { + uint256 amountAOptimal = UniswapV2Library.quote(amountBDesired, reserveB, reserveA); + assert(amountAOptimal <= amountADesired); + require(amountAOptimal >= amountAMin, "UniswapV2Router: INSUFFICIENT_A_AMOUNT"); + (amountA, amountB) = (amountAOptimal, amountBDesired); + } + } + } + function addLiquidity( + address tokenA, + address tokenB, + uint256 amountADesired, + uint256 amountBDesired, + uint256 amountAMin, + uint256 amountBMin, + address to, + uint256 deadline + ) external ensure(deadline) returns (uint256 amountA, uint256 amountB, uint256 liquidity) { + (amountA, amountB) = _addLiquidity( + tokenA, + tokenB, + amountADesired, + amountBDesired, + amountAMin, + amountBMin + ); + // require(false, "revert here"); + address pair = UniswapV2Library.pairFor(factory, tokenA, tokenB); + TransferHelper.safeTransferFrom(tokenA, msg.sender, pair, amountA); + TransferHelper.safeTransferFrom(tokenB, msg.sender, pair, amountB); + liquidity = IUniswapV2Pair(pair).mint(to); + } + function addLiquidityETH( + address token, + uint256 amountTokenDesired, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline + ) + external + payable + ensure(deadline) + returns (uint256 amountToken, uint256 amountETH, uint256 liquidity) + { + (amountToken, amountETH) = _addLiquidity( + token, + WETH, + amountTokenDesired, + msg.value, + amountTokenMin, + amountETHMin + ); + address pair = UniswapV2Library.pairFor(factory, token, WETH); + TransferHelper.safeTransferFrom(token, msg.sender, pair, amountToken); + // IWETH(WETH).deposit{value: amountETH}(); // TODO changed by volpe + assert(IWETH(WETH).transfer(pair, amountETH)); + liquidity = IUniswapV2Pair(pair).mint(to); + // refund dust eth, if any + if (msg.value > amountETH) TransferHelper.safeTransferETH(msg.sender, msg.value - amountETH); + } + + // **** REMOVE LIQUIDITY **** + function removeLiquidity( + address tokenA, + address tokenB, + uint256 liquidity, + uint256 amountAMin, + uint256 amountBMin, + address to, + uint256 deadline + ) public ensure(deadline) returns (uint256 amountA, uint256 amountB) { + address pair = UniswapV2Library.pairFor(factory, tokenA, tokenB); + IUniswapV2Pair(pair).transferFrom(msg.sender, pair, liquidity); // send liquidity to pair + (uint256 amount0, uint256 amount1) = IUniswapV2Pair(pair).burn(to); + (address token0, ) = UniswapV2Library.sortTokens(tokenA, tokenB); + (amountA, amountB) = tokenA == token0 ? (amount0, amount1) : (amount1, amount0); + require(amountA >= amountAMin, "UniswapV2Router: INSUFFICIENT_A_AMOUNT"); + require(amountB >= amountBMin, "UniswapV2Router: INSUFFICIENT_B_AMOUNT"); + } + function removeLiquidityETH( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline + ) public ensure(deadline) returns (uint256 amountToken, uint256 amountETH) { + (amountToken, amountETH) = removeLiquidity( + token, + WETH, + liquidity, + amountTokenMin, + amountETHMin, + address(this), + deadline + ); + TransferHelper.safeTransfer(token, to, amountToken); + IWETH(WETH).withdraw(amountETH); + TransferHelper.safeTransferETH(to, amountETH); + } + function removeLiquidityWithPermit( + address tokenA, + address tokenB, + uint256 liquidity, + uint256 amountAMin, + uint256 amountBMin, + address to, + uint256 deadline, + bool approveMax, + uint8 v, + bytes32 r, + bytes32 s + ) external returns (uint256 amountA, uint256 amountB) { + address pair = UniswapV2Library.pairFor(factory, tokenA, tokenB); + uint256 value = approveMax ? uint256(-1) : liquidity; + IUniswapV2Pair(pair).permit(msg.sender, address(this), value, deadline, v, r, s); + (amountA, amountB) = removeLiquidity( + tokenA, + tokenB, + liquidity, + amountAMin, + amountBMin, + to, + deadline + ); + } + function removeLiquidityETHWithPermit( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline, + bool approveMax, + uint8 v, + bytes32 r, + bytes32 s + ) external returns (uint256 amountToken, uint256 amountETH) { + address pair = UniswapV2Library.pairFor(factory, token, WETH); + uint256 value = approveMax ? uint256(-1) : liquidity; + IUniswapV2Pair(pair).permit(msg.sender, address(this), value, deadline, v, r, s); + (amountToken, amountETH) = removeLiquidityETH( + token, + liquidity, + amountTokenMin, + amountETHMin, + to, + deadline + ); + } + + // **** REMOVE LIQUIDITY (supporting fee-on-transfer tokens) **** + function removeLiquidityETHSupportingFeeOnTransferTokens( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline + ) public ensure(deadline) returns (uint256 amountETH) { + (, amountETH) = removeLiquidity( + token, + WETH, + liquidity, + amountTokenMin, + amountETHMin, + address(this), + deadline + ); + TransferHelper.safeTransfer(token, to, IERC20(token).balanceOf(address(this))); + IWETH(WETH).withdraw(amountETH); + TransferHelper.safeTransferETH(to, amountETH); + } + function removeLiquidityETHWithPermitSupportingFeeOnTransferTokens( + address token, + uint256 liquidity, + uint256 amountTokenMin, + uint256 amountETHMin, + address to, + uint256 deadline, + bool approveMax, + uint8 v, + bytes32 r, + bytes32 s + ) external returns (uint256 amountETH) { + address pair = UniswapV2Library.pairFor(factory, token, WETH); + uint256 value = approveMax ? uint256(-1) : liquidity; + IUniswapV2Pair(pair).permit(msg.sender, address(this), value, deadline, v, r, s); + amountETH = removeLiquidityETHSupportingFeeOnTransferTokens( + token, + liquidity, + amountTokenMin, + amountETHMin, + to, + deadline + ); + } + + // **** SWAP **** + // requires the initial amount to have already been sent to the first pair + function _swap(uint256[] memory amounts, address[] memory path, address _to) internal { + for (uint256 i; i < path.length - 1; i++) { + (address input, address output) = (path[i], path[i + 1]); + (address token0, ) = UniswapV2Library.sortTokens(input, output); + uint256 amountOut = amounts[i + 1]; + (uint256 amount0Out, uint256 amount1Out) = input == token0 + ? (uint256(0), amountOut) + : (amountOut, uint256(0)); + address to = i < path.length - 2 + ? UniswapV2Library.pairFor(factory, output, path[i + 2]) + : _to; + IUniswapV2Pair(UniswapV2Library.pairFor(factory, input, output)).swap( + amount0Out, + amount1Out, + to, + new bytes(0) + ); + } + } + function swapExactTokensForTokens( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external ensure(deadline) returns (uint256[] memory amounts) { + amounts = UniswapV2Library.getAmountsOut(factory, amountIn, path); + require( + amounts[amounts.length - 1] >= amountOutMin, + "UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT" + ); + TransferHelper.safeTransferFrom( + path[0], + msg.sender, + UniswapV2Library.pairFor(factory, path[0], path[1]), + amounts[0] + ); + _swap(amounts, path, to); + } + function swapTokensForExactTokens( + uint256 amountOut, + uint256 amountInMax, + address[] calldata path, + address to, + uint256 deadline + ) external ensure(deadline) returns (uint256[] memory amounts) { + amounts = UniswapV2Library.getAmountsIn(factory, amountOut, path); + require(amounts[0] <= amountInMax, "UniswapV2Router: EXCESSIVE_INPUT_AMOUNT"); + TransferHelper.safeTransferFrom( + path[0], + msg.sender, + UniswapV2Library.pairFor(factory, path[0], path[1]), + amounts[0] + ); + _swap(amounts, path, to); + } + function swapExactETHForTokens( + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external payable ensure(deadline) returns (uint256[] memory amounts) { + require(path[0] == WETH, "UniswapV2Router: INVALID_PATH"); + amounts = UniswapV2Library.getAmountsOut(factory, msg.value, path); + require( + amounts[amounts.length - 1] >= amountOutMin, + "UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT" + ); + // IWETH(WETH).deposit{value: amounts[0]}(); // TODO changed by volpe + assert(IWETH(WETH).transfer(UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0])); + _swap(amounts, path, to); + } + function swapTokensForExactETH( + uint256 amountOut, + uint256 amountInMax, + address[] calldata path, + address to, + uint256 deadline + ) external ensure(deadline) returns (uint256[] memory amounts) { + require(path[path.length - 1] == WETH, "UniswapV2Router: INVALID_PATH"); + amounts = UniswapV2Library.getAmountsIn(factory, amountOut, path); + require(amounts[0] <= amountInMax, "UniswapV2Router: EXCESSIVE_INPUT_AMOUNT"); + TransferHelper.safeTransferFrom( + path[0], + msg.sender, + UniswapV2Library.pairFor(factory, path[0], path[1]), + amounts[0] + ); + _swap(amounts, path, address(this)); + IWETH(WETH).withdraw(amounts[amounts.length - 1]); + TransferHelper.safeTransferETH(to, amounts[amounts.length - 1]); + } + function swapExactTokensForETH( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external ensure(deadline) returns (uint256[] memory amounts) { + require(path[path.length - 1] == WETH, "UniswapV2Router: INVALID_PATH"); + amounts = UniswapV2Library.getAmountsOut(factory, amountIn, path); + require( + amounts[amounts.length - 1] >= amountOutMin, + "UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT" + ); + TransferHelper.safeTransferFrom( + path[0], + msg.sender, + UniswapV2Library.pairFor(factory, path[0], path[1]), + amounts[0] + ); + _swap(amounts, path, address(this)); + IWETH(WETH).withdraw(amounts[amounts.length - 1]); + TransferHelper.safeTransferETH(to, amounts[amounts.length - 1]); + } + function swapETHForExactTokens( + uint256 amountOut, + address[] calldata path, + address to, + uint256 deadline + ) external payable ensure(deadline) returns (uint256[] memory amounts) { + require(path[0] == WETH, "UniswapV2Router: INVALID_PATH"); + amounts = UniswapV2Library.getAmountsIn(factory, amountOut, path); + require(amounts[0] <= msg.value, "UniswapV2Router: EXCESSIVE_INPUT_AMOUNT"); + // IWETH(WETH).deposit{value: amounts[0]}(); // TODO changed by volpe + assert(IWETH(WETH).transfer(UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0])); + _swap(amounts, path, to); + // refund dust eth, if any + if (msg.value > amounts[0]) TransferHelper.safeTransferETH(msg.sender, msg.value - amounts[0]); + } + + // **** SWAP (supporting fee-on-transfer tokens) **** + // requires the initial amount to have already been sent to the first pair + function _swapSupportingFeeOnTransferTokens(address[] memory path, address _to) internal { + for (uint256 i; i < path.length - 1; i++) { + (address input, address output) = (path[i], path[i + 1]); + (address token0, ) = UniswapV2Library.sortTokens(input, output); + IUniswapV2Pair pair = IUniswapV2Pair(UniswapV2Library.pairFor(factory, input, output)); + uint256 amountInput; + uint256 amountOutput; + { + // scope to avoid stack too deep errors + (uint256 reserve0, uint256 reserve1, ) = pair.getReserves(); + (uint256 reserveInput, uint256 reserveOutput) = input == token0 + ? (reserve0, reserve1) + : (reserve1, reserve0); + amountInput = IERC20(input).balanceOf(address(pair)).sub(reserveInput); + amountOutput = UniswapV2Library.getAmountOut(amountInput, reserveInput, reserveOutput); + } + (uint256 amount0Out, uint256 amount1Out) = input == token0 + ? (uint256(0), amountOutput) + : (amountOutput, uint256(0)); + address to = i < path.length - 2 + ? UniswapV2Library.pairFor(factory, output, path[i + 2]) + : _to; + pair.swap(amount0Out, amount1Out, to, new bytes(0)); + } + } + function swapExactTokensForTokensSupportingFeeOnTransferTokens( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external ensure(deadline) { + TransferHelper.safeTransferFrom( + path[0], + msg.sender, + UniswapV2Library.pairFor(factory, path[0], path[1]), + amountIn + ); + uint256 balanceBefore = IERC20(path[path.length - 1]).balanceOf(to); + _swapSupportingFeeOnTransferTokens(path, to); + require( + IERC20(path[path.length - 1]).balanceOf(to).sub(balanceBefore) >= amountOutMin, + "UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT" + ); + } + function swapExactETHForTokensSupportingFeeOnTransferTokens( + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external payable ensure(deadline) { + require(path[0] == WETH, "UniswapV2Router: INVALID_PATH"); + uint256 amountIn = msg.value; + // IWETH(WETH).deposit{value: amountIn}(); // TODO changed by volpe + assert(IWETH(WETH).transfer(UniswapV2Library.pairFor(factory, path[0], path[1]), amountIn)); + uint256 balanceBefore = IERC20(path[path.length - 1]).balanceOf(to); + _swapSupportingFeeOnTransferTokens(path, to); + require( + IERC20(path[path.length - 1]).balanceOf(to).sub(balanceBefore) >= amountOutMin, + "UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT" + ); + } + function swapExactTokensForETHSupportingFeeOnTransferTokens( + uint256 amountIn, + uint256 amountOutMin, + address[] calldata path, + address to, + uint256 deadline + ) external ensure(deadline) { + require(path[path.length - 1] == WETH, "UniswapV2Router: INVALID_PATH"); + TransferHelper.safeTransferFrom( + path[0], + msg.sender, + UniswapV2Library.pairFor(factory, path[0], path[1]), + amountIn + ); + _swapSupportingFeeOnTransferTokens(path, address(this)); + uint256 amountOut = IERC20(WETH).balanceOf(address(this)); + require(amountOut >= amountOutMin, "UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT"); + IWETH(WETH).withdraw(amountOut); + TransferHelper.safeTransferETH(to, amountOut); + } + + // **** LIBRARY FUNCTIONS **** + function quote(uint256 amountA, uint256 reserveA, uint256 reserveB) + public + pure + returns (uint256 amountB) + { + return UniswapV2Library.quote(amountA, reserveA, reserveB); + } + + function getAmountOut(uint256 amountIn, uint256 reserveIn, uint256 reserveOut) + public + pure + returns (uint256 amountOut) + { + return UniswapV2Library.getAmountOut(amountIn, reserveIn, reserveOut); + } + + function getAmountIn(uint256 amountOut, uint256 reserveIn, uint256 reserveOut) + public + pure + returns (uint256 amountIn) + { + return UniswapV2Library.getAmountIn(amountOut, reserveIn, reserveOut); + } + + function getAmountsOut(uint256 amountIn, address[] memory path) + public + view + returns (uint256[] memory amounts) + { + return UniswapV2Library.getAmountsOut(factory, amountIn, path); + } + + function getAmountsIn(uint256 amountOut, address[] memory path) + public + view + returns (uint256[] memory amounts) + { + return UniswapV2Library.getAmountsIn(factory, amountOut, path); + } +} diff --git a/packages/protocol/contracts/uniswap/test/UniswapV2ERC20.sol b/packages/protocol/contracts/uniswap/test/UniswapV2ERC20.sol new file mode 100644 index 00000000000..f96445acd4b --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/UniswapV2ERC20.sol @@ -0,0 +1,107 @@ +pragma solidity ^0.5.13; + +import "../interfaces/IUniswapV2ERC20.sol"; +import "openzeppelin-solidity/contracts/math/SafeMath.sol"; + +contract UniswapV2ERC20 is IUniswapV2ERC20 { + using SafeMath for uint256; + + string public constant name = "Uniswap V2"; + string public constant symbol = "UNI-V2"; + uint8 public constant decimals = 18; + uint256 public totalSupply; + mapping(address => uint256) public balanceOf; + mapping(address => mapping(address => uint256)) public allowance; + + bytes32 public DOMAIN_SEPARATOR; + // keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"); + bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9; + mapping(address => uint256) public nonces; + + event Approval(address indexed owner, address indexed spender, uint256 value); + event Transfer(address indexed from, address indexed to, uint256 value); + + constructor() public { + uint256 chainId; + assembly { + chainId := chainid + } + DOMAIN_SEPARATOR = keccak256( + abi.encode( + keccak256( + "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)" + ), + keccak256(bytes(name)), + keccak256(bytes("1")), + chainId, + address(this) + ) + ); + } + + function _mint(address to, uint256 value) internal { + totalSupply = totalSupply.add(value); + balanceOf[to] = balanceOf[to].add(value); + emit Transfer(address(0), to, value); + } + + function _burn(address from, uint256 value) internal { + balanceOf[from] = balanceOf[from].sub(value); + totalSupply = totalSupply.sub(value); + emit Transfer(from, address(0), value); + } + + function _approve(address owner, address spender, uint256 value) private { + allowance[owner][spender] = value; + emit Approval(owner, spender, value); + } + + function _transfer(address from, address to, uint256 value) private { + balanceOf[from] = balanceOf[from].sub(value); + balanceOf[to] = balanceOf[to].add(value); + emit Transfer(from, to, value); + } + + function approve(address spender, uint256 value) external returns (bool) { + _approve(msg.sender, spender, value); + return true; + } + + function transfer(address to, uint256 value) external returns (bool) { + _transfer(msg.sender, to, value); + return true; + } + + function transferFrom(address from, address to, uint256 value) external returns (bool) { + if (allowance[from][msg.sender] != uint256(-1)) { + allowance[from][msg.sender] = allowance[from][msg.sender].sub(value); + } + _transfer(from, to, value); + return true; + } + + function permit( + address owner, + address spender, + uint256 value, + uint256 deadline, + uint8 v, + bytes32 r, + bytes32 s + ) external { + require(deadline >= block.timestamp, "UniswapV2: EXPIRED"); + bytes32 digest = keccak256( + abi.encodePacked( + "\x19\x01", + DOMAIN_SEPARATOR, + keccak256(abi.encode(PERMIT_TYPEHASH, owner, spender, value, nonces[owner]++, deadline)) + ) + ); + address recoveredAddress = ecrecover(digest, v, r, s); + require( + recoveredAddress != address(0) && recoveredAddress == owner, + "UniswapV2: INVALID_SIGNATURE" + ); + _approve(owner, spender, value); + } +} diff --git a/packages/protocol/contracts/uniswap/test/libraries/Math.sol b/packages/protocol/contracts/uniswap/test/libraries/Math.sol new file mode 100644 index 00000000000..fb95208e7ae --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/libraries/Math.sol @@ -0,0 +1,23 @@ +pragma solidity ^0.5.13; + +// a library for performing various math operations + +library Math { + function min(uint256 x, uint256 y) internal pure returns (uint256 z) { + z = x < y ? x : y; + } + + // babylonian method (https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method) + function sqrt(uint256 y) internal pure returns (uint256 z) { + if (y > 3) { + z = y; + uint256 x = y / 2 + 1; + while (x < z) { + z = x; + x = (y / x + x) / 2; + } + } else if (y != 0) { + z = 1; + } + } +} diff --git a/packages/protocol/contracts/uniswap/test/libraries/SafeMath.sol b/packages/protocol/contracts/uniswap/test/libraries/SafeMath.sol new file mode 100644 index 00000000000..22e58e558b9 --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/libraries/SafeMath.sol @@ -0,0 +1,17 @@ +pragma solidity ^0.5.13; + +// a library for performing overflow-safe math, courtesy of DappHub (https://github.com/dapphub/ds-math) + +library SafeMath { + function add(uint256 x, uint256 y) internal pure returns (uint256 z) { + require((z = x + y) >= x, "ds-math-add-overflow"); + } + + function sub(uint256 x, uint256 y) internal pure returns (uint256 z) { + require((z = x - y) <= x, "ds-math-sub-underflow"); + } + + function mul(uint256 x, uint256 y) internal pure returns (uint256 z) { + require(y == 0 || (z = x * y) / y == x, "ds-math-mul-overflow"); + } +} diff --git a/packages/protocol/contracts/uniswap/test/libraries/TransferHelper.sol b/packages/protocol/contracts/uniswap/test/libraries/TransferHelper.sol new file mode 100644 index 00000000000..d4e3bea31d6 --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/libraries/TransferHelper.sol @@ -0,0 +1,41 @@ +pragma solidity ^0.5.13; + +// SPDX-License-Identifier: GPL-3.0-or-later + +// helper methods for interacting with ERC20 tokens and sending ETH that do not consistently return true/false +library TransferHelper { + function safeApprove(address token, address to, uint256 value) internal { + // bytes4(keccak256(bytes('approve(address,uint256)'))); + (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0x095ea7b3, to, value)); + require( + success && (data.length == 0 || abi.decode(data, (bool))), + "TransferHelper::safeApprove: approve failed" + ); + } + + function safeTransfer(address token, address to, uint256 value) internal { + // bytes4(keccak256(bytes('transfer(address,uint256)'))); + (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0xa9059cbb, to, value)); + require( + success && (data.length == 0 || abi.decode(data, (bool))), + "TransferHelper::safeTransfer: transfer failed" + ); + } + + function safeTransferFrom(address token, address from, address to, uint256 value) internal { + // bytes4(keccak256(bytes('transferFrom(address,address,uint256)'))); + (bool success, bytes memory data) = token.call( + abi.encodeWithSelector(0x23b872dd, from, to, value) + ); + require( + success && (data.length == 0 || abi.decode(data, (bool))), + "TransferHelper::transferFrom: transferFrom failed" + ); + } + + function safeTransferETH(address to, uint256 value) internal { + // TODO changed by volpe + // (bool success, ) = to.call{value: value}(new bytes(0)); + // require(success, 'TransferHelper::safeTransferETH: ETH transfer failed'); + } +} diff --git a/packages/protocol/contracts/uniswap/test/libraries/UQ112x112.sol b/packages/protocol/contracts/uniswap/test/libraries/UQ112x112.sol new file mode 100644 index 00000000000..6ca9013897f --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/libraries/UQ112x112.sol @@ -0,0 +1,20 @@ +pragma solidity ^0.5.13; + +// a library for handling binary fixed point numbers (https://en.wikipedia.org/wiki/Q_(number_format)) + +// range: [0, 2**112 - 1] +// resolution: 1 / 2**112 + +library UQ112x112 { + uint224 constant Q112 = 2**112; + + // encode a uint112 as a UQ112x112 + function encode(uint112 y) internal pure returns (uint224 z) { + z = uint224(y) * Q112; // never overflows + } + + // divide a UQ112x112 by a uint112, returning a UQ112x112 + function uqdiv(uint224 x, uint112 y) internal pure returns (uint224 z) { + z = x / uint224(y); + } +} diff --git a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol new file mode 100644 index 00000000000..cc7182d5383 --- /dev/null +++ b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol @@ -0,0 +1,127 @@ +pragma solidity ^0.5.13; + +import "../../interfaces/IUniswapV2Pair.sol"; + +import "./SafeMath.sol"; + +library UniswapV2Library { + using SafeMath for uint256; + + // returns sorted token addresses, used to handle return values from pairs sorted in this order + function sortTokens(address tokenA, address tokenB) + internal + pure + returns (address token0, address token1) + { + require(tokenA != tokenB, "UniswapV2Library: IDENTICAL_ADDRESSES"); + (token0, token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA); + require(token0 != address(0), "UniswapV2Library: ZERO_ADDRESS"); + } + + // calculates the CREATE2 address for a pair without making any external calls + function pairFor(address factory, address tokenA, address tokenB) + internal + pure + returns (address pair) + { + (address token0, address token1) = sortTokens(tokenA, tokenB); + pair = address( + uint256( + keccak256( + abi.encodePacked( + hex"ff", + factory, + keccak256(abi.encodePacked(token0, token1)), + // This variable was hardcoded for Uniswap Eth Mainnet deployment + // hex"96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f" // init code hash + // Hash in the CI "bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" + hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" + // hex"f0bd447d72bc4c5cd510462381a98e87f097a4d31106d6dd8b5922227696ef7a" + ) + ) + ) + ); + } + + // fetches and sorts the reserves for a pair + function getReserves(address factory, address tokenA, address tokenB) + internal + view + returns (uint256 reserveA, uint256 reserveB) + { + (address token0, address _) = sortTokens(tokenA, tokenB); + + // require(false, "revert here"); + (uint256 reserve0, uint256 reserve1, ) = IUniswapV2Pair(pairFor(factory, tokenA, tokenB)) + .getReserves(); + (reserveA, reserveB) = tokenA == token0 ? (reserve0, reserve1) : (reserve1, reserve0); + } + + // given some amount of an asset and pair reserves, returns an equivalent amount of the other asset + function quote(uint256 amountA, uint256 reserveA, uint256 reserveB) + internal + pure + returns (uint256 amountB) + { + require(amountA > 0, "UniswapV2Library: INSUFFICIENT_AMOUNT"); + require(reserveA > 0 && reserveB > 0, "UniswapV2Library: INSUFFICIENT_LIQUIDITY"); + amountB = amountA.mul(reserveB) / reserveA; + } + + // given an input amount of an asset and pair reserves, returns the maximum output amount of the other asset + function getAmountOut(uint256 amountIn, uint256 reserveIn, uint256 reserveOut) + internal + pure + returns (uint256 amountOut) + { + require(amountIn > 0, "UniswapV2Library: INSUFFICIENT_INPUT_AMOUNT"); + require(reserveIn > 0 && reserveOut > 0, "UniswapV2Library: INSUFFICIENT_LIQUIDITY"); + uint256 amountInWithFee = amountIn.mul(997); + uint256 numerator = amountInWithFee.mul(reserveOut); + uint256 denominator = reserveIn.mul(1000).add(amountInWithFee); + amountOut = numerator / denominator; + } + + // given an output amount of an asset and pair reserves, returns a required input amount of the other asset + function getAmountIn(uint256 amountOut, uint256 reserveIn, uint256 reserveOut) + internal + pure + returns (uint256 amountIn) + { + require(amountOut > 0, "UniswapV2Library: INSUFFICIENT_OUTPUT_AMOUNT"); + require(reserveIn > 0 && reserveOut > 0, "UniswapV2Library: INSUFFICIENT_LIQUIDITY"); + uint256 numerator = reserveIn.mul(amountOut).mul(1000); + uint256 denominator = reserveOut.sub(amountOut).mul(997); + amountIn = (numerator / denominator).add(1); + } + + // performs chained getAmountOut calculations on any number of pairs + function getAmountsOut(address factory, uint256 amountIn, address[] memory path) + internal + view + returns (uint256[] memory amounts) + { + require(path.length >= 2, "UniswapV2Library: INVALID_PATH"); + amounts = new uint256[](path.length); + amounts[0] = amountIn; + for (uint256 i; i < path.length - 1; i++) { + (uint256 reserveIn, uint256 reserveOut) = getReserves(factory, path[i], path[i + 1]); + amounts[i + 1] = getAmountOut(amounts[i], reserveIn, reserveOut); + } + } + + // performs chained getAmountIn calculations on any number of pairs + function getAmountsIn(address factory, uint256 amountOut, address[] memory path) + internal + view + returns (uint256[] memory amounts) + { + require(path.length >= 2, "UniswapV2Library: INVALID_PATH"); + amounts = new uint256[](path.length); + amounts[amounts.length - 1] = amountOut; + for (uint256 i = path.length - 1; i > 0; i--) { + (uint256 reserveIn, uint256 reserveOut) = getReserves(factory, path[i - 1], path[i]); + amounts[i - 1] = getAmountIn(amounts[i], reserveIn, reserveOut); + } + } +} diff --git a/packages/protocol/lib/compatibility/ast-layout.ts b/packages/protocol/lib/compatibility/ast-layout.ts index 67aacdcd35b..77c3edf5623 100644 --- a/packages/protocol/lib/compatibility/ast-layout.ts +++ b/packages/protocol/lib/compatibility/ast-layout.ts @@ -41,12 +41,14 @@ export const getLayout = (artifact: Artifact, artifacts: BuildArtifacts) => { } const selectIncompatibleOperations = (diff: Operation[]) => - diff.filter(operation => operation.action !== 'append') + diff.filter(operation => operation.action !== 'append' + && !(operation.action === 'rename' && (`deprecated_${operation.original.label}` === operation.updated.label && operation.original.type === operation.updated.type))) export interface ASTStorageCompatibilityReport { contract: string compatible: boolean errors: string[] + expanded?: boolean } const operationToDescription = (operation: Operation) => { @@ -71,6 +73,9 @@ const operationToDescription = (operation: Operation) => { case 'rename': message = `variable ${updated.label} was renamed from ${original.label}` break + case 'replace': + message = `variable ${updated.label} was replaced from ${original.label}` + break case 'append': message = `variable ${updated.label} was appended` @@ -97,7 +102,7 @@ const generateLayoutCompatibilityReport = (oldLayout: StorageLayoutInfo, newLayo } } -const compareStructDefinitions = (oldType: TypeInfo, newType: TypeInfo) => { +const compareStructDefinitions = (oldType: TypeInfo, newType: TypeInfo, structExpandable: boolean) => { if (oldType.kind !== 'struct') { return { same: false, @@ -105,6 +110,28 @@ const compareStructDefinitions = (oldType: TypeInfo, newType: TypeInfo) => { } } + if (structExpandable && oldType.members.length < newType.members.length) { + const expandableErrors = oldType.members.map((oldMember, i) => { + const newMember = newType.members[i] + + if (oldMember.label !== newMember.label && `deprecated_${oldMember.label}` !== newMember.label) { + return `struct ${newType.label} had ${oldMember.label} in slot ${i}, now has ${newMember.label}` + } + + if (oldMember.type !== newMember.type) { + return `struct ${newType.label}'s member ${newMember.label} changed type from ${oldMember.type} to ${newMember.type}` + } + }).filter(error => error) + + if (expandableErrors.length === 0) { + return { + same: true, + expanded: true, + errors: [] + } + } + } + if (oldType.members.length !== newType.members.length) { return { same: false, @@ -114,7 +141,7 @@ const compareStructDefinitions = (oldType: TypeInfo, newType: TypeInfo) => { const memberErrors = newType.members.map((newMember, i) => { const oldMember = oldType.members[i] - if (oldMember.label !== newMember.label) { + if (oldMember.label !== newMember.label && `deprecated_${oldMember.label}` !== newMember.label) { return `struct ${newType.label} had ${oldMember.label} in slot ${i}, now has ${newMember.label}` } @@ -131,31 +158,42 @@ const compareStructDefinitions = (oldType: TypeInfo, newType: TypeInfo) => { } } -const generateStructsCompatibilityReport = (oldLayout: StorageLayoutInfo, newLayout: StorageLayoutInfo) => { +// Struct is expandable only if used in mappings or arrays +const isStructExpandable = (oldType: TypeInfo, oldLayout: StorageLayoutInfo) => { + const structString = `t_struct<${oldType.label}>` + return !oldLayout.storage.some(storage => storage.type === structString) +} + +const generateStructsCompatibilityReport = (oldLayout: StorageLayoutInfo, newLayout: StorageLayoutInfo): {compatible: boolean, errors: any[], expanded?: boolean} => { let compatible = true let errors = [] + let expanded: boolean Object.keys(newLayout.types).forEach(typeName => { const newType = newLayout.types[typeName] const oldType = oldLayout.types[typeName] if (newType.kind === 'struct' && oldType !== undefined) { - const structReport = compareStructDefinitions(oldType, newType) + const structExpandable = isStructExpandable(oldType, oldLayout) + const structReport = compareStructDefinitions(oldType, newType, structExpandable) if (!structReport.same) { compatible = false errors = errors.concat(structReport.errors) } + expanded = structReport.expanded } }) return { compatible, - errors + errors, + expanded } } export const generateCompatibilityReport = (oldArtifact: Artifact, oldArtifacts: BuildArtifacts, - newArtifact: Artifact, newArtifacts: BuildArtifacts) => { + newArtifact: Artifact, newArtifacts: BuildArtifacts) + : {contract: string, compatible: boolean, errors: any[], expanded?: boolean } => { const oldLayout = getLayout(oldArtifact, oldArtifacts) const newLayout = getLayout(newArtifact, newArtifacts) const layoutReport = generateLayoutCompatibilityReport(oldLayout, newLayout) @@ -163,7 +201,8 @@ export const generateCompatibilityReport = (oldArtifact: Artifact, oldArtifacts return { contract: newArtifact.contractName, compatible: layoutReport.compatible && structsReport.compatible, - errors: layoutReport.errors.concat(structsReport.errors) + errors: layoutReport.errors.concat(structsReport.errors), + expanded: structsReport.expanded } } diff --git a/packages/protocol/lib/compatibility/report.ts b/packages/protocol/lib/compatibility/report.ts index f1583892a16..47a11ba3623 100644 --- a/packages/protocol/lib/compatibility/report.ts +++ b/packages/protocol/lib/compatibility/report.ts @@ -73,8 +73,9 @@ export class CategorizedChanges { reports: ASTReports, categorizer: Categorizer): CategorizedChanges { const storage = reports.storage.filter(r => !r.compatible) + const storageExpandedReports = reports.storage.filter(r => r.expanded) const c = categorize(reports.code.getChanges().concat(reports.libraryLinking), categorizer) - const major = c[ChangeType.Major] + const major = [...c[ChangeType.Major], ...storageExpandedReports.map(r => ({ getContract: () => r.contract, accept: () => null}))] const minor = c[ChangeType.Minor] const patch = c[ChangeType.Patch] return new CategorizedChanges(storage, major, minor, patch) diff --git a/packages/protocol/lib/fed-attestations-utils.ts b/packages/protocol/lib/fed-attestations-utils.ts index e23b39d3480..62f1936ac7f 100644 --- a/packages/protocol/lib/fed-attestations-utils.ts +++ b/packages/protocol/lib/fed-attestations-utils.ts @@ -1,45 +1,8 @@ import { ensureLeading0x } from '@celo/base' import { Address } from '@celo/utils/lib/address' -import { structHash } from '@celo/utils/lib/sign-typed-data-utils' -import { generateTypedDataHash } from '@celo/utils/src/sign-typed-data-utils' -import { parseSignatureWithoutPrefix } from '@celo/utils/src/signatureUtils' - -export interface AttestationDetails{ - identifier: string, - issuer: string, - account: string, - signer: string, - issuedOn: number, -} - -const getTypedData = (chainId: number, contractAddress: Address, message?: AttestationDetails) => { - const typedData = { - types: { - EIP712Domain: [ - { name: 'name', type: 'string' }, - { name: 'version', type: 'string' }, - { name: 'chainId', type: 'uint256'}, - { name: 'verifyingContract', type: 'address'}, - ], - OwnershipAttestation: [ - { name: 'identifier', type: 'bytes32' }, - { name: 'issuer', type: 'address'}, - { name: 'account', type: 'address' }, - { name: 'signer', type: 'address' }, - { name: 'issuedOn', type: 'uint64' }, - ], - }, - primaryType: 'OwnershipAttestation', - domain: { - name: 'FederatedAttestations', - version: '1.0', - chainId, - verifyingContract: contractAddress - }, - message: message ? message : {} - } - return typedData -} +import { generateTypedDataHash, structHash } from '@celo/utils/lib/sign-typed-data-utils' +import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' +import { registerAttestation as getTypedData } from '@celo/utils/lib/typed-data-constructors' export const getSignatureForAttestation = async ( identifier: string, diff --git a/packages/protocol/lib/registry-utils.ts b/packages/protocol/lib/registry-utils.ts index dc548a8c970..a5f12a5aa40 100644 --- a/packages/protocol/lib/registry-utils.ts +++ b/packages/protocol/lib/registry-utils.ts @@ -21,6 +21,7 @@ export enum CeloContractName { ExchangeEUR = 'ExchangeEUR', ExchangeBRL = 'ExchangeBRL', FederatedAttestations = 'FederatedAttestations', + FeeBurner = 'FeeBurner', FeeCurrencyWhitelist = 'FeeCurrencyWhitelist', Freezer = 'Freezer', GasPriceMinimum = 'GasPriceMinimum', @@ -40,7 +41,6 @@ export enum CeloContractName { StableTokenBRL = 'StableTokenBRL', TransferWhitelist = 'TransferWhitelist', Validators = 'Validators', - StableTokenRegistry = 'StableTokenRegistry', } export const usesRegistry = [ diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index d7eb127c883..027526831aa 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -1,26 +1,24 @@ -import { Signature } from '@celo/base/lib/signatureUtils' -import { hasEntryInRegistry, usesRegistry } from '@celo/protocol/lib/registry-utils' -import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils' -import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils' -import { config } from '@celo/protocol/migrationsConfig' -import { AttestationUtils } from '@celo/utils' -import { privateKeyToAddress } from '@celo/utils/lib/address' -import { soliditySha3 } from '@celo/utils/lib/solidity' -import assert from 'assert' -import BigNumber from 'bignumber.js' -import chai from 'chai' -import chaiSubset from 'chai-subset' -import { spawn, SpawnOptions } from 'child_process' -import { keccak256 } from 'ethereumjs-util' +import { hasEntryInRegistry, usesRegistry } from '@celo/protocol/lib/registry-utils'; +import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils'; +import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils'; +import { config } from '@celo/protocol/migrationsConfig'; +import { privateKeyToAddress } from '@celo/utils/lib/address'; +import { soliditySha3 } from '@celo/utils/lib/solidity'; +import assert from 'assert'; +import BigNumber from 'bignumber.js'; +import chai from 'chai'; +import chaiSubset from 'chai-subset'; +import { spawn, SpawnOptions } from 'child_process'; +import { keccak256 } from 'ethereumjs-util'; import { GovernanceApproverMultiSigInstance, GovernanceInstance, LockedGoldInstance, ProxyInstance, RegistryInstance, - UsingRegistryInstance, -} from 'types' -import Web3 from 'web3' + UsingRegistryInstance +} from 'types'; +import Web3 from 'web3'; // tslint:disable-next-line: ordered-imports import BN = require('bn.js') @@ -308,13 +306,44 @@ export function assertObjectWithBNEqual( } else if (isNumber(actual[k]) || isNumber(expected[k])) { assertEqualBN(actual[k], expected[k], fieldErrorMsg(k)) } else if (Array.isArray(actual[k])) { - assert.deepEqual(actual[k], expected[k], fieldErrorMsg(k)) - } else { + const actualArray = actual[k] as [] + const expectedArray = expected[k] as [] + if (actualArray.length === expectedArray.length + && actualArray.every(actualValue => isNumber(actualValue)) + && expectedArray.every(expectedValue => isNumber(expectedValue))) { + // if this is array of BNs, deepEqual will not work + // since it is not able to compare number/string/BN + // with each other and we have to compare it manually + for (let i = 0; i < actualArray.length; i++) { + assertEqualBN(actualArray[i], expectedArray[i], fieldErrorMsg(k)) + } + } else { + assert.deepEqual(actual[k], expected[k], fieldErrorMsg(k)) + } + } + else { assert.equal(actual[k], expected[k], fieldErrorMsg(k)) } } } +export function assertBNArrayEqual( + actualArray: any[], + expectedArray: any[] +) { + assert(Array.isArray(actualArray), `Actual is not an array`) + assert(Array.isArray(expectedArray), `Expected is not an array`) + assert(actualArray.length === expectedArray.length, `Different array sizes; actual: ${actualArray.length} expected: ${expectedArray.length}`) + assert(actualArray.every(actualValue => isNumber(actualValue)) + && expectedArray.every(expectedValue => isNumber(expectedValue)), + `Expected all elements to be numbers`) + + for (let i = 0; i < actualArray.length; i++) { + assertEqualBN(actualArray[i], expectedArray[i]) + } +} + + export function assertEqualBN( actual: number | BN | BigNumber, expected: number | BN | BigNumber, @@ -377,6 +406,18 @@ export function assertGteBN( ) } +export function assertGtBN( + value: number | BN | BigNumber, + expected: number | BN | BigNumber, + msg?: string +) { + assert( + web3.utils.toBN(value).gt(web3.utils.toBN(expected)), + `expected ${value.toString()} to be greater than to ${expected.toString()}. ${msg || + ''}` + ) +} + export const isSameAddress = (minerAddress, otherAddress) => { return minerAddress.toLowerCase() === otherAddress.toLowerCase() } @@ -384,7 +425,6 @@ export const isSameAddress = (minerAddress, otherAddress) => { // TODO(amy): Pull this list from the build artifacts instead export const proxiedContracts: string[] = [ 'Attestations', - // TODO ASv2 revisit if we need to update test-utils 'Escrow', 'GoldToken', 'Registry', @@ -396,7 +436,6 @@ export const proxiedContracts: string[] = [ // TODO(asa): Pull this list from the build artifacts instead export const ownedContracts: string[] = [ 'Attestations', - // TODO ASv2 revisit if we need to update test-utils 'Escrow', 'Exchange', 'Registry', @@ -541,16 +580,6 @@ export const accountPrivateKeys: string[] = [ '0x23cb7121166b9a2f93ae0b7c05bde02eae50d64449b2cbb42bc84e9d38d6cc89', ] -export async function getVerificationCodeSignature( - account: string, - issuer: string, - identifier: string, - accounts: string[] -): Promise { - const privateKey = getDerivedKey(KeyOffsets.ATTESTING_KEY_OFFSET, issuer, accounts) - return AttestationUtils.attestToIdentifier(identifier, account, privateKey) -} - export const getDerivedKey = (offset: number, address: string, accounts: string[]) => { const pKey = accountPrivateKeys[accounts.indexOf(address)] const aKey = Buffer.from(pKey.slice(2), 'hex') diff --git a/packages/protocol/lib/web3-utils.ts b/packages/protocol/lib/web3-utils.ts index e082d6b300e..71f5ff3a082 100644 --- a/packages/protocol/lib/web3-utils.ts +++ b/packages/protocol/lib/web3-utils.ts @@ -8,7 +8,7 @@ import { privateKeyToAddress } from '@celo/utils/lib/address' import { BuildArtifacts } from '@openzeppelin/upgrades' import { BigNumber } from 'bignumber.js' import prompts from 'prompts' -import { EscrowInstance, GoldTokenInstance, MultiSigInstance, OwnableInstance, ProxyContract, ProxyInstance, RegistryInstance, StableTokenInstance } from 'types' +import { GoldTokenInstance, MultiSigInstance, OwnableInstance, ProxyContract, ProxyInstance, RegistryInstance, StableTokenInstance } from 'types' import Web3 from 'web3' @@ -316,56 +316,6 @@ export async function transferOwnershipOfProxyAndImplementation< await transferOwnershipOfProxy(contractName, owner, artifacts) } -// TODO(asa): Share this code with mobile. -export async function createInviteCode( - goldToken: GoldTokenInstance, - stableToken: StableTokenInstance, - invitationStableTokenAmount: BigNumber, - gasPrice: number, - web3: Web3 -) { - // TODO(asa): This number was made up - const verificationGasAmount = new BigNumber(10000000) - if (!gasPrice) { - // TODO: this default gas price might not be accurate - gasPrice = 0 - } - const temporaryWalletAccount = await web3.eth.accounts.create() - const temporaryAddress = temporaryWalletAccount.address - // Buffer.from doesn't expect a 0x for hex input - const privateKeyHex = temporaryWalletAccount.privateKey.substring(2) - const inviteCode = Buffer.from(privateKeyHex, 'hex').toString('base64') - await goldToken.transfer(temporaryAddress, verificationGasAmount.times(gasPrice).toString()) - await stableToken.transfer(temporaryAddress, invitationStableTokenAmount.toString()) - return [temporaryAddress, inviteCode] -} - -export async function sendEscrowedPayment( - contract: StableTokenInstance, - escrow: EscrowInstance, - phone: string, - value: number, - paymentID: string -) { - console.log( - 'Transferring', - await convertFromContractDecimals(value, contract), - await contract.symbol(), - 'to', - phone, - 'via Escrow.' - ) - // @ts-ignore - const phoneHash: string = Web3.utils.soliditySha3({ - type: 'string', - value: phone, - }) - - await contract.approve(escrow.address, value.toString()) - const expirySeconds = 60 * 60 * 24 * 5 // 5 days - await escrow.transfer(phoneHash, contract.address, value.toString(), expirySeconds, paymentID, 0) -} - /* * Builds and returns mapping of function names to selectors. * Each function name maps to an array of selectors to account for overloading. diff --git a/packages/protocol/migrationsConfig.js b/packages/protocol/migrationsConfig.js index 99537c1d90e..1811d6c132f 100644 --- a/packages/protocol/migrationsConfig.js +++ b/packages/protocol/migrationsConfig.js @@ -87,8 +87,6 @@ const DefaultConfig = { updateFrequency: 5 * MINUTE, minimumReports: 1, frozen: false, - minSupplyForStableBucketCap: '1000000000000000000000000', // 1e24 = 1M - stableBucketFractionCap: 1 / 22, }, gasPriceMinimum: { minimumFloor: 100000000, @@ -240,10 +238,6 @@ const DefaultConfig = { commission: 0.1, votesRatioOfLastVsFirstGroup: 2.0, }, - stableTokenRegistry: { - fiatTicker: [], // empty array resambles empty bytes - stableTokenContractName: [], // empty array resambles empty bytes - }, } const NetworkConfigs = { diff --git a/packages/protocol/migrations_ts/10_01_exchange_EUR.ts b/packages/protocol/migrations_ts/10_01_exchange_EUR.ts index f6415ef41ce..4b774c611ba 100644 --- a/packages/protocol/migrations_ts/10_01_exchange_EUR.ts +++ b/packages/protocol/migrations_ts/10_01_exchange_EUR.ts @@ -17,8 +17,6 @@ const initializeArgs = async (): Promise => { toFixed(config.exchange.reserveFraction).toString(), config.exchange.updateFrequency, config.exchange.minimumReports, - config.exchange.minSupplyForStableBucketCap, - toFixed(config.exchange.stableBucketFractionCap).toString(), ] } diff --git a/packages/protocol/migrations_ts/10_02_exchange_BRL.ts b/packages/protocol/migrations_ts/10_02_exchange_BRL.ts index 3b429b2ebeb..ae38ba47fdb 100644 --- a/packages/protocol/migrations_ts/10_02_exchange_BRL.ts +++ b/packages/protocol/migrations_ts/10_02_exchange_BRL.ts @@ -17,8 +17,6 @@ const initializeArgs = async (): Promise => { toFixed(config.exchange.reserveFraction).toString(), config.exchange.updateFrequency, config.exchange.minimumReports, - config.exchange.minSupplyForStableBucketCap, - toFixed(config.exchange.stableBucketFractionCap).toString(), ] } diff --git a/packages/protocol/migrations_ts/10_0_exchange_USD.ts b/packages/protocol/migrations_ts/10_0_exchange_USD.ts index 2797ec538be..7c3d10e90e5 100644 --- a/packages/protocol/migrations_ts/10_0_exchange_USD.ts +++ b/packages/protocol/migrations_ts/10_0_exchange_USD.ts @@ -17,8 +17,6 @@ const initializeArgs = async (): Promise => { toFixed(config.exchange.reserveFraction).toString(), config.exchange.updateFrequency, config.exchange.minimumReports, - config.exchange.minSupplyForStableBucketCap, - toFixed(config.exchange.stableBucketFractionCap).toString(), ] } diff --git a/packages/protocol/migrations_ts/26_federated_attestations.ts b/packages/protocol/migrations_ts/25_federated_attestations.ts similarity index 100% rename from packages/protocol/migrations_ts/26_federated_attestations.ts rename to packages/protocol/migrations_ts/25_federated_attestations.ts diff --git a/packages/protocol/migrations_ts/25_stableToken_registry.ts b/packages/protocol/migrations_ts/25_stableToken_registry.ts deleted file mode 100644 index f6031cecadf..00000000000 --- a/packages/protocol/migrations_ts/25_stableToken_registry.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { deploymentForCoreContract } from '@celo/protocol/lib/web3-utils' -import { StableTokenRegistryInstance } from 'types' - -const initializeArgs = async (): Promise => { - return [[], []] -} - -module.exports = deploymentForCoreContract( - web3, - artifacts, - CeloContractName.StableTokenRegistry, - initializeArgs -) diff --git a/packages/protocol/migrations_ts/27_odispayments.ts b/packages/protocol/migrations_ts/26_odispayments.ts similarity index 100% rename from packages/protocol/migrations_ts/27_odispayments.ts rename to packages/protocol/migrations_ts/26_odispayments.ts diff --git a/packages/protocol/migrations_ts/28_governance.ts b/packages/protocol/migrations_ts/27_governance.ts similarity index 99% rename from packages/protocol/migrations_ts/28_governance.ts rename to packages/protocol/migrations_ts/27_governance.ts index 7c3095ab63b..680bdddfa9e 100644 --- a/packages/protocol/migrations_ts/28_governance.ts +++ b/packages/protocol/migrations_ts/27_governance.ts @@ -100,7 +100,6 @@ module.exports = deploymentForCoreContract( 'StableToken', 'StableTokenEUR', 'Validators', - 'StableTokenRegistry', ] if (!config.governance.skipTransferOwnership) { diff --git a/packages/protocol/migrations_ts/29_elect_validators.ts b/packages/protocol/migrations_ts/28_elect_validators.ts similarity index 100% rename from packages/protocol/migrations_ts/29_elect_validators.ts rename to packages/protocol/migrations_ts/28_elect_validators.ts diff --git a/packages/protocol/package.json b/packages/protocol/package.json index b7898fde216..13c710d3ea3 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -37,7 +37,6 @@ "make-release": "./scripts/bash/make-release.sh", "verify-deployed": "./scripts/bash/verify-deployed.sh", "verify-release": "./scripts/bash/verify-release.sh", - "invite": "./scripts/bash/invite.sh", "ganache-dev": "./scripts/bash/ganache.sh", "truffle:migrate": "truffle migrate", "devchain": "ts-node scripts/devchain.ts", @@ -51,11 +50,11 @@ "@0x/sol-profiler": "^3.0.0", "@0x/sol-trace": "^2.0.16", "@0x/subproviders": "^5.0.0", - "@celo/base": "2.2.1-dev", + "@celo/base": "3.2.1-dev", "@celo/bls12377js": "0.1.1", - "@celo/connect": "2.2.1-dev", - "@celo/cryptographic-utils": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/cryptographic-utils": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "@ethereumjs/vm": "npm:@soloseng/ethereumjs-vm@6.2.3", "@openzeppelin/upgrades": "^2.8.0", "@truffle/artifactor": "4.0.180", @@ -84,6 +83,9 @@ "solhint": "^2.3.1", "solidity-bytes-utils": "0.0.7", "truffle": "5.7.3", + "truffle-artifactor": "^4.0.30", + "truffle-contract": "^4.0.31", + "truffle-resolver": "^5.0.16", "truffle-security": "^1.7.3", "twilio": "^3.57.0", "weak-map": "^1.0.5", @@ -95,7 +97,7 @@ }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", - "@celo/phone-utils": "2.2.1-dev", + "@celo/phone-utils": "3.2.1-dev", "@celo/typechain-target-web3-v1-celo": "0.2.0", "@celo/typescript": "0.0.1", "@types/bn.js": "4.11.6", diff --git a/packages/protocol/releaseData/initializationData/release9.json b/packages/protocol/releaseData/initializationData/release9.json index c6e9e238558..5637a01250f 100644 --- a/packages/protocol/releaseData/initializationData/release9.json +++ b/packages/protocol/releaseData/initializationData/release9.json @@ -1,3 +1,3 @@ { - "StableTokenRegistry": [[], []] + "FeeBurner": ["0x000000000000000000000000000000000000ce10", [],[],[],[]] } \ No newline at end of file diff --git a/packages/protocol/releaseData/nonstandard/baklavaUpdate.json b/packages/protocol/releaseData/nonstandard/baklavaUpdate.json new file mode 100644 index 00000000000..2ca0978aa34 --- /dev/null +++ b/packages/protocol/releaseData/nonstandard/baklavaUpdate.json @@ -0,0 +1,7 @@ +{ + "GrandaMento": ["0x000000000000000000000000000000000000ce10", "0x0Cc59Ed03B3e763c02d54D695FFE353055f1502D", "300000000000000000000000", "0", "1209600"], + "StableTokenBRL": ["Celo Brazilian Real", "cREAL", 18, "0x000000000000000000000000000000000000ce10", "1000000000000000000000000", "47304000", [], [], "ExchangeBRL"], + "ExchangeBRL": ["0x000000000000000000000000000000000000ce10", "StableTokenBRL", "5000000000000000000000", "250000000000000000000", "300", "5"], + "FederatedAttestations": [], + "OdisPayments": [] +} \ No newline at end of file diff --git a/packages/protocol/releaseData/versionReports/nonstandar/baklava_fix_report_report.json b/packages/protocol/releaseData/versionReports/nonstandar/baklava_fix_report_report.json new file mode 100644 index 00000000000..7aba93a176b --- /dev/null +++ b/packages/protocol/releaseData/versionReports/nonstandar/baklava_fix_report_report.json @@ -0,0 +1,840 @@ +{ + "oldArtifactsFolder": "/Users/martinvol/celo/celo-monorepo/packages/protocol/build/core-contracts.v3/contracts", + "newArtifactsFolder": "/Users/martinvol/celo/celo-monorepo/packages/protocol/build/core-contracts.v8/contracts", + "exclude": "/.*Test|Mock.*|I[A-Z].*|.*Proxy|MultiSig.*|ReleaseGold|SlasherUtil|UsingPrecompiles/", + "report": { + "contracts": { + "Escrow": { + "changes": { + "storage": [], + "major": [ + { + "contract": "Escrow", + "signature": "setRegistry(address)", + "type": "MethodRemoved" + }, + { + "contract": "Escrow", + "signature": "initialize(address)", + "type": "MethodRemoved" + } + ], + "minor": [ + { + "contract": "Escrow", + "signature": "transferWithTrustedIssuers(bytes32,address,uint256,uint256,address,uint256,address[])", + "type": "MethodAdded" + }, + { + "contract": "Escrow", + "signature": "getTrustedIssuersPerPayment(address)", + "type": "MethodAdded" + }, + { + "contract": "Escrow", + "signature": "getDefaultTrustedIssuers()", + "type": "MethodAdded" + }, + { + "contract": "Escrow", + "signature": "MAX_TRUSTED_ISSUERS_PER_PAYMENT()", + "type": "MethodAdded" + }, + { + "contract": "Escrow", + "signature": "addDefaultTrustedIssuer(address)", + "type": "MethodAdded" + }, + { + "contract": "Escrow", + "signature": "removeDefaultTrustedIssuer(address,uint256)", + "type": "MethodAdded" + }, + { + "contract": "Escrow", + "signature": "initialize()", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "Escrow", + "type": "DeployedBytecode" + }, + { + "contract": "Escrow", + "dependency": "Signatures", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "+1", + "minor": "0", + "patch": "0" + } + }, + "Exchange": { + "changes": { + "storage": [], + "major": [ + { + "contract": "Exchange", + "signature": "initialize(address,address,uint256,uint256,uint256,uint256)", + "type": "MethodRemoved" + } + ], + "minor": [ + { + "contract": "Exchange", + "signature": "initialize(address,string,uint256,uint256,uint256,uint256)", + "type": "MethodAdded" + }, + { + "contract": "Exchange", + "signature": "activateStable()", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "Exchange", + "type": "DeployedBytecode" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "+1", + "minor": "0", + "patch": "0" + } + }, + "ExchangeBRL": { + "changes": { + "storage": [], + "major": [ + { + "contract": "ExchangeBRL", + "type": "NewContract" + } + ], + "minor": [], + "patch": [] + }, + "versionDelta": { + "storage": "=", + "major": "+2", + "minor": "0", + "patch": "0" + } + }, + "ExchangeEUR": { + "changes": { + "storage": [], + "major": [ + { + "contract": "ExchangeEUR", + "signature": "initialize(address,address,uint256,uint256,uint256,uint256)", + "type": "MethodRemoved" + } + ], + "minor": [ + { + "contract": "ExchangeEUR", + "signature": "initialize(address,string,uint256,uint256,uint256,uint256)", + "type": "MethodAdded" + }, + { + "contract": "ExchangeEUR", + "signature": "activateStable()", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "ExchangeEUR", + "type": "DeployedBytecode" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "+1", + "minor": "0", + "patch": "0" + } + }, + "FederatedAttestations": { + "changes": { + "storage": [], + "major": [ + { + "contract": "FederatedAttestations", + "type": "NewContract" + } + ], + "minor": [], + "patch": [ + { + "contract": "FederatedAttestations", + "dependency": "Signatures", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "+1", + "minor": "0", + "patch": "0" + } + }, + "GrandaMento": { + "changes": { + "storage": [], + "major": [ + { + "contract": "GrandaMento", + "type": "NewContract" + } + ], + "minor": [], + "patch": [] + }, + "versionDelta": { + "storage": "=", + "major": "0", + "minor": "0", + "patch": "+1" + } + }, + "OdisPayments": { + "changes": { + "storage": [], + "major": [ + { + "contract": "OdisPayments", + "type": "NewContract" + } + ], + "minor": [], + "patch": [] + }, + "versionDelta": { + "storage": "=", + "major": "+1", + "minor": "0", + "patch": "0" + } + }, + "StableTokenBRL": { + "changes": { + "storage": [], + "major": [ + { + "contract": "StableTokenBRL", + "type": "NewContract" + } + ], + "minor": [], + "patch": [] + }, + "versionDelta": { + "storage": "=", + "major": "+1", + "minor": "0", + "patch": "+1" + } + }, + "UsingRegistryV2": { + "changes": { + "storage": [], + "major": [ + { + "contract": "UsingRegistryV2", + "type": "NewContract" + } + ], + "minor": [], + "patch": [] + }, + "versionDelta": { + "storage": "=", + "major": "+1", + "minor": "0", + "patch": "0" + } + }, + "Accounts": { + "changes": { + "storage": [], + "major": [], + "minor": [ + { + "contract": "Accounts", + "signature": "setPaymentDelegation(address,uint256)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "getPaymentDelegation(address)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "isSigner(address,address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "setEip712DomainSeparator()", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "addStorageRoot(bytes)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "removeStorageRoot(uint256)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "getOffchainStorageRoots(address)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "deletePaymentDelegation()", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "setIndexedSigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "authorizeSignerWithSignature(address,bytes32,uint8,bytes32,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "authorizeSigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "completeSignerAuthorization(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "isLegacySigner(address,address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "isDefaultSigner(address,address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "isIndexedSigner(address,address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "removeDefaultSigner(bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "removeIndexedSigner(bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "removeSigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "isLegacyRole(bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "getLegacySigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "getDefaultSigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "getIndexedSigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "hasLegacySigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "hasDefaultSigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "hasIndexedSigner(address,bytes32)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "hasAuthorizedSigner(address,string)", + "type": "MethodAdded" + }, + { + "contract": "Accounts", + "signature": "getRoleAuthorizationSigner(address,address,bytes32,uint8,bytes32,bytes32)", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "Accounts", + "type": "DeployedBytecode" + }, + { + "contract": "Accounts", + "dependency": "Signatures", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "+1", + "patch": "0" + } + }, + "Election": { + "changes": { + "storage": [], + "major": [], + "minor": [ + { + "contract": "Election", + "signature": "activateForAccount(address,address)", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "Election", + "type": "DeployedBytecode" + }, + { + "contract": "Election", + "dependency": "AddressSortedLinkedList", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "+1", + "patch": "+1" + } + }, + "Governance": { + "changes": { + "storage": [], + "major": [], + "minor": [ + { + "contract": "Governance", + "signature": "revokeVotes()", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "Governance", + "type": "DeployedBytecode" + }, + { + "contract": "Governance", + "dependency": "Proposals", + "type": "LibraryLinkingChange" + }, + { + "contract": "Governance", + "dependency": "IntegerSortedLinkedList", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "+1", + "patch": "-1" + } + }, + "LockedGold": { + "changes": { + "storage": [], + "major": [], + "minor": [ + { + "contract": "LockedGold", + "signature": "getPendingWithdrawal(address,uint256)", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "LockedGold", + "type": "DeployedBytecode" + }, + { + "contract": "LockedGold", + "dependency": "Signatures", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "+1", + "patch": "0" + } + }, + "MetaTransactionWallet": { + "changes": { + "storage": [], + "major": [], + "minor": [ + { + "contract": "MetaTransactionWallet", + "signature": "setGuardian(address)", + "type": "MethodAdded" + }, + { + "contract": "MetaTransactionWallet", + "signature": "recoverWallet(address)", + "type": "MethodAdded" + } + ], + "patch": [ + { + "contract": "MetaTransactionWallet", + "type": "DeployedBytecode" + }, + { + "contract": "MetaTransactionWallet", + "dependency": "Signatures", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "+1", + "patch": "+1" + } + }, + "Attestations": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "Attestations", + "type": "DeployedBytecode" + }, + { + "contract": "Attestations", + "dependency": "Signatures", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+1" + } + }, + "GoldToken": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "GoldToken", + "type": "DeployedBytecode" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+1" + } + }, + "MetaTransactionWalletDeployer": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "MetaTransactionWalletDeployer", + "type": "DeployedBytecode" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+1" + } + }, + "Reserve": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "Reserve", + "signature": "getExchangeSpenders()", + "oldValue": "public", + "newValue": "external", + "type": "MethodVisibility" + }, + { + "contract": "Reserve", + "type": "DeployedBytecode" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+2" + } + }, + "SortedOracles": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "SortedOracles", + "type": "DeployedBytecode" + }, + { + "contract": "SortedOracles", + "dependency": "AddressSortedLinkedListWithMedian", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+1" + } + }, + "StableToken": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "StableToken", + "type": "DeployedBytecode" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+1" + } + }, + "StableTokenEUR": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "StableTokenEUR", + "type": "DeployedBytecode" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+1" + } + }, + "Validators": { + "changes": { + "storage": [], + "major": [], + "minor": [], + "patch": [ + { + "contract": "Validators", + "type": "DeployedBytecode" + }, + { + "contract": "Validators", + "dependency": "AddressLinkedList", + "type": "LibraryLinkingChange" + } + ] + }, + "versionDelta": { + "storage": "=", + "major": "=", + "minor": "=", + "patch": "+3" + } + } + }, + "libraries": { + "AddressLinkedList": { + "storage": [], + "major": [ + { + "contract": "AddressLinkedList", + "signature": "getVersionNumber()", + "type": "MethodRemoved" + } + ], + "minor": [], + "patch": [ + { + "contract": "AddressLinkedList", + "type": "DeployedBytecode" + } + ] + }, + "AddressSortedLinkedList": { + "storage": [], + "major": [ + { + "contract": "AddressSortedLinkedList", + "signature": "getVersionNumber()", + "type": "MethodRemoved" + } + ], + "minor": [], + "patch": [ + { + "contract": "AddressSortedLinkedList", + "type": "DeployedBytecode" + } + ] + }, + "AddressSortedLinkedListWithMedian": { + "storage": [], + "major": [ + { + "contract": "AddressSortedLinkedListWithMedian", + "signature": "getVersionNumber()", + "type": "MethodRemoved" + } + ], + "minor": [], + "patch": [ + { + "contract": "AddressSortedLinkedListWithMedian", + "type": "DeployedBytecode" + } + ] + }, + "IntegerSortedLinkedList": { + "storage": [], + "major": [ + { + "contract": "IntegerSortedLinkedList", + "signature": "getVersionNumber()", + "type": "MethodRemoved" + } + ], + "minor": [], + "patch": [ + { + "contract": "IntegerSortedLinkedList", + "type": "DeployedBytecode" + } + ] + }, + "Proposals": { + "storage": [], + "major": [ + { + "contract": "Proposals", + "signature": "getVersionNumber()", + "type": "MethodRemoved" + } + ], + "minor": [], + "patch": [ + { + "contract": "Proposals", + "type": "DeployedBytecode" + } + ] + }, + "Signatures": { + "storage": [], + "major": [ + { + "contract": "Signatures", + "signature": "getVersionNumber()", + "type": "MethodRemoved" + } + ], + "minor": [], + "patch": [ + { + "contract": "Signatures", + "type": "DeployedBytecode" + } + ] + } + } + } +} diff --git a/packages/protocol/scripts/bash/backupmigrations.sh b/packages/protocol/scripts/bash/backupmigrations.sh index 2b8fe2994f1..f17162027fc 100755 --- a/packages/protocol/scripts/bash/backupmigrations.sh +++ b/packages/protocol/scripts/bash/backupmigrations.sh @@ -47,6 +47,7 @@ else # cp migrations.bak/23_governance_approver_multisig.* migrations/ # cp migrations.bak/24_grandamento.* migrations/ # cp migrations.bak/25_stableToken_registry.* migrations/ + # cp migrations.bak/26_federated_attestations.* migrations/ # cp migrations.bak/27_odispayments.* migrations/ # cp migrations.bak/28_governance.* migrations/ # cp migrations.bak/29_elect_validators.* migrations/ diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index aa51f626af5..4de02288fbf 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -33,16 +33,17 @@ echo "- Checkout source code at $BRANCH" git fetch origin +"$BRANCH" 2>>$LOG_FILE >> $LOG_FILE git checkout $BRANCH 2>>$LOG_FILE >> $LOG_FILE -echo "- Build contract artifacts" -rm -rf build/contracts -rm -rf ../sdk/cryptographic-utils/lib -cd ../sdk/cryptographic-utils -yarn build -cd ../../protocol +echo "- Build monorepo (contract artifacts, migrations, + all dependencies)" +cd ../.. +# TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) +yarn run lerna run clean >> $LOG_FILE +# build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE -yarn build >> $LOG_FILE +# in release v8 and earlier, @celo/contractkit automatically uses set RELEASE_TAG +# when building, which fails if this differs from `package/protocol`'s build directory. +RELEASE_TAG="" yarn build >> $LOG_FILE +cd packages/protocol -# TODO: Move to yarn build:sol after the next contract release. echo "- Create local network" if [ -z "$GRANTS_FILE" ]; then yarn devchain generate-tar "$PWD/devchain.tar.gz" >> $LOG_FILE diff --git a/packages/protocol/scripts/bash/invite.sh b/packages/protocol/scripts/bash/invite.sh deleted file mode 100755 index 42e888a71a0..00000000000 --- a/packages/protocol/scripts/bash/invite.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# Sends an invite code to a user that can be used to verify and redeem an escrowed payment. -# -# Flags: -# -n: Name of the network to increment balances on -# -p: phone number of the user to invite - -NETWORK="" -PHONE="" -FAST="" -while getopts 'n:p:f:' flag; do - case "${flag}" in - n) NETWORK="$OPTARG" ;; - p) PHONE="$OPTARG" ;; - f) FAST="$OPTARG" ;; - *) error "Unexpected option ${flag}" ;; - esac -done - -[ -z "$NETWORK" ] && echo "Need to set the NETWORK via the -n flag" && exit 1; -[ -z "$PHONE" ] && echo "Need to set the PHONE via the -p flag" && exit 1; - -if ! nc -z 127.0.0.1 8545 ; then - echo "Port 8545 not open" - exit 1 -fi - -if [ "$FAST" == true ] ; then - echo "Fast mode is on, protocol won't be rebuilt and twilio config won't be decrypted with KMS." -else - yarn run build - gcloud config set project celo-testnet - gcloud kms decrypt --ciphertext-file=twilio-config.enc --plaintext-file=twilio-config.js \ - --key=github-mnemonic-key --keyring=celo-keyring --location=global -fi - -yarn run truffle exec ./scripts/truffle/invite.js \ - --network $NETWORK --stableValue 5 --goldValue 5 \ - --build_directory $PWD/build/$NETWORK --phone $PHONE diff --git a/packages/protocol/scripts/bash/release-on-devchain.sh b/packages/protocol/scripts/bash/release-on-devchain.sh index bdbd7508215..1da37484236 100755 --- a/packages/protocol/scripts/bash/release-on-devchain.sh +++ b/packages/protocol/scripts/bash/release-on-devchain.sh @@ -42,6 +42,7 @@ if command -v lsof; then fi echo "- Verify bytecode of the network" +rm -r build/contracts yarn build >> $LOG_FILE yarn run truffle exec ./scripts/truffle/verify-bytecode.js --network development --build_artifacts $BUILD_DIR/contracts --librariesFile libraries.json diff --git a/packages/protocol/scripts/build.ts b/packages/protocol/scripts/build.ts index fadfc9d73e7..f58e478f276 100644 --- a/packages/protocol/scripts/build.ts +++ b/packages/protocol/scripts/build.ts @@ -21,6 +21,7 @@ export const ProxyContracts = [ 'ExchangeEURProxy', 'ExchangeProxy', 'FederatedAttestationsProxy', + 'FeeBurnerProxy', 'FeeCurrencyWhitelistProxy', 'GasPriceMinimumProxy', 'GoldTokenProxy', @@ -38,12 +39,12 @@ export const ProxyContracts = [ 'StableTokenEURProxy', 'StableTokenProxy', 'SortedOraclesProxy', - 'StableTokenRegistryProxy', ] export const CoreContracts = [ // common 'Accounts', 'GasPriceMinimum', + 'FeeBurner', 'FeeCurrencyWhitelist', 'GoldToken', 'MetaTransactionWallet', @@ -83,7 +84,6 @@ export const CoreContracts = [ 'StableTokenEUR', 'StableTokenBRL', 'SortedOracles', - 'StableTokenRegistry', // liquidity 'GrandaMento', @@ -95,6 +95,10 @@ const OtherContracts = [ // abstract 'Initializable', 'UsingRegistry', + + // only used for testing + 'MockUniswapV2Router02', + 'MockUniswapV2Factory', ] const Interfaces = ['ICeloToken', 'IERC20', 'ICeloVersionedContract'] diff --git a/packages/protocol/scripts/truffle/invite.ts b/packages/protocol/scripts/truffle/invite.ts deleted file mode 100644 index 25aa3156482..00000000000 --- a/packages/protocol/scripts/truffle/invite.ts +++ /dev/null @@ -1,110 +0,0 @@ -/* tslint:disable:no-console */ -import { - convertToContractDecimals, - createInviteCode, - getDeployedProxiedContract, - sendEscrowedPayment, -} from '@celo/protocol/lib/web3-utils' -import BigNumber from 'bignumber.js' -import twilio from 'twilio' -import { AttestationsInstance, EscrowInstance, GoldTokenInstance, StableTokenInstance } from 'types' -import Web3 from 'web3' - -const truffle = require('@celo/protocol/truffle-config.js') -const twilioConfig = require('@celo/protocol/twilio-config') - -const start = Date.now() - -/* - * A simple script to send a payment and invite a user. - * - * Expects the following flags: - * network: name of the network defined in truffle-config.js to deploy to - * stableValue: amount of stable token to transfer - * goldValue: amount of gold transfer - * phone: phone number of user to invite - * - * Run using truffle exec, e.g.: - * truffle exec scripts/truffle/invite.js --network development --phone +18005882300 \ - * --stableValue 40 --goldValue 10 \ - * - */ -module.exports = async (callback: (error?: any) => number) => { - try { - const argv = require('minimist')(process.argv.slice(2), { - string: ['network', 'phone', 'goldValue', 'stableValue'], - }) - const network = truffle.networks[argv.network] - - logTime('Getting web3 providers...') - const provider = new Web3.providers.HttpProvider('http://' + network.host + ':' + network.port) - const web3 = new Web3(provider) - - logTime('Getting attestations...') - const attestationPromise = getDeployedProxiedContract( - 'Attestations', - artifacts - ) - - logTime('Getting Gold token...') - const goldTokenPromise = getDeployedProxiedContract('GoldToken', artifacts) - logTime('Getting stable token...') - const stableTokenPromise = getDeployedProxiedContract( - 'StableToken', - artifacts - ) - logTime('Getting Escrow token...') - const escrowPromise = getDeployedProxiedContract('Escrow', artifacts) - - logTime('Waiting for contracts...') - const attestations = await attestationPromise - const goldToken = await goldTokenPromise - const stableToken = await stableTokenPromise - const escrow = await escrowPromise - logTime('Contracts received') - - const stableTokenAmount = await convertToContractDecimals(argv.stableValue, stableToken) - const verificationFee = new BigNumber( - await attestations.getAttestationRequestFee(stableToken.address) - ) - const invitationStableTokenAmount = verificationFee.times(10) - - logTime('Creating invite code...') - const inviteCodeReturn = await createInviteCode( - goldToken, - stableToken, - invitationStableTokenAmount, - network.gasPrice, - web3 - ) - - const paymentID = inviteCodeReturn[0] - const inviteCode = inviteCodeReturn[1] - logTime(`Payment Id ${paymentID}`) - logTime(`Invite Code: ${inviteCode}`) - - // @ts-ignore soliditySha3 can take an object - const phoneHash: string = Web3.utils.soliditySha3({ type: 'string', value: argv.phone }) - - logTime('Sending escrow payment...') - await sendEscrowedPayment(stableToken, escrow, argv.phone, stableTokenAmount, paymentID) - logTime('Creating twilio client...') - const twilioClient = twilio(twilioConfig.sid, twilioConfig.authToken) - const messageText = `Hi! I would like to invite you to join the Celo payments network. Your invite code is: ${inviteCode}` - logTime('Sending SMS...') - await twilioClient.messages.create({ - body: messageText, - from: twilioConfig.phoneNumber, - to: argv.phone, - }) - callback() - } catch (error) { - callback(error) - } - logTime('Finish') -} - -function logTime(msg: string) { - const millis = Date.now() - start - console.log(`${millis} ms: ${msg}`) -} diff --git a/packages/protocol/test-sol/stability/Exchange.t.sol b/packages/protocol/test-sol/stability/Exchange.t.sol index 8ac9a7048a9..97b9d6425f6 100644 --- a/packages/protocol/test-sol/stability/Exchange.t.sol +++ b/packages/protocol/test-sol/stability/Exchange.t.sol @@ -28,8 +28,6 @@ contract ExchangeTest is Test, WithRegistry, TokenHelpers { event SpreadSet(uint256 spread); event ReserveFractionSet(uint256 reserveFraction); event BucketsUpdated(uint256 celoBucket, uint256 stableBucket); - event StableBucketMaxFractionSet(uint256 stableBucketMaxFraction); - event MinSupplyForStableBucketCapSet(uint256 minSupplyForStableBucketCap); address deployer; address rando; @@ -52,8 +50,6 @@ contract ExchangeTest is Test, WithRegistry, TokenHelpers { uint256 constant stableAmountForRate = 2000000000000000000000000; uint256 initialStableBucket = initialCeloBucket * 2; FixidityLib.Fraction spread = FixidityLib.newFixedFraction(3, 1000); - uint256 constant minSupplyForStableBucketCap = 1e24; - uint256 constant stableBucketMaxFraction = 45454545454545456000000; function setUp() public { deployer = actor("deployer"); @@ -105,9 +101,7 @@ contract ExchangeTest is Test, WithRegistry, TokenHelpers { FixidityLib.unwrap(spread), FixidityLib.unwrap(reserveFraction), bucketUpdateFrequency, - 2, - minSupplyForStableBucketCap, - stableBucketMaxFraction + 2 ); } @@ -177,9 +171,7 @@ contract Exchange_initializeAndSetters is ExchangeTest { FixidityLib.unwrap(FixidityLib.newFixedFraction(3, 1000)), FixidityLib.unwrap(FixidityLib.newFixedFraction(5, 100)), 60 * 60, - 2, - minSupplyForStableBucketCap, - stableBucketMaxFraction + 2 ); } @@ -275,46 +267,6 @@ contract Exchange_initializeAndSetters is ExchangeTest { vm.expectRevert("Ownable: caller is not the owner"); exchange.setReserveFraction(0); } - - function test_StableBucketMaxFraction_setsValueAndEmits() public { - uint256 newStableBucketMaxFraction = 90909090909090910000000; - vm.expectEmit(true, true, true, true, address(exchange)); - emit StableBucketMaxFractionSet(newStableBucketMaxFraction); - exchange.setStableBucketMaxFraction(newStableBucketMaxFraction); - assert(exchange.stableBucketMaxFraction() == newStableBucketMaxFraction); - } - - function test_StableBucketMaxFraction_NeverMoreThan1_AlwaysLessThan0() public { - vm.expectRevert("Bucket fraction must be smaller than 1"); - exchange.setStableBucketMaxFraction(1e24); - vm.expectRevert("bucket fraction must be greather than 0"); - exchange.setStableBucketMaxFraction(0); - } - - function test_setstableBucketMaxFraction_isOnlyCallableByOwner() public { - changePrank(rando); - vm.expectRevert("Ownable: caller is not the owner"); - exchange.setStableBucketMaxFraction(0); - } - - function test_StableBucketMinSupply_setsValueAndEmits() public { - uint256 newMinSupplyForStableBucketCap = 2e24; - vm.expectEmit(true, true, true, true, address(exchange)); - emit MinSupplyForStableBucketCapSet(newMinSupplyForStableBucketCap); - exchange.setMinSupplyForStableBucketCap(newMinSupplyForStableBucketCap); - assert(exchange.minSupplyForStableBucketCap() == newMinSupplyForStableBucketCap); - } - - function test_setMinSupplyForStableBucketCap_NeverSetTo0() public { - vm.expectRevert("Min supply for stable bucket cap must be greather than 0"); - exchange.setMinSupplyForStableBucketCap(0); - } - - function test_setMinSupplyForStableBucketCap_isOnlyCallableByOwner() public { - changePrank(rando); - vm.expectRevert("Ownable: caller is not the owner"); - exchange.setMinSupplyForStableBucketCap(0); - } } contract ExchangeTest_stableActivated is ExchangeTest { @@ -324,45 +276,6 @@ contract ExchangeTest_stableActivated is ExchangeTest { } } -contract ExchangeTest_stableBucket_hasBeenCapped is ExchangeTest { - function setUp() public { - super.setUp(); - sortedOracles.setMedianRate(address(stableToken), SafeMath.mul(2e24, 2000)); // bump the price by 2000, leaving with 4K CELO per dollar - exchange.activateStable(); - } - - function test_itHasTheRightPrice_AfterTheCap() public { - (uint256 tradableGold, uint256 mintableStable) = exchange.getBuyAndSellBuckets(false); - assertEq(SafeMath.div(mintableStable, tradableGold), 4000); - } -} - -contract ExchangeTest_stableBucket_needsToBeCapped is ExchangeTest { - function setUp() public { - super.setUp(); - registry.setAddressFor("Exchange", exchange.owner()); - sortedOracles.setMedianRate(address(stableToken), 2e24); - stableToken.mint(deployer, 61e24); // 6M - registry.setAddressFor("Exchange", address(exchange)); - exchange.activateStable(); - } - function test_hasCorrect_stableBucketMaxFraction() public { - assertEq(exchange.stableBucketMaxFraction(), 45454545454545456000000); - } - - function test_DoesntHitTheCap_shouldNotResize() public { - (uint256 tradableGold, uint256 mintableStable) = exchange.getBuyAndSellBuckets(false); - assertEq(mintableStable, 1e21); - assertEq(tradableGold, 5e20); - // the buckets hold the price - assertEq(SafeMath.div(mintableStable, tradableGold), 2); - } - - function test_HasCorrectGetStableBucketCap() public { - assert(exchange.getStableBucketCap() == 2772727272727272816000000); - } -} - contract ExchangeTest_buyAndSellValues is ExchangeTest_stableActivated { function test_getBuyAndSellBuckets_returnsTheCorrectAmountOfTokens() public view { (uint256 buyBucketSize, uint256 sellBucketSize) = exchange.getBuyAndSellBuckets(true); diff --git a/packages/protocol/test/common/feeburner.ts b/packages/protocol/test/common/feeburner.ts new file mode 100644 index 00000000000..e9bbccc6606 --- /dev/null +++ b/packages/protocol/test/common/feeburner.ts @@ -0,0 +1,506 @@ +// TODO remove magic numbers +import { CeloContractName } from '@celo/protocol/lib/registry-utils' +import { assertEqualBN, assertGtBN, assertRevert, timeTravel } from '@celo/protocol/lib/test-utils' +import { fixed1, toFixed } from '@celo/utils/lib/fixidity' +import BigNumber from 'bignumber.js' +import { + ExchangeContract, + ExchangeInstance, + FeeBurnerContract, + FeeBurnerInstance, + FeeCurrencyWhitelistContract, + FeeCurrencyWhitelistInstance, + FreezerContract, + FreezerInstance, + GoldTokenContract, + GoldTokenInstance, + MockERC20Contract, + MockERC20Instance, + MockReserveContract, + MockReserveInstance, + MockSortedOraclesContract, + MockSortedOraclesInstance, + MockUniswapV2FactoryContract, + MockUniswapV2FactoryInstance, + MockUniswapV2Router02Contract, + MockUniswapV2Router02Instance, + RegistryContract, + RegistryInstance, + StableTokenContract, + StableTokenInstance, +} from 'types' +import { SECONDS_IN_A_WEEK } from '../constants' + +const goldAmountForRate = new BigNumber('1000000000000000000000000') +const stableAmountForRate = new BigNumber(2).times(goldAmountForRate) +const spread = toFixed(3 / 1000) +const reserveFraction = toFixed(5 / 100) +const maxSlippage = toFixed(1 / 100) +const initialReserveBalance = new BigNumber('10000000000000000000000') + +const FeeBurner: FeeBurnerContract = artifacts.require('FeeBurner') +const Registry: RegistryContract = artifacts.require('Registry') +const Exchange: ExchangeContract = artifacts.require('Exchange') +const GoldToken: GoldTokenContract = artifacts.require('GoldToken') +const MockSortedOracles: MockSortedOraclesContract = artifacts.require('MockSortedOracles') +const MockReserve: MockReserveContract = artifacts.require('MockReserve') + +const StableToken: StableTokenContract = artifacts.require('StableToken') +const Freezer: FreezerContract = artifacts.require('Freezer') + +const UniswapRouter: MockUniswapV2Router02Contract = artifacts.require('MockUniswapV2Router02') +const UniswapV2Factory: MockUniswapV2FactoryContract = artifacts.require('MockUniswapV2Factory') +const ERC20: MockERC20Contract = artifacts.require('MockERC20') + +const FeeCurrencyWhitelist: FeeCurrencyWhitelistContract = artifacts.require('FeeCurrencyWhitelist') + +contract('FeeBurner', (accounts: string[]) => { + let feeBurner: FeeBurnerInstance + let exchange: ExchangeInstance + let registry: RegistryInstance + let stableToken: StableTokenInstance + let goldToken: GoldTokenInstance + let mockSortedOracles: MockSortedOraclesInstance + let mockReserve: MockReserveInstance + let freezer: FreezerInstance + + let uniswapFactory: MockUniswapV2FactoryInstance + let uniswapFactory2: MockUniswapV2FactoryInstance + let uniswap: MockUniswapV2Router02Instance + let uniswap2: MockUniswapV2Router02Instance + let tokenA: MockERC20Instance + + let deadline: number + + let feeCurrencyWhitelist: FeeCurrencyWhitelistInstance + + const decimals = 18 + const updateFrequency = 60 * 60 + const minimumReports = 2 + + async function fundReserve() { + // Would have used goldToken here, but ran into issues of inability to transfer + // TODO: Remove in https://github.com/celo-org/celo-monorepo/issues/2000 + await web3.eth.sendTransaction({ + from: accounts[0], + to: mockReserve.address, + value: initialReserveBalance.toString(), + }) + } + + const user = accounts[1] + + beforeEach(async () => { + deadline = (await web3.eth.getBlock('latest')).timestamp + 100 + goldToken = await GoldToken.new(true) + mockReserve = await MockReserve.new() + stableToken = await StableToken.new(true) + registry = await Registry.new(true) + feeBurner = await FeeBurner.new(true) + freezer = await Freezer.new(true) + feeCurrencyWhitelist = await FeeCurrencyWhitelist.new(true) + + tokenA = await ERC20.new() + await feeCurrencyWhitelist.initialize() + + uniswapFactory = await UniswapV2Factory.new('0x0000000000000000000000000000000000000000') // feeSetter + + uniswap = await UniswapRouter.new( + uniswapFactory.address, + '0x0000000000000000000000000000000000000000' + ) // _factory, _WETH + + uniswapFactory2 = await UniswapV2Factory.new('0x0000000000000000000000000000000000000000') // feeSetter + + uniswap2 = await UniswapRouter.new( + uniswapFactory2.address, + '0x0000000000000000000000000000000000000000' + ) // _factory, _WETH + + await registry.setAddressFor( + CeloContractName.FeeCurrencyWhitelist, + feeCurrencyWhitelist.address + ) + await registry.setAddressFor(CeloContractName.Freezer, freezer.address) + + await registry.setAddressFor(CeloContractName.GoldToken, goldToken.address) + await registry.setAddressFor(CeloContractName.Reserve, mockReserve.address) + await mockReserve.setGoldToken(goldToken.address) + await mockReserve.addToken(stableToken.address) + + await goldToken.initialize(registry.address) + // TODO: use MockStableToken for this + await stableToken.initialize( + 'Celo Dollar', + 'cUSD', + decimals, + registry.address, + fixed1, + SECONDS_IN_A_WEEK, + [], + [], + CeloContractName.Exchange // USD + ) + + mockSortedOracles = await MockSortedOracles.new() + await registry.setAddressFor(CeloContractName.SortedOracles, mockSortedOracles.address) + await mockSortedOracles.setMedianRate(stableToken.address, stableAmountForRate) + await mockSortedOracles.setMedianTimestampToNow(stableToken.address) + await mockSortedOracles.setNumRates(stableToken.address, 2) + + await fundReserve() + + exchange = await Exchange.new(true) + await exchange.initialize( + registry.address, + CeloContractName.StableToken, + spread, + reserveFraction, + updateFrequency, + minimumReports + ) + + await registry.setAddressFor(CeloContractName.StableToken, stableToken.address) + await registry.setAddressFor(CeloContractName.Exchange, exchange.address) + await exchange.activateStable() + + await feeBurner.initialize( + registry.address, + [stableToken.address, tokenA.address], + [new BigNumber(1000000e18), new BigNumber(1000001e18)], + [toFixed(1), toFixed(1)], // 100% slippage, virtually no limit + ['0x0000000000000000000000000000000000000000', uniswap.address] + ) + }) + + describe('#calculateMinAmount()', () => { + it('calculated the min correclty', async () => { + const midprice = new BigNumber('1e18') // (1 Stabletoken = 1 Celo) + const amount = new BigNumber('10e18') + + await feeBurner.setMaxSplippage(stableToken.address, toFixed(2 / 100)) + assertEqualBN( + await feeBurner.calculateMinAmount( + midprice, + new BigNumber('1e18'), + stableToken.address, + amount + ), + new BigNumber('9.8e18') + ) + }) + }) + + describe('#transfer()', () => { + beforeEach(async () => { + await tokenA.mint(feeBurner.address, new BigNumber(1e18)) + }) + + it('Only owner can take tokens out', async () => { + await assertRevert( + feeBurner.transfer(tokenA.address, user, new BigNumber(1e18), { from: user }) + ) + }) + + it('Can take funds out', async () => { + await feeBurner.transfer(tokenA.address, user, new BigNumber(1e18)) + assertEqualBN(await tokenA.balanceOf(user), new BigNumber(1e18)) + }) + }) + + describe('#initialize()', () => { + it('set the right parameters', async () => { + assertEqualBN(await feeBurner.maxSlippage(stableToken.address), toFixed(1)) + assertEqualBN(await feeBurner.maxSlippage(tokenA.address), toFixed(1)) + assertEqualBN(await feeBurner.dailyBurnLimit(stableToken.address), new BigNumber(1000000e18)) + assertEqualBN(await feeBurner.dailyBurnLimit(tokenA.address), new BigNumber(1000001e18)) + expect((await feeBurner.getRoutersForToken(tokenA.address)).toString()).to.equal( + [uniswap.address].toString() + ) + expect(await feeBurner.routerAddresses(tokenA.address, 0)).to.equal(uniswap.address) + }) + + it('should have set the owner', async () => { + const owner: string = await feeBurner.owner() + assert.equal(owner, accounts[0]) + }) + + it('should not be callable again', async () => { + await assertRevert(feeBurner.initialize(registry.address, [], [], [], [], { from: user })) + }) + }) + + describe('#setRouter()', () => { + it('sets pool for exchange', async () => { + await feeBurner.setRouter(tokenA.address, uniswap.address) + + assert(await feeBurner.routerAddresses(tokenA.address, 0), uniswap.address) + }) + }) + + describe('#removeRouter()', () => { + it('removes a token', async () => { + await feeBurner.removeRouter(tokenA.address, uniswap.address, 0) + expect((await feeBurner.getRoutersForToken(tokenA.address)).toString()).to.equal( + [].toString() + ) + }) + + it('removes when list is big', async () => { + await feeBurner.setRouter(tokenA.address, exchange.address) + await feeBurner.setRouter(tokenA.address, stableToken.address) + // list for token should be [uniswap, exchange, stabletoken] + await feeBurner.removeRouter(tokenA.address, exchange.address, 1) + expect((await feeBurner.getRoutersForToken(tokenA.address)).toString()).to.equal( + [uniswap.address, stableToken.address].toString() + ) + }) + + it("doesn't remove if the indexes doesn't match", async () => { + await assertRevert(feeBurner.removeRouter(tokenA.address, exchange.address, 0)) + }) + }) + + describe('#setDailyBurnLimit()', () => { + it('should only be called by owner', async () => { + await assertRevert( + feeBurner.setDailyBurnLimit(stableToken.address, goldAmountForRate, { from: user }) + ) + }) + }) + + describe('#setMaxSplipagge()', () => { + it('should only be called by owner', async () => { + await assertRevert( + feeBurner.setMaxSplippage(stableToken.address, maxSlippage, { from: user }) + ) + }) + }) + + describe('#burnMentoTokens()', () => { + beforeEach(async () => { + const goldTokenAmount = new BigNumber(1e18) + + await goldToken.approve(exchange.address, goldTokenAmount, { from: user }) + await exchange.sell(goldTokenAmount, 0, true, { from: user }) + }) + + it("Can't burn when forzen", async () => { + await freezer.freeze(feeBurner.address) + await assertRevert(feeBurner.burnMentoTokens()) + }) + + it('burns contract balance', async () => { + await stableToken.transfer(feeBurner.address, await stableToken.balanceOf(user), { + from: user, + }) + + assertEqualBN(await feeBurner.getPastBurnForToken(stableToken.address), 0) + + const burnedAmountStable = await stableToken.balanceOf(feeBurner.address) + + await feeBurner.burn() + + assertEqualBN(await feeBurner.getPastBurnForToken(stableToken.address), burnedAmountStable) + assertEqualBN(await goldToken.balanceOf(feeBurner.address), 0) + assertEqualBN(await stableToken.balanceOf(feeBurner.address), 0) + }) + + it("doesn't burn when bigger than limit", async () => { + await feeBurner.setDailyBurnLimit(stableToken.address, new BigNumber(1000)) + + await stableToken.transfer(feeBurner.address, new BigNumber(3000), { + from: user, + }) + + await feeBurner.burn() + + assertEqualBN(await stableToken.balanceOf(feeBurner.address), new BigNumber(2000)) + + // burning again shouldn't do anything + await feeBurner.burn() + assertEqualBN(await stableToken.balanceOf(feeBurner.address), new BigNumber(2000)) + }) + + it("doesn't burn when slippage is too big", async () => { + // TODO do the math to get the right threshold + await feeBurner.setMaxSplippage(stableToken.address, toFixed(1 / 1e6)) + + await stableToken.transfer(feeBurner.address, new BigNumber(3000), { + from: user, + }) + + await assertRevert(feeBurner.burn()) + + assertEqualBN(await stableToken.balanceOf(feeBurner.address), new BigNumber(3000)) + }) + + it('reset burn limit after 24 hours', async () => { + await feeBurner.setDailyBurnLimit(stableToken.address, new BigNumber(1000)) + + await stableToken.transfer(feeBurner.address, new BigNumber(3000), { + from: user, + }) + + await feeBurner.burn() + await timeTravel(3600 * 24, web3) + await feeBurner.burn() + + assertEqualBN(await stableToken.balanceOf(feeBurner.address), new BigNumber(1000)) + }) + + it("doesn't burn when balance is low", async () => { + await stableToken.transfer(feeBurner.address, new BigNumber(await feeBurner.MIN_BURN()), { + from: user, + }) + + const balanceBefore = await stableToken.balanceOf(feeBurner.address) + + await feeBurner.burn() + + assertEqualBN(await stableToken.balanceOf(feeBurner.address), balanceBefore) + }) + }) + + describe('#burnNonMentoAssets() (if this fails with "revert" please read comments of this tests)', () => { + // Uniswap can get the address of a pair by using an init code pair hash. Unfortunately, this hash is harcoded + // in the file UniswapV2Library.sol. The hash writen now there is meant to run in the CI. If you're seeing this problem you can + // 1. Skip these tests locally, as they will run in the CI anyway or + // 2. Change the hash, you can get the hash for the parciular test deployment with the following: + // // tslint:disable-next-line + // console.log('Uniswap INIT CODE PAIR HASH:', await uniswapFactory.INIT_CODE_PAIR_HASH()) + + beforeEach(async () => { + await feeCurrencyWhitelist.addNonMentoToken(tokenA.address) + await feeBurner.setRouter(tokenA.address, uniswap.address) + await tokenA.mint(feeBurner.address, new BigNumber(10e18)) + await tokenA.mint(user, new BigNumber(10e18)) + await goldToken.transfer(user, new BigNumber(10e18)) + const toTransfer = new BigNumber(5e18) + + await tokenA.approve(uniswap.address, toTransfer, { from: user }) + await goldToken.approve(uniswap.address, toTransfer, { from: user }) + + await uniswap.addLiquidity( + tokenA.address, + goldToken.address, + toTransfer, + toTransfer, + toTransfer, + toTransfer, + user, + deadline, + { from: user } + ) + }) + + it("Can't burn when frozen", async () => { + await freezer.freeze(feeBurner.address) + await assertRevert(feeBurner.burnNonMentoTokens()) + }) + + it('Uniswap trade test', async () => { + // Make sure our uniswap mock works + + const balanceAbefore = await tokenA.balanceOf(user) + const balanceBbefore = await goldToken.balanceOf(user) + + await tokenA.approve(uniswap.address, new BigNumber(1e18), { from: user }) + await uniswap.swapExactTokensForTokens( + new BigNumber(1e18), + 0, + [tokenA.address, goldToken.address], + user, + deadline, + { from: user } + ) + + assertGtBN(balanceAbefore, await tokenA.balanceOf(user)) + assertGtBN(await goldToken.balanceOf(user), balanceBbefore) + }) + + it('Burns non-Mento tokens', async () => { + await tokenA.mint(user, new BigNumber(10e18)) + + // safety check, check that the balance is not empty before the burn + await assertGtBN(await tokenA.balanceOf(feeBurner.address), 0) + await feeBurner.burnNonMentoTokens() + + assertEqualBN(await tokenA.balanceOf(feeBurner.address), 0) + }) + + it("Doesn't burn non Mento tokens if the limit is hit", async () => { + assertEqualBN(await feeBurner.getPastBurnForToken(tokenA.address), 0) + + await feeBurner.setDailyBurnLimit(tokenA.address, new BigNumber(1e18)) + await feeBurner.burnNonMentoTokens() + + assertEqualBN(await feeBurner.getPastBurnForToken(tokenA.address), new BigNumber(1e18)) + + assertEqualBN(await tokenA.balanceOf(feeBurner.address), new BigNumber(9e18)) + await feeBurner.burnNonMentoTokens() + assertEqualBN(await tokenA.balanceOf(feeBurner.address), new BigNumber(9e18)) + + await timeTravel(3600 * 24, web3) + await feeBurner.burnNonMentoTokens() + + assertEqualBN(await tokenA.balanceOf(feeBurner.address), new BigNumber(8e18)) + }) + + it("Doesn't exchange non-Mento when slippage is too high", async () => { + await feeBurner.setMaxSplippage(tokenA.address, maxSlippage) + await assertRevert(feeBurner.burnNonMentoTokens()) + + assertEqualBN(await tokenA.balanceOf(feeBurner.address), new BigNumber(10e18)) + }) + + it('Tries to get the best rate with many exchanges', async () => { + await feeBurner.setRouter(tokenA.address, uniswap2.address) + await tokenA.mint(user, new BigNumber(10e18)) + + // safety check, check that the balance is no empty before the burn + await assertGtBN(await tokenA.balanceOf(feeBurner.address), 0) + + const toTransfer = new BigNumber(10e18) // make uniswap2 bigger, so it should get used + + await tokenA.approve(uniswap2.address, toTransfer, { from: user }) + await goldToken.approve(uniswap2.address, toTransfer, { from: user }) + + await uniswap2.addLiquidity( + tokenA.address, + goldToken.address, + toTransfer, + toTransfer, + toTransfer, + toTransfer, + user, + deadline, + { from: user } + ) + + const quote1before = ( + await uniswap.getAmountsOut(new BigNumber(1e18), [tokenA.address, goldToken.address]) + )[1] + const quote2before = ( + await uniswap2.getAmountsOut(new BigNumber(1e18), [tokenA.address, goldToken.address]) + )[1] + + await feeBurner.burnNonMentoTokens() + + // liquidity should have been taken by the uniswap2, because it has better liquidity, and thust higher quite + // so the quote gets worse (smaller number) + + const quote1after = ( + await uniswap.getAmountsOut(new BigNumber(1e18), [tokenA.address, goldToken.address]) + )[1] + const quote2after = ( + await uniswap2.getAmountsOut(new BigNumber(1e18), [tokenA.address, goldToken.address]) + )[1] + + assertEqualBN(quote1before, quote1after) // uniswap 1 should be untouched + assertGtBN(quote2before, quote2after) + + assertEqualBN(await tokenA.balanceOf(feeBurner.address), 0) // check that it burned + }) + }) +}) diff --git a/packages/protocol/test/common/feecurrencywhitelist.ts b/packages/protocol/test/common/feecurrencywhitelist.ts new file mode 100644 index 00000000000..c23fca6afb8 --- /dev/null +++ b/packages/protocol/test/common/feecurrencywhitelist.ts @@ -0,0 +1,111 @@ +import { assertRevert } from '@celo/protocol/lib/test-utils' +import { FeeCurrencyWhitelistContract, FeeCurrencyWhitelistInstance } from 'types' + +const FeeCurrencyWhitelist: FeeCurrencyWhitelistContract = artifacts.require('FeeCurrencyWhitelist') + +contract('FeeCurrencyWhitelist', (accounts: string[]) => { + let feeCurrencyWhitelist: FeeCurrencyWhitelistInstance + + const aTokenAddress = '0x000000000000000000000000000000000000ce10' + + const nonOwner = accounts[1] + + beforeEach(async () => { + feeCurrencyWhitelist = await FeeCurrencyWhitelist.new(true) + await feeCurrencyWhitelist.initialize() + }) + + describe('#initialize()', () => { + it('should have set the owner', async () => { + const owner: string = await feeCurrencyWhitelist.owner() + assert.equal(owner, accounts[0]) + }) + + it('should not be callable again', async () => { + await assertRevert(feeCurrencyWhitelist.initialize()) + }) + }) + + describe('#addToken()', () => { + it('should allow the owner to add a token', async () => { + await feeCurrencyWhitelist.addToken(aTokenAddress) + const tokens = await feeCurrencyWhitelist.getWhitelist() + assert.sameMembers(tokens, [aTokenAddress]) + }) + + it('should not allow a non-owner to add a token', async () => { + await assertRevert(feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner })) + }) + }) + + describe('#addNonMentoToken()', () => { + it('should allow the owner to add a token', async () => { + await feeCurrencyWhitelist.addNonMentoToken(aTokenAddress) + const nonMentoTokens = await feeCurrencyWhitelist.getWhitelist() + assert.sameMembers(nonMentoTokens, [aTokenAddress]) + + const mentoTokens = await feeCurrencyWhitelist.getWhitelistNonMento() + assert.sameMembers(mentoTokens, [aTokenAddress]) + }) + + it('should not allow a non-owner to add a token', async () => { + await assertRevert(feeCurrencyWhitelist.addNonMentoToken(aTokenAddress, { from: nonOwner })) + }) + }) + + describe('Removing', () => { + beforeEach(async () => { + await feeCurrencyWhitelist.addToken(aTokenAddress) + await feeCurrencyWhitelist.addToken(accounts[0]) + await feeCurrencyWhitelist.addToken(accounts[1]) + }) + + describe('#removeToken()', () => { + it('Removes from a big list', async () => { + await feeCurrencyWhitelist.removeToken(accounts[0], 1) + assert.sameMembers(await feeCurrencyWhitelist.getWhitelist(), [aTokenAddress, accounts[1]]) + }) + + it("Doesn't remove if the index is wrong", async () => { + await assertRevert(feeCurrencyWhitelist.removeToken(accounts[0], 0)) + }) + + it('should not allow a non-owner to remove Mento token', async () => { + await assertRevert(feeCurrencyWhitelist.removeToken(accounts[0], 0, { from: nonOwner })) + }) + }) + + describe('#removeNonMentoToken()', () => { + beforeEach(async () => { + await feeCurrencyWhitelist.addNonMentoToken(accounts[2]) + await feeCurrencyWhitelist.addNonMentoToken(accounts[3]) + await feeCurrencyWhitelist.addNonMentoToken(accounts[4]) + }) + + it('Removes from a big list', async () => { + await feeCurrencyWhitelist.removeNonMentoToken(accounts[3], 4, 1) + assert.sameMembers(await feeCurrencyWhitelist.getWhitelist(), [ + aTokenAddress, + accounts[0], + accounts[1], + accounts[2], + accounts[4], + ]) + assert.sameMembers(await feeCurrencyWhitelist.getWhitelistNonMento(), [ + accounts[2], + accounts[4], + ]) + }) + + it("Doesn't remove if the index is wrong", async () => { + await assertRevert(feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1)) + }) + + it('should not allow a non-owner to remove non-Mento token', async () => { + await assertRevert( + feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1, { from: nonOwner }) + ) + }) + }) + }) +}) diff --git a/packages/protocol/test/common/gascurrencywhitelist.ts b/packages/protocol/test/common/gascurrencywhitelist.ts deleted file mode 100644 index daad69e1642..00000000000 --- a/packages/protocol/test/common/gascurrencywhitelist.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' -import { FeeCurrencyWhitelistContract, FeeCurrencyWhitelistInstance } from 'types' - -const FeeCurrencyWhitelist: FeeCurrencyWhitelistContract = artifacts.require('FeeCurrencyWhitelist') - -contract('FeeCurrencyWhitelist', (accounts: string[]) => { - let feeCurrencyWhitelist: FeeCurrencyWhitelistInstance - - const aTokenAddress = '0x000000000000000000000000000000000000ce10' - - const nonOwner = accounts[1] - - beforeEach(async () => { - feeCurrencyWhitelist = await FeeCurrencyWhitelist.new(true) - await feeCurrencyWhitelist.initialize() - }) - - describe('#initialize()', () => { - it('should have set the owner', async () => { - const owner: string = await feeCurrencyWhitelist.owner() - assert.equal(owner, accounts[0]) - }) - - it('should not be callable again', async () => { - await assertRevert(feeCurrencyWhitelist.initialize()) - }) - }) - - describe('#addToken()', () => { - it('should allow the owner to add a token', async () => { - await feeCurrencyWhitelist.addToken(aTokenAddress) - const tokens = await feeCurrencyWhitelist.getWhitelist() - assert.sameMembers(tokens, [aTokenAddress]) - }) - - it('should not allow a non-owner to add a token', async () => { - await assertRevert(feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner })) - }) - }) -}) diff --git a/packages/protocol/test/common/goldtoken.ts b/packages/protocol/test/common/goldtoken.ts index 140014329cd..86c7f31b047 100644 --- a/packages/protocol/test/common/goldtoken.ts +++ b/packages/protocol/test/common/goldtoken.ts @@ -8,6 +8,8 @@ import { FreezerInstance, GoldTokenContract, GoldTokenInstance, + MockGoldTokenContract, + MockGoldTokenInstance, RegistryContract, RegistryInstance, } from 'types' @@ -15,6 +17,7 @@ import { const Freezer: FreezerContract = artifacts.require('Freezer') const GoldToken: GoldTokenContract = artifacts.require('GoldToken') const Registry: RegistryContract = artifacts.require('Registry') +const MockGoldToken: MockGoldTokenContract = artifacts.require('MockGoldToken') // @ts-ignore // TODO(mcortesi): Use BN @@ -26,6 +29,8 @@ contract('GoldToken', (accounts: string[]) => { let registry: RegistryInstance const ONE_GOLDTOKEN = new BigNumber('1000000000000000000') const TWO_GOLDTOKEN = new BigNumber('2000000000000000000') + const burnAddress = '0x000000000000000000000000000000000000dEaD' + const sender = accounts[0] const receiver = accounts[1] @@ -51,6 +56,59 @@ contract('GoldToken', (accounts: string[]) => { }) }) + describe('#burn()', () => { + let startBurn: BigNumber + + beforeEach(async () => { + startBurn = await goldToken.getBurnedAmount() + }) + + it('burn address starts with zero balance', async () => { + assertEqualBN(await goldToken.balanceOf(burnAddress), 0) + }) + + it('burn starts as start burn amount', async () => { + assertEqualBN(await goldToken.getBurnedAmount(), startBurn) + }) + + it('Burned amount equals the balance of the burn address', async () => { + assertEqualBN(await goldToken.getBurnedAmount(), await goldToken.balanceOf(burnAddress)) + }) + + it('returns right burned amount', async () => { + await goldToken.burn(ONE_GOLDTOKEN) + + assertEqualBN(await goldToken.getBurnedAmount(), ONE_GOLDTOKEN.plus(startBurn)) + }) + }) + + describe('#circulatingSupply()', () => { + let mockGoldToken: MockGoldTokenInstance + + beforeEach(async () => { + mockGoldToken = await MockGoldToken.new() + // set supply to 1K + await mockGoldToken.setTotalSupply(ONE_GOLDTOKEN.multipliedBy(1000)) + }) + + it('matches circulatingSupply() when there was no burn', async () => { + assertEqualBN(await mockGoldToken.circulatingSupply(), await mockGoldToken.totalSupply()) + }) + + it('decreases when there was a burn', async () => { + // mock a burn + await mockGoldToken.setBalanceOf(burnAddress, ONE_GOLDTOKEN) + + const circulatingSupply = await mockGoldToken.circulatingSupply() + // circulatingSupply got reduced to 999 after burning 1 Celo + assertEqualBN(circulatingSupply, ONE_GOLDTOKEN.multipliedBy(999)) + assertEqualBN( + circulatingSupply, + new BigNumber(await mockGoldToken.totalSupply()).plus(ONE_GOLDTOKEN.multipliedBy(-1)) + ) + }) + }) + describe('#decimals()', () => { it('should have decimals', async () => { const decimals: BigNumber = await goldToken.decimals() diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index dfc65b4e40a..13e4bca7c82 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -631,9 +631,7 @@ contract('Integration: Adding StableToken', (accounts: string[]) => { '5000000000000000000000', // spread, matches mainnet for cUSD and cEUR '1300000000000000000000', // reserveFraction, matches mainnet for cEUR '300', // updateFrequency, matches mainnet for cUSD and cEUR - '1', // minimumReports, minimum possible to avoid having to mock multiple reports, - '1000000000000000000000000', // minSupplyForStableBucketCap, minimum amount of stabletoken supply considered for the stable token bucket cap - '45454545454545456000000' // stableBucketMaxFraction, value for stable bucket Fraction CAP + '1' // minimumReports, minimum possible to avoid having to mock multiple reports ) }) diff --git a/packages/protocol/test/common/onboarding.ts b/packages/protocol/test/common/onboarding.ts deleted file mode 100644 index 83d320f00c1..00000000000 --- a/packages/protocol/test/common/onboarding.ts +++ /dev/null @@ -1,424 +0,0 @@ -import { getSignatureForMetaTransaction, MetaTransaction } from '@celo/protocol/lib/meta-tx-utils' -import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils' -import { - assertEqualBN, - assumeOwnership, - getDerivedKey, - getVerificationCodeSignature, - KeyOffsets, - unlockAndAuthorizeKey, -} from '@celo/protocol/lib/test-utils' -import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils' -import { ensureLeading0x, privateKeyToAddress, trimLeading0x } from '@celo/utils/lib/address' -import { - AccountsContract, - AccountsInstance, - AttestationsTestContract, - AttestationsTestInstance, - MetaTransactionWalletContract, - MetaTransactionWalletDeployerContract, - MetaTransactionWalletDeployerInstance, - MetaTransactionWalletInstance, - MockRandomContract, - MockRandomInstance, - MockValidatorsContract, - ProxyCloneFactoryContract, - ProxyCloneFactoryInstance, - ProxyContract, - ProxyInstance, - RegistryInstance, - StableTokenInstance, -} from 'types' - -const executeMetaTransaction = async ( - signer: string, - mtw: MetaTransactionWalletInstance, - metaTx: MetaTransaction -) => { - const { v, r, s } = await getSignatureForMetaTransaction(signer, mtw.address, metaTx) - return mtw.executeMetaTransaction(metaTx.destination, metaTx.value, metaTx.data, v, r, s) -} - -const getExecuteMetaTransactionData = async ( - signer: string, - mtw: MetaTransactionWalletInstance, - metaTx: MetaTransaction -) => { - const { v, r, s } = await getSignatureForMetaTransaction(signer, mtw.address, metaTx) - // @ts-ignore - return mtw.contract.methods - .executeMetaTransaction(metaTx.destination, metaTx.value, metaTx.data, v, r, s) - .encodeABI() -} - -const logCosts = false -const logCost = (output: string) => { - if (logCosts) { - // tslint:disable-next-line:no-console - console.log(output) - } -} - -const Accounts: AccountsContract = artifacts.require('Accounts') -const Attestations: AttestationsTestContract = artifacts.require('AttestationsTest') -const MTW: MetaTransactionWalletContract = artifacts.require('MetaTransactionWallet') -const MTWDeployer: MetaTransactionWalletDeployerContract = artifacts.require( - 'MetaTransactionWalletDeployer' -) -const Proxy: ProxyContract = artifacts.require('InitializableProxy') -const ProxyCloneFactory: ProxyCloneFactoryContract = artifacts.require('ProxyCloneFactory') -const Random: MockRandomContract = artifacts.require('MockRandom') -const Validators: MockValidatorsContract = artifacts.require('MockValidators') -contract('Komenci Onboarding', (_accounts: string[]) => { - let accounts: AccountsInstance - let stableToken: StableTokenInstance - let mtw: MetaTransactionWalletInstance - let random: MockRandomInstance - let registry: RegistryInstance - let relayermtw: MetaTransactionWalletInstance - let transactions: any[] - const attestationExpiryBlocks = (60 * 60) / 5 - const selectIssuersWaitBlocks = 4 - const maxAttestations = 20 - const user: string = _accounts[1] - // Random hex strings - const dek = '0x02f2f48ee19680706196e2e339e5da3491186e0c4c5030670656b0e01611111111' - const identifier = '0x02f2f48ee19680706196e2e339e5da3491186e0c4c5030670656b0e016111111' - const numAttestations = 3 - // $0.05 - const perAttestationFee = '50000000000000000' - // $0.15 - const attestationFee = '150000000000000000' - before(async () => { - stableToken = await getDeployedProxiedContract('StableToken', artifacts) - // The komenci version is set as a test contract because we are not using it with a proxy. - relayermtw = await MTW.new(true) - await relayermtw.initialize(_accounts[0]) - - // Set up the required mocks that will allow verification to work with ganache. - registry = await getDeployedProxiedContract('Registry', artifacts) - random = await Random.new() - accounts = await Accounts.new(true) - await accounts.initialize(registry.address) - // Take ownership of the registry contract to point it to the mocks. - await assumeOwnership(['Registry'], _accounts[0]) - await registry.setAddressFor(CeloContractName.Random, random.address) - await registry.setAddressFor(CeloContractName.Accounts, accounts.address) - const mockValidators = await Validators.new() - await registry.setAddressFor(CeloContractName.Validators, mockValidators.address) - - await Promise.all( - _accounts.map(async (account) => { - await accounts.createAccount({ from: account }) - await unlockAndAuthorizeKey( - KeyOffsets.VALIDATING_KEY_OFFSET, - accounts.authorizeValidatorSigner, - account, - _accounts - ) - await unlockAndAuthorizeKey( - KeyOffsets.ATTESTING_KEY_OFFSET, - accounts.authorizeAttestationSigner, - account, - _accounts - ) - }) - ) - }) - - describe('With AttestationsV1', () => { - let attestations: AttestationsTestInstance - before(async () => { - // Attestations uses some precompiles that are not implemented in ganache. - // TODO: Put a proxy in front of it. - attestations = await Attestations.new() - await attestations.initialize( - registry.address, - attestationExpiryBlocks, - selectIssuersWaitBlocks, - maxAttestations, - [stableToken.address], - [perAttestationFee] - ) - await attestations.__setValidators( - _accounts.map((account) => - privateKeyToAddress(getDerivedKey(KeyOffsets.VALIDATING_KEY_OFFSET, account, _accounts)) - ) - ) - }) - - describe('Current flow', () => { - let mtwDeployer: MetaTransactionWalletDeployerInstance - before(async () => { - mtwDeployer = await MTWDeployer.new() - mtw = await MTW.new(false) - }) - - it('should onboard a new user', async () => { - let totalCost = 0 - - const deploymentTx = await mtwDeployer.deploy( - user, - mtw.address, - // @ts-ignore - mtw.contract.methods.initialize(ensureLeading0x(user)).encodeABI() - ) - logCost(`Deploying and initializing a proxy takes ${deploymentTx.receipt.gasUsed} gas`) - totalCost += deploymentTx.receipt.gasUsed - mtw = await MTW.at(deploymentTx.logs[0].args.wallet) - - let { v, r, s } = await getParsedSignatureOfAddress(web3, mtw.address, user) - const setAccount = { - value: 0, - destination: accounts.address, - // @ts-ignore - data: accounts.contract.methods.setAccount('', dek, user, v, r, s).encodeABI(), - nonce: 0, - } - const setAccountTx = await executeMetaTransaction(user, mtw, setAccount) - logCost(`Setting the account takes ${setAccountTx.receipt.gasUsed} gas`) - totalCost += setAccountTx.receipt.gasUsed - - await stableToken.transfer(relayermtw.address, attestationFee) - - const approve = { - value: 0, - destination: stableToken.address, - // @ts-ignore - data: stableToken.contract.methods - .approve(attestations.address, attestationFee) - .encodeABI(), - nonce: 1, - } - const approveMeta = { - value: 0, - destination: mtw.address, - data: await getExecuteMetaTransactionData(user, mtw, approve), - } - - const request = { - value: 0, - destination: attestations.address, - // @ts-ignore - data: attestations.contract.methods - .request(identifier, numAttestations, stableToken.address) - .encodeABI(), - nonce: 2, - } - const requestMeta = { - value: 0, - destination: mtw.address, - data: await getExecuteMetaTransactionData(user, mtw, request), - } - - const transfer = { - value: 0, - destination: stableToken.address, - // @ts-ignore - data: stableToken.contract.methods.transfer(mtw.address, attestationFee).encodeABI(), - } - - transactions = [transfer, approveMeta, requestMeta] - const requestTx = await relayermtw.executeTransactions( - transactions.map((t) => t.destination), - transactions.map((t) => t.value), - ensureLeading0x(transactions.map((t) => trimLeading0x(t.data)).join('')), - transactions.map((t) => trimLeading0x(t.data).length / 2) - ) - logCost(`Requesting attestations takes ${requestTx.receipt.gasUsed} gas`) - totalCost += requestTx.receipt.gasUsed - - // Add fake randomness so that issuers can be selected. - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks, '0x1') - - const select = { - value: 0, - destination: attestations.address, - // @ts-ignore - data: attestations.contract.methods.selectIssuers(identifier).encodeABI(), - nonce: 3, - } - const selectTx = await executeMetaTransaction(user, mtw, select) - logCost(`Selecting issuers takes ${selectTx.receipt.gasUsed} gas`) - totalCost += selectTx.receipt.gasUsed - - const issuers = await attestations.getAttestationIssuers(identifier, mtw.address) - for (let i = 0; i < numAttestations; i++) { - const issuer = issuers[i] - ;({ v, r, s } = await getVerificationCodeSignature( - mtw.address, - issuer, - identifier, - _accounts - )) - const complete = { - value: 0, - destination: attestations.address, - // @ts-ignore - data: attestations.contract.methods.complete(identifier, v, r, s).encodeABI(), - nonce: i + 4, - } - const completeTx = await executeMetaTransaction(user, mtw, complete) - logCost(`Completing an attestation takes ${completeTx.receipt.gasUsed} gas`) - totalCost += completeTx.receipt.gasUsed - } - const [completed, total] = await attestations.getAttestationStats(identifier, mtw.address) - assertEqualBN(completed, numAttestations) - assertEqualBN(total, numAttestations) - logCost(`Onboarding a user takes ${totalCost} gas`) - }) - // Deploying and initializing a proxy takes 695743 gas - // Setting the account takes 189023 gas - // Requesting attestations takes 219860 gas - // Selecting issuers takes 249338 gas - // Completing an attestation takes 144778 gas - // Completing an attestation takes 104194 gas - // Completing an attestation takes 104146 gas - // Onboarding a user takes 1707082 gas - }) - - describe('With EIP-1167', () => { - let proxyCloneFactory: ProxyCloneFactoryInstance - before(async () => { - const proxy: ProxyInstance = await Proxy.new() - proxyCloneFactory = await ProxyCloneFactory.new() - await proxyCloneFactory.setImplementationAddress(proxy.address) - mtw = await MTW.new(false) - }) - - // The same as the current komenci flow, but using EIP-1167 proxies, and transferring the - // proxy ownership to the proxy rather than the user (this does not affect gas costs in - // this flow, but will save gas in future flows which use a pool of pre-deployed proxies) - describe('Current flow', () => { - it('should onboard a new user', async () => { - let totalCost = 0 - - const deploymentTx = await proxyCloneFactory.deploy( - mtw.address, - // @ts-ignore - mtw.contract.methods.initialize(ensureLeading0x(user)).encodeABI() - ) - logCost(`Deploying a proxy takes ${deploymentTx.receipt.gasUsed} gas`) - totalCost += deploymentTx.receipt.gasUsed - const proxy = await Proxy.at(deploymentTx.logs[1].args.proxyClone) - mtw = await MTW.at(proxy.address) - - let { v, r, s } = await getParsedSignatureOfAddress(web3, mtw.address, user) - const setAccount = { - value: 0, - destination: accounts.address, - // @ts-ignore - data: accounts.contract.methods.setAccount('', dek, user, v, r, s).encodeABI(), - nonce: 0, - } - const setAccountTx = await executeMetaTransaction(user, mtw, setAccount) - logCost(`Setting the account takes ${setAccountTx.receipt.gasUsed} gas`) - totalCost += setAccountTx.receipt.gasUsed - - await stableToken.transfer(relayermtw.address, attestationFee) - - // Is is cheaper to submit these two as separate meta transaction than as a single - // meta transaction batch by ~10k gas. - const approve = { - value: 0, - destination: stableToken.address, - // @ts-ignore - data: stableToken.contract.methods - .approve(attestations.address, attestationFee) - .encodeABI(), - nonce: 1, - } - const approveMeta = { - value: 0, - destination: mtw.address, - data: await getExecuteMetaTransactionData(user, mtw, approve), - } - - const request = { - value: 0, - destination: attestations.address, - // @ts-ignore - data: attestations.contract.methods - .request(identifier, numAttestations, stableToken.address) - .encodeABI(), - nonce: 2, - } - const requestMeta = { - value: 0, - destination: mtw.address, - data: await getExecuteMetaTransactionData(user, mtw, request), - } - - const transfer = { - value: 0, - destination: stableToken.address, - // @ts-ignore - data: stableToken.contract.methods.transfer(mtw.address, attestationFee).encodeABI(), - } - - transactions = [transfer, approveMeta, requestMeta] - const requestTx = await relayermtw.executeTransactions( - transactions.map((t) => t.destination), - transactions.map((t) => t.value), - ensureLeading0x(transactions.map((t) => trimLeading0x(t.data)).join('')), - transactions.map((t) => trimLeading0x(t.data).length / 2) - ) - logCost(`Requesting attestations takes ${requestTx.receipt.gasUsed} gas`) - totalCost += requestTx.receipt.gasUsed - - // Add fake randomness so that issuers can be selected. - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks, '0x1') - - const select = { - value: 0, - destination: attestations.address, - // @ts-ignore - data: attestations.contract.methods.selectIssuers(identifier).encodeABI(), - nonce: 3, - } - const selectTx = await executeMetaTransaction(user, mtw, select) - logCost(`Selecting issuers takes ${selectTx.receipt.gasUsed} gas`) - totalCost += selectTx.receipt.gasUsed - - const issuers = await attestations.getAttestationIssuers(identifier, mtw.address) - for (let i = 0; i < numAttestations; i++) { - const issuer = issuers[i] - ;({ v, r, s } = await getVerificationCodeSignature( - mtw.address, - issuer, - identifier, - _accounts - )) - const complete = { - value: 0, - destination: attestations.address, - // @ts-ignore - data: attestations.contract.methods.complete(identifier, v, r, s).encodeABI(), - nonce: i + 4, - } - const completeTx = await executeMetaTransaction(user, mtw, complete) - logCost(`Completing an attestation takes ${completeTx.receipt.gasUsed} gas`) - totalCost += completeTx.receipt.gasUsed - } - const [completed, total] = await attestations.getAttestationStats(identifier, mtw.address) - assertEqualBN(completed, numAttestations) - assertEqualBN(total, numAttestations) - logCost(`Onboarding a user takes ${totalCost} gas`) - }) - // Deploying a proxy takes 187488 gas - // Setting the account takes 189943 gas - // Requesting attestations takes 221676 gas - // Selecting issuers takes 250184 gas - // Completing an attestation takes 145670 gas - // Completing an attestation takes 105110 gas - // Completing an attestation takes 105066 gas - // Onboarding a user takes 1205137 gas - // Total gas cost: 70.6% of current. - // Throughput increase: 41.7%. - }) - }) - }) -}) diff --git a/packages/protocol/test/compatibility/ast-layout.ts b/packages/protocol/test/compatibility/ast-layout.ts index 1965eee89e8..00e9470da83 100644 --- a/packages/protocol/test/compatibility/ast-layout.ts +++ b/packages/protocol/test/compatibility/ast-layout.ts @@ -27,6 +27,15 @@ const testCases = { mapping_source_changed: getTestArtifacts('mapping_source_changed'), internal_mapping_source_changed: getTestArtifacts('internal_mapping_source_changed'), mapping_target_changed: getTestArtifacts('mapping_target_changed'), + + original_struct_in_mapping: getTestArtifacts('original_struct_in_mapping'), + inserted_in_struct_mapping: getTestArtifacts('inserted_in_struct_mapping'), + inserted_in_library_struct_mapping: getTestArtifacts('inserted_in_library_struct_mapping'), + deprecated_prefixed_in_library_struct_mapping: getTestArtifacts( + 'deprecated_prefixed_in_library_struct_mapping' + ), + deprecated_prefixed_in_struct: getTestArtifacts('deprecated_prefixed_in_struct'), + deprecated_prefixed_variable: getTestArtifacts('deprecated_prefixed_variable'), } const assertCompatible = (report) => { @@ -132,6 +141,56 @@ describe('#reportLayoutIncompatibilities()', () => { }) }) + describe('when a field is added to a struct in mapping', () => { + it('reports no incompatibilities', () => { + const report = reportLayoutIncompatibilities( + testCases.original_struct_in_mapping, + testCases.inserted_in_struct_mapping + ) + assertCompatible(report) + }) + }) + + describe('when a field is added to a library struct in mapping', () => { + it('reports no incompatibilities', () => { + const report = reportLayoutIncompatibilities( + testCases.original_struct_in_mapping, + testCases.inserted_in_library_struct_mapping + ) + assertCompatible(report) + }) + }) + + describe('when a field is prefixed with deprecated to a library struct in mapping', () => { + it('reports no incompatibilities', () => { + const report = reportLayoutIncompatibilities( + testCases.original_struct_in_mapping, + testCases.deprecated_prefixed_in_library_struct_mapping + ) + assertCompatible(report) + }) + }) + + describe('when a field is prefixed with deprecated to struct variable', () => { + it('reports no incompatibilities', () => { + const report = reportLayoutIncompatibilities( + testCases.original, + testCases.deprecated_prefixed_in_struct + ) + assertCompatible(report) + }) + }) + + describe('when a variable is prefixed with deprecated', () => { + it('reports no incompatibilities', () => { + const report = reportLayoutIncompatibilities( + testCases.original, + testCases.deprecated_prefixed_variable + ) + assertCompatible(report) + }) + }) + describe('when a field is added to a struct', () => { it('reports a struct change', () => { const report = reportLayoutIncompatibilities(testCases.original, testCases.inserted_in_struct) diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index e6e1f4e6871..9953f909d44 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -107,7 +107,7 @@ contract('Governance', (accounts: string[]) => { const participationFloor = toFixed(5 / 100) const baselineUpdateFactor = toFixed(1 / 5) const baselineQuorumFactor = toFixed(1) - const weight = 100 + const yesVotes = 100 const participation = toFixed(1) const expectedParticipationBaseline = multiply(baselineUpdateFactor, participation).plus( multiply(fixed1.minus(baselineUpdateFactor), participationBaseline) @@ -145,8 +145,8 @@ contract('Governance', (accounts: string[]) => { await registry.setAddressFor(CeloContractName.Validators, mockValidators.address) await accountsInstance.initialize(registry.address) await accountsInstance.createAccount() - await mockLockedGold.setAccountTotalLockedGold(account, weight) - await mockLockedGold.setTotalLockedGold(weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + await mockLockedGold.setTotalLockedGold(yesVotes) transactionSuccess1 = { value: 0, destination: testTransactions.address, @@ -987,7 +987,7 @@ contract('Governance', (accounts: string[]) => { describe('#upvote()', () => { const proposalId = new BigNumber(1) beforeEach(async () => { - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.propose( [transactionSuccess1.value], [transactionSuccess1.destination], @@ -1002,14 +1002,14 @@ contract('Governance', (accounts: string[]) => { it('should increase the number of upvotes for the proposal', async () => { await governance.upvote(proposalId, 0, 0) - assertEqualBN(await governance.getUpvotes(proposalId), weight) + assertEqualBN(await governance.getUpvotes(proposalId), yesVotes) }) it('should mark the account as having upvoted the proposal', async () => { await governance.upvote(proposalId, 0, 0) const [recordId, recordWeight] = await governance.getUpvoteRecord(account) assertEqualBN(recordId, proposalId) - assertEqualBN(recordWeight, weight) + assertEqualBN(recordWeight, yesVotes) }) it('should return true', async () => { @@ -1026,7 +1026,7 @@ contract('Governance', (accounts: string[]) => { args: { proposalId: new BigNumber(proposalId), account, - upvotes: new BigNumber(weight), + upvotes: new BigNumber(yesVotes), }, }) }) @@ -1054,7 +1054,7 @@ contract('Governance', (accounts: string[]) => { await governance.upvote(upvotedProposalId, proposalId, 0) const [proposalIds, upvotes] = await governance.getQueue() assert.equal(proposalIds[0].toNumber(), upvotedProposalId) - assertEqualBN(upvotes[0], weight) + assertEqualBN(upvotes[0], yesVotes) }) }) @@ -1075,7 +1075,7 @@ contract('Governance', (accounts: string[]) => { ) const otherAccount1 = accounts[1] await accountsInstance.createAccount({ from: otherAccount1 }) - await mockLockedGold.setAccountTotalLockedGold(otherAccount1, weight) + await mockLockedGold.setAccountTotalLockedGold(otherAccount1, yesVotes) await governance.upvote(otherProposalId, proposalId, 0, { from: otherAccount1 }) await timeTravel(queueExpiry, web3) }) @@ -1165,14 +1165,14 @@ contract('Governance', (accounts: string[]) => { it('should increase the number of upvotes for the proposal', async () => { await governance.upvote(upvotedProposalId, 0, 0) - assertEqualBN(await governance.getUpvotes(upvotedProposalId), weight) + assertEqualBN(await governance.getUpvotes(upvotedProposalId), yesVotes) }) it('should mark the account as having upvoted the proposal', async () => { await governance.upvote(upvotedProposalId, 0, 0) const [recordId, recordWeight] = await governance.getUpvoteRecord(account) assertEqualBN(recordId, upvotedProposalId) - assertEqualBN(recordWeight, weight) + assertEqualBN(recordWeight, yesVotes) }) it('should return true', async () => { @@ -1200,7 +1200,7 @@ contract('Governance', (accounts: string[]) => { args: { proposalId: new BigNumber(upvotedProposalId), account, - upvotes: new BigNumber(weight), + upvotes: new BigNumber(yesVotes), }, }) }) @@ -1210,7 +1210,7 @@ contract('Governance', (accounts: string[]) => { describe('#revokeUpvote()', () => { const proposalId = new BigNumber(1) beforeEach(async () => { - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.propose( [transactionSuccess1.value], [transactionSuccess1.destination], @@ -1250,7 +1250,7 @@ contract('Governance', (accounts: string[]) => { args: { proposalId: new BigNumber(proposalId), account, - revokedUpvotes: new BigNumber(weight), + revokedUpvotes: new BigNumber(yesVotes), }, }) }) @@ -1581,7 +1581,7 @@ contract('Governance', (accounts: string[]) => { await governance.approve(1, 0) await governance.approve(2, 1) await governance.approve(3, 2) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) }) for (let numVoted = 0; numVoted < 3; numVoted++) { @@ -1605,17 +1605,18 @@ contract('Governance', (accounts: string[]) => { assert.isFalse(voting) }) - it(`should emit the ProposalVoteRevoked event ${numVoted} times`, async () => { + it(`should emit the ProposalVoteRevokedV2 event ${numVoted} times`, async () => { const resp = await governance.revokeVotes() assert.equal(resp.logs.length, numVoted) resp.logs.map((log, i) => assertLogMatches2(log, { - event: 'ProposalVoteRevoked', + event: 'ProposalVoteRevokedV2', args: { proposalId: i + 1, account, - value, - weight, + yesVotes, + noVotes: 0, + abstainVotes: 0, }, }) ) @@ -1623,7 +1624,58 @@ contract('Governance', (accounts: string[]) => { it('should not revert when proposals are not in the Referendum stage', async () => { await timeTravel(referendumStageDuration, web3) + const success = await governance.revokeVotes.call() + assert.isTrue(success) + }) + }) + } + + for (let numVoted = 0; numVoted < 3; numVoted++) { + describe(`when account has partially voted on ${numVoted} proposals`, () => { + const yes = 10 + const no = 30 + const abstain = 0 + beforeEach(async () => { + for (let i = 0; i < numVoted; i++) { + await governance.votePartially(i + 1, i, yes, no, abstain) + } + }) + + it('should unset the most recent referendum proposal voted on', async () => { + await governance.revokeVotes() + const mostRecentReferendum = await governance.getMostRecentReferendumProposal(account) + assert.equal(mostRecentReferendum.toNumber(), 0) + }) + + it('should return false on `isVoting`', async () => { await governance.revokeVotes() + const voting = await governance.isVoting(accounts[0]) + const totalVotesByAccount = await governance.getAmountOfGoldUsedForVoting(accounts[0]) + assert.isFalse(voting) + assert.isTrue(totalVotesByAccount.eq(0)) + }) + + it(`should emit the ProposalVoteRevokedV2 event ${numVoted} times`, async () => { + const resp = await governance.revokeVotes() + assert.equal(resp.logs.length, numVoted) + resp.logs.map((log, i) => + assertLogMatches2(log, { + event: 'ProposalVoteRevokedV2', + args: { + proposalId: i + 1, + account, + yesVotes: yes, + noVotes: no, + abstainVotes: abstain, + }, + }) + ) + }) + + it('should not revert when proposals are not in the Referendum stage', async () => { + await timeTravel(referendumStageDuration, web3) + const success = await governance.revokeVotes.call() + assert.isTrue(success) }) }) } @@ -1648,29 +1700,31 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) }) it('should return true', async () => { - const success = await governance.vote.call(proposalId, index, value) + const success = await governance.vote.call(proposalId, index, value, { + gas: 7000000, + from: account, + }) assert.isTrue(success) }) it('should increment the vote totals', async () => { await governance.vote(proposalId, index, value) const [yes, ,] = await governance.getVoteTotals(proposalId) - assert.equal(yes.toNumber(), weight) + assert.equal(yes.toNumber(), yesVotes) }) it("should set the voter's vote record", async () => { await governance.vote(proposalId, index, value) - const [recordProposalId, recordValue, recordWeight] = await governance.getVoteRecord( - account, - index - ) + const [recordProposalId, , , yesVotesRecord, noVotesRecord, abstainVotesRecord] = + await governance.getVoteRecord(account, index) assertEqualBN(recordProposalId, proposalId) - assertEqualBN(recordValue, value) - assertEqualBN(recordWeight, weight) + assertEqualBN(yesVotesRecord, yesVotes) + assertEqualBN(noVotesRecord, 0) + assertEqualBN(abstainVotesRecord, 0) }) it('should set the most recent referendum proposal voted on', async () => { @@ -1681,17 +1735,18 @@ contract('Governance', (accounts: string[]) => { ) }) - it('should emit the ProposalVoted event', async () => { + it('should emit the ProposalVotedV2 event', async () => { const resp = await governance.vote(proposalId, index, value) assert.equal(resp.logs.length, 1) const log = resp.logs[0] assertLogMatches2(log, { - event: 'ProposalVoted', + event: 'ProposalVotedV2', args: { proposalId: new BigNumber(proposalId), account, - value: new BigNumber(value), - weight: new BigNumber(weight), + yesVotes, + noVotes: 0, + abstainVotes: 0, }, }) }) @@ -1753,7 +1808,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(newDequeueFrequency, web3) await governance.approve(proposalId2, index2) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) }) it('should set mostRecentReferendumProposal to the youngest proposal voted on', async () => { @@ -1801,14 +1856,18 @@ contract('Governance', (accounts: string[]) => { it('should increment the vote total for the new vote', async () => { await governance.vote(proposalId, index, newValue) const voteTotals = await governance.getVoteTotals(proposalId) - assert.equal(voteTotals[3 - newValue].toNumber(), weight) + assert.equal(voteTotals[3 - newValue].toNumber(), yesVotes) }) it("should set the voter's vote record", async () => { await governance.vote(proposalId, index, newValue) - const [recordProposalId, recordValue] = await governance.getVoteRecord(account, index) + const [recordProposalId, , , yesVotesRecord, noVotesRecord, abstainVotesRecord] = + await governance.getVoteRecord(account, index) assert.equal(recordProposalId.toNumber(), proposalId) - assert.equal(recordValue.toNumber(), newValue) + + const votesNormalized = [0, abstainVotesRecord, noVotesRecord, yesVotesRecord] + + assertEqualBN(votesNormalized[newValue], yesVotes) }) } @@ -1912,7 +1971,7 @@ contract('Governance', (accounts: string[]) => { { value: minDeposit } ) await timeTravel(dequeueFrequency, web3) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) }) it('should return true', async () => { @@ -1923,18 +1982,17 @@ contract('Governance', (accounts: string[]) => { it('should increment the vote totals', async () => { await governance.vote(proposalId, index, value) const [yes, ,] = await governance.getVoteTotals(proposalId) - assert.equal(yes.toNumber(), weight) + assert.equal(yes.toNumber(), yesVotes) }) it("should set the voter's vote record", async () => { await governance.vote(proposalId, index, value) - const [recordProposalId, recordValue, recordWeight] = await governance.getVoteRecord( - account, - index - ) + const [recordProposalId, , , yesVotesRecord, noVotesRecord, abstainVotesRecord] = + await governance.getVoteRecord(account, index) assertEqualBN(recordProposalId, proposalId) - assertEqualBN(recordValue, value) - assertEqualBN(recordWeight, weight) + assertEqualBN(yesVotesRecord, yesVotes) + assertEqualBN(noVotesRecord, 0) + assertEqualBN(abstainVotesRecord, 0) }) it('should set the most recent referendum proposal voted on', async () => { @@ -1945,18 +2003,19 @@ contract('Governance', (accounts: string[]) => { ) }) - it('should emit the ProposalVoted event', async () => { + it('should emit the ProposalVotedV2 event', async () => { await governance.dequeueProposalsIfReady() const resp = await governance.vote(proposalId, index, value) assert.equal(resp.logs.length, resp.logs.length) const log = resp.logs[0] assertLogMatches2(log, { - event: 'ProposalVoted', + event: 'ProposalVotedV2', args: { proposalId: new BigNumber(proposalId), account, - value: new BigNumber(value), - weight: new BigNumber(weight), + yesVotes, + noVotes: 0, + abstainVotes: 0, }, }) }) @@ -1983,7 +2042,576 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevert(governance.vote(otherProposalId, index, value)) + await assertRevert(governance.vote(otherProposalId, index, value)) + }) + }) + + describe('When voting on different proposal with same index', () => { + const proposalId2 = 2 + const otherAccountWeight = 100 + beforeEach(async () => { + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + await governance.approve(proposalId, index) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + await governance.vote(proposalId, index, value) + await timeTravel(referendumStageDuration, web3) + await timeTravel(executionStageDuration, web3) + }) + + it('should ignore votes from previous proposal', async () => { + const dequeuedProposal1Dequeued = await governance.dequeued(index) + assertEqualBN(dequeuedProposal1Dequeued, proposalId) + + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await governance.execute(proposalId, index) + assert.isFalse(await governance.proposalExists(proposalId)) + + await timeTravel(dequeueFrequency + 1, web3) + await governance.dequeueProposalsIfReady() + await governance.approve.call(proposalId2, index) + assert.isTrue(await governance.proposalExists(proposalId2)) + + const dequeuedProposal2 = await governance.dequeued(index) + assertEqualBN(dequeuedProposal2, proposalId2) + await governance.getVoteTotals(proposalId2) + + const otherAccount1 = accounts[1] + await accountsInstance.createAccount({ from: otherAccount1 }) + await mockLockedGold.setAccountTotalLockedGold(otherAccount1, otherAccountWeight) + await governance.vote(proposalId2, index, value, { from: otherAccount1 }) + + await governance.vote(proposalId2, index, VoteValue.No) + + const [yesVotesTotal, noVotesTotal, abstainVotesTotal] = await governance.getVoteTotals( + proposalId2 + ) + + assertEqualBN(yesVotesTotal, otherAccountWeight) + assertEqualBN(noVotesTotal, yesVotes) + assertEqualBN(abstainVotesTotal, 0) + }) + }) + }) + + describe('#votePartially()', () => { + const proposalId = 1 + const index = 0 + + describe('when proposal is approved', () => { + beforeEach(async () => { + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + await governance.approve(proposalId, index) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + }) + + it('should return true', async () => { + const success = await governance.votePartially.call(proposalId, index, yesVotes, 0, 0, { + gas: 7000000, + from: account, + }) + assert.isTrue(success) + }) + + it('should increment the vote totals', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + const [yes, ,] = await governance.getVoteTotals(proposalId) + assert.equal(yes.toNumber(), yesVotes) + }) + + it('should increment the vote totals when voting partially', async () => { + const yes = 10 + const no = 50 + const abstain = 30 + await governance.votePartially(proposalId, index, yes, no, abstain) + const [yesTotal, noTotal, abstainTotal] = await governance.getVoteTotals(proposalId) + assert.equal(yesTotal.toNumber(), yes) + assert.equal(noTotal.toNumber(), no) + assert.equal(abstainTotal.toNumber(), abstain) + }) + + it("should set the voter's vote record", async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + const [recordProposalId, , , yesVotesRecord] = await governance.getVoteRecord( + account, + index + ) + assertEqualBN(recordProposalId, proposalId) + assertEqualBN(yesVotesRecord, yesVotes) + }) + + it('should set the most recent referendum proposal voted on', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + assert.equal( + (await governance.getMostRecentReferendumProposal(account)).toNumber(), + proposalId + ) + }) + + it('should emit the ProposalVotedV2 event', async () => { + const resp = await governance.votePartially(proposalId, index, yesVotes, 0, 0) + assert.equal(resp.logs.length, 1) + const log = resp.logs[0] + assertLogMatches2(log, { + event: 'ProposalVotedV2', + args: { + proposalId: new BigNumber(proposalId), + account, + yesVotes, + noVotes: 0, + abstainVotes: 0, + }, + }) + }) + + it('should revert when the account weight is 0', async () => { + await mockLockedGold.setAccountTotalLockedGold(account, 0) + await assertRevert(governance.votePartially(proposalId, index, yesVotes, 0, 0)) + }) + + it('should revert when the account does not have enough gold', async () => { + await assertRevert(governance.votePartially(proposalId, index, yesVotes + 1, 0, 0)) + }) + + it('should revert when the account does not have enough gold when voting partially', async () => { + const noVotes = yesVotes + await assertRevert(governance.votePartially(proposalId, index, yesVotes, noVotes, 0)) + }) + + it('should revert when the index is out of bounds', async () => { + await assertRevert(governance.votePartially(proposalId, index + 1, yesVotes, 0, 0)) + }) + + it('should revert if the proposal id does not match the index', async () => { + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + const otherProposalId = 2 + await assertRevert(governance.votePartially(otherProposalId, index, yesVotes, 0, 0)) + }) + + describe('when voting on two proposals', () => { + const proposalId1 = 2 + const proposalId2 = 3 + const index1 = 1 + const index2 = 2 + beforeEach(async () => { + const newDequeueFrequency = 60 + await governance.setDequeueFrequency(newDequeueFrequency) + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(newDequeueFrequency, web3) + await governance.approve(proposalId1, index1) + await governance.propose( + [transactionSuccess2.value], + [transactionSuccess2.destination], + // @ts-ignore bytes type + transactionSuccess2.data, + [transactionSuccess2.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(newDequeueFrequency, web3) + await governance.approve(proposalId2, index2) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + }) + + it('should set mostRecentReferendumProposal to the youngest proposal voted on', async () => { + await governance.votePartially(proposalId1, index1, yesVotes, 0, 0) + await governance.votePartially(proposalId2, index2, yesVotes, 0, 0) + const mostRecent = await governance.getMostRecentReferendumProposal(accounts[0]) + assert.equal(mostRecent.toNumber(), proposalId2) + }) + + it('should return true on `isVoting`', async () => { + await governance.votePartially(proposalId2, index2, yesVotes, 0, 0) + await governance.votePartially(proposalId1, index1, yesVotes, 0, 0) + const voting = await governance.isVoting(accounts[0]) + assert.isTrue(voting) + }) + + describe('after the first proposal expires', () => { + beforeEach(async () => { + await governance.votePartially(proposalId2, index2, yesVotes, 0, 0) + await governance.votePartially(proposalId1, index1, yesVotes, 0, 0) + await timeTravel(referendumStageDuration - 10, web3) + }) + + it('should still return true on `isVoting`', async () => { + const voting = await governance.isVoting(accounts[0]) + assert.isTrue(voting) + }) + + it('should no longer return true on `isVoting` after both expire', async () => { + await timeTravel(11, web3) + const voting = await governance.isVoting(accounts[0]) + assert.isFalse(voting) + }) + }) + }) + + describe('when the account has already voted partially on this proposal', () => { + const revoteTests = (newYes: number, newNo: number, newAbstain) => { + it('should set vote total correctly', async () => { + await governance.votePartially(proposalId, index, newYes, newNo, newAbstain) + const voteTotals = await governance.getVoteTotals(proposalId) + + assertEqualBN(voteTotals[0], newYes) + assertEqualBN(voteTotals[1], newNo) + assertEqualBN(voteTotals[2], newAbstain) + }) + + it("should set the voter's vote record", async () => { + await governance.votePartially(proposalId, index, newYes, newNo, newAbstain) + const [recordProposalId, , , yesVotesRecord, noVotesRecord, abstainVotesRecord] = + await governance.getVoteRecord(account, index) + assert.equal(recordProposalId.toNumber(), proposalId) + + assertEqualBN(yesVotesRecord, newYes) + assertEqualBN(noVotesRecord, newNo) + assertEqualBN(abstainVotesRecord, newAbstain) + }) + } + + describe('when the account has already voted yes and no on this proposal', () => { + const oldYes = 70 + const oldNo = 30 + const oldAbstain = 0 + + beforeEach(async () => { + await governance.votePartially(proposalId, index, oldYes, oldNo, oldAbstain) + }) + + revoteTests(30, 70, 0) + }) + + describe('when the account has already voted abstain and yes on this proposal', () => { + const oldYes = 0 + const oldNo = 70 + const oldAbstain = 30 + + beforeEach(async () => { + await governance.votePartially(proposalId, index, oldYes, oldNo, oldAbstain) + }) + + revoteTests(30, 0, 20) + }) + }) + + describe('when the account has already voted on this proposal', () => { + const voteWeight = yesVotes + const revoteTests = (newYes, newNo, newAbstain) => { + it('should decrement the vote total from the previous vote', async () => { + await governance.votePartially(proposalId, index, newYes, newNo, newAbstain) + const voteTotals = await governance.getVoteTotals(proposalId) + assertEqualBN(voteTotals[0], newYes) + assertEqualBN(voteTotals[1], newNo) + assertEqualBN(voteTotals[2], newAbstain) + }) + + it('should increment the vote total for the new vote', async () => { + await governance.votePartially(proposalId, index, newYes, newNo, newAbstain) + const voteTotals = await governance.getVoteTotals(proposalId) + assertEqualBN(voteTotals[0], newYes) + assertEqualBN(voteTotals[1], newNo) + assertEqualBN(voteTotals[2], newAbstain) + }) + + it("should set the voter's vote record", async () => { + await governance.votePartially(proposalId, index, newYes, newNo, newAbstain) + const [recordProposalId, , , yesVotesRecord, noVotesRecord, abstainVotesRecord] = + await governance.getVoteRecord(account, index) + assert.equal(recordProposalId.toNumber(), proposalId) + assertEqualBN(yesVotesRecord, newYes) + assertEqualBN(noVotesRecord, newNo) + assertEqualBN(abstainVotesRecord, newAbstain) + }) + } + + describe('when the account has already voted yes on this proposal', () => { + beforeEach(async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + }) + + revoteTests(0, voteWeight, 0) + }) + + describe('when the account has already voted no on this proposal', () => { + beforeEach(async () => { + await governance.votePartially(proposalId, index, voteWeight, 0, 0) + }) + + revoteTests(0, 0, voteWeight) + }) + + describe('when the account has already voted abstain on this proposal', () => { + beforeEach(async () => { + await governance.votePartially(proposalId, index, 0, 0, voteWeight) + }) + + revoteTests(voteWeight, 0, 0) + }) + }) + + describe('when the proposal is past the referendum stage and passing', () => { + beforeEach(async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + await timeTravel(referendumStageDuration, web3) + }) + + it('should revert', async () => { + await assertRevert(governance.votePartially.call(proposalId, index, yesVotes, 0, 0)) + }) + }) + + describe('when the proposal is past the referendum stage and failing', () => { + beforeEach(async () => { + await governance.votePartially(proposalId, index, 0, yesVotes, 0) + await timeTravel(referendumStageDuration, web3) + }) + + it('should return false', async () => { + const success = await governance.votePartially.call(proposalId, index, yesVotes, 0, 0) + assert.isFalse(success) + }) + + it('should delete the proposal', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + assert.isFalse(await governance.proposalExists(proposalId)) + }) + + it('should remove the proposal ID from dequeued', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + const dequeued = await governance.getDequeue() + assert.notInclude( + dequeued.map((x) => x.toNumber()), + proposalId + ) + }) + + it('should add the index to empty indices', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + const emptyIndex = await governance.emptyIndices(0) + assert.equal(emptyIndex.toNumber(), index) + }) + + it('should update the participation baseline', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + const [actualParticipationBaseline, , ,] = await governance.getParticipationParameters() + assertEqualBN(actualParticipationBaseline, expectedParticipationBaseline) + }) + + it('should emit the ParticipationBaselineUpdated event', async () => { + const resp = await governance.votePartially(proposalId, index, yesVotes, 0, 0) + assert.equal(resp.logs.length, 1) + const log = resp.logs[0] + assertLogMatches2(log, { + event: 'ParticipationBaselineUpdated', + args: { + participationBaseline: expectedParticipationBaseline, + }, + }) + }) + }) + }) + + describe('when proposal is not approved', () => { + beforeEach(async () => { + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + }) + + it('should return true', async () => { + const success = await governance.votePartially.call(proposalId, index, yesVotes, 0, 0) + assert.isTrue(success) + }) + + it('should increment the vote totals', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + const [yes, ,] = await governance.getVoteTotals(proposalId) + assert.equal(yes.toNumber(), yesVotes) + }) + + it("should set the voter's vote record", async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + const [recordProposalId, , , yesVotesRecord, noVotesRecord, abstainVotesRecord] = + await governance.getVoteRecord(account, index) + assertEqualBN(recordProposalId, proposalId) + assertEqualBN(yesVotesRecord, yesVotes) + assertEqualBN(noVotesRecord, 0) + assertEqualBN(abstainVotesRecord, 0) + }) + + it('should set the most recent referendum proposal voted on', async () => { + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + assert.equal( + (await governance.getMostRecentReferendumProposal(account)).toNumber(), + proposalId + ) + }) + + it('should emit the ProposalVotedV2 event', async () => { + await governance.dequeueProposalsIfReady() + const resp = await governance.votePartially(proposalId, index, yesVotes, 0, 0) + assert.equal(resp.logs.length, resp.logs.length) + const log = resp.logs[0] + assertLogMatches2(log, { + event: 'ProposalVotedV2', + args: { + proposalId: new BigNumber(proposalId), + account, + yesVotes: new BigNumber(yesVotes), + noVotes: new BigNumber(0), + abstainVotes: new BigNumber(0), + }, + }) + }) + + it('should revert when the account weight is 0', async () => { + await mockLockedGold.setAccountTotalLockedGold(account, 0) + await assertRevert(governance.votePartially(proposalId, index, yesVotes, 0, 0)) + }) + + it('should revert when the index is out of bounds', async () => { + await assertRevert(governance.votePartially(proposalId, index + 1, yesVotes, 0, 0)) + }) + + it('should revert if the proposal id does not match the index', async () => { + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + const otherProposalId = 2 + await assertRevert(governance.votePartially(otherProposalId, index, yesVotes, 0, 0)) + }) + }) + + describe('When voting on different proposal with same index', () => { + const proposalId2 = 2 + const otherAccountWeight = 100 + beforeEach(async () => { + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + await governance.approve(proposalId, index) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + await governance.votePartially(proposalId, index, yesVotes, 0, 0) + await timeTravel(referendumStageDuration, web3) + await timeTravel(executionStageDuration, web3) + }) + + it('should ignore votes from previous proposal', async () => { + const dequeuedProposal1Dequeued = await governance.dequeued(index) + assertEqualBN(dequeuedProposal1Dequeued, proposalId) + + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await governance.execute(proposalId, index) + assert.isFalse(await governance.proposalExists(proposalId)) + + await timeTravel(dequeueFrequency + 1, web3) + await governance.dequeueProposalsIfReady() + await governance.approve.call(proposalId2, index) + assert.isTrue(await governance.proposalExists(proposalId2)) + + const dequeuedProposal2 = await governance.dequeued(index) + assertEqualBN(dequeuedProposal2, proposalId2) + await governance.getVoteTotals(proposalId2) + + const otherAccount1 = accounts[1] + await accountsInstance.createAccount({ from: otherAccount1 }) + await mockLockedGold.setAccountTotalLockedGold(otherAccount1, otherAccountWeight) + await governance.votePartially(proposalId2, index, otherAccountWeight, 0, 0, { + from: otherAccount1, + }) + + await governance.votePartially(proposalId2, index, 0, yesVotes, 0) + + const [yesVotesRecord, noVotesRecord, abstainVotesRecord] = await governance.getVoteTotals( + proposalId2 + ) + + assertEqualBN(yesVotesRecord, otherAccountWeight) + assertEqualBN(noVotesRecord, yesVotes) + assertEqualBN(abstainVotesRecord, 0) }) }) }) @@ -2008,7 +2636,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) }) @@ -2076,7 +2704,7 @@ contract('Governance', (accounts: string[]) => { { value: minDeposit } ) await timeTravel(dequeueFrequency, web3) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration + 1, web3) await governance.approve(proposalId, index) @@ -2145,7 +2773,7 @@ contract('Governance', (accounts: string[]) => { { value: minDeposit } ) await timeTravel(dequeueFrequency, web3) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) }) @@ -2169,7 +2797,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) }) @@ -2193,7 +2821,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) }) @@ -2219,7 +2847,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) }) @@ -2286,7 +2914,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) }) @@ -2310,7 +2938,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) }) @@ -2336,7 +2964,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) await timeTravel(referendumStageDuration, web3) await timeTravel(executionStageDuration, web3) @@ -2385,6 +3013,104 @@ contract('Governance', (accounts: string[]) => { }) }) }) + + describe('when a proposal with 0 transactions is past the execution stage', () => { + beforeEach(async () => { + await governance.propose( + [], + [], + // @ts-ignore + [], + [], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + }) + + it('should not emit ProposalExecuted when not approved', async () => { + await governance.vote(proposalId, index, value) + await timeTravel(referendumStageDuration, web3) + await timeTravel(executionStageDuration, web3) + const resp = await governance.execute(proposalId, index) + assert.isTrue( + resp.logs.every((log) => log.event !== 'ProposalExecuted'), + 'ProposalExecuted should not be emitted' + ) + }) + + it('should not emit ProposalExecuted when not passing', async () => { + await governance.approve(proposalId, index) + await timeTravel(referendumStageDuration, web3) + await timeTravel(executionStageDuration, web3) + const resp = await governance.execute(proposalId, index) + assert.isTrue( + resp.logs.every((log) => log.event !== 'ProposalExecuted'), + 'ProposalExecuted should not be emitted' + ) + }) + + describe('Proposal approved and passing', () => { + beforeEach(async () => { + await governance.approve(proposalId, index) + await governance.vote(proposalId, index, value) + await timeTravel(referendumStageDuration, web3) + await timeTravel(executionStageDuration, web3) + }) + + it('should return true', async () => { + const success = await governance.execute.call(proposalId, index) + assert.isTrue(success) + }) + + it('should delete the proposal', async () => { + await governance.execute(proposalId, index) + assert.isFalse(await governance.proposalExists(proposalId)) + }) + + it('should remove the proposal ID from dequeued', async () => { + await governance.execute(proposalId, index) + const dequeued = await governance.getDequeue() + assert.notInclude( + dequeued.map((x) => x.toNumber()), + proposalId + ) + }) + + it('should add the index to empty indices', async () => { + await governance.execute(proposalId, index) + const emptyIndex = await governance.emptyIndices(0) + assert.equal(emptyIndex.toNumber(), index) + }) + + it('should update the participation baseline', async () => { + await governance.execute(proposalId, index) + const [actualParticipationBaseline, , ,] = await governance.getParticipationParameters() + assertEqualBN(actualParticipationBaseline, expectedParticipationBaseline) + }) + + it('should emit ProposalExecuted and ParticipationBaselineUpdated event', async () => { + const resp = await governance.execute(proposalId, index) + assert.equal(resp.logs.length, 2) + const log = resp.logs[0] + assertLogMatches2(log, { + event: 'ProposalExecuted', + args: { + proposalId: new BigNumber(proposalId), + }, + }) + const log2 = resp.logs[1] + assertLogMatches2(log2, { + event: 'ParticipationBaselineUpdated', + args: { + participationBaseline: expectedParticipationBaseline, + }, + }) + }) + }) + }) }) describe('#approveHotfix()', () => { @@ -2650,7 +3376,7 @@ contract('Governance', (accounts: string[]) => { describe('when the account has upvoted a proposal', () => { const proposalId = 1 beforeEach(async () => { - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.propose( [transactionSuccess1.value], [transactionSuccess1.destination], @@ -2706,7 +3432,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) await governance.approve(proposalId, index) - await mockLockedGold.setAccountTotalLockedGold(account, weight) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) await governance.vote(proposalId, index, value) }) @@ -2747,8 +3473,8 @@ contract('Governance', (accounts: string[]) => { describe('when the adjusted support is greater than threshold', () => { beforeEach(async () => { - await mockLockedGold.setAccountTotalLockedGold(account, (weight * 51) / 100) - await mockLockedGold.setAccountTotalLockedGold(otherAccount, (weight * 49) / 100) + await mockLockedGold.setAccountTotalLockedGold(account, (yesVotes * 51) / 100) + await mockLockedGold.setAccountTotalLockedGold(otherAccount, (yesVotes * 49) / 100) await governance.vote(proposalId, index, VoteValue.Yes) await governance.vote(proposalId, index, VoteValue.No, { from: otherAccount }) }) @@ -2761,8 +3487,8 @@ contract('Governance', (accounts: string[]) => { describe('when the adjusted support is less than or equal to threshold', () => { beforeEach(async () => { - await mockLockedGold.setAccountTotalLockedGold(account, (weight * 50) / 100) - await mockLockedGold.setAccountTotalLockedGold(otherAccount, (weight * 50) / 100) + await mockLockedGold.setAccountTotalLockedGold(account, (yesVotes * 50) / 100) + await mockLockedGold.setAccountTotalLockedGold(otherAccount, (yesVotes * 50) / 100) await governance.vote(proposalId, index, VoteValue.Yes) await governance.vote(proposalId, index, VoteValue.No, { from: otherAccount }) }) @@ -2825,7 +3551,7 @@ contract('Governance', (accounts: string[]) => { assertEqualBN(stage, expected) } - it('should return None stage when proposal doesnt exist', async () => { + it('should return None stage when proposal does not exist', async () => { await expectStage(Stage.None, 0) await expectStage(Stage.None, 1) }) @@ -2911,8 +3637,210 @@ contract('Governance', (accounts: string[]) => { it('should return Expiration when expired', async () => { await timeTravel(executionStageDuration, web3) await expectStage(Stage.Expiration, proposalId) + const isDequeuedProposalExpired = await governance.isDequeuedProposalExpired(proposalId) + assert.isTrue(isDequeuedProposalExpired) + }) + }) + }) + }) + + describe('when a proposal with 0 transactions exists', () => { + let proposalId: number + beforeEach(async () => { + await governance.propose( + [], + [], + // @ts-ignore + [], + [], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + proposalId = 1 + const exists = await governance.proposalExists(proposalId) + assert.isTrue(exists, 'proposal does not exist') + }) + + describe('when proposal with 0 transactions is dequeued', () => { + const index = 0 + beforeEach(async () => { + await timeTravel(dequeueFrequency, web3) + await governance.dequeueProposalsIfReady() + const dequeued = await governance.isDequeuedProposal(proposalId, index) + assert.isTrue(dequeued, 'proposal not dequeued') + }) + + it('should return Expiration past the execution stage when not approved', async () => { + await governance.vote(proposalId, index, VoteValue.Yes) + await timeTravel(referendumStageDuration + executionStageDuration + 1, web3) + await expectStage(Stage.Expiration, proposalId) + const isDequeuedProposalExpired = await governance.isDequeuedProposalExpired(proposalId) + assert.isTrue(isDequeuedProposalExpired) + }) + + it('should return Expiration past the execution stage when not passing', async () => { + await governance.approve(proposalId, index) + await timeTravel(referendumStageDuration + executionStageDuration + 1, web3) + await expectStage(Stage.Expiration, proposalId) + const isDequeuedProposalExpired = await governance.isDequeuedProposalExpired(proposalId) + assert.isTrue(isDequeuedProposalExpired) + }) + + describe('when in execution stage', () => { + beforeEach(async () => { + await governance.approve(proposalId, index) + await governance.vote(proposalId, index, VoteValue.Yes) + const passing = await governance.isProposalPassing(proposalId) + assert.isTrue(passing, 'proposal not passing') + await timeTravel(referendumStageDuration, web3) + }) + + it('should return Execution when not expired', () => + expectStage(Stage.Execution, proposalId)) + + it('should return Execution past the execution stage if passed and approved', async () => { + await timeTravel(executionStageDuration + 1, web3) + await expectStage(Stage.Execution, proposalId) + const isDequeuedProposalExpired = await governance.isDequeuedProposalExpired(proposalId) + assert.isFalse(isDequeuedProposalExpired) + }) + }) + }) + }) + }) + + describe('#getAmountOfGoldUsedForVoting()', () => { + describe('3 concurrent proposals dequeued', () => { + beforeEach(async () => { + await governance.setConcurrentProposals(3) + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await governance.propose( + [transactionSuccess2.value], + [transactionSuccess2.destination], + // @ts-ignore bytes type + transactionSuccess2.data, + [transactionSuccess2.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + await governance.approve(1, 0) + await governance.approve(2, 1) + await governance.approve(3, 2) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + }) + for (let numVoted = 0; numVoted < 3; numVoted++) { + describe(`when account has partially voted on ${numVoted} proposals`, () => { + const yes = 10 + const no = 30 + const abstain = 0 + + beforeEach(async () => { + for (let i = 0; i < numVoted; i++) { + await governance.votePartially(1, 0, yes, no, abstain) + } + }) + + it('Should return correct number of votes', async () => { + const totalVotesByAccount = await governance.getAmountOfGoldUsedForVoting(accounts[0]) + const expectedArraySum = yes + no + abstain + assertEqualBN(totalVotesByAccount, numVoted === 0 ? 0 : expectedArraySum) }) }) + } + }) + + describe('proposal dequeued', () => { + beforeEach(async () => { + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await timeTravel(dequeueFrequency, web3) + await governance.approve(1, 0) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + }) + + describe(`when account has partially voted on proposal`, () => { + const yes = 10 + const no = 30 + const abstain = 0 + + beforeEach(async () => { + await governance.votePartially(1, 0, yes, no, abstain) + }) + + it('Should return correct number of votes', async () => { + const totalVotesByAccount = await governance.getAmountOfGoldUsedForVoting(accounts[0]) + const expectedArraySum = yes + no + abstain + + assertEqualBN(totalVotesByAccount, expectedArraySum) + }) + + it('Should return 0 votes since expired', async () => { + await timeTravel(executionStageDuration + referendumStageDuration + 1, web3) + const totalVotesByAccount = await governance.getAmountOfGoldUsedForVoting(accounts[0]) + + assertEqualBN(totalVotesByAccount, 0) + }) + }) + }) + + describe('proposal in queue', () => { + beforeEach(async () => { + const proposalId1 = 1 + + await governance.setConcurrentProposals(3) + await governance.propose( + [transactionSuccess1.value], + [transactionSuccess1.destination], + // @ts-ignore bytes type + transactionSuccess1.data, + [transactionSuccess1.data.length], + descriptionUrl, + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails + { value: minDeposit } + ) + await mockLockedGold.setAccountTotalLockedGold(account, yesVotes) + await governance.upvote(proposalId1, 0, 0) + }) + + it('should return full weight when upvoting', async () => { + const totalVotesByAccount = await governance.getAmountOfGoldUsedForVoting(accounts[0]) + assertEqualBN(totalVotesByAccount, yesVotes) + }) + + it('should return 0 since proposal is already expired', async () => { + await timeTravel(queueExpiry, web3) + const totalVotesByAccount = await governance.getAmountOfGoldUsedForVoting(accounts[0]) + assertEqualBN(totalVotesByAccount, 0) }) }) }) diff --git a/packages/protocol/test/governance/validators/validators.ts b/packages/protocol/test/governance/validators/validators.ts index f3154fa494a..5a491cf8271 100644 --- a/packages/protocol/test/governance/validators/validators.ts +++ b/packages/protocol/test/governance/validators/validators.ts @@ -563,6 +563,18 @@ contract('Validators', (accounts: string[]) => { ) }) + it('should revert when vote over max number of groups set to true', async () => { + await mockElection.setAllowedToVoteOverMaxNumberOfGroups(validator, true) + const signer = accounts[9] + const sig = await getParsedSignatureOfAddress(web3, validator, signer) + await accountsInstance.authorizeValidatorSigner(signer, sig.v, sig.r, sig.s) + const publicKey = await addressToPublicKey(signer, web3.eth.sign) + await assertRevert( + validators.registerValidator(publicKey, blsPublicKey, blsPoP), + 'Validators cannot vote for more than max number of groups' + ) + }) + describe('when the account has authorized a validator signer', () => { let validatorRegistrationEpochNumber: number let publicKey: string @@ -1273,6 +1285,18 @@ contract('Validators', (accounts: string[]) => { const group = accounts[0] let resp: any describe('when the account is not a registered validator group', () => { + it('should revert when vote over max number of groups set to true', async () => { + await mockElection.setAllowedToVoteOverMaxNumberOfGroups(group, true) + const signer = accounts[9] + const sig = await getParsedSignatureOfAddress(web3, group, signer) + await accountsInstance.authorizeValidatorSigner(signer, sig.v, sig.r, sig.s) + const publicKey = await addressToPublicKey(signer, web3.eth.sign) + await assertRevert( + validators.registerValidator(publicKey, blsPublicKey, blsPoP), + 'Validators cannot vote for more than max number of groups' + ) + }) + describe('when the account meets the locked gold requirements', () => { beforeEach(async () => { await mockLockedGold.setAccountTotalLockedGold(group, groupLockedGoldRequirements.value) diff --git a/packages/protocol/test/governance/voting/election.ts b/packages/protocol/test/governance/voting/election.ts index 8683b2fa459..de8835d7109 100644 --- a/packages/protocol/test/governance/voting/election.ts +++ b/packages/protocol/test/governance/voting/election.ts @@ -81,6 +81,21 @@ contract('Election', (accounts: string[]) => { ) }) + async function setupGroupAndVote( + newGroup: string, + oldGroup: string, + members: string[], + vote = true + ) { + await mockValidators.setMembers(newGroup, members) + await registry.setAddressFor(CeloContractName.Validators, accounts[0]) + await election.markGroupEligible(newGroup, oldGroup, NULL_ADDRESS) + await registry.setAddressFor(CeloContractName.Validators, mockValidators.address) + if (vote) { + await election.vote(newGroup, 1, oldGroup, NULL_ADDRESS) + } + } + describe('#initialize()', () => { it('should have set the owner', async () => { const owner: string = await election.owner() @@ -217,6 +232,66 @@ contract('Election', (accounts: string[]) => { }) }) + describe('#setAllowedToVoteOverMaxNumberOfGroups', () => { + it('should set Allowed To Vote Over Max Number Of Groups', async () => { + await election.setAllowedToVoteOverMaxNumberOfGroups(true) + assert.equal(await election.allowedToVoteOverMaxNumberOfGroups(accounts[0]), true) + }) + + it('should revert when vote over max number of groups set to true', async () => { + await mockValidators.setValidator(accounts[0]) + await assertRevert( + election.setAllowedToVoteOverMaxNumberOfGroups(true), + 'Validators cannot vote for more than max number of groups' + ) + }) + + it('should revert when vote over max number of groups set to true', async () => { + await mockValidators.setValidatorGroup(accounts[0]) + await assertRevert( + election.setAllowedToVoteOverMaxNumberOfGroups(true), + 'Validator groups cannot vote for more than max number of groups' + ) + }) + + it('should emit the AllowedToVoteOverMaxNumberOfGroups event', async () => { + const resp = await election.setAllowedToVoteOverMaxNumberOfGroups(true) + assert.equal(resp.logs.length, 1) + const log = resp.logs[0] + assertContainSubset(log, { + event: 'AllowedToVoteOverMaxNumberOfGroups', + args: { + account: accounts[0], + flag: true, + }, + }) + }) + + describe('When AllowedToVoteOverMaxNumberOfGroups on', () => { + beforeEach(async () => { + await election.setAllowedToVoteOverMaxNumberOfGroups(true) + }) + + it('should turn AllowedToVoteOverMaxNumberOfGroups off', async () => { + await election.setAllowedToVoteOverMaxNumberOfGroups(false) + assert.equal(await election.allowedToVoteOverMaxNumberOfGroups(accounts[0]), false) + }) + + it('should emit the AllowedToVoteOverMaxNumberOfGroups event', async () => { + const resp = await election.setAllowedToVoteOverMaxNumberOfGroups(false) + assert.equal(resp.logs.length, 1) + const log = resp.logs[0] + assertContainSubset(log, { + event: 'AllowedToVoteOverMaxNumberOfGroups', + args: { + account: accounts[0], + flag: false, + }, + }) + }) + }) + }) + describe('#markGroupEligible', () => { const group = accounts[1] describe('when called by the registered validators contract', () => { @@ -458,11 +533,7 @@ contract('Election', (accounts: string[]) => { await mockLockedGold.incrementNonvotingAccountBalance(voter, value) for (let i = 0; i < maxNumGroupsVotedFor.toNumber(); i++) { newGroup = accounts[i + 2] - await mockValidators.setMembers(newGroup, [accounts[9]]) - await registry.setAddressFor(CeloContractName.Validators, accounts[0]) - await election.markGroupEligible(newGroup, group, NULL_ADDRESS) - await registry.setAddressFor(CeloContractName.Validators, mockValidators.address) - await election.vote(newGroup, 1, group, NULL_ADDRESS) + await setupGroupAndVote(newGroup, group, [accounts[9]]) } }) @@ -472,6 +543,181 @@ contract('Election', (accounts: string[]) => { ) }) }) + + describe('when the voter is over maxNumGroupsVotedFor but can vote for additional groups', () => { + let newGroup: string + beforeEach(async () => { + await mockLockedGold.incrementNonvotingAccountBalance(voter, value) + for (let i = 0; i < maxNumGroupsVotedFor.toNumber(); i++) { + newGroup = accounts[i + 2] + await setupGroupAndVote(newGroup, group, [accounts[9]]) + } + newGroup = accounts[maxNumGroupsVotedFor.toNumber() + 2] + await setupGroupAndVote(newGroup, group, [accounts[9]], false) + await election.setAllowedToVoteOverMaxNumberOfGroups(true) + }) + + it('should allow to vote for another group', async () => { + const valueToVoteFor = value.minus(maxNumGroupsVotedFor) + const resp = await election.vote(group, valueToVoteFor, newGroup, NULL_ADDRESS) + assert.equal(resp.logs.length, 1) + const log = resp.logs[0] + assertContainSubset(log, { + event: 'ValidatorGroupVoteCast', + args: { + account: voter, + group, + value: new BigNumber(valueToVoteFor), + }, + }) + }) + + it('should total votes by account since max number of groups was not reached', async () => { + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN(totalVotes, maxNumGroupsVotedFor) + }) + + describe('When over maximum number of groups voted', () => { + const originallyNotVotedWithAmount = 1 + const account0FirstGroupVote = value + .minus(maxNumGroupsVotedFor) + .minus(originallyNotVotedWithAmount) + beforeEach(async () => { + await election.vote(group, account0FirstGroupVote, newGroup, NULL_ADDRESS) + }) + + it('should revert when turning off of setAllowedToVoteOverMaxNumberOfGroups', async () => { + await assertRevert( + election.setAllowedToVoteOverMaxNumberOfGroups(false), + 'Too many groups voted for!' + ) + }) + + it('should return return only last voted with since votes were not manually counted', async () => { + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN(totalVotes, account0FirstGroupVote) + }) + + describe('When total votes are manually counted on', () => { + beforeEach(async () => { + for (let i = 0; i < maxNumGroupsVotedFor.toNumber(); i++) { + newGroup = accounts[i + 2] + await election.updateTotalVotesByAccountForGroup(accounts[0], newGroup) + } + await election.updateTotalVotesByAccountForGroup(accounts[0], group) + }) + + it('should return total votes by account', async () => { + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN(totalVotes, value.minus(originallyNotVotedWithAmount)) + }) + + describe('When votes revoked', () => { + const revokeDiff = 100 + const revokeValue = account0FirstGroupVote.minus(100) + + beforeEach(async () => { + await election.revokePending(group, revokeValue, accounts[4], NULL_ADDRESS, 3, { + from: accounts[0], + }) + }) + + it('should return lowered total number of votes', async () => { + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN(totalVotes, maxNumGroupsVotedFor.plus(revokeDiff)) + }) + }) + }) + + describe('When votes are being activated', () => { + const rewardValue = new BigNumber(1000000) + beforeEach(async () => { + await mineBlocks(EPOCH, web3) + await election.activateForAccount(group, voter) + }) + + it("should increment the account's active votes for the group", async () => { + assertEqualBN( + await election.getActiveVotesForGroupByAccount(group, voter), + account0FirstGroupVote + ) + }) + + it('should return correct value when manually counted', async () => { + for (let i = 0; i < maxNumGroupsVotedFor.toNumber(); i++) { + newGroup = accounts[i + 2] + await election.updateTotalVotesByAccountForGroup(accounts[0], newGroup) + } + await election.updateTotalVotesByAccountForGroup(accounts[0], group) + + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN(totalVotes, value.minus(originallyNotVotedWithAmount)) + }) + + describe('When awards are distributed', () => { + beforeEach(async () => { + await election.distributeEpochRewards(group, rewardValue, newGroup, NULL_ADDRESS) + }) + + it('should revoke active votes (more then original votes without rewards)', async () => { + await election.revokeActive(group, value, newGroup, NULL_ADDRESS, 3) + assertEqualBN( + await election.getActiveVotesForGroupByAccount(group, voter), + rewardValue.minus(maxNumGroupsVotedFor).minus(originallyNotVotedWithAmount) + ) + }) + + describe('When more votes than active is revoked', () => { + beforeEach(async () => { + await election.revokeActive(group, value, newGroup, NULL_ADDRESS, 3) + }) + + it('should return correct value when manually counted', async () => { + for (let i = 0; i < maxNumGroupsVotedFor.toNumber(); i++) { + newGroup = accounts[i + 2] + await election.updateTotalVotesByAccountForGroup(accounts[0], newGroup) + } + await election.updateTotalVotesByAccountForGroup(accounts[0], group) + + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN(totalVotes, rewardValue.minus(originallyNotVotedWithAmount)) + }) + }) + + describe('When total votes are manually counted on rewards are being distributed', () => { + beforeEach(async () => { + for (let i = 0; i < maxNumGroupsVotedFor.toNumber(); i++) { + newGroup = accounts[i + 2] + await election.updateTotalVotesByAccountForGroup(accounts[0], newGroup) + } + await election.updateTotalVotesByAccountForGroup(accounts[0], group) + }) + + it('should return total votes by account', async () => { + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN( + totalVotes, + value.plus(rewardValue).minus(originallyNotVotedWithAmount) + ) + }) + + it('should increase total votes count once voted', async () => { + await election.vote( + newGroup, + originallyNotVotedWithAmount, + accounts[3], + group, + { from: accounts[0] } + ) + + const totalVotes = await election.getTotalVotesByAccount(accounts[0]) + assertEqualBN(totalVotes, value.plus(rewardValue)) + }) + }) + }) + }) + }) + }) }) describe('when the group cannot receive votes', () => { diff --git a/packages/protocol/test/governance/voting/lockedgold.ts b/packages/protocol/test/governance/voting/lockedgold.ts index 21265141d41..c93155b3aeb 100644 --- a/packages/protocol/test/governance/voting/lockedgold.ts +++ b/packages/protocol/test/governance/voting/lockedgold.ts @@ -245,13 +245,66 @@ contract('LockedGold', (accounts: string[]) => { }) describe('when the account is voting in governance', () => { + const votingGold = 1 + const valueWithoutVotingGold = value - votingGold beforeEach(async () => { await mockGovernance.setVoting(account) + await mockGovernance.setTotalVotes(account, votingGold) }) - it('should revert', async () => { + it('should revert when requesting gold that is voted with', async () => { await assertRevert(lockedGold.unlock(value)) }) + + describe('when the account is requesting only non voting gold', () => { + beforeEach(async () => { + resp = await lockedGold.unlock(valueWithoutVotingGold) + availabilityTime = new BigNumber(unlockingPeriod).plus( + (await web3.eth.getBlock('latest')).timestamp + ) + }) + + it('should add a pending withdrawal #getPendingWithdrawal()', async () => { + const [val, timestamp] = await lockedGold.getPendingWithdrawal(account, 0) + assertEqualBN(val, valueWithoutVotingGold) + assertEqualBN(timestamp, availabilityTime) + await assertRevert(lockedGold.getPendingWithdrawal(account, 1)) + }) + + it('should add a pending withdrawal #getPendingWithdrawals()', async () => { + const [values, timestamps] = await lockedGold.getPendingWithdrawals(account) + assert.equal(values.length, 1) + assert.equal(timestamps.length, 1) + assertEqualBN(values[0], valueWithoutVotingGold) + assertEqualBN(timestamps[0], availabilityTime) + }) + + it("should decrease the account's nonvoting locked gold balance", async () => { + assertEqualBN(await lockedGold.getAccountNonvotingLockedGold(account), votingGold) + }) + + it("should decrease the account's total locked gold balance", async () => { + assertEqualBN(await lockedGold.getAccountTotalLockedGold(account), votingGold) + }) + + it('should decrease the nonvoting locked gold balance', async () => { + assertEqualBN(await lockedGold.getNonvotingLockedGold(), votingGold) + }) + + it('should decrease the total locked gold balance', async () => { + assertEqualBN(await lockedGold.getTotalLockedGold(), votingGold) + }) + + it('should emit a GoldUnlocked event', async () => { + assert.equal(resp.logs.length, 1) + const log = resp.logs[0] + assertLogMatches(log, 'GoldUnlocked', { + account, + value: new BigNumber(valueWithoutVotingGold), + available: availabilityTime, + }) + }) + }) }) }) diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index ce04f91764e..16f2137c3a1 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -1,21 +1,18 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' +import { Signature } from '@celo/base/lib/signatureUtils' import getPhoneHash from '@celo/phone-utils/lib/getPhoneHash' import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { assertEqualBN, assertLogMatches2, assertRevert, - assertSameAddress, getDerivedKey, - getVerificationCodeSignature, KeyOffsets, - mineBlocks, unlockAndAuthorizeKey, } from '@celo/protocol/lib/test-utils' import { privateKeyToAddress } from '@celo/utils/lib/address' -import { parseSolidityStringArray } from '@celo/utils/lib/parsing' +import { SignatureUtils } from '@celo/utils/src/signatureUtils' import BigNumber from 'bignumber.js' -import { range, uniq } from 'lodash' import { AccountsContract, AccountsInstance, @@ -34,6 +31,7 @@ import { RegistryInstance, } from 'types' import Web3 from 'web3' +import { soliditySha3 } from 'web3-utils' import { beforeEachWithRetries } from '../customHooks' const Accounts: AccountsContract = artifacts.require('Accounts') @@ -291,404 +289,32 @@ contract('Attestations', (accounts: string[]) => { }) }) - describe('#request()', () => { - it('should indicate an unselected attestation request', async () => { - await attestations.request(phoneHash, attestationsRequested, mockERC20Token.address) - const requestBlock = await web3.eth.getBlock('latest') - - const [blockNumber, actualAttestationsRequested, actualAttestationRequestFeeToken] = - await attestations.getUnselectedRequest(phoneHash, caller) - - assertEqualBN(blockNumber, requestBlock.number) - assertEqualBN(attestationsRequested, actualAttestationsRequested) - assertSameAddress(actualAttestationRequestFeeToken, mockERC20Token.address) - }) - - it('should increment the number of attestations requested', async () => { - await attestations.request(phoneHash, attestationsRequested, mockERC20Token.address) - - const [completed, total] = await attestations.getAttestationStats(phoneHash, caller) - assertEqualBN(completed, 0) - assertEqualBN(total, attestationsRequested) - }) - - it('should revert if 0 attestations are requested', async () => { - await assertRevert(attestations.request(phoneHash, 0, mockERC20Token.address)) - }) - - it('should emit the AttestationsRequested event', async () => { - const response = await attestations.request( - phoneHash, - attestationsRequested, - mockERC20Token.address - ) - - assert.lengthOf(response.logs, 1) - const event = response.logs[0] - assertLogMatches2(event, { - event: 'AttestationsRequested', - args: { - identifier: phoneHash, - account: caller, - attestationsRequested: new BigNumber(attestationsRequested), - attestationRequestFeeToken: mockERC20Token.address, - }, - }) - }) - - describe('when attestations have already been requested', () => { - beforeEach(async () => { - await attestations.request(phoneHash, attestationsRequested, mockERC20Token.address) - }) - - describe('when the issuers have not yet been selected', () => { - it('should revert requesting more attestations', async () => { - await assertRevert(attestations.request(phoneHash, 1, mockERC20Token.address)) - }) - - describe('when the original request has expired', () => { - it('should allow to request more attestations', async () => { - await mineBlocks(attestationExpiryBlocks, web3) - await attestations.request(phoneHash, 1, mockERC20Token.address) - }) - }) - - describe('when the original request cannot be selected for due to randomness not being available', () => { - it('should allow to request more attestations', async () => { - const randomnessBlockRetentionWindow = await random.randomnessBlockRetentionWindow() - await mineBlocks(randomnessBlockRetentionWindow.toNumber(), web3) - await attestations.request(phoneHash, 1, mockERC20Token.address) - }) - }) - }) - - describe('when the issuers have been selected', () => { - beforeEach(async () => { - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks, '0x1') - await attestations.selectIssuers(phoneHash) - }) - - it('should allow to request more attestations', async () => { - await attestations.request(phoneHash, 1, mockERC20Token.address) - const [completed, total] = await attestations.getAttestationStats(phoneHash, caller) - assert.equal(completed.toNumber(), 0) - assert.equal(total.toNumber(), attestationsRequested + 1) - }) - }) - }) - }) - - describe('#selectIssuers()', () => { - let expectedRequestBlockNumber: number - - describe('when half the validator set does not authorize an attestation key', () => { - const accountsThatOptedIn = accounts.slice(0, 5) - - beforeEach(async () => { - await Promise.all( - accounts - .slice(5, 10) - .map(async (account) => accountsInstance.removeAttestationSigner({ from: account })) - ) - }) - - it('does not select among those when requesting 5', async () => { - await attestations.request(phoneHash, 5, mockERC20Token.address) - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks, '0x1') - await attestations.selectIssuers(phoneHash) - - const attestationIssuers = await attestations.getAttestationIssuers(phoneHash, caller) - assert.includeMembers(accountsThatOptedIn, attestationIssuers) - }) - }) - - describe('when attestations were requested', () => { - beforeEach(async () => { - await attestations.request(phoneHash, attestationsRequested, mockERC20Token.address) - expectedRequestBlockNumber = await web3.eth.getBlockNumber() - }) - - // These tests/functionality implicitly relies on randomness to only be available - // historically. The attestation contract itself will not test that the current block - // number is sufficiently in the future after the request block - describe('when the randomness of the right block has been set', () => { - beforeEach(async () => { - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks, '0x1') - }) - - it('should add the correct number attestation issuers', async () => { - assert.isEmpty(await attestations.getAttestationIssuers(phoneHash, caller)) - await attestations.selectIssuers(phoneHash) - - const attestationIssuers = await attestations.getAttestationIssuers(phoneHash, caller) - assert.lengthOf(attestationIssuers, attestationsRequested) - assert.lengthOf(uniq(attestationIssuers), attestationsRequested) - }) - - it('should set the block of request in the attestation', async () => { - await attestations.selectIssuers(phoneHash) - const attestationIssuers = await attestations.getAttestationIssuers(phoneHash, caller) - - await Promise.all( - attestationIssuers.map(async (issuer) => { - const [status, requestBlock] = await attestations.getAttestationState( - phoneHash, - caller, - issuer - ) - - assert.equal(status.toNumber(), 1) - assert.equal(requestBlock.toNumber(), expectedRequestBlockNumber) - }) - ) - }) - - it('should return the attestations in getCompletableAttestations', async () => { - await Promise.all( - accounts.map((account) => - accountsInstance.setMetadataURL(`https://test.com/${account}`, { from: account }) - ) - ) - await attestations.selectIssuers(phoneHash) - const [attestationBlockNumbers, attestationIssuers, stringLengths, stringData] = - await attestations.getCompletableAttestations(phoneHash, caller) - - const urls = parseSolidityStringArray( - stringLengths.map((x) => x.toNumber()), - stringData as unknown as string - ) - - assert.lengthOf(attestationBlockNumbers, attestationsRequested) - await Promise.all( - range(0, attestationsRequested).map(async (i) => { - const [status, requestBlock] = await attestations.getAttestationState( - phoneHash, - caller, - attestationIssuers[i]! - ) - assert.equal(status.toNumber(), 1) - assertEqualBN(requestBlock, attestationBlockNumbers[i]) - assert.equal(`https://test.com/${attestationIssuers[i]}`, urls[i]) - }) - ) - }) - - it('should delete the unselected request', async () => { - await attestations.selectIssuers(phoneHash) - const [blockNumber, actualAttestationsRequested] = - await attestations.getUnselectedRequest(phoneHash, caller) - assertEqualBN(blockNumber, 0) - assertEqualBN(actualAttestationsRequested, 0) - }) - - it('should emit the AttestationIssuerSelected event', async () => { - const response = await attestations.selectIssuers(phoneHash) - const issuers = await attestations.getAttestationIssuers(phoneHash, caller) - assert.lengthOf(response.logs, 3) - - issuers.forEach((issuer, index) => { - assertLogMatches2(response.logs[index], { - event: 'AttestationIssuerSelected', - args: { - identifier: phoneHash, - account: caller, - issuer, - attestationRequestFeeToken: mockERC20Token.address, - }, - }) - }) - }) - - describe('when more attestations were requested', () => { - beforeEach(async () => { - await attestations.selectIssuers(phoneHash) - await attestations.request(phoneHash, 8, mockERC20Token.address) - expectedRequestBlockNumber = await web3.eth.getBlockNumber() - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks, '0x1') - }) - - it('should revert if too many issuers attempted', async () => { - await assertRevert(attestations.selectIssuers(phoneHash)) - }) - }) - - describe('after attestationExpiryBlocks', () => { - beforeEach(async () => { - await attestations.selectIssuers(phoneHash) - await mineBlocks(attestationExpiryBlocks, web3) - }) - - it('should no longer list the attestations in getCompletableAttestations', async () => { - const [attestationBlockNumbers] = await attestations.getCompletableAttestations( - phoneHash, - caller - ) - - assert.lengthOf(attestationBlockNumbers, 0) - }) - }) - - describe('when the validation key has been rotated for all validators', () => { - // Rotate all validation keys - beforeEach(async () => { - await Promise.all( - accounts.map((account) => - unlockAndAuthorizeKey( - KeyOffsets.NEW_VALIDATING_KEY_OFFSET, - accountsInstance.authorizeValidatorSigner, - account, - accounts - ) - ) - ) - }) - - it('can still select issuers', async () => { - assert.isEmpty(await attestations.getAttestationIssuers(phoneHash, caller)) - await attestations.selectIssuers(phoneHash) - - const attestationIssuers = await attestations.getAttestationIssuers(phoneHash, caller) - assert.lengthOf(attestationIssuers, attestationsRequested) - }) - }) - }) - - it('should revert when selecting too soon', async () => { - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks - 1, '0x1') - await assertRevert(attestations.selectIssuers(phoneHash)) - }) - }) - - describe('without requesting attestations before', () => { - it('should revert when selecting issuers', async () => { - await assertRevert(attestations.selectIssuers(phoneHash)) - }) - }) - }) - - describe('#complete()', () => { - let issuer: string - let v: number - let r: string - let s: string - - beforeEach(async () => { - await requestAttestations() - issuer = (await attestations.getAttestationIssuers(phoneHash, caller))[0] - ;({ v, r, s } = await getVerificationCodeSignature(caller, issuer, phoneHash, accounts)) - }) - - it('should add the account to the list upon completion', async () => { - let attestedAccounts = await attestations.lookupAccountsForIdentifier(phoneHash) - assert.isEmpty(attestedAccounts) - - await attestations.complete(phoneHash, v, r, s) - attestedAccounts = await attestations.lookupAccountsForIdentifier(phoneHash) - assert.lengthOf(attestedAccounts, 1) - assert.equal(attestedAccounts[0], caller) - }) - - it('should not add the account twice to the list', async () => { - await attestations.complete(phoneHash, v, r, s) - const secondIssuer = (await attestations.getAttestationIssuers(phoneHash, caller))[1] - ;({ v, r, s } = await getVerificationCodeSignature(caller, secondIssuer, phoneHash, accounts)) - - await attestations.complete(phoneHash, v, r, s) - const attestedAccounts = await attestations.lookupAccountsForIdentifier(phoneHash) - assert.lengthOf(attestedAccounts, 1) - assert.equal(attestedAccounts[0], caller) - }) - - it('should increment the number of completed verification requests', async () => { - const [numCompleted] = await attestations.getAttestationStats(phoneHash, caller) - assert.equal(numCompleted.toNumber(), 0) - - await attestations.complete(phoneHash, v, r, s) - const [numCompleted2, numTotal] = await attestations.getAttestationStats(phoneHash, caller) - assert.equal(numCompleted2.toNumber(), 1) - assert.equal(numTotal.toNumber(), attestationsRequested) - }) - - it('should set the time of the successful completion', async () => { - await mineBlocks(1, web3) - await attestations.complete(phoneHash, v, r, s) - - const expectedBlock = await web3.eth.getBlock('latest') - - const [status, completionBlock, actualAttestationRequestFeeToken] = - await attestations.getAttestationState(phoneHash, caller, issuer) - - assert.equal(status.toNumber(), 2) - assert.equal(completionBlock.toNumber(), expectedBlock.number) - assertSameAddress(actualAttestationRequestFeeToken, NULL_ADDRESS) - }) - - it('should increment pendingWithdrawals for the rewards recipient', async () => { - await attestations.complete(phoneHash, v, r, s) - const pendingWithdrawals = await attestations.pendingWithdrawals( - mockERC20Token.address, - issuer - ) - assert.equal(pendingWithdrawals.toString(), attestationFee.toString()) - }) - - it('should no longer list the attestation in getCompletableAttestationStats', async () => { - await attestations.complete(phoneHash, v, r, s) - const [attestationIssuers] = await attestations.getCompletableAttestations(phoneHash, caller) - assert.equal(attestationIssuers.indexOf(new BigNumber(issuer)), -1) - }) - - it('should emit the AttestationCompleted event', async () => { - const response = await attestations.complete(phoneHash, v, r, s) - assert.lengthOf(response.logs, 1) - const event = response.logs[0] - assertLogMatches2(event, { - event: 'AttestationCompleted', - args: { - identifier: phoneHash, - account: caller, - issuer, - }, - }) - }) - - it('should revert when an invalid attestation code is provided', async () => { - ;({ v, r, s } = await getVerificationCodeSignature(accounts[1], issuer, phoneHash, accounts)) - await assertRevert(attestations.complete(phoneHash, v, r, s)) - }) - - it('should revert with a non-requested issuer', async () => { - ;({ v, r, s } = await getVerificationCodeSignature( - caller, - await getNonIssuer(), - phoneHash, - accounts - )) - await assertRevert(attestations.complete(phoneHash, v, r, s)) - }) - - it('should revert an already completed request', async () => { - await attestations.complete(phoneHash, v, r, s) - await assertRevert(attestations.complete(phoneHash, v, r, s)) - }) - - it('does not let you verify beyond the window', async () => { - await mineBlocks(attestationExpiryBlocks, web3) - await assertRevert(attestations.complete(phoneHash, v, r, s)) - }) - }) + function getVerificationCodeSignature( + _account: string, + _issuer: string, + _identifier: string, + _accounts: string[] + ): Signature { + const privateKey = getDerivedKey(KeyOffsets.ATTESTING_KEY_OFFSET, _issuer, _accounts) + const derivedIssuerAddress = privateKeyToAddress(privateKey) + const attestationMessageFromIdentifier = soliditySha3( + { type: 'bytes32', value: _identifier }, + { type: 'address', value: _account } + )! + const { v, r, s } = SignatureUtils.signMessage( + attestationMessageFromIdentifier, + privateKey, + derivedIssuerAddress + ) + return { v, r, s } + } describe('#withdraw()', () => { let issuer: string beforeEach(async () => { await requestAttestations() issuer = (await attestations.getAttestationIssuers(phoneHash, caller))[0] - const { v, r, s } = await getVerificationCodeSignature(caller, issuer, phoneHash, accounts) + const { v, r, s } = getVerificationCodeSignature(caller, issuer, phoneHash, accounts) await attestations.complete(phoneHash, v, r, s) await mockERC20Token.mint(attestations.address, attestationFee) }) @@ -759,7 +385,7 @@ contract('Attestations', (accounts: string[]) => { const requestAndCompleteAttestations = async () => { await requestAttestations() const issuer = (await attestations.getAttestationIssuers(phoneHash, caller))[0] - const { v, r, s } = await getVerificationCodeSignature(caller, issuer, phoneHash, accounts) + const { v, r, s } = getVerificationCodeSignature(caller, issuer, phoneHash, accounts) await attestations.complete(phoneHash, v, r, s) } @@ -865,12 +491,7 @@ contract('Attestations', (accounts: string[]) => { await attestations.selectIssuers(phoneHash, { from: other }) const issuer = (await attestations.getAttestationIssuers(phoneHash, other))[0] - const { v, r, s } = await getVerificationCodeSignature( - other, - issuer, - phoneHash, - accounts - ) + const { v, r, s } = getVerificationCodeSignature(other, issuer, phoneHash, accounts) await attestations.complete(phoneHash, v, r, s, { from: other }) await accountsInstance.setWalletAddress(other, '0x0', '0x0', '0x0', { from: other }) }) @@ -993,128 +614,4 @@ contract('Attestations', (accounts: string[]) => { }) }) }) - - describe('#approveTransfer()', () => { - const replacementAddress: string = accounts[1] - describe('when the attestation exists', () => { - beforeEach(async () => { - await requestAndCompleteAttestations() - }) - - it('should allow a user to change their mapped address when approved in the order from-->to', async () => { - const originalAttestationStats = await attestations.getAttestationStats(phoneHash, caller) - const originalUnselectedRequest = await attestations.getUnselectedRequest(phoneHash, caller) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: caller, - }) - const attestedAccounts = await attestations.lookupAccountsForIdentifier(phoneHash) - await assert.deepEqual(attestedAccounts, [caller]) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: replacementAddress, - }) - const attestedAccountsAfterApproval = await attestations.lookupAccountsForIdentifier( - phoneHash - ) - assert.deepEqual(attestedAccountsAfterApproval, [replacementAddress]) - const newAttestationStats = await attestations.getAttestationStats( - phoneHash, - replacementAddress - ) - const newUnselectedRequest = await attestations.getUnselectedRequest( - phoneHash, - replacementAddress - ) - assert.deepEqual(originalAttestationStats, newAttestationStats) - assert.deepEqual(originalUnselectedRequest, newUnselectedRequest) - }) - - it('should allow a user to change their mapped address when approved in the order to-->from', async () => { - const originalAttestationStats = await attestations.getAttestationStats(phoneHash, caller) - const originalUnselectedRequest = await attestations.getUnselectedRequest(phoneHash, caller) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: replacementAddress, - }) - const attestedAccounts = await attestations.lookupAccountsForIdentifier(phoneHash) - await assert.deepEqual(attestedAccounts, [caller]) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: caller, - }) - const attestedAccountsAfterApproval = await attestations.lookupAccountsForIdentifier( - phoneHash - ) - assert.deepEqual(attestedAccountsAfterApproval, [replacementAddress]) - const newAttestationStats = await attestations.getAttestationStats( - phoneHash, - replacementAddress - ) - const newUnselectedRequest = await attestations.getUnselectedRequest( - phoneHash, - replacementAddress - ) - assert.deepEqual(originalAttestationStats, newAttestationStats) - assert.deepEqual(originalUnselectedRequest, newUnselectedRequest) - }) - - it('should allow a user to revoke their approval', async () => { - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: caller, - }) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, false, { - from: caller, - }) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: replacementAddress, - }) - const [completed, requested] = await attestations.getAttestationStats( - phoneHash, - replacementAddress - ) - assertEqualBN(completed, 0) - assertEqualBN(requested, 0) - }) - - it('should revert if the caller is not one of the two parties', async () => { - const otherAddress: string = accounts[2] - await assertRevert( - attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: otherAddress, - }) - ) - }) - - it('should revert when the `to` address has attestations existing', async () => { - await attestations.request(phoneHash, attestationsRequested, mockERC20Token.address, { - from: replacementAddress, - }) - const requestBlockNumber = await web3.eth.getBlockNumber() - await random.addTestRandomness(requestBlockNumber + selectIssuersWaitBlocks, '0x1') - await attestations.selectIssuers(phoneHash, { from: replacementAddress }) - - const issuer = ( - await attestations.getAttestationIssuers(phoneHash, replacementAddress, { - from: replacementAddress, - }) - )[0] - const { v, r, s } = await getVerificationCodeSignature( - replacementAddress, - issuer, - phoneHash, - accounts - ) - await attestations.complete(phoneHash, v, r, s, { from: replacementAddress }) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: replacementAddress, - }) - await attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: replacementAddress, - }) - await assertRevert( - attestations.approveTransfer(phoneHash, 0, caller, replacementAddress, true, { - from: caller, - }), - 'Address tranferring to has already requested attestations' - ) - }) - }) - }) }) diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/Migrations.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/Migrations.sol new file mode 100644 index 00000000000..d1008cca7bc --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/Migrations.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.5.13; + +contract Migrations { + address public owner; + uint256 public last_completed_migration; // solhint-disable var-name-mixedcase + + modifier restricted() { + if (msg.sender == owner) _; + } + + constructor() public { + owner = msg.sender; + } + + function setCompleted(uint256 completed) external restricted { + last_completed_migration = completed; // solhint-disable var-name-mixedcase + } + + // solhint-disable-next-line func-param-name-mixedcase + function upgrade(address new_address) external restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestContract.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestContract.sol new file mode 100644 index 00000000000..632344ac59e --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestContract.sol @@ -0,0 +1,16 @@ +pragma solidity ^0.5.13; + +import "./TestParent.sol"; + +contract TestContract is TestParent { + struct Thing { + uint128 a; + uint128 b; + uint128 c; + } + + uint256 public x; + address public z; + + mapping(uint256 => Thing) thingMapping; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestLibrary.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestLibrary.sol new file mode 100644 index 00000000000..8f8bc25a5ea --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestLibrary.sol @@ -0,0 +1,8 @@ +pragma solidity ^0.5.13; + +library TestLibrary { + struct Thing { + uint8 field1; + uint16 deprecated_field2; + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestParent.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestParent.sol new file mode 100644 index 00000000000..00cd0b43f54 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_library_struct_mapping/TestParent.sol @@ -0,0 +1,14 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; + +import "./TestLibrary.sol"; + +contract TestParent is Ownable { + using TestLibrary for TestLibrary.Thing; + + uint256 private p; + address private q; + + mapping(uint256 => TestLibrary.Thing) thingMapping; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/Migrations.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/Migrations.sol new file mode 100644 index 00000000000..d1008cca7bc --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/Migrations.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.5.13; + +contract Migrations { + address public owner; + uint256 public last_completed_migration; // solhint-disable var-name-mixedcase + + modifier restricted() { + if (msg.sender == owner) _; + } + + constructor() public { + owner = msg.sender; + } + + function setCompleted(uint256 completed) external restricted { + last_completed_migration = completed; // solhint-disable var-name-mixedcase + } + + // solhint-disable-next-line func-param-name-mixedcase + function upgrade(address new_address) external restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestContract.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestContract.sol new file mode 100644 index 00000000000..a431fa32c7f --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestContract.sol @@ -0,0 +1,16 @@ +pragma solidity ^0.5.13; + +import "./TestParent.sol"; + +contract TestContract is TestParent { + struct Thing { + uint128 a; + uint128 b; + uint128 deprecated_c; + } + + uint256 public x; + address public z; + + Thing public thing; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestLibrary.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestLibrary.sol new file mode 100644 index 00000000000..419c911393f --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestLibrary.sol @@ -0,0 +1,8 @@ +pragma solidity ^0.5.13; + +library TestLibrary { + struct Thing { + uint8 field1; + uint16 field2; + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestParent.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestParent.sol new file mode 100644 index 00000000000..502ef0a9fd2 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_in_struct/TestParent.sol @@ -0,0 +1,14 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; + +import "./TestLibrary.sol"; + +contract TestParent is Ownable { + using TestLibrary for TestLibrary.Thing; + + uint256 private p; + address private q; + + TestLibrary.Thing libraryThing; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/Migrations.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/Migrations.sol new file mode 100644 index 00000000000..d1008cca7bc --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/Migrations.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.5.13; + +contract Migrations { + address public owner; + uint256 public last_completed_migration; // solhint-disable var-name-mixedcase + + modifier restricted() { + if (msg.sender == owner) _; + } + + constructor() public { + owner = msg.sender; + } + + function setCompleted(uint256 completed) external restricted { + last_completed_migration = completed; // solhint-disable var-name-mixedcase + } + + // solhint-disable-next-line func-param-name-mixedcase + function upgrade(address new_address) external restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestContract.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestContract.sol new file mode 100644 index 00000000000..6cb2fbe5254 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestContract.sol @@ -0,0 +1,16 @@ +pragma solidity ^0.5.13; + +import "./TestParent.sol"; + +contract TestContract is TestParent { + struct Thing { + uint128 a; + uint128 b; + uint128 c; + } + + uint256 public x; + address public deprecated_z; + + Thing public thing; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestLibrary.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestLibrary.sol new file mode 100644 index 00000000000..419c911393f --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestLibrary.sol @@ -0,0 +1,8 @@ +pragma solidity ^0.5.13; + +library TestLibrary { + struct Thing { + uint8 field1; + uint16 field2; + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestParent.sol b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestParent.sol new file mode 100644 index 00000000000..502ef0a9fd2 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_deprecated_prefixed_variable/TestParent.sol @@ -0,0 +1,14 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; + +import "./TestLibrary.sol"; + +contract TestParent is Ownable { + using TestLibrary for TestLibrary.Thing; + + uint256 private p; + address private q; + + TestLibrary.Thing libraryThing; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/Migrations.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/Migrations.sol new file mode 100644 index 00000000000..d1008cca7bc --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/Migrations.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.5.13; + +contract Migrations { + address public owner; + uint256 public last_completed_migration; // solhint-disable var-name-mixedcase + + modifier restricted() { + if (msg.sender == owner) _; + } + + constructor() public { + owner = msg.sender; + } + + function setCompleted(uint256 completed) external restricted { + last_completed_migration = completed; // solhint-disable var-name-mixedcase + } + + // solhint-disable-next-line func-param-name-mixedcase + function upgrade(address new_address) external restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestContract.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestContract.sol new file mode 100644 index 00000000000..632344ac59e --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestContract.sol @@ -0,0 +1,16 @@ +pragma solidity ^0.5.13; + +import "./TestParent.sol"; + +contract TestContract is TestParent { + struct Thing { + uint128 a; + uint128 b; + uint128 c; + } + + uint256 public x; + address public z; + + mapping(uint256 => Thing) thingMapping; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestLibrary.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestLibrary.sol new file mode 100644 index 00000000000..9b896161d9c --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestLibrary.sol @@ -0,0 +1,9 @@ +pragma solidity ^0.5.13; + +library TestLibrary { + struct Thing { + uint8 field1; + uint16 field2; + uint128 inserted; + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestParent.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestParent.sol new file mode 100644 index 00000000000..00cd0b43f54 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_library_struct_mapping/TestParent.sol @@ -0,0 +1,14 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; + +import "./TestLibrary.sol"; + +contract TestParent is Ownable { + using TestLibrary for TestLibrary.Thing; + + uint256 private p; + address private q; + + mapping(uint256 => TestLibrary.Thing) thingMapping; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/Migrations.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/Migrations.sol new file mode 100644 index 00000000000..d1008cca7bc --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/Migrations.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.5.13; + +contract Migrations { + address public owner; + uint256 public last_completed_migration; // solhint-disable var-name-mixedcase + + modifier restricted() { + if (msg.sender == owner) _; + } + + constructor() public { + owner = msg.sender; + } + + function setCompleted(uint256 completed) external restricted { + last_completed_migration = completed; // solhint-disable var-name-mixedcase + } + + // solhint-disable-next-line func-param-name-mixedcase + function upgrade(address new_address) external restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestContract.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestContract.sol new file mode 100644 index 00000000000..a16494f71b4 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestContract.sol @@ -0,0 +1,18 @@ +pragma solidity ^0.5.13; + +import "./TestParent.sol"; + +contract TestContract is TestParent { + struct Thing { + uint128 a; + uint128 b; + uint128 c; + uint128 inserted; + } + + uint256 public x; + address public z; + + mapping(uint256 => Thing) thingMapping; + Thing public myVariable; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestLibrary.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestLibrary.sol new file mode 100644 index 00000000000..419c911393f --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestLibrary.sol @@ -0,0 +1,8 @@ +pragma solidity ^0.5.13; + +library TestLibrary { + struct Thing { + uint8 field1; + uint16 field2; + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestParent.sol b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestParent.sol new file mode 100644 index 00000000000..00cd0b43f54 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_inserted_in_struct_mapping/TestParent.sol @@ -0,0 +1,14 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; + +import "./TestLibrary.sol"; + +contract TestParent is Ownable { + using TestLibrary for TestLibrary.Thing; + + uint256 private p; + address private q; + + mapping(uint256 => TestLibrary.Thing) thingMapping; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/Migrations.sol b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/Migrations.sol new file mode 100644 index 00000000000..d1008cca7bc --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/Migrations.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.5.13; + +contract Migrations { + address public owner; + uint256 public last_completed_migration; // solhint-disable var-name-mixedcase + + modifier restricted() { + if (msg.sender == owner) _; + } + + constructor() public { + owner = msg.sender; + } + + function setCompleted(uint256 completed) external restricted { + last_completed_migration = completed; // solhint-disable var-name-mixedcase + } + + // solhint-disable-next-line func-param-name-mixedcase + function upgrade(address new_address) external restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestContract.sol b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestContract.sol new file mode 100644 index 00000000000..632344ac59e --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestContract.sol @@ -0,0 +1,16 @@ +pragma solidity ^0.5.13; + +import "./TestParent.sol"; + +contract TestContract is TestParent { + struct Thing { + uint128 a; + uint128 b; + uint128 c; + } + + uint256 public x; + address public z; + + mapping(uint256 => Thing) thingMapping; +} diff --git a/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestLibrary.sol b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestLibrary.sol new file mode 100644 index 00000000000..419c911393f --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestLibrary.sol @@ -0,0 +1,8 @@ +pragma solidity ^0.5.13; + +library TestLibrary { + struct Thing { + uint8 field1; + uint16 field2; + } +} diff --git a/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestParent.sol b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestParent.sol new file mode 100644 index 00000000000..00cd0b43f54 --- /dev/null +++ b/packages/protocol/test/resources/compatibility/contracts_original_struct_in_mapping/TestParent.sol @@ -0,0 +1,14 @@ +pragma solidity ^0.5.13; + +import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; + +import "./TestLibrary.sol"; + +contract TestParent is Ownable { + using TestLibrary for TestLibrary.Thing; + + uint256 private p; + address private q; + + mapping(uint256 => TestLibrary.Thing) thingMapping; +} diff --git a/packages/protocol/test/stability/stabletokenregistry.ts b/packages/protocol/test/stability/stabletokenregistry.ts deleted file mode 100644 index 6f63d683720..00000000000 --- a/packages/protocol/test/stability/stabletokenregistry.ts +++ /dev/null @@ -1,157 +0,0 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' -import BigNumber from 'bignumber.js' -import { StableTokenRegistryContract, StableTokenRegistryInstance } from 'types' - -const STRC: StableTokenRegistryContract = artifacts.require('StableTokenRegistry') - -const convertToHex = (input: string) => { - return web3.utils.utf8ToHex(input) -} - -const assertSTContractNames = ( - contractsHex: string, - lengths: BigNumber[], - expectedContracts: string[] -) => { - assert.equal(lengths.length, expectedContracts.length) - const contracts = web3.utils.hexToUtf8(contractsHex) - let currentIndex = 0 - expectedContracts.forEach((expectedContract: string, i: number) => { - const contract = contracts.slice(currentIndex, currentIndex + lengths[i].toNumber()) - currentIndex += lengths[i].toNumber() - assert.equal(contract, expectedContract) - }) - assert.equal(contracts.length, currentIndex) -} -contract('StableTokenRegistry', (accounts: string[]) => { - let strc: StableTokenRegistryInstance - const nonOwner: string = accounts[1] - - const fiatTicker: string = convertToHex('USD') - const stableTokenContractName = convertToHex('StableToken') - - // Add this to contractkit once we have it - const getFiatTickers = async () => { - const updatedFiatTickers = [] - try { - let index = 0 - while (await strc.fiatTickers(index)) { - updatedFiatTickers.push(web3.utils.hexToUtf8(await strc.fiatTickers(index))) - index++ - } - } catch (error) { - return updatedFiatTickers - } - } - - beforeEach(async () => { - strc = await STRC.new(true) - await strc.initialize(convertToHex('GEL'), convertToHex('StableTokenGEL')) - }) - - describe('#initialize()', async () => { - it('should have set the owner', async () => { - const owner: string = await strc.owner() - assert.equal(owner, accounts[0]) - }) - - it('should not be callable again', async () => { - await assertRevert(strc.initialize(convertToHex('GEL'), convertToHex('StableTokenGEL'))) - }) - }) - - describe('#removeStableToken(fiatTicker)', () => { - beforeEach(async () => { - await strc.addNewStableToken(convertToHex('GBP'), convertToHex('StableTokenGBP')) - }) - - it('only allows owner', async () => { - await assertRevert(strc.removeStableToken(fiatTicker, 0, { from: nonOwner })) - }) - - it('has the right list of fiat tickers after removing one', async () => { - await strc.removeStableToken(fiatTicker, 0) - const updatedFiatTickers = await getFiatTickers() - assert.deepEqual(updatedFiatTickers, ['GBP', 'EUR', 'BRL', 'GEL']) - }) - - it('has the right list of contract names after removing one', async () => { - await strc.removeStableToken(fiatTicker, 0) - const [contractsHex, lengths] = await strc.getContractInstances() - assertSTContractNames(contractsHex, lengths, [ - 'StableTokenGBP', - 'StableTokenEUR', - 'StableTokenBRL', - 'StableTokenGEL', - ]) - }) - - it("can't be removed twice", async () => { - await strc.removeStableToken(convertToHex('USD'), 0) - await assertRevert(strc.removeStableToken(convertToHex('USD'), 0)) - }) - - it("can't delete an index out of range", async () => { - await assertRevert(strc.removeStableToken(convertToHex('USD'), 1)) - }) - - it('removes from fiatTickers array', async () => { - await strc.removeStableToken(fiatTicker, 0) - const updatedFiatTickers = await getFiatTickers() - assert.deepEqual(updatedFiatTickers, ['GBP', 'EUR', 'BRL', 'GEL']) - }) - - it("doesn't remove an fiat ticker with the wrong index", async () => { - await assertRevert(strc.removeStableToken(convertToHex('USD'), 1)) - }) - - it('reverts if a wrong values is passed as a fiatTicker', async () => { - await assertRevert(strc.removeStableToken(convertToHex('EUR'), 0)) - }) - }) - - describe('#addNewStableToken(fiatTicker)', () => { - it('only allows owner', async () => { - await assertRevert( - strc.addNewStableToken(fiatTicker, stableTokenContractName, { from: nonOwner }) - ) - }) - - it('does not allow empty strings', async () => { - await assertRevert(strc.addNewStableToken(fiatTicker, convertToHex(''))) - await assertRevert(strc.addNewStableToken(convertToHex(''), fiatTicker)) - await assertRevert(strc.addNewStableToken(convertToHex(''), convertToHex(''))) - }) - - it('does not allow duplicate values', async () => { - await assertRevert(strc.addNewStableToken(fiatTicker, stableTokenContractName)) - }) - - it('has the right list of fiat tickers after addition', async () => { - const fiatTickersBefore = await getFiatTickers() - assert.deepEqual(fiatTickersBefore, ['USD', 'EUR', 'BRL', 'GEL']) - await strc.addNewStableToken(convertToHex('MXN'), convertToHex('StableTokenMXN')) - const updatedFiatTickers = await getFiatTickers() - assert.deepEqual(updatedFiatTickers, ['USD', 'EUR', 'BRL', 'GEL', 'MXN']) - }) - - it('has the right list of contract names after adding one', async () => { - await strc.addNewStableToken(convertToHex('MXN'), convertToHex('StableTokenMXN')) - const [contractsHex, lengths] = await strc.getContractInstances() - assertSTContractNames(contractsHex, lengths, [ - 'StableToken', - 'StableTokenEUR', - 'StableTokenBRL', - 'StableTokenGEL', - 'StableTokenMXN', - ]) - }) - }) - - describe('#queryStableTokenContractNames(fiatTicker)', () => { - it('returns the corresponfing contract name', async () => { - const queriedContract = await strc.queryStableTokenContractNames.call(fiatTicker) - assert.deepEqual(queriedContract, stableTokenContractName) - }) - }) -}) diff --git a/packages/sdk/base/package.json b/packages/sdk/base/package.json index 25ca53c3b05..a1a1f59daa2 100644 --- a/packages/sdk/base/package.json +++ b/packages/sdk/base/package.json @@ -1,6 +1,6 @@ { "name": "@celo/base", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Celo base common utils, no dependencies", "author": "Celo", "license": "Apache-2.0", diff --git a/packages/sdk/base/src/address.test.ts b/packages/sdk/base/src/address.test.ts index 8c220f2a217..8d27354278e 100644 --- a/packages/sdk/base/src/address.test.ts +++ b/packages/sdk/base/src/address.test.ts @@ -1,4 +1,4 @@ -import { getAddressChunks } from './address' +import { getAddressChunks, isNullAddress } from './address' describe(getAddressChunks, () => { test('splits the address into chunks of 4 chars', async () => { @@ -16,3 +16,24 @@ describe(getAddressChunks, () => { ]) }) }) + +describe(isNullAddress, () => { + test('returns true for 0x0000000000000000000000000000000000000000', () => { + expect(isNullAddress('0x0000000000000000000000000000000000000000')).toBe(true) + }) + test('returns true for 0000000000000000000000000000000000000000', () => { + expect(isNullAddress('0000000000000000000000000000000000000000')).toBe(true) + }) + + test('returns false for 0xce10ce10ce10ce10ce10ce10ce10ce10ce10ce10', () => { + expect(isNullAddress('0xce10ce10ce10ce10ce10ce10ce10ce10ce10ce10')).toBe(false) + }) + + test('returns false for 0x0x0000000000000000000000000000000000000000', () => { + expect(isNullAddress('0x0x0000000000000000000000000000000000000000')).toBe(false) + }) + + test('returns false for 0x000000000000000000000000000000000000ce10', () => { + expect(isNullAddress('0x000000000000000000000000000000000000ce10')).toBe(false) + }) +}) diff --git a/packages/sdk/base/src/address.ts b/packages/sdk/base/src/address.ts index 32b484f440d..d49e641a2af 100644 --- a/packages/sdk/base/src/address.ts +++ b/packages/sdk/base/src/address.ts @@ -6,7 +6,7 @@ export const eqAddress = (a: Address, b: Address) => normalizeAddress(a) === nor export const normalizeAddress = (a: Address) => trimLeading0x(a).toLowerCase() -export const isNullAddress = (a: Address) => normalizeAddress(a) === NULL_ADDRESS +export const isNullAddress = (a: Address) => normalizeAddress(a) === normalizeAddress(NULL_ADDRESS) export const normalizeAddressWith0x = (a: Address) => ensureLeading0x(a).toLowerCase() diff --git a/packages/sdk/base/src/attestations.test.ts b/packages/sdk/base/src/attestations.test.ts deleted file mode 100644 index f32276a90bd..00000000000 --- a/packages/sdk/base/src/attestations.test.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { - extractAttestationCodeFromMessage, - messageContainsAttestationCode, - sanitizeMessageBase64, -} from './attestations' - -const MESSAGE_1 = - 'Celo : q4BJuVrALpiaroth_dwQ_ps6w8auvNPmi-SVVwstPaFaq8aRq4jeaWSPmI-rZTrJQ_Z0BOUyz9EBNif1Y2XzZQE=' -const MESSAGE_2 = - 'Celo attestation code: IDOp4SaFdr9d_uNUo3SAUp1x-ZvoLAUAX_txx9dC0Q56mqAfisxNeZjh6LGDz2uMtNSo2SP-z93RkeYeB0rcXgA=' -const MESSAGE_3 = - '<#> GTCp4SaFdr9d3uNUo3SAUp1x-ZvoLAUAX3txx9dC0Q56mqAfisxNeZP3WrGDz2uMtNSo2SP-z93RkeYeB0rcWhA= l5k6LvdPDXS' -const MESSAGE_3_WITH_LINK = - '<#> celo://wallet/v/GTCp4SaFdr9d3uNUo3SAUp1x-ZvoLAUAX3txx9dC0Q56mqAfisxNeZP3WrGDz2uMtNSo2SP-z93RkeYeB0rcWhA= l5k6LvdPDXS' -const MESSAGE_4_UNSANITIZED = - '<#> AOvujFUk§HkATAEsmVZRgB2phcFp69eqMqg0ps4Z8688s2-kgmyHybsRWYfTgjYMJv0jmFnjM8KKmb2tThROLAE= l5k6LvdPDXS' - -const MESSAGE_1_DECODED = - '0xab8049b95ac02e989aae8b61fddc10fe9b3ac3c6aebcd3e68be495570b2d3da15aabc691ab88de69648f988fab653ac943f67404e532cfd1013627f56365f36501' -const MESSAGE_2_DECODED = - '0x2033a9e1268576bf5dfee354a37480529d71f99be82c05005ffb71c7d742d10e7a9aa01f8acc4d7998e1e8b183cf6b8cb4d4a8d923fecfddd191e61e074adc5e00' -const MESSAGE_3_DECODED = - '0x1930a9e1268576bf5ddee354a37480529d71f99be82c05005f7b71c7d742d10e7a9aa01f8acc4d7993f75ab183cf6b8cb4d4a8d923fecfddd191e61e074adc5a10' -const MESSAGE_4_DECODED = - '0x00ebee8c5524fc79004c012c995651801da985c169ebd7aa32a834a6ce19f3af3cb36fa4826c87c9bb115987d382360c26fd239859e333c28a99bdad4e144e2c01' - -describe('Attestation Utils', () => { - describe('messageContainsAttestationCode', () => { - it('should check if a message contains a attestation code', () => { - expect(messageContainsAttestationCode(MESSAGE_1)).toBeTruthy() - expect(messageContainsAttestationCode(MESSAGE_2)).toBeTruthy() - expect(messageContainsAttestationCode(MESSAGE_3)).toBeTruthy() - expect(messageContainsAttestationCode(MESSAGE_3_WITH_LINK)).toBeTruthy() - }) - - it('should fail if a message does not contain a attestation code', () => { - expect(messageContainsAttestationCode('asdfasdaf')).toBeFalsy() - expect(messageContainsAttestationCode('')).toBeFalsy() - expect(messageContainsAttestationCode('Howdy there')).toBeFalsy() - }) - }) - - describe('extractAttestationCode', () => { - it('should extract the code from a message', () => { - expect(extractAttestationCodeFromMessage(MESSAGE_1)).toBe(MESSAGE_1_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_2)).toBe(MESSAGE_2_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_3)).toBe(MESSAGE_3_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_3_WITH_LINK)).toBe(MESSAGE_3_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_4_UNSANITIZED)).toBe(MESSAGE_4_DECODED) - }) - }) - - // TODO Update codes to include deeplink prefix - describe('sanitizeBase64', () => { - const CODE_1 = - 'Celo attestation code: NaLrNSYGRQ1JurhgREF1tNF43KDJnO6KaatnD¿hoim1XTq0O0IKNDQuBOF¿Fn5xIAjLQMtWbxbOgrtTBZ1oYAQA=' - const SANITIZED_CODE_1 = - 'Celo attestation code: NaLrNSYGRQ1JurhgREF1tNF43KDJnO6KaatnD_hoim1XTq0O0IKNDQuBOF_Fn5xIAjLQMtWbxbOgrtTBZ1oYAQA=' - const CODE_2 = - 'Celo attestation code: ZxO§ML8EU5K4a§h0jmjDbbV4a6gNJeBjfN9aa9xG-wsnf8§LYNE052gGuPML9s0Yqc§2YDCfwGgoiviV-IilRwA=' - const SANITIZED_CODE_2 = - 'Celo attestation code: ZxO_ML8EU5K4a_h0jmjDbbV4a6gNJeBjfN9aa9xG-wsnf8_LYNE052gGuPML9s0Yqc_2YDCfwGgoiviV-IilRwA=' - const NORMAL_CODE = - 'Celo attestation code: T7p-Mn1_L5zJuycAgAxYVqaJDp5r2TORcb775fdVoARbdJ-rNP-LArWCNJzJ6KjuVg0yskkEM8vVtl1PPmOsWwE=' - - it('sanitizes correctly', () => { - expect(sanitizeMessageBase64(CODE_1)).toBe(SANITIZED_CODE_1) - expect(sanitizeMessageBase64(CODE_2)).toBe(SANITIZED_CODE_2) - expect(sanitizeMessageBase64(NORMAL_CODE)).toBe(NORMAL_CODE) - }) - }) -}) diff --git a/packages/sdk/base/src/attestations.ts b/packages/sdk/base/src/attestations.ts deleted file mode 100644 index fa389258a24..00000000000 --- a/packages/sdk/base/src/attestations.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { getPhoneHash } from './phoneNumbers' - -const DEFAULT_NUM_ATTESTATIONS_REQUIRED = 3 -const DEFAULT_ATTESTATION_THRESHOLD = 0.25 - -// Supported identifer types for attestations -export enum IdentifierType { - PHONE_NUMBER = 0, - // In the future, other types like usernames or emails could go here -} - -// Each identifer type has a unique prefix to prevent unlikely but possible collisions -export function getIdentifierPrefix(type: IdentifierType) { - switch (type) { - case IdentifierType.PHONE_NUMBER: - return 'tel://' - default: - throw new Error('Unsupported Identifier Type') - } -} - -export function hashIdentifier( - sha3: (a: string) => string | null, - identifier: string, - type: IdentifierType, - salt?: string -) { - switch (type) { - case IdentifierType.PHONE_NUMBER: - return getPhoneHash(sha3, identifier, salt) - default: - throw new Error('Unsupported Identifier Type') - } -} - -export function base64ToHex(base64String: string) { - return '0x' + Buffer.from(base64String, 'base64').toString('hex') -} - -export function sanitizeMessageBase64(base64String: string) { - // Replace occurrences of ¿ with _. Unsure why that is happening right now - return base64String.replace(/(¿|§)/gi, '_') -} - -const attestationCodeRegex = new RegExp( - /(.* |^)(?:celo:\/\/wallet\/v\/)?([a-zA-Z0-9=\+\/_-]{87,88})($| .*)/ -) - -export function messageContainsAttestationCode(message: string) { - return attestationCodeRegex.test(message) -} - -export function extractAttestationCodeFromMessage(message: string) { - const sanitizedMessage = sanitizeMessageBase64(message) - - if (!messageContainsAttestationCode(sanitizedMessage)) { - return null - } - - const matches = sanitizedMessage.match(attestationCodeRegex) - if (!matches || matches.length < 3) { - return null - } - return base64ToHex(matches[2]) -} - -export interface AttestationsStatus { - isVerified: boolean - numAttestationsRemaining: number - total: number - completed: number -} - -interface AttestationStat { - completed: number - total: number -} - -/** - * Returns true if an AttestationStat is considered verified using the given factors, - * or defaults if factors are ommited. - * @param stats AttestationStat of the account's attestation identitifer, retrievable via lookupIdentitfiers - * @param numAttestationsRequired Optional number of attestations required. Will default to - * hardcoded value if absent. - * @param attestationThreshold Optional threshold for fraction attestations completed. Will - * default to hardcoded value if absent. - */ -export function isAccountConsideredVerified( - stats: AttestationStat | undefined, - numAttestationsRequired: number = DEFAULT_NUM_ATTESTATIONS_REQUIRED, - attestationThreshold: number = DEFAULT_ATTESTATION_THRESHOLD -): AttestationsStatus { - if (!stats) { - return { - isVerified: false, - numAttestationsRemaining: 0, - total: 0, - completed: 0, - } - } - const numAttestationsRemaining = numAttestationsRequired - stats.completed - const fractionAttestation = stats.total < 1 ? 0 : stats.completed / stats.total - // 'verified' is a term of convenience to mean that the attestation stats for a - // given identifier are beyond a certain threshold of confidence - const isVerified = numAttestationsRemaining <= 0 && fractionAttestation >= attestationThreshold - - return { - isVerified, - numAttestationsRemaining, - total: stats.total, - completed: stats.completed, - } -} - -export const AttestationBase = { - IdentifierType, - getIdentifierPrefix, - hashIdentifier, - base64ToHex, - sanitizeMessageBase64, - messageContainsAttestationCode, - extractAttestationCodeFromMessage, - isAccountConsideredVerified, -} diff --git a/packages/sdk/base/src/identifier.test.ts b/packages/sdk/base/src/identifier.test.ts new file mode 100644 index 00000000000..373d725a75e --- /dev/null +++ b/packages/sdk/base/src/identifier.test.ts @@ -0,0 +1,33 @@ +import { soliditySha3 } from 'web3-utils' +import { getIdentifierHash, IdentifierPrefix } from './identifier' +const sha3 = (v: string) => soliditySha3({ type: 'string', value: v }) + +const TEST_SALT = 'abcdefg' +const TEST_PLAINTEXT_IDENTIFIER = '+testIdentifier@' + +const EXPECTED_HASH_FOR_PREFIX: Record = { + [IdentifierPrefix.NULL]: '0x9ba535838da6c3b9e5052e63261deb872451a45d24cbbc2e0153a02b151702e3', + [IdentifierPrefix.PHONE_NUMBER]: + '0x1c404f57b436d75c6c63547c795d1d475c87dcd7bce6413fb016483e815335ee', + [IdentifierPrefix.EMAIL]: '0xaa47e9630a60f2e6667b310164b82d973124fc462e0361750fb36cf9f0e6ee16', + [IdentifierPrefix.TWITTER]: '0x9bb3eedf112f5ff18ec50467e2422fa1c2df01550fd650970e7aec3d52bc5ea9', + [IdentifierPrefix.FACEBOOK]: '0x883c8d998c5e75e7014fdcd1f75976032023fbfe89707d030f22367f501e08e8', + [IdentifierPrefix.INSTAGRAM]: + '0x3b212606f77d62fa85f636d76ab499306bed09f7f23e39db6aba348000c54d48', + [IdentifierPrefix.DISCORD]: '0xce7834e8e3c84180fab3a97b099dd131a78f9c91c3ae9753412423dc7ffdbdaa', + [IdentifierPrefix.TELEGRAM]: '0x65ecb839a118e293672aa7556dcff3f5d82dd142835e9d6f45b9539f252b3c6c', + [IdentifierPrefix.SIGNAL]: '0x34702bc6c5253a4d9521da1f45cec9eac3969c9cae7380aac422e2b872019182', +} + +describe('Identifier hashing', () => { + describe('Produces correct hash', () => { + Object.values(IdentifierPrefix).forEach((prefix: IdentifierPrefix) => { + it(`with IdentifierPrefix: ${prefix}`, () => { + const expectedHash = EXPECTED_HASH_FOR_PREFIX[prefix] + expect(getIdentifierHash(sha3, TEST_PLAINTEXT_IDENTIFIER, prefix, TEST_SALT)).toBe( + expectedHash + ) + }) + }) + }) +}) diff --git a/packages/sdk/base/src/identifier.ts b/packages/sdk/base/src/identifier.ts new file mode 100644 index 00000000000..64754b4071b --- /dev/null +++ b/packages/sdk/base/src/identifier.ts @@ -0,0 +1,84 @@ +// These functions were moved from the identity SDK because the protocol package +// and @celo/phone-utils both need these core identifier generation functions as well. +// The protocol package cannot depend on the identity SDK as is since this creates +// a non-trivial dependency cycle (currently, if A->B means "A depends on B", +// identity -> phone-number-privacy-common -> contractkit -> protocol). + +export const PEPPER_SEPARATOR = '__' + +// Docstring is duplicated in @celo/identity; make sure to update in both places. +/** + * Standardized prefixes for ODIS identifiers. + * + * @remarks These prefixes prevent collisions between off-chain identifiers. + * i.e. if a user's instagram and twitter handles are the same, + * these prefixes prevent the ODIS identifers from being the same. + * + * If you would like to use a prefix that isn't included, please put up a PR + * adding it to @celo/base (in celo-monorepo/packages/sdk/base/src/identifier.ts) + * to ensure interoperability with other projects. When adding new prefixes, + * please use either the full platform name in all lowercase (e.g. 'facebook') + * or DID methods https://w3c.github.io/did-spec-registries/#did-methods. + * Make sure to add the expected value for the unit test case in + * `celo-monorepo/packages/sdk/base/src/identifier.test.ts`, + * otherwise the test will fail. + * + * The NULL prefix is included to allow projects to use the sdk without selecting + * a predefined prefix or adding their own. Production use of the NULL prefix is + * discouraged since identifiers will not be interoperable with other projects. + * Please think carefully before using the NULL prefix. + */ +export enum IdentifierPrefix { + NULL = '', + PHONE_NUMBER = 'tel', + EMAIL = 'mailto', + TWITTER = 'twit', + FACEBOOK = 'facebook', + INSTAGRAM = 'instagram', + DISCORD = 'discord', + TELEGRAM = 'telegram', + SIGNAL = 'signal', +} + +// Docstring is duplicated in @celo/identity; make sure to update in both places. +/** + * Concatenates the identifierPrefix and plaintextIdentifier with the separator '://' + * + * @param plaintextIdentifier Off-chain identifier, ex: phone number, twitter handle, email, etc. + * @param identifierPrefix Standardized prefix used to prevent collisions between identifiers + */ +export const getPrefixedIdentifier = ( + plaintextIdentifier: string, + identifierPrefix: IdentifierPrefix +): string => identifierPrefix + '://' + plaintextIdentifier + +/** + * Helper function for getIdentifierHash in @celo/identity, so that this can + * be used in protocol tests without dependency issues. + * + * @remarks + * Concatenates the plaintext prefixed identifier with the pepper derived by hashing the unblinded + * signature returned by ODIS. + * + * @param sha3 Hash function (i.e. soliditySha3) to use to generate the identifier + * @param plaintextIdentifier Off-chain identifier, ex: phone number, twitter handle, email, etc. + * @param identifierPrefix Standardized prefix used to prevent collisions between identifiers + * @param pepper Hash of the unblinded signature returned by ODIS + */ +export const getIdentifierHash = ( + sha3: (a: string) => string | null, + plaintextIdentifier: string, + identifierPrefix: IdentifierPrefix, + pepper: string +): string => { + // hashing the identifier before appending the pepper to avoid domain collisions where the + // identifier may contain underscores + // not doing this for phone numbers to maintain backwards compatibility + const value = + identifierPrefix === IdentifierPrefix.PHONE_NUMBER + ? getPrefixedIdentifier(plaintextIdentifier, identifierPrefix) + PEPPER_SEPARATOR + pepper + : (sha3(getPrefixedIdentifier(plaintextIdentifier, identifierPrefix)) as string) + + PEPPER_SEPARATOR + + pepper + return sha3(value) as string +} diff --git a/packages/sdk/base/src/index.ts b/packages/sdk/base/src/index.ts index b2129e97453..bd0ec27fbd3 100644 --- a/packages/sdk/base/src/index.ts +++ b/packages/sdk/base/src/index.ts @@ -1,12 +1,12 @@ export * from './account' export * from './address' export * from './async' -export * from './attestations' export * from './collections' export * from './contacts' export * from './currencies' export * from './displayFormatting' export * from './future' +export * from './identifier' export * from './inputValidation' export * from './io' export * from './logger' diff --git a/packages/sdk/base/src/phoneNumbers.test.ts b/packages/sdk/base/src/phoneNumbers.test.ts index 2d39f8aa482..5b3160aa74a 100644 --- a/packages/sdk/base/src/phoneNumbers.test.ts +++ b/packages/sdk/base/src/phoneNumbers.test.ts @@ -1,6 +1,4 @@ -import { soliditySha3 } from 'web3-utils' -import { getPhoneHash, isE164Number } from './phoneNumbers' -const sha3 = (v: string) => soliditySha3({ type: 'string', value: v }) +import { isE164Number } from './phoneNumbers' const TEST_PHONE_NUMBERS = { VALID_US_1: '6282287826', @@ -30,27 +28,6 @@ const TEST_PHONE_NUMBERS = { } describe('Phone number formatting and utilities', () => { - describe('Phone hashing', () => { - it('Hashes an valid number without a salt', () => { - expect(getPhoneHash(sha3, TEST_PHONE_NUMBERS.VALID_E164, '')).toBe( - '0x483128504c69591aed5751690805ba9aad6c390644421dc189f6dbb6e085aadf' - ) - }) - it('Hashes an valid number with a salt', () => { - expect(getPhoneHash(sha3, TEST_PHONE_NUMBERS.VALID_E164, 'abcdefg')).toBe( - '0xf08257f6b126597dbd090fecf4f5106cfb59c98ef997644cef16f9349464810c' - ) - }) - it('Throws for an invalid number', () => { - try { - getPhoneHash(sha3, TEST_PHONE_NUMBERS.VALID_US_1, '') - fail('expected an error') - } catch (error) { - // Error expected - } - }) - }) - describe('Other phone helper methods', () => { it('checks if number is e164', () => { // @ts-ignore diff --git a/packages/sdk/base/src/phoneNumbers.ts b/packages/sdk/base/src/phoneNumbers.ts index 0f91e40af19..1334c0f9e20 100644 --- a/packages/sdk/base/src/phoneNumbers.ts +++ b/packages/sdk/base/src/phoneNumbers.ts @@ -1,5 +1,3 @@ -import { getIdentifierPrefix, IdentifierType } from './attestations' - export interface ParsedPhoneNumber { e164Number: string displayNumber: string @@ -8,22 +6,8 @@ export interface ParsedPhoneNumber { regionCode?: string } -const PHONE_SALT_SEPARATOR = '__' const E164_REGEX = /^\+[1-9][0-9]{1,14}$/ -export const getPhoneHash = ( - sha3: (a: string) => string | null, - phoneNumber: string, - salt?: string -): string => { - if (!phoneNumber || !isE164Number(phoneNumber)) { - throw Error('Attempting to hash a non-e164 number: ' + phoneNumber) - } - const prefix = getIdentifierPrefix(IdentifierType.PHONE_NUMBER) - const value = prefix + (salt ? phoneNumber + PHONE_SALT_SEPARATOR + salt : phoneNumber) - return sha3(value) as string -} - export function isE164Number(phoneNumber: string) { return E164_REGEX.test(phoneNumber) } @@ -33,6 +17,5 @@ export function anonymizedPhone(phoneNumber: string) { } export const PhoneNumberBase = { - getPhoneHash, isE164Number, } diff --git a/packages/sdk/connect/package.json b/packages/sdk/connect/package.json index ecc2f65cba9..998048737d0 100644 --- a/packages/sdk/connect/package.json +++ b/packages/sdk/connect/package.json @@ -1,6 +1,6 @@ { "name": "@celo/connect", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Light Toolkit for connecting with the Celo network", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -24,8 +24,8 @@ "dependencies": { "@types/debug": "^4.1.5", "@types/utf8": "^2.1.6", - "@celo/base": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "bignumber.js": "^9.0.0", "debug": "^4.1.1", "utf8": "3.0.0" diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index eabe08733ee..bfd6b99534a 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -1,6 +1,6 @@ { "name": "@celo/contractkit", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Celo's ContractKit to interact with Celo network", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -16,23 +16,24 @@ ], "scripts": { "build:ts": "tsc -b .", - "build:gen": "BUILD_DIR=./build/$RELEASE_TAG yarn --cwd ../../protocol ts-node ./scripts/build.ts --web3Types ../sdk/contractkit/src/generated", + "build:gen": "yarn --cwd ../../protocol ts-node ./scripts/build.ts --web3Types ../sdk/contractkit/src/generated", "build": "yarn build:gen && yarn build:ts", + "build:releasetag": "BUILD_DIR=./build/$RELEASE_TAG yarn build", "clean": "tsc -b . --clean", "clean:all": "yarn clean && rm -rf src/generated", "prepublishOnly": "yarn build", "docs": "typedoc", - "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 28", + "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 27", "test:livechain": "yarn --cwd ../../protocol devchain run-tar .tmp/devchain.tar.gz", "test": "jest --runInBand", "lint": "tslint -c tslint.json --project ." }, "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", - "@celo/wallet-local": "2.2.1-dev", - "@types/bn.js": "4.11.6", + "@celo/base": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/wallet-local": "3.2.1-dev", + "@types/bn.js": "^5.1.0", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", "cross-fetch": "^3.0.6", @@ -43,9 +44,9 @@ "web3": "1.3.6" }, "devDependencies": { + "@celo/phone-utils": "3.2.1-dev", "@celo/dev-utils": "0.0.1-dev", "@celo/flake-tracker": "0.0.1-dev", - "@celo/phone-utils": "2.2.1-dev", "@celo/protocol": "1.0.0", "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", diff --git a/packages/sdk/contractkit/src/base.ts b/packages/sdk/contractkit/src/base.ts index 6dc4af415c4..99f8ae52200 100644 --- a/packages/sdk/contractkit/src/base.ts +++ b/packages/sdk/contractkit/src/base.ts @@ -32,7 +32,6 @@ export enum CeloContract { StableTokenBRL = 'StableTokenBRL', TransferWhitelist = 'TransferWhitelist', Validators = 'Validators', - StableTokenRegistry = 'StableTokenRegistry', } export type StableTokenContract = diff --git a/packages/sdk/contractkit/src/contract-cache.ts b/packages/sdk/contractkit/src/contract-cache.ts index ff079d7301f..68e0b61d00a 100644 --- a/packages/sdk/contractkit/src/contract-cache.ts +++ b/packages/sdk/contractkit/src/contract-cache.ts @@ -28,7 +28,6 @@ import { MultiSigWrapper } from './wrappers/MultiSig' import { OdisPaymentsWrapper } from './wrappers/OdisPayments' import { ReserveWrapper } from './wrappers/Reserve' import { SortedOraclesWrapper } from './wrappers/SortedOracles' -import { StableTokenRegistryWrapper } from './wrappers/StableTokenRegistry' import { StableTokenWrapper } from './wrappers/StableTokenWrapper' import { ValidatorsWrapper } from './wrappers/Validators' @@ -57,7 +56,6 @@ const WrapperFactories = { [CeloContract.StableToken]: StableTokenWrapper, [CeloContract.StableTokenEUR]: StableTokenWrapper, [CeloContract.StableTokenBRL]: StableTokenWrapper, - [CeloContract.StableTokenRegistry]: StableTokenRegistryWrapper, } as const const WithRegistry = { @@ -116,7 +114,6 @@ interface WrapperCacheMap { [CeloContract.StableToken]?: StableTokenWrapper [CeloContract.StableTokenEUR]?: StableTokenWrapper [CeloContract.StableTokenBRL]?: StableTokenWrapper - [CeloContract.StableTokenRegistry]?: StableTokenRegistryWrapper [CeloContract.Validators]?: ValidatorsWrapper } @@ -166,19 +163,15 @@ export class WrapperCache implements ContractCacheType { getEscrow(): Promise { return this.getContract(CeloContract.Escrow) } - getExchange(stableToken: StableToken = StableToken.cUSD) { return this.getContract(stableTokenInfos[stableToken].exchangeContract) } - getFreezer() { return this.getContract(CeloContract.Freezer) } - getFederatedAttestations() { return this.getContract(CeloContract.FederatedAttestations) } - getGasPriceMinimum() { return this.getContract(CeloContract.GasPriceMinimum) } @@ -206,23 +199,18 @@ export class WrapperCache implements ContractCacheType { getOdisPayments() { return this.getContract(CeloContract.OdisPayments) } - getReserve() { return this.getContract(CeloContract.Reserve) } getSortedOracles() { return this.getContract(CeloContract.SortedOracles) } - getStableToken(stableToken: StableToken = StableToken.cUSD) { return this.getContract(stableTokenInfos[stableToken].contract) } getValidators() { return this.getContract(CeloContract.Validators) } - getStableTokenRegistry() { - return this.getContract(CeloContract.StableTokenRegistry) - } /** * Get Contract wrapper diff --git a/packages/sdk/contractkit/src/identity/metadata.ts b/packages/sdk/contractkit/src/identity/metadata.ts index c4686761b92..3eccd7d3874 100644 --- a/packages/sdk/contractkit/src/identity/metadata.ts +++ b/packages/sdk/contractkit/src/identity/metadata.ts @@ -61,7 +61,13 @@ export class IdentityMetadataWrapper { } static fromFile(contractKitOrAccountsWrapper: KitOrAccountsWrapper, path: string) { - const { readFileSync } = require('fs') + let readFileSync + try { + const fs = require('fs') + readFileSync = fs.readFileSync + } catch { + console.error('cant read from file in browser or environment without native fs module') + } return this.fromRawString(contractKitOrAccountsWrapper, readFileSync(path, 'utf-8')) } diff --git a/packages/sdk/contractkit/src/kit.ts b/packages/sdk/contractkit/src/kit.ts index 23da74900a4..3d4e72c681e 100644 --- a/packages/sdk/contractkit/src/kit.ts +++ b/packages/sdk/contractkit/src/kit.ts @@ -27,8 +27,6 @@ import { BlockchainParametersConfig } from './wrappers/BlockchainParameters' import { DowntimeSlasherConfig } from './wrappers/DowntimeSlasher' import { ElectionConfig } from './wrappers/Election' import { ExchangeConfig } from './wrappers/Exchange' -// TODO ASv2 -// import { FederatedAttestationsConfig } from './wrappers/FederatedAttestations' import { GasPriceMinimumConfig } from './wrappers/GasPriceMinimum' import { GovernanceConfig } from './wrappers/Governance' import { GrandaMentoConfig } from './wrappers/GrandaMento' @@ -74,8 +72,6 @@ export interface NetworkConfig { stableTokens: EachCeloToken election: ElectionConfig attestations: AttestationsConfig - // TODO ASv2 - // federatedattestations: FederatedAttestationsConfig governance: GovernanceConfig lockedGold: LockedGoldConfig sortedOracles: SortedOraclesConfig @@ -150,8 +146,6 @@ export class ContractKit { const configContracts: ValidWrappers[] = [ CeloContract.Election, CeloContract.Attestations, - // TODO ASv2 - // CeloContract.FederatedAttestations, CeloContract.Governance, CeloContract.LockedGold, CeloContract.SortedOracles, diff --git a/packages/sdk/contractkit/src/setupForKits.ts b/packages/sdk/contractkit/src/setupForKits.ts index a808c4e9684..61d1756dbfc 100644 --- a/packages/sdk/contractkit/src/setupForKits.ts +++ b/packages/sdk/contractkit/src/setupForKits.ts @@ -24,8 +24,13 @@ export function ensureCurrentProvider(web3: Web3) { export function getWeb3ForKit(url: string, options: Web3HttpProviderOptions | undefined) { let web3: Web3 if (url.endsWith('.ipc')) { - const net = require('net') - web3 = new Web3(new Web3.providers.IpcProvider(url, net)) + try { + const net = require('net') + web3 = new Web3(new Web3.providers.IpcProvider(url, net)) + } catch (e) { + console.error('.ipc only works in environments with native net module') + } + web3 = new Web3(url) } else if (url.toLowerCase().startsWith('http')) { web3 = new Web3(new Web3.providers.HttpProvider(url, options)) } else { diff --git a/packages/sdk/contractkit/src/web3-contract-cache.ts b/packages/sdk/contractkit/src/web3-contract-cache.ts index 8755adceea8..a997e3467de 100644 --- a/packages/sdk/contractkit/src/web3-contract-cache.ts +++ b/packages/sdk/contractkit/src/web3-contract-cache.ts @@ -32,7 +32,6 @@ import { newRegistry } from './generated/Registry' import { newReserve } from './generated/Reserve' import { newSortedOracles } from './generated/SortedOracles' import { newStableToken } from './generated/StableToken' -import { newStableTokenRegistry } from './generated/StableTokenRegistry' import { newTransferWhitelist } from './generated/TransferWhitelist' import { newValidators } from './generated/Validators' @@ -70,7 +69,6 @@ export const ContractFactories = { [CeloContract.StableToken]: newStableToken, [CeloContract.StableTokenEUR]: newStableToken, [CeloContract.StableTokenBRL]: newStableToken, - [CeloContract.StableTokenRegistry]: newStableTokenRegistry, [CeloContract.TransferWhitelist]: newTransferWhitelist, [CeloContract.Validators]: newValidators, } @@ -165,6 +163,9 @@ export class Web3ContractCache { getMultiSig(address: string) { return this.getContract(CeloContract.MultiSig, address) } + getOdisPayments() { + return this.getContract(CeloContract.OdisPayments) + } getRandom() { return this.getContract(CeloContract.Random) } @@ -186,9 +187,6 @@ export class Web3ContractCache { getValidators() { return this.getContract(CeloContract.Validators) } - getStableTokenRegistry() { - return this.getContract(CeloContract.StableTokenRegistry) - } /** * Get native web3 contract wrapper diff --git a/packages/sdk/contractkit/src/wrappers/Attestations.ts b/packages/sdk/contractkit/src/wrappers/Attestations.ts index 74588f840ef..c67548e1c03 100644 --- a/packages/sdk/contractkit/src/wrappers/Attestations.ts +++ b/packages/sdk/contractkit/src/wrappers/Attestations.ts @@ -1,12 +1,10 @@ import { StableToken } from '@celo/base' -import { eqAddress, NULL_ADDRESS } from '@celo/base/lib/address' +import { eqAddress } from '@celo/base/lib/address' import { concurrentMap, sleep } from '@celo/base/lib/async' import { notEmpty, zip3 } from '@celo/base/lib/collections' import { parseSolidityStringArray } from '@celo/base/lib/parsing' import { appendPath } from '@celo/base/lib/string' import { Address, Connection, toTransactionObject } from '@celo/connect' -import { AttestationUtils, SignatureUtils } from '@celo/utils/lib' -import { attestationSecurityCode as buildSecurityCodeTypedData } from '@celo/utils/lib/typed-data-constructors' import BigNumber from 'bignumber.js' import fetch from 'cross-fetch' import { Attestations } from '../generated/Attestations' @@ -31,25 +29,6 @@ export function getSecurityCodePrefix(issuerAddress: Address) { return `${hashAddressToSingleDigit(issuerAddress)}` } -// from '@celo/phone-utils/lib/io' -interface AttestationRequest { - phoneNumber: string - account: string - issuer: string - salt: string | undefined - smsRetrieverAppSig: string | undefined - securityCodePrefix: string | undefined - language: string | undefined - phoneNumberSignature: string | undefined -} -interface GetAttestationRequest { - phoneNumber: string - account: string - issuer: string - salt: string | undefined - securityCode: string | undefined -} - export interface AttestationStat { completed: number total: number @@ -262,15 +241,30 @@ export class AttestationsWrapper extends BaseWrapper { async getVerifiedStatus( identifier: string, account: Address, - numAttestationsRequired?: number, - attestationThreshold?: number + numAttestationsRequired: number = 3, + attestationThreshold: number = 0.25 ) { - const attestationStats = await this.getAttestationStat(identifier, account) - return AttestationUtils.isAccountConsideredVerified( - attestationStats, - numAttestationsRequired, - attestationThreshold - ) + const stats = await this.getAttestationStat(identifier, account) + if (!stats) { + return { + isVerified: false, + numAttestationsRemaining: 0, + total: 0, + completed: 0, + } + } + const numAttestationsRemaining = numAttestationsRequired - stats.completed + const fractionAttestation = stats.total < 1 ? 0 : stats.completed / stats.total + // 'verified' is a term of convenience to mean that the attestation stats for a + // given identifier are beyond a certain threshold of confidence + const isVerified = numAttestationsRemaining <= 0 && fractionAttestation >= attestationThreshold + + return { + isVerified, + numAttestationsRemaining, + total: stats.total, + completed: stats.completed, + } } /** @@ -392,28 +386,6 @@ export class AttestationsWrapper extends BaseWrapper { } } - /** - * Completes an attestation with the corresponding code - * @param identifier Attestation identifier (e.g. phone hash) - * @param account Address of the account - * @param issuer The issuer of the attestation - * @param code The code received by the validator - */ - async complete(identifier: string, account: Address, issuer: Address, code: string) { - const accounts = await this.contracts.getAccounts() - const attestationSigner = await accounts.getAttestationSigner(issuer) - const expectedSourceMessage = AttestationUtils.getAttestationMessageToSignFromIdentifier( - identifier, - account - ) - const { r, s, v } = SignatureUtils.parseSignature( - expectedSourceMessage, - code, - attestationSigner - ) - return toTransactionObject(this.connection, this.contract.methods.complete(identifier, v, r, s)) - } - /** * Returns the attestation signer for the specified account. * @param account The address of token rewards are accumulated in. @@ -432,37 +404,6 @@ export class AttestationsWrapper extends BaseWrapper { */ withdraw = proxySend(this.connection, this.contract.methods.withdraw) - /** - * Given a list of issuers, finds the matching issuer for a given code - * @param identifier Attestation identifier (e.g. phone hash) - * @param account Address of the account - * @param code The code received by the validator - * @param issuers The list of potential issuers - */ - async findMatchingIssuer( - identifier: string, - account: Address, - code: string, - issuers: string[] - ): Promise { - const accounts = await this.contracts.getAccounts() - const expectedSourceMessage = AttestationUtils.getAttestationMessageToSignFromIdentifier( - identifier, - account - ) - for (const issuer of issuers) { - const attestationSigner = await accounts.getAttestationSigner(issuer) - - try { - SignatureUtils.parseSignature(expectedSourceMessage, code, attestationSigner) - return issuer - } catch (error) { - continue - } - } - return null - } - /** * Returns the current configuration parameters for the contract. * @param tokens List of tokens used for attestation fees. use CeloTokens.getAddresses() to get @@ -541,174 +482,6 @@ export class AttestationsWrapper extends BaseWrapper { return result } - /** - * Requests a new attestation - * @param identifier Attestation identifier (e.g. phone hash) - * @param attestationsRequested The number of attestations to request - */ - async request(identifier: string, attestationsRequested: number) { - const contract = await this.contracts.getStableToken(StableToken.cUSD) - - return toTransactionObject( - this.connection, - this.contract.methods.request(identifier, attestationsRequested, contract.address) - ) - } - - /** - * Updates sender's approval status on whether to allow an attestation identifier - * mapping to be transfered from one address to another. - * @param identifier The identifier for this attestation. - * @param index The index of the account in the accounts array. - * @param from The current attestation address to which the identifier is mapped. - * @param to The new address to map to identifier. - * @param status The approval status - */ - approveTransfer = proxySend(this.connection, this.contract.methods.approveTransfer) - - /** - * Selects the issuers for previously requested attestations for a phone number - * @param identifier Attestation identifier (e.g. phone hash) - */ - selectIssuers(identifier: string) { - return toTransactionObject(this.connection, this.contract.methods.selectIssuers(identifier)) - } - - /** - * Waits appropriate number of blocks, then selects issuers for previously requested phone number attestations - * @param identifier Attestation identifier (e.g. phone hash) - * @param account Address of the account - */ - async selectIssuersAfterWait( - identifier: string, - account: string, - timeoutSeconds?: number, - pollDurationSeconds?: number - ) { - await this.waitForSelectingIssuers(identifier, account, timeoutSeconds, pollDurationSeconds) - return this.selectIssuers(identifier) - } - - /** - * Reveal phone number to issuer - * @param serviceURL: validator's attestation service URL - * @param body - */ - revealPhoneNumberToIssuer(serviceURL: string, requestBody: AttestationRequest) { - return fetch(appendPath(serviceURL, 'attestations'), { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(requestBody), - }) - } - - /** - * Returns reveal status from validator's attestation service - * @param phoneNumber: attestation's phone number - * @param account: attestation's account - * @param issuer: validator's address - * @param serviceURL: validator's attestation service URL - * @param pepper: phone number privacy pepper - */ - getRevealStatus( - phoneNumber: string, - account: Address, - issuer: Address, - serviceURL: string, - pepper?: string - ) { - const urlParams = new URLSearchParams({ - phoneNumber, - salt: pepper ?? '', - issuer, - account, - }) - return fetch(appendPath(serviceURL, 'get_attestations') + '?' + urlParams, { - method: 'GET', - headers: { 'Content-Type': 'application/json' }, - }) - } - - /** - * Returns attestation code for provided security code from validator's attestation service - * @param serviceURL: validator's attestation service URL - * @param body - */ - async getAttestationForSecurityCode( - serviceURL: string, - requestBody: GetAttestationRequest, - signer: Address - ): Promise { - const urlParams = new URLSearchParams({ - phoneNumber: requestBody.phoneNumber, - account: requestBody.account, - issuer: requestBody.issuer, - }) - - let additionalHeaders = {} - if (requestBody.salt) { - urlParams.set('salt', requestBody.salt) - } - if (requestBody.securityCode) { - urlParams.set('securityCode', requestBody.securityCode) - const signature = await this.connection.signTypedData( - signer, - buildSecurityCodeTypedData(requestBody.securityCode) - ) - additionalHeaders = { - Authentication: SignatureUtils.serializeSignature(signature), - } - } - - const response = await fetch(appendPath(serviceURL, 'get_attestations') + '?' + urlParams, { - method: 'GET', - headers: { 'Content-Type': 'application/json', ...additionalHeaders }, - }) - - const { ok, status } = response - if (ok) { - const body = await response.json() - if (body.attestationCode) { - return body.attestationCode - } - } - throw new Error( - `Error getting security code for ${requestBody.issuer}. ${status}: ${await response.text()}` - ) - } - - /** - * Validates a given code by the issuer on-chain - * @param identifier Attestation identifier (e.g. phone hash) - * @param account The address of the account which requested attestation - * @param issuer The address of the issuer of the attestation - * @param code The code send by the issuer - */ - async validateAttestationCode( - identifier: string, - account: Address, - issuer: Address, - code: string - ) { - const accounts = await this.contracts.getAccounts() - const attestationSigner = await accounts.getAttestationSigner(issuer) - const expectedSourceMessage = AttestationUtils.getAttestationMessageToSignFromIdentifier( - identifier, - account - ) - const { r, s, v } = SignatureUtils.parseSignature( - expectedSourceMessage, - code, - attestationSigner - ) - const result = await this.contract.methods - .validateAttestationCode(identifier, account, v, r, s) - .call() - return result.toLowerCase() !== NULL_ADDRESS - } - /** * Gets the relevant attestation service status for a validator * @param validator Validator to get the attestation service status for diff --git a/packages/sdk/contractkit/src/wrappers/Escrow.test.ts b/packages/sdk/contractkit/src/wrappers/Escrow.test.ts index ac95574c885..1dc35103a68 100644 --- a/packages/sdk/contractkit/src/wrappers/Escrow.test.ts +++ b/packages/sdk/contractkit/src/wrappers/Escrow.test.ts @@ -123,4 +123,37 @@ testWithGanache('Escrow Wrapper', (web3) => { .sendAndWaitForReceipt() ).rejects.toThrow() }) + it('withdraw should revert if attestation is registered by issuer not on the trusted issuers list', async () => { + const sender: string = accounts[1] + const receiver: string = accounts[2] + const withdrawKeyAddress: string = accounts[3] + const oneDayInSecs: number = 86400 + const parsedSig = await getParsedSignatureOfAddress(web3, receiver, withdrawKeyAddress) + + await federatedAttestations + .registerAttestationAsIssuer(identifier, receiver, TIMESTAMP) + .sendAndWaitForReceipt() + + await stableTokenContract + .approve(escrow.address, TEN_CUSD) + .sendAndWaitForReceipt({ from: sender }) + + await escrow + .transferWithTrustedIssuers( + identifier, + stableTokenContract.address, + TEN_CUSD, + oneDayInSecs, + withdrawKeyAddress, + 1, + [accounts[5]] + ) + .sendAndWaitForReceipt({ from: sender }) + + await expect( + escrow + .withdraw(withdrawKeyAddress, parsedSig.v, parsedSig.r, parsedSig.s) + .sendAndWaitForReceipt() + ).rejects.toThrow() + }) }) diff --git a/packages/sdk/contractkit/src/wrappers/FederatedAttestations.test.ts b/packages/sdk/contractkit/src/wrappers/FederatedAttestations.test.ts index 2f4cbf24197..f6d70799081 100644 --- a/packages/sdk/contractkit/src/wrappers/FederatedAttestations.test.ts +++ b/packages/sdk/contractkit/src/wrappers/FederatedAttestations.test.ts @@ -43,6 +43,46 @@ testWithGanache('FederatedAttestations Wrapper', (web3) => { expect(attestations.publishedOns).toEqual([]) }) + it('attestation and identifiers should exist after registerAttestation is called', async () => { + const issuer = accounts[1] + const account = accounts[3] + + const accountInstance = await kit.contracts.getAccounts() + await accountInstance.createAccount().sendAndWaitForReceipt({ from: issuer }) + + // Ganache returns 1 in chainId assembly code + // @ts-ignore + jest.spyOn(kit.connection, 'chainId').mockReturnValue(1) + + const celoTransactionObject = await federatedAttestations.registerAttestation( + testIdentifierBytes32, + issuer, + account, + issuer, + TIME_STAMP + ) + + await celoTransactionObject.sendAndWaitForReceipt() + + const attestationsAfterRegistration = await federatedAttestations.lookupAttestations( + testIdentifierBytes32, + [issuer] + ) + + const identifiersAfterRegistration = await federatedAttestations.lookupIdentifiers(account, [ + issuer, + ]) + + expect(attestationsAfterRegistration.countsPerIssuer).toEqual(['1']) + expect(attestationsAfterRegistration.accounts).toEqual([account]) + expect(attestationsAfterRegistration.signers).toEqual([issuer]) + expect(attestationsAfterRegistration.issuedOns).toEqual([`${TIME_STAMP}`]) + expect(attestationsAfterRegistration.publishedOns[0]).toBeDefined() + + expect(identifiersAfterRegistration.countsPerIssuer).toEqual(['1']) + expect(identifiersAfterRegistration.identifiers).toEqual([testIdentifierBytes32]) + }) + it('attestation should exist when registered and not when revoked', async () => { await federatedAttestations .registerAttestationAsIssuer(testIdentifierBytes32, testAccountAddress, TIME_STAMP) diff --git a/packages/sdk/contractkit/src/wrappers/FederatedAttestations.ts b/packages/sdk/contractkit/src/wrappers/FederatedAttestations.ts index b01727b3894..4323ccffa39 100644 --- a/packages/sdk/contractkit/src/wrappers/FederatedAttestations.ts +++ b/packages/sdk/contractkit/src/wrappers/FederatedAttestations.ts @@ -1,4 +1,5 @@ -import { Address, CeloTransactionObject } from '@celo/connect' +import { Address, CeloTransactionObject, toTransactionObject } from '@celo/connect' +import { registerAttestation as buildRegisterAttestationTypedData } from '@celo/utils/lib/typed-data-constructors' import { FederatedAttestations } from '../generated/FederatedAttestations' import { BaseWrapper, proxyCall, proxySend } from './BaseWrapper' @@ -98,30 +99,44 @@ export class FederatedAttestationsWrapper extends BaseWrapper CeloTransactionObject = proxySend( - this.connection, - this.contract.methods.registerAttestation - ) + issuedOn: number + ) { + const chainId = await this.connection.chainId() + const typedData = buildRegisterAttestationTypedData(chainId, this.address, { + identifier, + issuer, + account, + signer, + issuedOn, + }) + const sig = await this.connection.signTypedData(signer, typedData) + return toTransactionObject( + this.connection, + this.contract.methods.registerAttestation( + identifier, + issuer, + account, + signer, + issuedOn, + sig.v, + sig.r, + sig.s + ) + ) + } /** * @notice Revokes an attestation diff --git a/packages/sdk/contractkit/src/wrappers/Governance.test.ts b/packages/sdk/contractkit/src/wrappers/Governance.test.ts index 37030a1c6e0..1505f05b1f0 100644 --- a/packages/sdk/contractkit/src/wrappers/Governance.test.ts +++ b/packages/sdk/contractkit/src/wrappers/Governance.test.ts @@ -181,6 +181,47 @@ testWithGanache('Governance Wrapper', (web3: Web3) => { expect(yesVotes).toEqBigNumber(voteWeight) }) + it('#getVoteRecord', async () => { + const voter = accounts[2] + await proposeFn(accounts[0]) + await timeTravel(expConfig.dequeueFrequency, web3) + await governance.dequeueProposalsIfReady().sendAndWaitForReceipt() + await approveFn() + await voteFn(voter) + + const voteWeight = await governance.getVoteWeight(voter) + const yesVotes = (await governance.getVotes(proposalID))[VoteValue.Yes] + expect(yesVotes).toEqBigNumber(voteWeight) + + const voteRecord = await governance.getVoteRecord(voter, proposalID) + expect(voteRecord?.yesVotes).toEqBigNumber(voteWeight) + expect(voteRecord?.noVotes).toEqBigNumber(0) + expect(voteRecord?.abstainVotes).toEqBigNumber(0) + }) + + it('#votePartially', async () => { + await proposeFn(accounts[0]) + await timeTravel(expConfig.dequeueFrequency, web3) + await governance.dequeueProposalsIfReady().sendAndWaitForReceipt() + await approveFn() + + const yes = 10 + const no = 20 + const abstain = 0 + + const tx = await governance.votePartially(proposalID, yes, no, abstain) + await tx.sendAndWaitForReceipt({ from: accounts[2] }) + await timeTravel(expConfig.referendumStageDuration, web3) + + const votes = await governance.getVotes(proposalID) + const yesVotes = votes[VoteValue.Yes] + const noVotes = votes[VoteValue.No] + const abstainVotes = votes[VoteValue.Abstain] + expect(yesVotes).toEqBigNumber(yes) + expect(noVotes).toEqBigNumber(no) + expect(abstainVotes).toEqBigNumber(abstain) + }) + it( '#execute', async () => { @@ -212,7 +253,14 @@ testWithGanache('Governance Wrapper', (web3: Web3) => { expect(proposer.refundedDeposits).toEqBigNumber(minDeposit) const voter = await governance.getVoter(accounts[2]) - const expectedVoteRecord = { proposalID, votes: new BigNumber(ONE_CGLD), value: 'Yes' } + const expectedVoteRecord = { + proposalID, + votes: new BigNumber(0), + value: VoteValue.None, + abstainVotes: new BigNumber(0), + noVotes: new BigNumber(0), + yesVotes: new BigNumber('1000000000000000000'), + } expect(voter.votes[0]).toEqual(expectedVoteRecord) }) }) diff --git a/packages/sdk/contractkit/src/wrappers/Governance.ts b/packages/sdk/contractkit/src/wrappers/Governance.ts index 78867f4eed9..9551b034ae3 100644 --- a/packages/sdk/contractkit/src/wrappers/Governance.ts +++ b/packages/sdk/contractkit/src/wrappers/Governance.ts @@ -107,7 +107,7 @@ export interface UpvoteRecord { } export enum VoteValue { - None = 'NONE', + None = 'None', Abstain = 'Abstain', No = 'No', Yes = 'Yes', @@ -135,6 +135,9 @@ export interface VoteRecord { proposalID: BigNumber votes: BigNumber value: VoteValue + yesVotes: BigNumber + noVotes: BigNumber + abstainVotes: BigNumber } export interface Voter { @@ -545,6 +548,9 @@ export class GovernanceWrapper extends BaseWrapperForGoverning { proposalID: valueToBigNumber(res[0]), value: Object.keys(VoteValue)[valueToInt(res[1])] as VoteValue, votes: valueToBigNumber(res[2]), + yesVotes: valueToBigNumber(res[3]), + noVotes: valueToBigNumber(res[4]), + abstainVotes: valueToBigNumber(res[5]), } } catch (_) { // The proposal ID may not be present in the dequeued list, or the voter may not have a vote @@ -797,6 +803,32 @@ export class GovernanceWrapper extends BaseWrapperForGoverning { ) } + /** + * Applies `sender`'s vote choice to a given proposal. + * @param proposalID Governance proposal UUID. + * @param yesVotes The yes votes. + * @param noVotes The no votes. + * @param abstainVotes The abstain votes. + */ + async votePartially( + proposalID: BigNumber.Value, + yesVotes: BigNumber.Value, + noVotes: BigNumber.Value, + abstainVotes: BigNumber.Value + ) { + const proposalIndex = await this.getDequeueIndex(proposalID) + return toTransactionObject( + this.connection, + this.contract.methods.votePartially( + valueToString(proposalID), + proposalIndex, + valueToString(yesVotes), + valueToString(noVotes), + valueToString(abstainVotes) + ) + ) + } + revokeVotes = proxySend(this.connection, this.contract.methods.revokeVotes) /** diff --git a/packages/sdk/contractkit/src/wrappers/OdisPayments.ts b/packages/sdk/contractkit/src/wrappers/OdisPayments.ts index eaf807b4994..3b4998a0a74 100644 --- a/packages/sdk/contractkit/src/wrappers/OdisPayments.ts +++ b/packages/sdk/contractkit/src/wrappers/OdisPayments.ts @@ -1,14 +1,17 @@ import { Address, CeloTransactionObject } from '@celo/connect' +import { BigNumber } from 'bignumber.js' import { OdisPayments } from '../generated/OdisPayments' -import { BaseWrapper, proxyCall, proxySend } from './BaseWrapper' +import { BaseWrapper, proxyCall, proxySend, valueToBigNumber } from './BaseWrapper' export class OdisPaymentsWrapper extends BaseWrapper { /** * @notice Fetches total amount sent (all-time) for given account to odisPayments * @param account The account to fetch total amount of funds sent */ - totalPaidCUSD: (account: Address) => Promise = proxyCall( - this.contract.methods.totalPaidCUSD + totalPaidCUSD: (account: Address) => Promise = proxyCall( + this.contract.methods.totalPaidCUSD, + undefined, + valueToBigNumber ) /** @@ -22,3 +25,5 @@ export class OdisPaymentsWrapper extends BaseWrapper { this.contract.methods.payInCUSD ) } + +export type OdisPaymentsWrapperType = OdisPaymentsWrapper diff --git a/packages/sdk/contractkit/src/wrappers/StableTokenRegistry.test.ts b/packages/sdk/contractkit/src/wrappers/StableTokenRegistry.test.ts deleted file mode 100644 index 37cd313b483..00000000000 --- a/packages/sdk/contractkit/src/wrappers/StableTokenRegistry.test.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Address } from '@celo/base/lib/address' -import { testWithGanache } from '@celo/dev-utils/lib/ganache-test' -import Web3 from 'web3' -import { newKitFromWeb3 } from '../kit' -import { StableTokenRegistryWrapper } from './StableTokenRegistry' - -testWithGanache('StableTokenRegistry Wrapper', (web3: Web3) => { - const kit = newKitFromWeb3(web3) - let accounts: Address[] = [] - let stableTokenRegistry: StableTokenRegistryWrapper - - beforeAll(async () => { - accounts = await web3.eth.getAccounts() - kit.defaultAccount = accounts[0] - stableTokenRegistry = await kit.contracts.getStableTokenRegistry() - }) - - describe('Verifying that it always has correct values', () => { - it('has the correct list of fiatTicker', async () => { - const fiatTickers = await stableTokenRegistry.getFiatTickers() - expect(fiatTickers).toEqual(['USD', 'EUR', 'BRL']) - }) - it('has the correct list of stable token contracts', async () => { - const contractInstances = await stableTokenRegistry.getContractInstances() - expect(contractInstances).toEqual(['StableToken', 'StableTokenEUR', 'StableTokenBRL']) - }) - it('can query stable token contract names', async () => { - const stableTokenContractName = await stableTokenRegistry.queryStableTokenContractNames('USD') - expect(stableTokenContractName).toEqual('StableToken') - }) - }) -}) diff --git a/packages/sdk/contractkit/src/wrappers/StableTokenRegistry.ts b/packages/sdk/contractkit/src/wrappers/StableTokenRegistry.ts deleted file mode 100644 index 82298499ec3..00000000000 --- a/packages/sdk/contractkit/src/wrappers/StableTokenRegistry.ts +++ /dev/null @@ -1,61 +0,0 @@ -import Web3 from 'web3' -import { StableTokenRegistry } from '../generated/StableTokenRegistry' -import { BaseWrapper, proxyCall } from './BaseWrapper' - -/** - * Splits a string with concatenated contract names into each individual name. - * @param contractHex concatenated contract names - * @param lengths their lengths - * @return string array containing contract names - */ -const splitContractNamesByLength = (contractsHex: string, lengths: string[]): string[] => { - const contracts = Web3.utils.hexToUtf8(contractsHex) - let currentIndex = 0 - const contractsArr = [] - for (const length of lengths) { - const contract = contracts.slice(currentIndex, currentIndex + Number(length)) - currentIndex += Number(length) - contractsArr.push(contract) - } - return contractsArr -} - -export class StableTokenRegistryWrapper extends BaseWrapper { - fiatTickers = proxyCall(this.contract.methods.fiatTickers) - stableTokens = proxyCall(this.contract.methods.stableTokens) - - /** - * Returns a stringified array of stable token contracts - * @return string array containing contract names - */ - async getContractInstances(): Promise { - const values = await this.contract.methods.getContractInstances().call() - const concatenatedContracts = values[0] - const contractLengths = values[1] - return splitContractNamesByLength(concatenatedContracts, contractLengths) - } - - async getFiatTickers(): Promise { - const convertedToHex: string[] = [] - let index = 0 - while (true) { - let fiatTicker - try { - fiatTicker = await this.fiatTickers(index) - } catch (error) { - return convertedToHex - } - convertedToHex.push(Web3.utils.hexToUtf8(fiatTicker)) - index++ - } - } - - /** - * Queries the mapping using a fiatTicker - * @return queried stableTokenContractName - */ - async queryStableTokenContractNames(fiatTicker: string): Promise { - const res = await this.stableTokens(Web3.utils.utf8ToHex(fiatTicker)) - return Web3.utils.hexToUtf8(res) - } -} diff --git a/packages/sdk/cryptographic-utils/package.json b/packages/sdk/cryptographic-utils/package.json index 084137cba5e..8bb74c1405c 100644 --- a/packages/sdk/cryptographic-utils/package.json +++ b/packages/sdk/cryptographic-utils/package.json @@ -1,6 +1,6 @@ { "name": "@celo/cryptographic-utils", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Some Celo utils for comment/data encryption, bls, and mnemonics", "author": "Celo", "license": "Apache-2.0", @@ -22,10 +22,10 @@ "lib/**/*" ], "dependencies": { - "@celo/utils": "2.2.1-dev", + "@celo/utils": "3.2.1-dev", "@celo/bls12377js": "0.1.1", - "@celo/base": "2.2.1-dev", - "@types/bn.js": "4.11.6", + "@celo/base": "3.2.1-dev", + "@types/bn.js": "^5.1.0", "@types/elliptic": "^6.4.9", "@types/ethereumjs-util": "^5.2.0", "@types/node": "^18.7.16", diff --git a/packages/sdk/dappkit/package.json b/packages/sdk/dappkit/package.json index 57129557fed..667c0a9ed19 100644 --- a/packages/sdk/dappkit/package.json +++ b/packages/sdk/dappkit/package.json @@ -1,6 +1,6 @@ { "name": "@celo/dappkit", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "scripts": { "build": "tsc", "clean": "tsc -b . --clean", @@ -9,9 +9,9 @@ "homepage": "https://celo-sdk-docs.readthedocs.io/en/latest/dappkit", "repository": "https://github.com/celo-org/celo-monorepo/tree/master/packages/sdk/dappkit", "dependencies": { - "@celo/connect": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/contractkit": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "react-native": "^0.63.4" }, "devDependencies": { diff --git a/packages/sdk/encrypted-backup/package.json b/packages/sdk/encrypted-backup/package.json index 39b34f08f65..b2e4a08d146 100644 --- a/packages/sdk/encrypted-backup/package.json +++ b/packages/sdk/encrypted-backup/package.json @@ -1,6 +1,6 @@ { "name": "@celo/encrypted-backup", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Libraries for implemented password encrypted account backups", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -25,11 +25,11 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/identity": "2.2.1-dev", - "@celo/phone-number-privacy-common": "1.0.39", - "@celo/poprf": "^0.1.6", - "@celo/utils": "2.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/identity": "3.2.1-dev", + "@celo/phone-number-privacy-common": "^3.0.0-dev", + "@celo/poprf": "^0.1.9", + "@celo/utils": "3.2.1-dev", "@types/debug": "^4.1.5", "debug": "^4.1.1", "fp-ts": "2.1.1", diff --git a/packages/sdk/encrypted-backup/src/backup.test.ts b/packages/sdk/encrypted-backup/src/backup.test.ts index 956bc9f6d2b..9e6cb75e794 100644 --- a/packages/sdk/encrypted-backup/src/backup.test.ts +++ b/packages/sdk/encrypted-backup/src/backup.test.ts @@ -155,7 +155,12 @@ describe('createBackup', () => { body: { success: true, version: 'mock', - status: { timer: Date.now() / 1000 + 3600, counter: 0, disabled: false }, + status: { + timer: Date.now() / 1000 + 3600, + counter: 0, + disabled: false, + now: Date.now() / 1000, + }, }, }) const result = await createBackup({ @@ -356,7 +361,12 @@ describe('openBackup', () => { body: { success: true, version: 'mock', - status: { timer: Date.now() / 1000 + 3600, counter: 0, disabled: false }, + status: { + timer: Date.now() / 1000 + 3600, + counter: 0, + disabled: false, + now: Date.now() / 1000, + }, }, }) const result = await openBackup({ diff --git a/packages/sdk/encrypted-backup/src/config.ts b/packages/sdk/encrypted-backup/src/config.ts index 0643e915803..edc19449433 100644 --- a/packages/sdk/encrypted-backup/src/config.ts +++ b/packages/sdk/encrypted-backup/src/config.ts @@ -4,8 +4,8 @@ import { VALORA_MAINNET_CIRCUIT_BREAKER_ENVIRONMENT, } from '@celo/identity/lib/odis/circuit-breaker' import { - ODIS_ALFAJORES_CONTEXT, - ODIS_MAINNET_CONTEXT, + ODIS_ALFAJORES_CONTEXT_DOMAINS, + ODIS_MAINNET_CONTEXT_DOMAINS, ServiceContext as OdisServiceContext, } from '@celo/identity/lib/odis/query' import { SequentialDelayStage } from '@celo/phone-number-privacy-common' @@ -248,6 +248,34 @@ const PASSWORD_HARDENING_RATE_LIMIT: SequentialDelayStage[] = [ }, ] +/** + * ODIS SequentialDelayDomain rate limit configured for e2e testing where no rate limit should be applied. + * + * @remarks This should only be used testing purposes + */ +const E2E_TESTING_RATE_LIMIT: SequentialDelayStage[] = [ + { + delay: 0, + resetTimer: defined(true), + batchSize: defined(1000000000), + repetitions: defined(1000000000), + }, +] + +/** + * ODIS SequentialDelayDomain rate limit configured for e2e testing where the user should have no quota. + * + * @remarks This should only be used testing purposes + */ +const NO_QUOTA_RATE_LIMIT: SequentialDelayStage[] = [ + { + delay: 0, + resetTimer: defined(true), + batchSize: defined(0), + repetitions: defined(0), + }, +] + export enum EnvironmentIdentifier { MAINNET = 'MAINNET', ALFAJORES = 'ALFAJORES', @@ -256,7 +284,7 @@ export enum EnvironmentIdentifier { export const PIN_HARDENING_MAINNET_CONFIG: HardeningConfig = { odis: { rateLimit: PIN_HARDENING_RATE_LIMIT, - environment: ODIS_MAINNET_CONTEXT, + environment: ODIS_MAINNET_CONTEXT_DOMAINS, }, circuitBreaker: { environment: VALORA_MAINNET_CIRCUIT_BREAKER_ENVIRONMENT, @@ -266,7 +294,7 @@ export const PIN_HARDENING_MAINNET_CONFIG: HardeningConfig = { export const PIN_HARDENING_ALFAJORES_CONFIG: HardeningConfig = { odis: { rateLimit: PIN_HARDENING_RATE_LIMIT, - environment: ODIS_ALFAJORES_CONTEXT, + environment: ODIS_ALFAJORES_CONTEXT_DOMAINS, }, circuitBreaker: { environment: VALORA_ALFAJORES_CIRCUIT_BREAKER_ENVIRONMENT, @@ -276,7 +304,33 @@ export const PIN_HARDENING_ALFAJORES_CONFIG: HardeningConfig = { export const PASSWORD_HARDENING_MAINNET_CONFIG: HardeningConfig = { odis: { rateLimit: PASSWORD_HARDENING_RATE_LIMIT, - environment: ODIS_MAINNET_CONTEXT, + environment: ODIS_MAINNET_CONTEXT_DOMAINS, + }, + computational: { + function: ComputationalHardeningFunction.SCRYPT, + cost: 32768, + blockSize: 8, + parallelization: 1, + }, +} + +export const E2E_TESTING_MAINNET_CONFIG: HardeningConfig = { + odis: { + rateLimit: E2E_TESTING_RATE_LIMIT, + environment: ODIS_MAINNET_CONTEXT_DOMAINS, + }, + computational: { + function: ComputationalHardeningFunction.SCRYPT, + cost: 32768, + blockSize: 8, + parallelization: 1, + }, +} + +export const NO_QUOTA_MAINNET_CONFIG: HardeningConfig = { + odis: { + rateLimit: NO_QUOTA_RATE_LIMIT, + environment: ODIS_MAINNET_CONTEXT_DOMAINS, }, computational: { function: ComputationalHardeningFunction.SCRYPT, @@ -289,7 +343,33 @@ export const PASSWORD_HARDENING_MAINNET_CONFIG: HardeningConfig = { export const PASSWORD_HARDENING_ALFAJORES_CONFIG: HardeningConfig = { odis: { rateLimit: PASSWORD_HARDENING_RATE_LIMIT, - environment: ODIS_ALFAJORES_CONTEXT, + environment: ODIS_ALFAJORES_CONTEXT_DOMAINS, + }, + computational: { + function: ComputationalHardeningFunction.SCRYPT, + cost: 32768, + blockSize: 8, + parallelization: 1, + }, +} + +export const E2E_TESTING_ALFAJORES_CONFIG: HardeningConfig = { + odis: { + rateLimit: E2E_TESTING_RATE_LIMIT, + environment: ODIS_ALFAJORES_CONTEXT_DOMAINS, + }, + computational: { + function: ComputationalHardeningFunction.SCRYPT, + cost: 32768, + blockSize: 8, + parallelization: 1, + }, +} + +export const NO_QUOTA_ALFAJORES_CONFIG: HardeningConfig = { + odis: { + rateLimit: NO_QUOTA_RATE_LIMIT, + environment: ODIS_ALFAJORES_CONTEXT_DOMAINS, }, computational: { function: ComputationalHardeningFunction.SCRYPT, diff --git a/packages/sdk/encrypted-backup/src/odis.mock.ts b/packages/sdk/encrypted-backup/src/odis.mock.ts index 9cc2b04582f..1416449188d 100644 --- a/packages/sdk/encrypted-backup/src/odis.mock.ts +++ b/packages/sdk/encrypted-backup/src/odis.mock.ts @@ -10,8 +10,8 @@ import { PoprfServer, SequentialDelayDomain, SequentialDelayDomainState, - verifyDomainQuotaStatusRequestSignature, - verifyDomainRestrictedSignatureRequestSignature, + verifyDomainQuotaStatusRequestAuthenticity, + verifyDomainRestrictedSignatureRequestAuthenticity, } from '@celo/phone-number-privacy-common' import * as poprf from '@celo/poprf' import debugFactory from 'debug' @@ -31,11 +31,19 @@ export class MockOdis { readonly state: Record = {} readonly poprf = new PoprfServer(MOCK_ODIS_KEYPAIR.privateKey) + private now = () => Math.floor(Date.now() / 1000) + + private domainState(hash: Buffer) { + return ( + this.state[hash.toString('hex')] ?? { timer: 0, counter: 0, disabled: false, now: this.now() } + ) + } + quota(req: DomainQuotaStatusRequest): { status: number body: DomainQuotaStatusResponse } { - const authorized = verifyDomainQuotaStatusRequestSignature(req) + const authorized = verifyDomainQuotaStatusRequestAuthenticity(req) if (!authorized) { return { status: 401, @@ -47,14 +55,12 @@ export class MockOdis { } } - const hash = domainHash(req.domain).toString('hex') - const domainState = this.state[hash] ?? { timer: 0, counter: 0, disabled: false } return { status: 200, body: { success: true, version: 'mock', - status: domainState, + status: this.domainState(domainHash(req.domain)), }, } } @@ -63,7 +69,7 @@ export class MockOdis { status: number body: DomainRestrictedSignatureResponse } { - const authorized = verifyDomainRestrictedSignatureRequestSignature(req) + const authorized = verifyDomainRestrictedSignatureRequestAuthenticity(req) if (!authorized) { return { status: 401, @@ -71,16 +77,13 @@ export class MockOdis { success: false, version: 'mock', error: 'unauthorized', + status: undefined, }, } } const hash = domainHash(req.domain) - const domainState = this.state[hash.toString('hex')] ?? { - timer: 0, - counter: 0, - disabled: false, - } + const domainState = this.domainState(hash) const nonce = req.options.nonce.defined ? req.options.nonce.value : undefined if (nonce !== domainState.counter) { return { @@ -89,11 +92,12 @@ export class MockOdis { success: false, version: 'mock', error: 'incorrect nonce', + status: domainState, }, } } - const limitCheck = checkSequentialDelayRateLimit(req.domain, Date.now() / 1000, domainState) + const limitCheck = checkSequentialDelayRateLimit(req.domain, this.now(), domainState) if (!limitCheck.accepted || limitCheck.state === undefined) { return { status: 429, @@ -101,6 +105,7 @@ export class MockOdis { success: false, version: 'mock', error: 'request limit exceeded', + status: domainState, }, } } @@ -121,6 +126,7 @@ export class MockOdis { body: { success: false, version: 'mock', + status: undefined, error: (error as Error).toString(), }, } @@ -131,6 +137,7 @@ export class MockOdis { body: { success: true, version: 'mock', + status: limitCheck.state, signature, }, } @@ -147,7 +154,7 @@ export class MockOdis { const res = this.quota( JSON.parse(req.body) as DomainQuotaStatusRequest ) - debug('Mocking request', { url, req, res }) + debug('Mocking request', JSON.stringify({ url, req, res })) return res }) ) @@ -164,7 +171,7 @@ export class MockOdis { const res = this.sign( JSON.parse(req.body) as DomainRestrictedSignatureRequest ) - debug('Mocking request', { url, req, res }) + debug('Mocking request', JSON.stringify({ url, req, res })) return res }) ) diff --git a/packages/sdk/encrypted-backup/src/odis.ts b/packages/sdk/encrypted-backup/src/odis.ts index bf720b0f92d..e7630ebf738 100644 --- a/packages/sdk/encrypted-backup/src/odis.ts +++ b/packages/sdk/encrypted-backup/src/odis.ts @@ -15,15 +15,15 @@ import { DomainQuotaStatusResponse, domainQuotaStatusResponseSchema, DomainQuotaStatusResponseSuccess, + DomainRequestTypeTag, DomainRestrictedSignatureRequest, domainRestrictedSignatureRequestEIP712, DomainRestrictedSignatureResponse, - DomainRestrictedSignatureResponseSchema, + domainRestrictedSignatureResponseSchema, DomainRestrictedSignatureResponseSuccess, genSessionID, PoprfClient, SequentialDelayDomain, - SequentialDelayDomainState, SequentialDelayDomainStateSchema, } from '@celo/phone-number-privacy-common' import { defined, noNumber, noString } from '@celo/utils/lib/sign-typed-data-utils' @@ -81,28 +81,26 @@ export async function odisHardenKey( const sessionID = genSessionID() // Request the quota status for the domain to get the state, including the quota counter. - const quotaResp = await requestOdisQuotaStatus(domain, environment, sessionID, wallet) + const quotaResp = await requestOdisDomainQuotaStatus(domain, environment, sessionID, wallet) if (!quotaResp.ok) { return quotaResp } // Check locally whether or not we should expect to be able to make a query to ODIS right now. - // TODO(victor) Using Date.now is actually not appropriate because mobile clients may have a large - // clock drift. Modify this to use a time returned from ODIS either in the status response, or as - // part of the 429 response upon rejecting the signature request. Risk with the latter approach is - // that unless replay handling is implemented, having the request accepted by half of the signers, - // but rejected by the other half can get the client into a bad state. - const quotaState = quotaResp.result.status as SequentialDelayDomainState - const { accepted, notBefore } = checkSequentialDelayRateLimit( + // Note that this uses the servers timestamp through the `quotaState.now` field. This is because + // mobile clients may have a large clock drift. This prevents that clock drift from resulting in + // misinterpretations of the domain quota. + const quotaState = quotaResp.result.status + const quotaResult = checkSequentialDelayRateLimit( domain, - // Dividing by 1000 to convert ms to seconds for the rate limit check. - Date.now() / 1000, + // Use the local clock as a fallback. Divide by 1000 to get seconds from ms. + quotaState.now ?? Date.now() / 1000, quotaState ) - if (!accepted) { + if (!quotaResult.accepted) { return Err( new OdisRateLimitingError( - notBefore, + quotaResult.notBefore, new Error('client does not currently have quota based on status response.') ) ) @@ -168,13 +166,24 @@ export function odisQueryAuthorizer(nonce: Buffer): { address: Address; wallet: return { address, wallet } } -async function requestOdisQuotaStatus( +/** + * Returns a hardened key derived from the input key material and a POPRF evaluation on that keying + * material under the given rate limiting domain. + * + * @param domain Rate limiting configuration and domain input to the ODIS POPRF. + * @param environment Information for the targeted ODIS environment. + * @param sessionID client-defined session ID for tracking requests across services + * @param wallet Wallet with access to the authorizer signing key specified in the domain input. + * Should be provided if the input domain is authenticated. + */ +export async function requestOdisDomainQuotaStatus( domain: SequentialDelayDomain, environment: OdisServiceContext, sessionID: string, wallet?: EIP712Wallet ): Promise> { const quotaStatusReq: DomainQuotaStatusRequest = { + type: DomainRequestTypeTag.QUOTA, domain, options: { signature: noString, @@ -183,7 +192,7 @@ async function requestOdisQuotaStatus( sessionID: defined(sessionID), } - // If a query authorizer is defined in the domain, include a siganture over the request. + // If a query authorizer is defined in the domain, include a signature over the request. const authorizer = domain.address.defined ? domain.address.value : undefined if (authorizer !== undefined) { if (wallet === undefined || !wallet.hasAccount(authorizer)) { @@ -230,6 +239,7 @@ async function requestOdisDomainSignature( wallet?: EIP712Wallet ): Promise> { const signatureReq: DomainRestrictedSignatureRequest = { + type: DomainRequestTypeTag.SIGN, domain, options: { signature: noString, @@ -262,7 +272,7 @@ async function requestOdisDomainSignature( signatureReq, environment, DomainEndpoint.DOMAIN_SIGN, - DomainRestrictedSignatureResponseSchema + domainRestrictedSignatureResponseSchema(SequentialDelayDomainStateSchema) ) } catch (error) { if ((error as Error).message?.includes(ErrorMessages.ODIS_FETCH_ERROR)) { diff --git a/packages/sdk/explorer/fixtures/contract.metadata.json b/packages/sdk/explorer/fixtures/contract.metadata.json new file mode 100644 index 00000000000..e6e522a3234 --- /dev/null +++ b/packages/sdk/explorer/fixtures/contract.metadata.json @@ -0,0 +1,2895 @@ +{ + "compiler": { + "version": "0.5.13+commit.5b0b510c" + }, + "language": "Solidity", + "output": { + "abi": [ + { + "inputs": [ + { + "internalType": "bool", + "name": "test", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "AccountCreated", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes", + "name": "dataEncryptionKey", + "type": "bytes" + } + ], + "name": "AccountDataEncryptionKeySet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "string", + "name": "metadataURL", + "type": "string" + } + ], + "name": "AccountMetadataURLSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "string", + "name": "name", + "type": "string" + } + ], + "name": "AccountNameSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "walletAddress", + "type": "address" + } + ], + "name": "AccountWalletAddressSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "AttestationSignerAuthorized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "oldSigner", + "type": "address" + } + ], + "name": "AttestationSignerRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "oldSigner", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "DefaultSignerRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "DefaultSignerSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "oldSigner", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "IndexedSignerRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "IndexedSignerSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "oldSigner", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "LegacySignerRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "LegacySignerSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes", + "name": "url", + "type": "bytes" + } + ], + "name": "OffchainStorageRootAdded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes", + "name": "url", + "type": "bytes" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "index", + "type": "uint256" + } + ], + "name": "OffchainStorageRootRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "beneficiary", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "fraction", + "type": "uint256" + } + ], + "name": "PaymentDelegationSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "registryAddress", + "type": "address" + } + ], + "name": "RegistrySet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "SignerAuthorizationCompleted", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "SignerAuthorizationStarted", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "SignerAuthorized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "oldSigner", + "type": "address" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "SignerRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "ValidatorSignerAuthorized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "oldSigner", + "type": "address" + } + ], + "name": "ValidatorSignerRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "VoteSignerAuthorized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "oldSigner", + "type": "address" + } + ], + "name": "VoteSignerRemoved", + "type": "event" + }, + { + "constant": true, + "inputs": [], + "name": "EIP712_AUTHORIZE_SIGNER_TYPEHASH", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "bytes", + "name": "url", + "type": "bytes" + } + ], + "name": "addStorageRoot", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "attestationSignerToAccount", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "authorizeAttestationSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "authorizeSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "authorizeSignerWithSignature", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "authorizeValidatorSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "ecdsaPublicKey", + "type": "bytes" + }, + { + "internalType": "bytes", + "name": "blsPublicKey", + "type": "bytes" + }, + { + "internalType": "bytes", + "name": "blsPop", + "type": "bytes" + } + ], + "name": "authorizeValidatorSignerWithKeys", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "ecdsaPublicKey", + "type": "bytes" + } + ], + "name": "authorizeValidatorSignerWithPublicKey", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "authorizeVoteSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "authorizedBy", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address[]", + "name": "accountsToQuery", + "type": "address[]" + } + ], + "name": "batchGetMetadataURL", + "outputs": [ + { + "internalType": "uint256[]", + "name": "", + "type": "uint256[]" + }, + { + "internalType": "bytes", + "name": "", + "type": "bytes" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "completeSignerAuthorization", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "createAccount", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "deletePaymentDelegation", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "eip712DomainSeparator", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getAttestationSigner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getDataEncryptionKey", + "outputs": [ + { + "internalType": "bytes", + "name": "", + "type": "bytes" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "getDefaultSigner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "getIndexedSigner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "_account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "getLegacySigner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getMetadataURL", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getName", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getOffchainStorageRoots", + "outputs": [ + { + "internalType": "bytes", + "name": "", + "type": "bytes" + }, + { + "internalType": "uint256[]", + "name": "", + "type": "uint256[]" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getPaymentDelegation", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "getRoleAuthorizationSigner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getValidatorSigner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "getVersionNumber", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "pure", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getVoteSigner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getWalletAddress", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "hasAuthorizedAttestationSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "string", + "name": "role", + "type": "string" + } + ], + "name": "hasAuthorizedSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "hasAuthorizedValidatorSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "hasAuthorizedVoteSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "hasDefaultSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "hasIndexedSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "hasLegacySigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "registryAddress", + "type": "address" + } + ], + "name": "initialize", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "initialized", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "isAccount", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "isAuthorizedSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "isDefaultSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "isIndexedSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "isLegacyRole", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "pure", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "otherRole", + "type": "bytes32" + } + ], + "name": "isLegacyRole", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "pure", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "_account", + "type": "address" + }, + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "isLegacySigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "isOwner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "isSigner", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "offchainStorageRoots", + "outputs": [ + { + "internalType": "bytes", + "name": "", + "type": "bytes" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "owner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "registry", + "outputs": [ + { + "internalType": "contract IRegistry", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "removeAttestationSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "removeDefaultSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "removeIndexedSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "removeSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "uint256", + "name": "index", + "type": "uint256" + } + ], + "name": "removeStorageRoot", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "removeValidatorSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "removeVoteSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "renounceOwnership", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "string", + "name": "name", + "type": "string" + }, + { + "internalType": "bytes", + "name": "dataEncryptionKey", + "type": "bytes" + }, + { + "internalType": "address", + "name": "walletAddress", + "type": "address" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "setAccount", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "bytes", + "name": "dataEncryptionKey", + "type": "bytes" + } + ], + "name": "setAccountDataEncryptionKey", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "setEip712DomainSeparator", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "setIndexedSigner", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "string", + "name": "metadataURL", + "type": "string" + } + ], + "name": "setMetadataURL", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "string", + "name": "name", + "type": "string" + } + ], + "name": "setName", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "beneficiary", + "type": "address" + }, + { + "internalType": "uint256", + "name": "fraction", + "type": "uint256" + } + ], + "name": "setPaymentDelegation", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "registryAddress", + "type": "address" + } + ], + "name": "setRegistry", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "walletAddress", + "type": "address" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "setWalletAddress", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "signerToAccount", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "transferOwnership", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "validatorSignerToAccount", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "signer", + "type": "address" + } + ], + "name": "voteSignerToAccount", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + } + ], + "devdoc": { + "methods": { + "addStorageRoot(bytes)": { + "params": { + "url": "The URL pointing to the offchain storage root." + } + }, + "attestationSignerToAccount(address)": { + "details": "Fails if the `signer` is not an account or currently authorized attestation signer.", + "params": { + "signer": "The address of the account or currently authorized attestation signer." + }, + "return": "The associated account." + }, + "authorizeAttestationSigner(address,uint8,bytes32,bytes32)": { + "details": "v, r, s constitute `signer`'s signature on `msg.sender`.", + "params": { + "r": "Output value r of the ECDSA signature.", + "s": "Output value s of the ECDSA signature.", + "signer": "The address of the signing key to authorize.", + "v": "The recovery id of the incoming ECDSA signature." + } + }, + "authorizeSigner(address,bytes32)": { + "params": { + "role": "The role to authorize signing for.", + "signer": "The address of the signing key to authorize." + } + }, + "authorizeSignerWithSignature(address,bytes32,uint8,bytes32,bytes32)": { + "details": "v, r, s constitute `signer`'s EIP712 signature over `role`, `msg.sender` and `signer`.", + "params": { + "r": "Output value r of the ECDSA signature.", + "role": "The role to authorize signing for.", + "s": "Output value s of the ECDSA signature.", + "signer": "The address of the signing key to authorize.", + "v": "The recovery id of the incoming ECDSA signature." + } + }, + "authorizeValidatorSigner(address,uint8,bytes32,bytes32)": { + "details": "v, r, s constitute `signer`'s signature on `msg.sender`.", + "params": { + "r": "Output value r of the ECDSA signature.", + "s": "Output value s of the ECDSA signature.", + "signer": "The address of the signing key to authorize.", + "v": "The recovery id of the incoming ECDSA signature." + } + }, + "authorizeValidatorSignerWithKeys(address,uint8,bytes32,bytes32,bytes,bytes,bytes)": { + "details": "v, r, s constitute `signer`'s signature on `msg.sender`.", + "params": { + "blsPop": "The BLS public key proof-of-possession, which consists of a signature on the account address. 48 bytes.", + "blsPublicKey": "The BLS public key that the validator is using for consensus, should pass proof of possession. 96 bytes.", + "ecdsaPublicKey": "The ECDSA public key corresponding to `signer`.", + "r": "Output value r of the ECDSA signature.", + "s": "Output value s of the ECDSA signature.", + "signer": "The address of the signing key to authorize.", + "v": "The recovery id of the incoming ECDSA signature." + } + }, + "authorizeValidatorSignerWithPublicKey(address,uint8,bytes32,bytes32,bytes)": { + "details": "v, r, s constitute `signer`'s signature on `msg.sender`.", + "params": { + "ecdsaPublicKey": "The ECDSA public key corresponding to `signer`.", + "r": "Output value r of the ECDSA signature.", + "s": "Output value s of the ECDSA signature.", + "signer": "The address of the signing key to authorize.", + "v": "The recovery id of the incoming ECDSA signature." + } + }, + "authorizeVoteSigner(address,uint8,bytes32,bytes32)": { + "details": "v, r, s constitute `signer`'s signature on `msg.sender`.", + "params": { + "r": "Output value r of the ECDSA signature.", + "s": "Output value s of the ECDSA signature.", + "signer": "The address of the signing key to authorize.", + "v": "The recovery id of the incoming ECDSA signature." + } + }, + "batchGetMetadataURL(address[])": { + "params": { + "accountsToQuery": "The addresses of the accounts to get the metadata for." + }, + "return": "The length of each string in bytes.All strings concatenated." + }, + "completeSignerAuthorization(address,bytes32)": { + "params": { + "account": "The address of account that authorized signing.", + "role": "The role to finish authorizing for." + } + }, + "constructor": { + "params": { + "test": "Set to true to skip implementation initialization" + } + }, + "createAccount()": { + "return": "True if account creation succeeded." + }, + "getAttestationSigner(address)": { + "params": { + "account": "The address of the account." + }, + "return": "The address with which the account can sign attestations." + }, + "getDataEncryptionKey(address)": { + "params": { + "account": "The address of the account to get the key for" + }, + "return": "dataEncryptionKey secp256k1 public key for data encryption. Preferably compressed." + }, + "getDefaultSigner(address,bytes32)": { + "params": { + "account": "The address of the account.", + "role": "The role of the signer." + } + }, + "getIndexedSigner(address,bytes32)": { + "params": { + "account": "The address of the account.", + "role": "The role of the signer." + } + }, + "getLegacySigner(address,bytes32)": { + "params": { + "_account": "The address of the account.", + "role": "The role of the signer." + } + }, + "getMetadataURL(address)": { + "params": { + "account": "The address of the account to get the metadata for." + }, + "return": "metadataURL The URL to access the metadata." + }, + "getName(address)": { + "params": { + "account": "The address of the account to get the name for." + }, + "return": "name The name of the account." + }, + "getOffchainStorageRoots(address)": { + "params": { + "account": "The account whose storage roots to return." + }, + "return": "Concatenated storage root URLs.Lengths of storage root URLs." + }, + "getPaymentDelegation(address)": { + "params": { + "account": "Account of the validator." + }, + "return": "Beneficiary address of payment delegated.Fraction of payment delegated." + }, + "getRoleAuthorizationSigner(address,address,bytes32,uint8,bytes32,bytes32)": { + "params": { + "account": "The `account` property signed over in the EIP712 signature", + "r": "Output value r of the ECDSA signature.", + "role": "The `role` property signed over in the EIP712 signature", + "s": "Output value s of the ECDSA signature.", + "signer": "The `signer` property signed over in the EIP712 signature", + "v": "The recovery id of the incoming ECDSA signature." + }, + "return": "The address that signed the provided role authorization." + }, + "getValidatorSigner(address)": { + "params": { + "account": "The address of the account." + }, + "return": "The address with which the account can register a validator or group." + }, + "getVersionNumber()": { + "return": "Storage version of the contract.Major version of the contract.Minor version of the contract.Patch version of the contract." + }, + "getVoteSigner(address)": { + "params": { + "account": "The address of the account." + }, + "return": "The address with which the account can sign votes." + }, + "getWalletAddress(address)": { + "params": { + "account": "The address of the account to get the wallet address for" + }, + "return": "Wallet address" + }, + "hasAuthorizedAttestationSigner(address)": { + "params": { + "account": "The address of the account." + }, + "return": "Whether the account has specified a dedicated attestation signer." + }, + "hasAuthorizedSigner(address,string)": { + "details": "See `hasIndexedSigner` for more gas efficient call." + }, + "hasAuthorizedValidatorSigner(address)": { + "params": { + "account": "The address of the account." + }, + "return": "Whether the account has specified a dedicated validator signer." + }, + "hasAuthorizedVoteSigner(address)": { + "params": { + "account": "The address of the account." + }, + "return": "Whether the account has specified a dedicated vote signer." + }, + "initialize(address)": { + "params": { + "registryAddress": "The address of the registry core smart contract." + } + }, + "isAccount(address)": { + "params": { + "account": "The address of the account" + }, + "return": "Returns `true` if account exists. Returns `false` otherwise." + }, + "isAuthorizedSigner(address)": { + "params": { + "signer": "The possibly authorized address." + }, + "return": "Returns `true` if authorized. Returns `false` otherwise." + }, + "isDefaultSigner(address,address,bytes32)": { + "params": { + "account": "The address of account that authorized signing.", + "role": "The role that has been authorized.", + "signer": "The address of the signer." + } + }, + "isIndexedSigner(address,address,bytes32)": { + "params": { + "account": "The address of account that authorized signing.", + "role": "The role that has been authorized.", + "signer": "The address of the signer." + } + }, + "isLegacyRole(bytes32)": { + "params": { + "role": "The role to check" + } + }, + "isLegacySigner(address,address,bytes32)": { + "params": { + "_account": "The address of account that authorized signing.", + "role": "The role that has been authorized.", + "signer": "The address of the signer." + } + }, + "isOwner()": { + "details": "Returns true if the caller is the current owner." + }, + "isSigner(address,address,bytes32)": { + "params": { + "account": "The address of account that authorized signing.", + "role": "The role that has been authorized.", + "signer": "The address of the signer." + } + }, + "owner()": { + "details": "Returns the address of the current owner." + }, + "removeDefaultSigner(bytes32)": { + "params": { + "role": "The role that has been authorized." + } + }, + "removeIndexedSigner(bytes32)": { + "params": { + "role": "The role of the signer." + } + }, + "removeSigner(address,bytes32)": { + "params": { + "role": "The role that has been authorized.", + "signer": "The address of the signer." + } + }, + "removeStorageRoot(uint256)": { + "details": "The order of storage roots may change after this operation (the last storage root will be moved to `index`), be aware of this if removing multiple storage roots at a time.", + "params": { + "index": "The index of the storage root to be removed in the account's list of storage roots." + } + }, + "renounceOwnership()": { + "details": "Leaves the contract without owner. It will not be possible to call `onlyOwner` functions anymore. Can only be called by the current owner. * NOTE: Renouncing ownership will leave the contract without an owner, thereby removing any functionality that is only available to the owner." + }, + "setAccount(string,bytes,address,uint8,bytes32,bytes32)": { + "details": "v, r, s constitute `signer`'s signature on `msg.sender` (unless the wallet address is 0x0 or msg.sender).", + "params": { + "dataEncryptionKey": "secp256k1 public key for data encryption. Preferably compressed.", + "name": "A string to set as the name of the account", + "r": "Output value r of the ECDSA signature.", + "s": "Output value s of the ECDSA signature.", + "v": "The recovery id of the incoming ECDSA signature.", + "walletAddress": "The wallet address to set for the account" + } + }, + "setAccountDataEncryptionKey(bytes)": { + "params": { + "dataEncryptionKey": "secp256k1 public key for data encryption. Preferably compressed." + } + }, + "setIndexedSigner(address,bytes32)": { + "params": { + "role": "the role to register a default signer for", + "signer": "the address to set as default" + } + }, + "setMetadataURL(string)": { + "params": { + "metadataURL": "The URL to access the metadata." + } + }, + "setName(string)": { + "params": { + "name": "The name to set." + } + }, + "setPaymentDelegation(address,uint256)": { + "details": "Use `deletePaymentDelegation` to unset the payment delegation.", + "params": { + "beneficiary": "The address that should receive a portion of validator payments.", + "fraction": "The fraction of the validator's payment that should be diverted to `beneficiary` every epoch, given as FixidityLib value. Must not be greater than 1." + } + }, + "setRegistry(address)": { + "params": { + "registryAddress": "The address of a registry contract for routing to other contracts." + } + }, + "setWalletAddress(address,uint8,bytes32,bytes32)": { + "details": "Wallet address can be zero. This means that the owner of the wallet does not want to be paid directly without interaction, and instead wants users to contact them, using the data encryption key, and arrange a payment.v, r, s constitute `signer`'s signature on `msg.sender` (unless the wallet address is 0x0 or msg.sender).", + "params": { + "r": "Output value r of the ECDSA signature.", + "s": "Output value s of the ECDSA signature.", + "v": "The recovery id of the incoming ECDSA signature.", + "walletAddress": "The wallet address to set for the account" + } + }, + "signerToAccount(address)": { + "details": "Fails if the `signer` is not an account or previously authorized signer.", + "params": { + "signer": "The address of the account or previously authorized signer." + }, + "return": "The associated account." + }, + "transferOwnership(address)": { + "details": "Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner." + }, + "validatorSignerToAccount(address)": { + "details": "Fails if the `signer` is not an account or currently authorized validator.", + "params": { + "signer": "The address of an account or currently authorized validator signer." + }, + "return": "The associated account." + }, + "voteSignerToAccount(address)": { + "details": "Fails if the `signer` is not an account or currently authorized vote signer.", + "params": { + "signer": "The address of the account or currently authorized vote signer." + }, + "return": "The associated account." + } + } + }, + "userdoc": { + "methods": { + "addStorageRoot(bytes)": { + "notice": "Adds a new CIP8 storage root." + }, + "attestationSignerToAccount(address)": { + "notice": "Returns the account associated with `signer`." + }, + "authorizeAttestationSigner(address,uint8,bytes32,bytes32)": { + "notice": "Authorizes an address to sign attestations on behalf of the account." + }, + "authorizeSigner(address,bytes32)": { + "notice": "Begin the process of authorizing an address to sign on behalf of the account" + }, + "authorizeSignerWithSignature(address,bytes32,uint8,bytes32,bytes32)": { + "notice": "Authorizes an address to act as a signer, for `role`, on behalf of the account." + }, + "authorizeValidatorSigner(address,uint8,bytes32,bytes32)": { + "notice": "Authorizes an address to sign consensus messages on behalf of the account." + }, + "authorizeValidatorSignerWithKeys(address,uint8,bytes32,bytes32,bytes,bytes,bytes)": { + "notice": "Authorizes an address to sign consensus messages on behalf of the account." + }, + "authorizeValidatorSignerWithPublicKey(address,uint8,bytes32,bytes32,bytes)": { + "notice": "Authorizes an address to sign consensus messages on behalf of the account." + }, + "authorizeVoteSigner(address,uint8,bytes32,bytes32)": { + "notice": "Authorizes an address to sign votes on behalf of the account." + }, + "batchGetMetadataURL(address[])": { + "notice": "Getter for the metadata of multiple accounts." + }, + "completeSignerAuthorization(address,bytes32)": { + "notice": "Finish the process of authorizing an address to sign on behalf of the account. " + }, + "constructor": "Sets initialized == true on implementation contracts", + "createAccount()": { + "notice": "Creates an account." + }, + "deletePaymentDelegation()": { + "notice": "Removes a validator's payment delegation by setting benficiary and fraction to 0." + }, + "getAttestationSigner(address)": { + "notice": "Returns the attestation signer for the specified account." + }, + "getDataEncryptionKey(address)": { + "notice": "Getter for the data encryption key and version." + }, + "getDefaultSigner(address,bytes32)": { + "notice": "Returns the default signer for the specified account and role. If no signer has been specified it will return the account itself." + }, + "getIndexedSigner(address,bytes32)": { + "notice": "Returns the indexed signer for the specified account and role. If no signer has been specified it will return the account itself." + }, + "getLegacySigner(address,bytes32)": { + "notice": "Returns the legacy signer for the specified account and role. If no signer has been specified it will return the account itself." + }, + "getMetadataURL(address)": { + "notice": "Getter for the metadata of an account." + }, + "getName(address)": { + "notice": "Getter for the name of an account." + }, + "getOffchainStorageRoots(address)": { + "notice": "Returns the full list of offchain storage roots for an account." + }, + "getPaymentDelegation(address)": { + "notice": "Gets validator payment delegation settings." + }, + "getRoleAuthorizationSigner(address,address,bytes32,uint8,bytes32,bytes32)": { + "notice": "Returns the address that signed the provided role authorization." + }, + "getValidatorSigner(address)": { + "notice": "Returns the validator signer for the specified account." + }, + "getVersionNumber()": { + "notice": "Returns the storage, major, minor, and patch version of the contract." + }, + "getVoteSigner(address)": { + "notice": "Returns the vote signer for the specified account." + }, + "getWalletAddress(address)": { + "notice": "Getter for the wallet address for an account" + }, + "hasAuthorizedAttestationSigner(address)": { + "notice": "Returns if account has specified a dedicated attestation signer." + }, + "hasAuthorizedSigner(address,string)": { + "notice": "Checks whether or not the account has a signer registered for the plaintext role." + }, + "hasAuthorizedValidatorSigner(address)": { + "notice": "Returns if account has specified a dedicated validator signer." + }, + "hasAuthorizedVoteSigner(address)": { + "notice": "Returns if account has specified a dedicated vote signer." + }, + "hasDefaultSigner(address,bytes32)": { + "notice": "Checks whether or not the account has an indexed signer registered for a role" + }, + "hasIndexedSigner(address,bytes32)": { + "notice": "Checks whether or not the account has an indexed signer registered for the role" + }, + "hasLegacySigner(address,bytes32)": { + "notice": "Checks whether or not the account has an indexed signer registered for one of the legacy roles" + }, + "initialize(address)": { + "notice": "Used in place of the constructor to allow the contract to be upgradable via proxy." + }, + "isAccount(address)": { + "notice": "Check if an account already exists." + }, + "isAuthorizedSigner(address)": { + "notice": "Check if an address has been an authorized signer for an account." + }, + "isDefaultSigner(address,address,bytes32)": { + "notice": "Whether or not the signer has been registered as the default signer for role" + }, + "isIndexedSigner(address,address,bytes32)": { + "notice": "Whether or not the signer has been registered as an indexed signer for role" + }, + "isLegacyRole(bytes32)": { + "notice": "Checks whether the role is one of Vote, Validator or Attestation" + }, + "isLegacySigner(address,address,bytes32)": { + "notice": "Whether or not the signer has been registered as the legacy signer for role" + }, + "isSigner(address,address,bytes32)": { + "notice": "Whether or not the signer has been registered as a signer for role" + }, + "removeAttestationSigner()": { + "notice": "Removes the currently authorized attestation signer for the account Note that the signers cannot be reauthorized after they have been removed." + }, + "removeDefaultSigner(bytes32)": { + "notice": "Removes the signer for a default role." + }, + "removeIndexedSigner(bytes32)": { + "notice": "Removes the currently authorized and indexed signer for a specific role" + }, + "removeSigner(address,bytes32)": { + "notice": "Removes the currently authorized signer for a specific role and if the signer is indexed, remove that as well." + }, + "removeStorageRoot(uint256)": { + "notice": "Removes a CIP8 storage root." + }, + "removeValidatorSigner()": { + "notice": "Removes the currently authorized validator signer for the account Note that the signers cannot be reauthorized after they have been removed." + }, + "removeVoteSigner()": { + "notice": "Removes the currently authorized vote signer for the account. Note that the signers cannot be reauthorized after they have been removed." + }, + "setAccount(string,bytes,address,uint8,bytes32,bytes32)": { + "notice": "Convenience Setter for the dataEncryptionKey and wallet address for an account" + }, + "setAccountDataEncryptionKey(bytes)": { + "notice": "Setter for the data encryption key and version." + }, + "setEip712DomainSeparator()": { + "notice": "Sets the EIP712 domain separator for the Celo Accounts abstraction." + }, + "setIndexedSigner(address,bytes32)": { + "notice": "Set the indexed signer for a specific role" + }, + "setMetadataURL(string)": { + "notice": "Setter for the metadata of an account." + }, + "setName(string)": { + "notice": "Setter for the name of an account." + }, + "setPaymentDelegation(address,uint256)": { + "notice": "Sets validator payment delegation settings." + }, + "setRegistry(address)": { + "notice": "Updates the address pointing to a Registry contract." + }, + "setWalletAddress(address,uint8,bytes32,bytes32)": { + "notice": "Setter for the wallet address for an account" + }, + "signerToAccount(address)": { + "notice": "Returns the account associated with `signer`." + }, + "validatorSignerToAccount(address)": { + "notice": "Returns the account associated with `signer`." + }, + "voteSignerToAccount(address)": { + "notice": "Returns the account associated with `signer`." + } + } + } + }, + "settings": { + "compilationTarget": { + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/Accounts.sol": "Accounts" + }, + "evmVersion": "istanbul", + "libraries": {}, + "optimizer": { + "enabled": false, + "runs": 200 + }, + "remappings": [] + }, + "sources": { + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/Accounts.sol": { + "keccak256": "0x173da8996b5f86b96e2ee965d8d94d18b5ed6f1b10f1b86683ffdc4da8b874fb", + "urls": [ + "bzz-raw://d9a08dd2d4f855263df926ecc5143aea5de043768c802534c82ed1178bdf5629", + "dweb:/ipfs/QmZQPMB92xaHhqHKbBrJCDsEr7yxXFYxxP5vzYC2oeLACA" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/FixidityLib.sol": { + "keccak256": "0x2f98fa3b3454621817917bae2830806858a96c9457be2c5b6e0bed5b35aaaba3", + "urls": [ + "bzz-raw://b6bf5cf79debe02093777cc9ddef4616dedd041ccc2618c43ea91c90afd97df6", + "dweb:/ipfs/QmXonY3FkVy2jnQvLkgDi4LcaniS5DVZ1zpRZecWKWy9Ro" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/Initializable.sol": { + "keccak256": "0xad98825b5d3181f4ce2d2dbe84adeb0cd7960fd80fafb0813539d6d96ba42ab8", + "urls": [ + "bzz-raw://f76468328c78b80eeaaaadb7b186e41da4a34134446fe11bb707106322b8e32f", + "dweb:/ipfs/QmNyjyVjPX1GKFibDcJBJyZQ57nhusG3DhPjAGnY7iaU39" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/Signatures.sol": { + "keccak256": "0xb11ccc01ac5d81c5496828a92536cfc07378e87c0517fe6f8b429a96c41cb21e", + "urls": [ + "bzz-raw://8c8b5c705c55e4141bf7fa4a6dd5941ebbf81969033476f737db357224075057", + "dweb:/ipfs/QmcUySMBWov2uVEzVmwECzFLxiimqzLEip29w9bNvUvRBK" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/UsingRegistry.sol": { + "keccak256": "0xfdd9e70bd58259b491ec54779715d7469ab4f804836bf5f63ff86921d0cae056", + "urls": [ + "bzz-raw://e55f23f464e49c42b1f31782dcb88cbd2ca64e050d5f110ccdc2ffd50cd582ff", + "dweb:/ipfs/QmfBiet9GbT9S9rn9SG9CkyXQGAMQRuk4EBmChY1m4kv47" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/interfaces/IAccounts.sol": { + "keccak256": "0x1ec92ced98458b625f5cc7742e7487c6e9c0042ae86bbd4b5cec293363c543ee", + "urls": [ + "bzz-raw://bf85ce1ac9c145877666436ce0c9c998ab205a7fe8ec39a90332ac01fecad9f2", + "dweb:/ipfs/QmYQTztErbUUYf52rAL3xVjFqED91n6Es7RidjDTkuKeM6" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/interfaces/ICeloVersionedContract.sol": { + "keccak256": "0x7bf4411df057bec6f7fcc1c25c1f46cd9a8f75118958012b56ecef8a986abd62", + "urls": [ + "bzz-raw://b08c5c589b31ab774f6d1eb73bf67e111e04a0f1b99cd8e2528f021cf4983100", + "dweb:/ipfs/Qmao3mnAW1mUixfwtZXvJUCBzK65hzfmvHGgZqHPpXEt3C" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/interfaces/IFeeCurrencyWhitelist.sol": { + "keccak256": "0xd4711baf3e38a0abeb3ef48eaab21aeb917f5e0a185cf463fddeb4bf20277b68", + "urls": [ + "bzz-raw://8f350863943ab54dcf4d5ea525c16748f59263bf36c1d85251c1164d0e592032", + "dweb:/ipfs/QmXAG6fvVQKM86rVsk6R3ndEoHtS9fcAAVxBApJ5j3LWeK" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/interfaces/IFreezer.sol": { + "keccak256": "0x12508a9d528d1b63dc06644e9d97e864acc94f8a763cf8555e90bcdf1b2f8b21", + "urls": [ + "bzz-raw://32df109167a13e684c9b296a0e13dda1899e418788eb59bf59aedd7a3ce65466", + "dweb:/ipfs/QmR6BJCRFMSQpBpnSH2vzLE959FhXnmreDocWWc7fUYnnu" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/interfaces/IRegistry.sol": { + "keccak256": "0x78ba82722d28e815c117f33d4659404f0707dab1c9b51f1bce5d4c15d6c94537", + "urls": [ + "bzz-raw://0cea84b948896aece11c64b97c22b0f08f86cb45e166a004db4a88a98952cbfa", + "dweb:/ipfs/QmR4uSGcs4nmph6duroscchstSwMzWSV8CDvD2SSnWuHbs" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/libraries/ReentrancyGuard.sol": { + "keccak256": "0xa2584554532d7004ca3d2d168cd9dfb7694605f1a32431af4d1b7d834fa6b08d", + "urls": [ + "bzz-raw://fb012e7a76145a86b8746b0b10768845d17a5c5ab9cbdcd863fde42028b5632c", + "dweb:/ipfs/QmdJi5va3broTVwJJ5uCBSg4T2rwTaAvzSBtnZzETvverK" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/governance/interfaces/IElection.sol": { + "keccak256": "0xebcd0d7dbbb2df503967ad63c9ddd437cef89a94ba2cc2f9ce274f41a4c901ee", + "urls": [ + "bzz-raw://84dcf3a9952f1ce9a9110abb1783dfead290fd17c28216c5acb22de9d090921d", + "dweb:/ipfs/QmeNoLz8WcHX9GLcBfQChXFHsFDRaVRRXnPXXvB2qVTaSZ" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/governance/interfaces/IGovernance.sol": { + "keccak256": "0x1416ade12c83b723dcd0d42c59d5bd7fbe3ad51b83b613c5f76eb524b84530ce", + "urls": [ + "bzz-raw://c189b55fc7a6f5769a3171f84ea4b78828da4ce130e0fc20158aa9403c03ac4d", + "dweb:/ipfs/QmREMga9rQTs1uBeGRRiNdNdYQQaSm5dY9LufnMVphtdMw" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/governance/interfaces/ILockedGold.sol": { + "keccak256": "0x577d01d8a1fbf47980fb5ffd36de2084ec255889b15671adfecd3a285df4f253", + "urls": [ + "bzz-raw://6b955b6829748cd136fa92c3a434f5419e4eb024d535a854900ad48bd4151b67", + "dweb:/ipfs/QmXM5uL5dsKecYyedAzsrZXAp81NtWQErbbVEFccJ6ZqiY" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/governance/interfaces/IValidators.sol": { + "keccak256": "0x524a9e48689537421f97296ffd57fa0f2887117f9af9e71dd5ed17e66ba92d2a", + "urls": [ + "bzz-raw://cf5d0c2f6ee9b2c8e270162455177e9c3bac79ac07d4f37c86f7f2ee5978a756", + "dweb:/ipfs/QmZTKmytn1Wi3QfU3bHuSaSeYQzRrFKehyngrg37rHD3vV" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/identity/interfaces/IAttestations.sol": { + "keccak256": "0x979aaac636fe6a64f97034bf0bf062b5f0efd6e6f9f3fe84e81180f82eeb7a3e", + "urls": [ + "bzz-raw://c1255d08278188247ef81fb09edd2d1d4a019fb0fe80fd3d9850415c5eb5caaf", + "dweb:/ipfs/QmcJvqSM35nAR8p8LwVczhnaY6VwTRThNjfCzkzeiAkz45" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/identity/interfaces/IRandom.sol": { + "keccak256": "0xd65fd529d133cbde94628b39b0d2f0f4b6d0af2e8f97c0e6b4b2cd476479ed1d", + "urls": [ + "bzz-raw://f2c6fe351990bfdeb55484bd3622d44c8f58579a7212d5cce71a82df846497f5", + "dweb:/ipfs/QmRDDTXUqbA6dHfJe4ZS1442JDAfwoHq2eH9LHnQyzsh44" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/stability/interfaces/IExchange.sol": { + "keccak256": "0xbfcf77e30fc62218decbb73297d5161b9c490f7e44f75158f1c79674e4b8b83c", + "urls": [ + "bzz-raw://ad0caaddcb552a2c040e827e9336cdec7dfaf629cca9f30e5f5bc12645abde43", + "dweb:/ipfs/QmTjnGbfoSkZhNWhrbcYdLjF1LLqAJcviJ2ZKSMH9KWz95" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/stability/interfaces/IReserve.sol": { + "keccak256": "0x8da4d702b47a7e60981ca416f2d0f24a3c1dea9ab44f04b695c0fde02c84a38e", + "urls": [ + "bzz-raw://198fb3cd945e374926e3d6bcb2469b7f5c635e78b40417a4b3a1eacabeca234b", + "dweb:/ipfs/Qma8RRSqksFCzL5gWTXmGtJvC4Mw1bgquvN33nKhrRwUrD" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/stability/interfaces/ISortedOracles.sol": { + "keccak256": "0x8f80e430800fff2f04f3981c4b73a2a374b2c2150543a2de51fcf7ba4fb08789", + "urls": [ + "bzz-raw://f1a472385d5fa1b1cc4ab6ff948cd11f86c55328841d89f39f02b64449d3ac1a", + "dweb:/ipfs/QmSYfwR8RJ2nyzt9VJtLKqaUHwAPfz579vhcQP7LRLaqTe" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/stability/interfaces/IStableToken.sol": { + "keccak256": "0x091e577acecdf050fe4c41133b11fe330d07050c5fe78b65bfce32ccc29e51c6", + "urls": [ + "bzz-raw://94f7d7578274be8212b8c9a3f0759d884969b05a7f0c64c7c9352102f4e51ab4", + "dweb:/ipfs/Qmd3bERcFLrrvpURuzKUg6YCSFisNQ36YpRLWkxEcS1Tkj" + ] + }, + "openzeppelin-solidity/contracts/GSN/Context.sol": { + "keccak256": "0x90a3995645af7562d84b9d69363ffa5ae7217714ab61e951bf7bc450f40e4061", + "urls": [ + "bzz-raw://216ef9d6b614db4eb46970b4e84903f2534a45572dd30a79f0041f1a5830f436", + "dweb:/ipfs/QmNPrJ4MWKUAWzKXpUqeyKRUfosaoANZAqXgvepdrCwZAG" + ] + }, + "openzeppelin-solidity/contracts/cryptography/ECDSA.sol": { + "keccak256": "0xc89ea7e48ba477b1781b24ae963442fff1bb2af33b6178dad679a3fa2f5ab2de", + "urls": [ + "bzz-raw://b736ddad8143f8f1cd13c20809d4ebce5f5a8c7725081b0b703294078bd506d1", + "dweb:/ipfs/QmdhTWCXFCuwG9JaPMjwnhkQoDj9su8R7KMPNvD5z9KeWD" + ] + }, + "openzeppelin-solidity/contracts/math/SafeMath.sol": { + "keccak256": "0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076", + "urls": [ + "bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f", + "dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq" + ] + }, + "openzeppelin-solidity/contracts/ownership/Ownable.sol": { + "keccak256": "0x6fb9d7889769d7cc161225f9ef7a90e468ba9788b253816f8d8b6894d3472c24", + "urls": [ + "bzz-raw://cf4c00fc3c37cc5acf0c82ec6fd97bab67d72c2567fdc0ebf023d9c09b30a08e", + "dweb:/ipfs/Qmb7TChG6DsEDX7LooJ4vmxot19f7VXX8S1zUGPeJTWbwZ" + ] + }, + "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol": { + "keccak256": "0xe5bb0f57cff3e299f360052ba50f1ea0fff046df2be070b6943e0e3c3fdad8a9", + "urls": [ + "bzz-raw://59fd025151435da35faa8093a5c7a17de02de9d08ad27275c5cdf05050820d91", + "dweb:/ipfs/QmQMvwEcPhoRXzbXyrdoeRtvLoifUW9Qh7Luho7bmUPRkc" + ] + } + }, + "version": 1 +} \ No newline at end of file diff --git a/packages/sdk/explorer/fixtures/proxy.metadata.json b/packages/sdk/explorer/fixtures/proxy.metadata.json new file mode 100644 index 00000000000..40296fa2dae --- /dev/null +++ b/packages/sdk/explorer/fixtures/proxy.metadata.json @@ -0,0 +1,198 @@ +{ + "compiler": { + "version": "0.5.13+commit.5b0b510c" + }, + "language": "Solidity", + "output": { + "abi": [ + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "implementation", + "type": "address" + } + ], + "name": "ImplementationSet", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "name": "OwnerSet", + "type": "event" + }, + { + "payable": true, + "stateMutability": "payable", + "type": "fallback" + }, + { + "constant": true, + "inputs": [], + "name": "_getImplementation", + "outputs": [ + { + "internalType": "address", + "name": "implementation", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "_getOwner", + "outputs": [ + { + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "implementation", + "type": "address" + }, + { + "internalType": "bytes", + "name": "callbackData", + "type": "bytes" + } + ], + "name": "_setAndInitializeImplementation", + "outputs": [], + "payable": true, + "stateMutability": "payable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "implementation", + "type": "address" + } + ], + "name": "_setImplementation", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "_transferOwnership", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + } + ], + "devdoc": { + "methods": { + "_setAndInitializeImplementation(address,bytes)": { + "details": "Throws if the initialization callback fails.If the target contract does not need initialization, use setImplementation instead.", + "params": { + "callbackData": "The abi-encoded function call to perform in the implementation contract.", + "implementation": "Address of the new target contract." + } + }, + "_setImplementation(address)": { + "details": "If the target contract needs to be initialized, call setAndInitializeImplementation instead.", + "params": { + "implementation": "Address of the new target contract." + } + }, + "_transferOwnership(address)": { + "params": { + "newOwner": "Address of the new owner account." + } + } + } + }, + "userdoc": { + "methods": { + "_getImplementation()": { + "notice": "Returns the implementation address." + }, + "_getOwner()": { + "notice": "Returns the Proxy owner's address." + }, + "_setAndInitializeImplementation(address,bytes)": { + "notice": "Sets the address of the implementation contract and calls into it." + }, + "_setImplementation(address)": { + "notice": "Sets the address of the implementation contract." + }, + "_transferOwnership(address)": { + "notice": "Transfers ownership of Proxy to a new owner." + } + } + } + }, + "settings": { + "compilationTarget": { + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/proxies/AccountsProxy.sol": "AccountsProxy" + }, + "evmVersion": "istanbul", + "libraries": {}, + "optimizer": { + "enabled": false, + "runs": 200 + }, + "remappings": [] + }, + "sources": { + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/Proxy.sol": { + "keccak256": "0x650f2a079da45a71970749c9039dece5986835225035b29eca4df1c1dab0d6ac", + "urls": [ + "bzz-raw://cb6c36af368fa26a6fb5f033941536e73ebd1aafad5162f073f318a30f4ee349", + "dweb:/ipfs/QmaWNhRtpPU4iGDnWjBYRZobUvJYwGQJvtaPZMtbzjjZB3" + ] + }, + "/home/bowd/Workspace/job/celo/celo-monorepo/packages/protocol/contracts/common/proxies/AccountsProxy.sol": { + "keccak256": "0x42531c7bfc12cf2e3e33a1b1f7614d82b25e8a2beff194d793446b7639a55d05", + "urls": [ + "bzz-raw://49c99e47f7ed5ad077ac98fd30bee47674959cbb5ce5ac5d21d12bd121ad9711", + "dweb:/ipfs/QmNRDQrNYKMqdNgduv4euvrmFxSDqJJ267RzPJY5p6fNte" + ] + }, + "openzeppelin-solidity/contracts/utils/Address.sol": { + "keccak256": "0x1a8e5072509c5ea7365eb1d48030b9be865140c8fb779968da0a459a0e174a11", + "urls": [ + "bzz-raw://03335b7b07c7c8c8d613cfdd8ec39a0b5ec133ee510bf2fe6cc5a496767bef4b", + "dweb:/ipfs/Qmebp4nzPja645c9yXSdJkGq96oU3am3LUnG2K3R7XxyKf" + ] + } + }, + "version": 1 +} \ No newline at end of file diff --git a/packages/sdk/explorer/jest.config.js b/packages/sdk/explorer/jest.config.js new file mode 100644 index 00000000000..ea4971b7402 --- /dev/null +++ b/packages/sdk/explorer/jest.config.js @@ -0,0 +1,13 @@ +const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') + +module.exports = { + preset: 'ts-jest', + ...nodeFlakeTracking, + testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], + setupFilesAfterEnv: [ + '@celo/dev-utils/lib/matchers', + '/jestSetup.ts', + ...nodeFlakeTracking.setupFilesAfterEnv, + ], + verbose: true, +} diff --git a/packages/sdk/explorer/jestSetup.ts b/packages/sdk/explorer/jestSetup.ts new file mode 100644 index 00000000000..a3708cfed4e --- /dev/null +++ b/packages/sdk/explorer/jestSetup.ts @@ -0,0 +1,7 @@ +import { FetchMockSandbox } from 'fetch-mock' + +const fetchMockSandbox = require('fetch-mock').sandbox() +jest.mock('cross-fetch', () => fetchMockSandbox) + +// @ts-ignore +global.fetchMock = fetchMockSandbox as FetchMockSandbox diff --git a/packages/sdk/explorer/package.json b/packages/sdk/explorer/package.json index a4ecfe99ad0..34660137cb2 100644 --- a/packages/sdk/explorer/package.json +++ b/packages/sdk/explorer/package.json @@ -1,6 +1,6 @@ { "name": "@celo/explorer", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Celo's block explorer consumer", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -22,14 +22,17 @@ "prepublishOnly": "yarn build" }, "dependencies": { + "@celo/base": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/contractkit": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "@types/debug": "^4.1.5", - "@celo/base": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "cross-fetch": "^3.1.5", "debug": "^4.1.1" }, "devDependencies": { + "@types/fetch-mock": "^7.3.5", + "fetch-mock": "^9.11.0", "web3": "1.3.6" }, "engines": { diff --git a/packages/sdk/explorer/src/block-explorer.ts b/packages/sdk/explorer/src/block-explorer.ts index 16f618f2d65..d387b0729cf 100644 --- a/packages/sdk/explorer/src/block-explorer.ts +++ b/packages/sdk/explorer/src/block-explorer.ts @@ -1,5 +1,6 @@ import { ABIDefinition, + AbiItem, Address, Block, CeloTxPending, @@ -17,6 +18,7 @@ import { mapFromPairs, obtainKitContractDetails, } from './base' +import { fetchMetadata } from './sourcify' const debug = debugFactory('kit:explorer:block') @@ -42,6 +44,12 @@ interface ContractMapping { fnMapping: Map } +interface ContractNameAndMethodAbi { + abi: ABIDefinition + contract: string + contractName?: string +} + export async function newBlockExplorer(kit: ContractKit) { return new BlockExplorer(kit, await obtainKitContractDetails(kit)) } @@ -115,15 +123,70 @@ export class BlockExplorer { } } - getContractMethodAbi = (address: string, callSignature: string) => { + getContractMethodAbiFromCore = ( + address: string, + selector: string + ): ContractNameAndMethodAbi | null => { const contractMapping = this.addressMapping.get(address) - return { - contract: contractMapping?.details.name, - abi: contractMapping?.fnMapping.get(callSignature), + if (contractMapping) { + const abi = contractMapping.fnMapping.get(selector) + if (abi) { + return { + contract: contractMapping.details.name, + abi, + } + } else { + console.warn( + `Function with signature ${selector} not found in contract ${contractMapping.details.name}(${address})` + ) + } } + + return null } - getKnownFunction(selector: string): ABIDefinition | undefined { + getContractMethodAbiFromSourcify = async ( + address: string, + selector: string + ): Promise => { + let metadata = await fetchMetadata(this.kit.connection, address) + let abi: AbiItem | null = null + let contractName: string | null = null + + if (metadata && metadata.abi) { + contractName = metadata.contractName + abi = metadata.abiForSelector(selector) + + if (abi === null) { + const implAddress = await metadata.tryGetProxyImplementation() + console.log(implAddress) + if (implAddress) { + metadata = await fetchMetadata(this.kit.connection, implAddress) + if (metadata && metadata.abi) { + abi = metadata?.abiForSelector(selector) + contractName = metadata?.contractName + } + } + } + } + + if (abi !== null) { + return { + abi: { + ...abi, + signature: selector, + }, + contract: contractName ? `${contractName}(${address})` : `Unknown(${address})`, + } + } + + return null + } + + getContractMethodAbiFallback = ( + address: string, + selector: string + ): ContractNameAndMethodAbi | null => { // TODO(bogdan): This could be replaced with a call to 4byte.directory // or a local database of common functions. const knownFunctions: { [k: string]: string } = { @@ -132,9 +195,31 @@ export class BlockExplorer { } const signature = knownFunctions[selector] if (signature) { - return signatureToAbiDefinition(signature) + return { + abi: signatureToAbiDefinition(signature), + contract: `Unknown(${address})`, + } } - return undefined + return null + } + + getContractMethodAbi = async ( + address: string, + selector: string, + onlyCoreContracts = false + ): Promise => { + let resp = this.getContractMethodAbiFromCore(address, selector) + if (resp !== null) { + return resp + } else if (onlyCoreContracts) { + return null + } + + resp = await this.getContractMethodAbiFromSourcify(address, selector) + if (resp !== null) { + return resp + } + return this.getContractMethodAbiFallback(address, selector) } buildCallDetails(contract: string, abi: ABIDefinition, input: string): CallDetails { @@ -167,32 +252,13 @@ export class BlockExplorer { } } - tryParseAsCoreContractCall(address: string, input: string): CallDetails | null { - const selector = input.slice(0, 10) - const { contract: contractName, abi: matchedAbi } = this.getContractMethodAbi(address, selector) - - if (matchedAbi === undefined || contractName === undefined) { - return null - } - - return this.buildCallDetails(contractName, matchedAbi, input) - } - - tryParseAsExternalContractCall(address: string, input: string): CallDetails | null { + async tryParseTxInput(address: string, input: string): Promise { const selector = input.slice(0, 10) - const matchedAbi = this.getKnownFunction(selector) - if (matchedAbi === undefined) { - return null - } - - return this.buildCallDetails(address, matchedAbi, input) - } + const resp = await this.getContractMethodAbi(address, selector) - async tryParseTxInput(address: string, input: string): Promise { - let callDetails = this.tryParseAsCoreContractCall(address, input) - if (callDetails == null) { - callDetails = this.tryParseAsExternalContractCall(address, input) + if (resp !== null) { + return this.buildCallDetails(resp.contract, resp.abi, input) } - return callDetails + return null } } diff --git a/packages/sdk/explorer/src/globals.d.ts b/packages/sdk/explorer/src/globals.d.ts new file mode 100644 index 00000000000..7dd76e4c8a1 --- /dev/null +++ b/packages/sdk/explorer/src/globals.d.ts @@ -0,0 +1,5 @@ +import { FetchMockSandbox } from 'fetch-mock' + +declare global { + const fetchMock: FetchMockSandbox +} diff --git a/packages/sdk/explorer/src/sourcify.test.ts b/packages/sdk/explorer/src/sourcify.test.ts new file mode 100644 index 00000000000..05c20cf1fd5 --- /dev/null +++ b/packages/sdk/explorer/src/sourcify.test.ts @@ -0,0 +1,263 @@ +import { + Address, + Callback, + Connection, + JsonRpcPayload, + JsonRpcResponse, + Provider, +} from '@celo/connect' +import Web3 from 'web3' +import { fetchMetadata, Metadata } from './sourcify' + +// This is taken from protocol/contracts/build/Account.json +const CONTRACT_METADATA = require('../fixtures/contract.metadata.json') +// This is taken from protocol/contracts/build/AccountProxy.json +const PROXY_METADATA = require('../fixtures/proxy.metadata.json') + +describe('sourcify helpers', () => { + let connection: Connection + const web3: Web3 = new Web3() + const address: Address = web3.utils.randomHex(20) + const proxyAddress: Address = web3.utils.randomHex(20) + const implAddress: Address = web3.utils.randomHex(20) + const chainId: number = 42220 + + const mockProvider: Provider = { + send: (payload: JsonRpcPayload, callback: Callback): void => { + if (payload.params[0].to === proxyAddress) { + callback(null, { + jsonrpc: payload.jsonrpc, + id: Number(payload.id), + result: `0x000000000000000000000000${implAddress}`, + }) + } else { + callback(new Error('revert')) + } + }, + } + + beforeEach(() => { + fetchMock.reset() + web3.setProvider(mockProvider as any) + connection = new Connection(web3) + connection.chainId = jest.fn().mockImplementation(async () => { + return chainId + }) + }) + + describe('fetchMetadata()', () => { + describe('when a full match exists', () => { + it('returns the metadata from the full match', async () => { + fetchMock.get( + `https://repo.sourcify.dev/contracts/full_match/42220/${address}/metadata.json`, + {} + ) + const metadata = await fetchMetadata(connection, address) + expect(metadata).toBeInstanceOf(Metadata) + }) + }) + + describe('when a full match does not exist', () => { + describe('but a partial match exists', () => { + it('returns the metadata from the partial match', async () => { + fetchMock + .get( + `https://repo.sourcify.dev/contracts/full_match/42220/${address}/metadata.json`, + 400 + ) + .get( + `https://repo.sourcify.dev/contracts/partial_match/42220/${address}/metadata.json`, + {} + ) + const metadata = await fetchMetadata(connection, address) + expect(metadata).toBeInstanceOf(Metadata) + }) + }) + + describe('and a partial match does not exist', () => { + it('is null', async () => { + fetchMock + .get( + `https://repo.sourcify.dev/contracts/full_match/42220/${address}/metadata.json`, + 400 + ) + .get( + `https://repo.sourcify.dev/contracts/partial_match/42220/${address}/metadata.json`, + 400 + ) + const metadata = await fetchMetadata(connection, address) + expect(metadata).toEqual(null) + }) + }) + }) + }) + + describe('Metadata', () => { + describe('get abi', () => { + it('returns the abi when it finds it', () => { + const metadata = new Metadata(connection, address, { output: { abi: [{}] } }) + const abi = metadata.abi + expect(abi).not.toBeNull() + expect(abi).toEqual([{}]) + }) + + it('returns null when there is no abi', () => { + const metadata = new Metadata(connection, address, { output: { other: [{}] } }) + const abi = metadata.abi + expect(abi).toBeNull() + }) + }) + + describe('get contractName', () => { + describe('when the structure does not contain it', () => { + it('returns null', () => { + const metadata = new Metadata(connection, address, { output: { abi: [{}] } }) + const name = metadata.contractName + expect(name).toBeNull() + }) + }) + + describe('when the structure contains multiple compilation targets', () => { + it('returns the first', () => { + const metadata = new Metadata(connection, address, { + settings: { + compilationTarget: { + 'somefile.sol': 'SomeContract', + 'otherfile.sol': 'OtherContract', + }, + }, + }) + const name = metadata.contractName + expect(name).toEqual('SomeContract') + }) + }) + + describe('when the structure contains one compilation targets', () => { + it('returns it', () => { + const metadata = new Metadata(connection, address, { + settings: { + compilationTarget: { + 'otherfile.sol': 'OtherContract', + }, + }, + }) + const name = metadata.contractName + expect(name).toEqual('OtherContract') + }) + }) + }) + + describe('abiForMethod', () => { + let contractMetadata: Metadata + + beforeEach(() => { + contractMetadata = new Metadata(connection, address, CONTRACT_METADATA) + }) + + describe('with full signature', () => { + it('finds one ABI item when it exists', async () => { + const results = contractMetadata.abiForMethod('isLegacyRole(bytes32,bytes32)') + expect(results.length).toEqual(1) + expect(results[0]).toMatchObject({ + name: 'isLegacyRole', + inputs: [{ name: 'role' }, { name: 'otherRole' }], + }) + }) + + it('returns an empty array when none exists', async () => { + const results = contractMetadata.abiForMethod('randomFunction(bytes32,bytes32') + expect(results.length).toEqual(0) + }) + }) + + describe('with method name', () => { + it('finds one ABI item when one exists', async () => { + const results = contractMetadata.abiForMethod('isLegacySigner') + expect(results.length).toEqual(1) + expect(results[0]).toMatchObject({ + name: 'isLegacySigner', + }) + }) + + it('finds multiple ABI items when they exist', async () => { + const results = contractMetadata.abiForMethod('isLegacyRole') + expect(results.length).toEqual(2) + }) + + it('returns an empty array when none exists', async () => { + const results = contractMetadata.abiForMethod('randomFunction') + expect(results.length).toEqual(0) + }) + }) + }) + + describe('abiForSignature', () => { + let contractMetadata: Metadata + + beforeEach(() => { + contractMetadata = new Metadata(connection, address, CONTRACT_METADATA) + }) + + describe('when the function exists', () => { + it('returns the ABI', async () => { + const callSignature = connection + .getAbiCoder() + .encodeFunctionSignature('authorizedBy(address)') + const abi = contractMetadata.abiForSelector(callSignature) + expect(abi).toMatchObject({ + constant: true, + inputs: [ + { + internalType: 'address', + name: '', + type: 'address', + }, + ], + name: 'authorizedBy', + outputs: [ + { + internalType: 'address', + name: '', + type: 'address', + }, + ], + payable: false, + stateMutability: 'view', + type: 'function', + }) + }) + }) + + describe("when the function doesn't exist", () => { + it('returns null', () => { + const abi = contractMetadata.abiForSelector('0x0') + expect(abi).toBeNull() + }) + }) + }) + + describe('tryGetProxyImplementation', () => { + let proxyMetadata: Metadata + let contractMetadata: Metadata + + beforeEach(() => { + contractMetadata = new Metadata(connection, address, CONTRACT_METADATA) + proxyMetadata = new Metadata(connection, proxyAddress, PROXY_METADATA) + }) + + describe('with a cLabs proxy', () => { + it('fetches the implementation', async () => { + const result = await proxyMetadata.tryGetProxyImplementation() + expect(result?.toLocaleLowerCase()).toEqual(implAddress.toLocaleLowerCase()) + }) + }) + + describe('with a non-proxy', () => { + it('returns null', async () => { + const result = await contractMetadata.tryGetProxyImplementation() + expect(result).toBeNull() + }) + }) + }) + }) +}) diff --git a/packages/sdk/explorer/src/sourcify.ts b/packages/sdk/explorer/src/sourcify.ts new file mode 100644 index 00000000000..812854984de --- /dev/null +++ b/packages/sdk/explorer/src/sourcify.ts @@ -0,0 +1,209 @@ +/** + * Sourcify (https://sourcify.dev/) helpers for querying + * contract metadata when it's available. + * + * @example + * Get the ABI of an arbitrary contract. + * ```ts + * const metadata = fetchMetadata('42220', '0xF27c7D717B4b7CaD2833a61cb9CA7B61021f9F73') + * if (metadata.abi !== null) { + * // do something with it. + * } + */ +import { AbiCoder, AbiItem, Address, Connection } from '@celo/connect' +import fetch from 'cross-fetch' + +const PROXY_IMPLEMENTATION_GETTERS = [ + '_getImplementation', + 'getImplementation', + '_implementation', + 'implementation', +] + +const PROXY_ABI: AbiItem[] = PROXY_IMPLEMENTATION_GETTERS.map((funcName) => ({ + constant: true, + inputs: [], + name: funcName, + outputs: [ + { + internalType: 'address', + name: 'implementation', + type: 'address', + }, + ], + payable: false, + stateMutability: 'view', + type: 'function', +})) + +/** + * MetadataResponse interface for the `metadata.json` file that the sourcify repo returns. + * All fields are optional because we don't really _know_ what we get from the API, thus + * we need to enforce the structure at runtime. + */ +export interface MetadataResponse { + output?: { + abi?: AbiItem[] + } + settings?: { + compilationTarget?: Record + } +} + +/** + * Wrapper class for a metadata.json response from sourcify. + * Because the response's true structure is unknown this wrapper implements + * light runtime verification. + */ +export class Metadata { + public abi: AbiItem[] | null = null + public contractName: string | null = null + + private abiCoder: AbiCoder + private jsonInterfaceMethodToString: (item: AbiItem) => string + private connection: Connection + private address: Address + + constructor(connection: Connection, address: Address, response: any) { + this.response = response as MetadataResponse + this.abiCoder = connection.getAbiCoder() + // XXX: For some reason this isn't exported as it should be + // @ts-ignore + this.jsonInterfaceMethodToString = connection.web3.utils._jsonInterfaceMethodToString + this.connection = connection + this.address = address + } + + set response(value: MetadataResponse) { + if ( + typeof value === 'object' && + typeof value.output === 'object' && + 'abi' in value.output && + Array.isArray(value.output.abi) && + value.output.abi.length > 0 + ) { + this.abi = value.output.abi + } + + if ( + typeof value === 'object' && + typeof value.settings === 'object' && + typeof value.settings.compilationTarget === 'object' && + Object.values(value.settings.compilationTarget).length > 0 + ) { + // XXX: Not sure when there are multiple compilationTargets and what should + // happen then but defaulting to this for now. + const contracts = Object.values(value.settings.compilationTarget) + this.contractName = contracts[0] + } + } + + /** + * Find the AbiItem for a given function selector + * @param selector the 4-byte selector of the function call + * @returns an AbiItem if found or null + */ + abiForSelector(selector: string): AbiItem | null { + return ( + this.abi?.find((item) => { + return item.type === 'function' && this.abiCoder.encodeFunctionSignature(item) === selector + }) || null + ) + } + + /** + * Find the AbiItem for methods that match the provided method name. + * The function can return more than one AbiItem if the query string + * provided doesn't contain arguments as there can be multiple + * definitions with different arguments. + * @param method name of the method to lookup + * @returns and array of AbiItems matching the query + */ + abiForMethod(query: string): AbiItem[] { + if (query.indexOf('(') >= 0) { + // Method is a full call signature with arguments + return ( + this.abi?.filter((item) => { + return item.type === 'function' && this.jsonInterfaceMethodToString(item) === query + }) || [] + ) + } else { + // Method is only method name + return ( + this.abi?.filter((item) => { + return item.type === 'function' && item.name === query + }) || [] + ) + } + } + + /** + * Use heuristics to determine if the contract can be a proxy + * and extract the implementation. + * Available scenarios: + * - _getImplementation() exists + * - getImplementation() exists + * - _implementation() exists + * - implementation() exists + * @returns the implementation address or null + */ + async tryGetProxyImplementation(): Promise
{ + const proxyContract = new this.connection.web3.eth.Contract(PROXY_ABI, this.address) + for (const fn of PROXY_IMPLEMENTATION_GETTERS) { + try { + return await new Promise((resolve, reject) => { + proxyContract.methods[fn]().call().then(resolve).catch(reject) + }) + } catch { + continue + } + } + + return null + } +} + +/** + * Fetch the sourcify response and instantiate a Metadata wrapper class around it. + * Try a full_match but fallback to partial_match when not strict. + * @param connection @celo/connect instance + * @param contract the address of the contract to query + * @param strict only allow full matches https://docs.sourcify.dev/docs/full-vs-partial-match/ + * @returns Metadata or null + */ +export async function fetchMetadata( + connection: Connection, + contract: Address, + strict = false +): Promise { + const fullMatchMetadata = await querySourcify(connection, 'full_match', contract) + if (fullMatchMetadata !== null) { + return fullMatchMetadata + } else if (strict) { + return null + } else { + return querySourcify(connection, 'partial_match', contract) + } +} + +/** + * Fetch the sourcify response and instantiate a Metadata wrapper class around it. + * @param connection @celo/connect instance + * @param matchType what type of match to query for https://docs.sourcify.dev/docs/full-vs-partial-match/ + * @param contract the address of the contract to query + * @returns Metadata or null + */ +async function querySourcify( + connection: Connection, + matchType: 'full_match' | 'partial_match', + contract: Address +): Promise { + const chainID = await connection.chainId() + const resp = await fetch( + `https://repo.sourcify.dev/contracts/${matchType}/${chainID}/${contract}/metadata.json` + ) + if (resp.ok) { + return new Metadata(connection, contract, await resp.json()) + } + return null +} diff --git a/packages/sdk/governance/package.json b/packages/sdk/governance/package.json index 1b0b36dc798..cc0d74c8e07 100644 --- a/packages/sdk/governance/package.json +++ b/packages/sdk/governance/package.json @@ -1,6 +1,6 @@ { "name": "@celo/governance", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Celo's governance proposals", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -21,11 +21,11 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", - "@celo/explorer": "2.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/contractkit": "3.2.1-dev", + "@celo/explorer": "3.2.1-dev", "@types/debug": "^4.1.5", "@types/inquirer": "^6.5.0", "@types/ethereumjs-util": "^5.2.0", diff --git a/packages/sdk/governance/src/proposals.ts b/packages/sdk/governance/src/proposals.ts index 85e71173df5..d96bfb90a25 100644 --- a/packages/sdk/governance/src/proposals.ts +++ b/packages/sdk/governance/src/proposals.ts @@ -2,6 +2,7 @@ import { Address, isHexString, trimLeading0x } from '@celo/base/lib/address' import { AbiCoder, ABIDefinition, + AbiItem, CeloTransactionObject, CeloTxObject, CeloTxPending, @@ -34,6 +35,7 @@ import { ProposalTransaction, } from '@celo/contractkit/lib/wrappers/Governance' import { newBlockExplorer } from '@celo/explorer' +import { fetchMetadata } from '@celo/explorer/lib/sourcify' import { isValidAddress } from '@celo/utils/lib/address' import { fromFixed } from '@celo/utils/lib/fixidity' import { BigNumber } from 'bignumber.js' @@ -184,15 +186,15 @@ export const proposalToJSON = async ( jsonTx.params![`initialize@${initSig}`] = initParams } else if (isGovernanceConstitutionSetter(jsonTx)) { const [address, functionId, threshold] = jsonTx.args - const { contract, abi } = blockExplorer.getContractMethodAbi(address, functionId) - if (!contract || !abi) { + const result = await blockExplorer.getContractMethodAbi(address, functionId) + if (result === null) { throw new Error( `Governance.setConstitution targets unknown address ${address} and function id ${functionId}` ) } jsonTx.params![`setConstitution[${address}][${functionId}]`] = { - contract, - method: abi.name, + contract: result.contract, + method: result.abi.name, threshold: fromFixed(new BigNumber(threshold)), } } @@ -287,37 +289,55 @@ export class ProposalBuilder { getRegistryAddition = (contract: CeloContract): string | undefined => this.registryAdditions[stripProxy(contract)] - isRegistered = (contract: CeloContract) => + isRegistryContract = (contract: CeloContract) => RegisteredContracts.includes(stripProxy(contract)) || this.getRegistryAddition(contract) !== undefined - buildFunctionCallToExternalContract = async ( + /* + * @deprecated - use isRegistryContract + */ + isRegistered = this.isRegistryContract + + buildCallToExternalContract = async ( tx: ProposalTransactionJSON ): Promise => { - const methodABI = signatureToAbiDefinition(tx.function) - const input = this.kit.connection.getAbiCoder().encodeFunctionCall(methodABI, tx.args) - return { input, to: tx.contract, value: tx.value } - } + const abiCoder = this.kit.connection.getAbiCoder() + let methodABI: AbiItem | null = null + + const metadata = await fetchMetadata(this.kit.connection, tx.contract) + if (metadata) { + const potentialABIs = metadata.abiForMethod(tx.function) + methodABI = + potentialABIs.find((abi) => { + try { + abiCoder.encodeFunctionCall(abi, tx.args) + return true + } catch { + return false + } + }) || null + } - fromJsonTx = async (tx: ProposalTransactionJSON): Promise => { - if (isRegistryRepoint(tx)) { - // Update canonical registry addresses - const args = registryRepointArgs(tx) - this.setRegistryAddition(args.name, args.address) + if (methodABI === null) { + methodABI = signatureToAbiDefinition(tx.function) } - // handle sending value to unregistered contracts - if (!this.isRegistered(tx.contract)) { - if (!isValidAddress(tx.contract)) { - throw new Error( - `Transaction to unregistered contract ${tx.contract} only supported by address` - ) - } else if (tx.function !== '' || tx.args !== []) { - return this.buildFunctionCallToExternalContract(tx) - } - return { input: '', to: tx.contract, value: tx.value } + const input = this.kit.connection.getAbiCoder().encodeFunctionCall(methodABI, tx.args) + let to: string = tx.contract + if (metadata && metadata.contractName) { + to = tx.contract } + return { input, to, value: tx.value } + } + + /* + * @deprecated use buildCallToExternalContract + * + */ + buildFunctionCallToExternalContract = this.buildCallToExternalContract + + buildCallToCoreContract = async (tx: ProposalTransactionJSON): Promise => { // Account for canonical registry addresses from current proposal const address = this.getRegistryAddition(tx.contract) ?? (await this.kit.registry.addressFor(tx.contract)) @@ -343,6 +363,32 @@ export class ProposalBuilder { return this.fromWeb3tx(txo, { to: address, value: tx.value }) } + fromJsonTx = async (tx: ProposalTransactionJSON): Promise => { + if (isRegistryRepoint(tx)) { + // Update canonical registry addresses + const args = registryRepointArgs(tx) + this.setRegistryAddition(args.name, args.address) + } + + // handle sending value to unregistered contracts + if (this.isRegistryContract(tx.contract)) { + return this.buildCallToCoreContract(tx) + } else { + if (!isValidAddress(tx.contract)) { + throw new Error( + `Transaction to unregistered contract ${tx.contract} only supported by address` + ) + } + + if (tx.function === '') { + // It's not a function call + return { input: '', to: tx.contract, value: tx.value } + } + + return this.buildCallToExternalContract(tx) + } + } + addJsonTx = (tx: ProposalTransactionJSON) => this.builders.push(async () => this.fromJsonTx(tx)) } diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json index 277d40e9972..29130c78f0c 100644 --- a/packages/sdk/identity/package.json +++ b/packages/sdk/identity/package.json @@ -1,6 +1,6 @@ { "name": "@celo/identity", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Utilities for interacting with Celo's identity protocol", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -18,17 +18,17 @@ "build": "tsc -b .", "clean": "tsc -b . --clean", "docs": "typedoc", - "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 28", + "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 27", "test:livechain": "yarn --cwd ../../protocol devchain run-tar .tmp/devchain.tar.gz", - "test": "jest --runInBand", + "test": "jest --runInBand --testPathIgnorePatterns src/odis/identifier-backwards-compatibility.test.ts", "lint": "tslint -c tslint.json --project .", "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/contractkit": "2.2.1-dev", - "@celo/phone-number-privacy-common": "1.0.39", - "@celo/utils": "2.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/contractkit": "3.2.1-dev", + "@celo/phone-number-privacy-common": "^3.0.0-dev", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a", @@ -41,10 +41,11 @@ "devDependencies": { "@celo/dev-utils": "0.0.1-dev", "@celo/flake-tracker": "0.0.1-dev", - "@celo/wallet-local": "2.2.1-dev", + "@celo/wallet-local": "3.2.1-dev", "@types/elliptic": "^6.4.12", "fetch-mock": "9.10.4", - "ganache": "npm:@soloseng/ganache@7.7.5-beta.3" + "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", + "old-identity-sdk": "npm:@celo/identity@1.5.2" }, "engines": { "node": ">=12.9.0" diff --git a/packages/sdk/identity/src/odis/bls-blinding-client.ts b/packages/sdk/identity/src/odis/bls-blinding-client.ts index 62370afe94f..9ceedf633c3 100644 --- a/packages/sdk/identity/src/odis/bls-blinding-client.ts +++ b/packages/sdk/identity/src/odis/bls-blinding-client.ts @@ -27,12 +27,14 @@ export class WasmBlsBlindingClient implements BlsBlindingClient { constructor(odisPubKey: string) { this.odisPubKey = Buffer.from(odisPubKey, 'base64') // Dynamically load the Wasm library - if (!this.isReactNativeEnvironment()) { - this.thresholdBls = require('blind-threshold-bls') - } else { - // When using react instead rely upon this library instead - // https://github.com/celo-org/react-native-blind-threshold-bls#cc36392 + // Checkout out documentation for alternative runtime environments: + // https://github.com/celo-org/identity/tree/ASv2/asv2#runtime-environments + if (this.isReactNativeEnvironment()) { throw new Error('Cannot use WasmBlsBlindingClient in a React Native app') + } else if (this.isBrowserEnvironment()) { + throw new Error('Cannot use WasmBlsBlindingClient in a browser environment') + } else { + this.thresholdBls = require('blind-threshold-bls') } } @@ -67,4 +69,8 @@ export class WasmBlsBlindingClient implements BlsBlindingClient { private isReactNativeEnvironment(): boolean { return typeof navigator !== 'undefined' && navigator.product === 'ReactNative' } + + // https://stackoverflow.com/questions/17575790/environment-detection-node-js-or-browser + // tslint:disable-next-line: function-constructor + private isBrowserEnvironment = new Function('try {return this===window;}catch(e){ return false;}') } diff --git a/packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts b/packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts new file mode 100644 index 00000000000..19aff1cc449 --- /dev/null +++ b/packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts @@ -0,0 +1,114 @@ +import { getPhoneHash } from '@celo/base' +import { soliditySha3 } from '@celo/utils/lib/solidity' +import { OdisUtils as OdisUtilsOld } from 'old-identity-sdk' +import { OdisUtils } from '../../lib' +import { WasmBlsBlindingClient } from './bls-blinding-client' +import { AuthenticationMethod, AuthSigner, getServiceContext, OdisContextName } from './query' + +const { getBlindedIdentifier, getIdentifierHash, getObfuscatedIdentifier, IdentifierPrefix } = + OdisUtils.Identifier + +const mockE164Number = '+14155550000' +const mockAccount = '0x755dB5fF7B82e9a96e0dDDD143293dc2ADeC0050' +// const mockPrivateKey = '0x2cacaf965ae80da49d5b1fc4b4c9b08ffc35971a584aedcc1cb8322b9d5fd9c9' + +// this DEK has been registered to the above account on alfajores +const dekPrivateKey = '0xc2bbdabb440141efed205497a41d5fb6114e0435fd541e368dc628a8e086bfee' + +const authSigner: AuthSigner = { + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, + rawKey: dekPrivateKey, +} +const oldServiceContext = OdisUtilsOld.Query.getServiceContext('alfajores') +const currentServiceContext = getServiceContext(OdisContextName.ALFAJORES) + +const expectedObfuscatedIdentifier = + '0xf82c6272fd57d3e5d4e291be16b3ebac5c616084a5e6f3730c73f62efd39c6ae' +const expectedPepper = 'Pi4Z1NQnfsdvJ' + +describe('backwards compatibility of phone number identifiers', () => { + beforeAll(() => { + fetchMock.reset() + // disables the mock, lets all calls fall through to the actual network + fetchMock.spy() + }) + + it('should match when using EncryptionSigner', async () => { + const oldRes = await OdisUtilsOld.PhoneNumberIdentifier.getPhoneNumberIdentifier( + mockE164Number, + mockAccount, + authSigner, + oldServiceContext + ) + + const currRes = await getObfuscatedIdentifier( + mockE164Number, + IdentifierPrefix.PHONE_NUMBER, + mockAccount, + authSigner, + currentServiceContext + ) + + expect(oldRes.e164Number).toEqual(currRes.plaintextIdentifier) + expect(oldRes.phoneHash).toEqual(expectedObfuscatedIdentifier) + expect(currRes.obfuscatedIdentifier).toEqual(expectedObfuscatedIdentifier) + expect(oldRes.pepper).toEqual(expectedPepper) + expect(currRes.pepper).toEqual(expectedPepper) + }, 20000) + + it('blinded identifier should match', async () => { + const blsBlindingClient = new WasmBlsBlindingClient('') + const seed = Buffer.from( + '44714c0a2b2bacec757a67822a4fbbdfe043cca8c6ae936545ef992f246df1a9', + 'hex' + ) + const oldRes = await OdisUtilsOld.PhoneNumberIdentifier.getBlindedPhoneNumber( + mockE164Number, + blsBlindingClient, + seed + ) + const currentRes = await getBlindedIdentifier( + mockE164Number, + IdentifierPrefix.PHONE_NUMBER, + blsBlindingClient, + seed + ) + + const expectedBlindedIdentifier = + 'fuN6SmbxkYBqVbKZu4SizdyDjavNLK/XguIlwsWUhsWA0hQDoZtsZjQCbXqTnUiA' + + expect(oldRes).toEqual(expectedBlindedIdentifier) + expect(currentRes).toEqual(expectedBlindedIdentifier) + }) + + it('obfuscated identifier should match', async () => { + const sha3 = (v: string) => soliditySha3({ type: 'string', value: v }) + const oldRes = getPhoneHash(sha3, mockE164Number, expectedPepper) + + const currRes = getIdentifierHash(mockE164Number, IdentifierPrefix.PHONE_NUMBER, expectedPepper) + + expect(oldRes).toEqual(expectedObfuscatedIdentifier) + expect(currRes).toEqual(expectedObfuscatedIdentifier) + }) + + it('should not match when different prefix used', async () => { + const oldRes = await OdisUtilsOld.PhoneNumberIdentifier.getPhoneNumberIdentifier( + mockE164Number, + mockAccount, + authSigner, + oldServiceContext + ) + + const currRes = await getObfuscatedIdentifier( + mockE164Number, + '' as typeof IdentifierPrefix.PHONE_NUMBER, + mockAccount, + authSigner, + currentServiceContext + ) + + expect(oldRes.e164Number).toEqual(currRes.plaintextIdentifier) + expect(oldRes.phoneHash).not.toEqual(currRes.obfuscatedIdentifier) + expect(oldRes.pepper).not.toEqual(currRes.pepper) + }) +}) diff --git a/packages/sdk/identity/src/odis/identifier.test.ts b/packages/sdk/identity/src/odis/identifier.test.ts new file mode 100644 index 00000000000..945c0000c3e --- /dev/null +++ b/packages/sdk/identity/src/odis/identifier.test.ts @@ -0,0 +1,156 @@ +import { CombinerEndpoint } from '@celo/phone-number-privacy-common' +import { WasmBlsBlindingClient } from './bls-blinding-client' +import { + getBlindedIdentifier, + getBlindedIdentifierSignature, + getObfuscatedIdentifier, + getObfuscatedIdentifierFromSignature, + getPepperFromThresholdSignature, + IdentifierPrefix, +} from './identifier' +import { AuthenticationMethod, EncryptionKeySigner, ErrorMessages, ServiceContext } from './query' + +jest.mock('./bls-blinding-client', () => { + // tslint:disable-next-line:no-shadowed-variable + class WasmBlsBlindingClient { + blindMessage = (m: string) => m + unblindAndVerifyMessage = (m: string) => m + } + return { + WasmBlsBlindingClient, + } +}) + +const mockOffchainIdentifier = 'twitterHandle' +const mockAccount = '0x0000000000000000000000000000000000007E57' +const expectedIdentifierHash = '0x8d1f580d4e49568883df9092285c0f8336e50d592b944607a613aff804e0b48f' +const expectedPepper = 'nHIvMC9B4j2+H' + +const serviceContext: ServiceContext = { + odisUrl: 'https://mockodis.com', + odisPubKey: + '7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA', +} +const endpoint = serviceContext.odisUrl + CombinerEndpoint.PNP_SIGN +const rawKey = '41e8e8593108eeedcbded883b8af34d2f028710355c57f4c10a056b72486aa04' + +const authSigner: EncryptionKeySigner = { + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, + rawKey, +} + +describe(getObfuscatedIdentifier, () => { + afterEach(() => { + fetchMock.reset() + }) + + describe('Retrieves a pepper correctly', () => { + it('Using EncryptionKeySigner', async () => { + fetchMock.mock(endpoint, { + success: true, + signature: '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A', + performedQueryCount: 5, + totalQuota: 10, + version: '', + }) + + const blsBlindingClient = new WasmBlsBlindingClient(serviceContext.odisPubKey) + const base64BlindedMessage = await getBlindedIdentifier( + mockOffchainIdentifier, + IdentifierPrefix.TWITTER, + blsBlindingClient + ) + const base64BlindSig = await getBlindedIdentifierSignature( + mockAccount, + authSigner, + serviceContext, + base64BlindedMessage + ) + const base64UnblindedSig = await blsBlindingClient.unblindAndVerifyMessage(base64BlindSig) + + await expect( + getObfuscatedIdentifier( + mockOffchainIdentifier, + IdentifierPrefix.TWITTER, + mockAccount, + authSigner, + serviceContext + ) + ).resolves.toMatchObject({ + plaintextIdentifier: mockOffchainIdentifier, + pepper: expectedPepper, + obfuscatedIdentifier: expectedIdentifierHash, + unblindedSignature: base64UnblindedSig, + }) + }) + + it('Preblinding the off-chain identifier', async () => { + fetchMock.mock(endpoint, { + success: true, + signature: '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A', + performedQueryCount: 5, + totalQuota: 10, + version: '', + }) + + const blsBlindingClient = new WasmBlsBlindingClient(serviceContext.odisPubKey) + const base64BlindedMessage = await getBlindedIdentifier( + mockOffchainIdentifier, + IdentifierPrefix.TWITTER, + blsBlindingClient + ) + + const base64BlindSig = await getBlindedIdentifierSignature( + mockAccount, + authSigner, + serviceContext, + base64BlindedMessage + ) + + const obfuscatedIdentifierDetails = await getObfuscatedIdentifierFromSignature( + mockOffchainIdentifier, + IdentifierPrefix.TWITTER, + base64BlindSig, + blsBlindingClient + ) + + expect(obfuscatedIdentifierDetails.obfuscatedIdentifier).toEqual(expectedIdentifierHash) + expect(obfuscatedIdentifierDetails.pepper).toEqual(expectedPepper) + }) + }) + + it('Throws quota error', async () => { + fetchMock.mock(endpoint, 403) + + await expect( + getObfuscatedIdentifier( + mockOffchainIdentifier, + IdentifierPrefix.TWITTER, + mockAccount, + authSigner, + serviceContext + ) + ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) + }) + + it('Throws auth error', async () => { + fetchMock.mock(endpoint, 401) + await expect( + getObfuscatedIdentifier( + mockOffchainIdentifier, + IdentifierPrefix.TWITTER, + mockAccount, + authSigner, + serviceContext + ) + ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) + }) +}) + +describe(getPepperFromThresholdSignature, () => { + it('Hashes sigs correctly', () => { + const base64Sig = 'vJeFZJ3MY5KlpI9+kIIozKkZSR4cMymLPh2GHZUatWIiiLILyOcTiw2uqK/LBReA' + const signature = Buffer.from(base64Sig, 'base64') + expect(getPepperFromThresholdSignature(signature)).toBe('piWqRHHYWtfg9') + }) +}) diff --git a/packages/sdk/identity/src/odis/identifier.ts b/packages/sdk/identity/src/odis/identifier.ts new file mode 100644 index 00000000000..ac8be6e91a1 --- /dev/null +++ b/packages/sdk/identity/src/odis/identifier.ts @@ -0,0 +1,304 @@ +import { + getIdentifierHash as baseGetIdentifierHash, + getPrefixedIdentifier, + IdentifierPrefix, + isE164Number, +} from '@celo/base' +import { + CombinerEndpointPNP, + KEY_VERSION_HEADER, + SignMessageRequest, + SignMessageResponseSchema, +} from '@celo/phone-number-privacy-common' +import { soliditySha3 } from '@celo/utils/lib/solidity' +import { createHash } from 'crypto' +import debugFactory from 'debug' +import { BlsBlindingClient, WasmBlsBlindingClient } from './bls-blinding-client' +import { + AuthenticationMethod, + AuthSigner, + EncryptionKeySigner, + getOdisPnpRequestAuth, + queryOdis, + ServiceContext, +} from './query' + +const debug = debugFactory('kit:odis:identifier') +const sha3 = (v: string) => soliditySha3({ type: 'string', value: v }) + +const PEPPER_CHAR_LENGTH = 13 + +// Docstring is duplicated in @celo/base; make sure to update in both places. +/** + * Standardized prefixes for ODIS identifiers. + * + * @remarks These prefixes prevent collisions between off-chain identifiers. + * i.e. if a user's instagram and twitter handles are the same, + * these prefixes prevent the ODIS identifers from being the same. + * + * If you would like to use a prefix that isn't included, please put up a PR + * adding it to @celo/base (in celo-monorepo/packages/sdk/base/src/identifier.ts) + * to ensure interoperability with other projects. When adding new prefixes, + * please use either the full platform name in all lowercase (e.g. 'facebook') + * or DID methods https://w3c.github.io/did-spec-registries/#did-methods. + * Make sure to add the expected value for the unit test case in + * `celo-monorepo/packages/sdk/base/src/identifier.test.ts`, + * otherwise the test will fail. + * + * The NULL prefix is included to allow projects to use the sdk without selecting + * a predefined prefix or adding their own. Production use of the NULL prefix is + * discouraged since identifiers will not be interoperable with other projects. + * Please think carefully before using the NULL prefix. + */ +export { IdentifierPrefix } +// Docstring is duplicated in @celo/base; make sure to update in both places. +/** + * Concatenates the identifierPrefix and plaintextIdentifier with the separator '://' + * + * @param plaintextIdentifier Off-chain identifier, ex: phone number, twitter handle, email, etc. + * @param identifierPrefix Standardized prefix used to prevent collisions between identifiers + */ +export { getPrefixedIdentifier } + +/** + * Steps from the private plaintext identifier to the obfuscated identifier, which can be made public. + * + * plaintext identifier: off-chain information, ex: phone number, twitter handle, email, etc. + * blinded identifier: obtained by blinding the plaintext identifier + * blinded signature: blinded identifier signed by ODIS + * unblinded signatue: obtained by unblinding the blinded signature + * pepper: unique secret, obtained by hashing the unblinded signature + * obfuscated identifier: identifier used for on-chain attestations, obtained by hashing the plaintext identifier and pepper + */ + +export interface IdentifierHashDetails { + // plaintext off-chain phone number, twitter handle, email, etc. + plaintextIdentifier: string + // identifier obtained after hashing, used for on-chain attestations + obfuscatedIdentifier: string + // unique pepper obtained through ODIS + pepper: string + // raw signature from ODIS + unblindedSignature?: string +} + +/** + * Retrieve the obfuscated identifier for the provided plaintext identifier + * Performs blinding, querying, and unblinding + * + * @remarks This function will send a request to ODIS, authorized by the provided signer. + * This method consumes ODIS quota on the account provided by the signer. + * You can use the DEK as your signer to decrease quota usage + * + * @param plaintextIdentifier Off-chain identifier, ex: phone number, twitter handle, email, etc. + * @param identifierPrefix Standardized prefix used to prevent collisions between identifiers + * @param account The address making the request to ODIS, from which quota will be charged + * @param signer Object containing the private key used to authenticate the ODIS request + * @param context Specifies which ODIS combiner url should be queried (i.e. mainnet or alfajores) + * @param blindingFactor Optional Private seed used to blind identifers before they are sent to ODIS + * @param clientVersion Optional Specifies the client software version + * @param blsBlindingClient Optional Performs blinding and unblinding, defaults to WasmBlsBlindingClient + * @param sessionID Optional Used to track user sessions across the client and ODIS + * @param keyVersion Optional For testing. Specifies which version key ODIS should use + * @param endpoint Optional Allows client to specify the legacy endpoint if they desire (will be deprecated) + * @param abortController Optional Allows client to specify a timeout for the ODIS request + */ +export async function getObfuscatedIdentifier( + plaintextIdentifier: string, + identifierPrefix: IdentifierPrefix, + account: string, + signer: AuthSigner, + context: ServiceContext, + blindingFactor?: string, + clientVersion?: string, + blsBlindingClient?: BlsBlindingClient, + sessionID?: string, + keyVersion?: number, + endpoint?: CombinerEndpointPNP.LEGACY_PNP_SIGN | CombinerEndpointPNP.PNP_SIGN, + abortController?: AbortController +): Promise { + debug('Getting identifier pepper') + + let seed: Buffer | undefined + if (blindingFactor) { + seed = Buffer.from(blindingFactor) + } else if (signer.authenticationMethod === AuthenticationMethod.ENCRYPTION_KEY) { + seed = Buffer.from((signer as EncryptionKeySigner).rawKey) + } + + // Fallback to using Wasm version if not specified + if (!blsBlindingClient) { + debug('No BLSBlindingClient found, using WasmBlsBlindingClient') + blsBlindingClient = new WasmBlsBlindingClient(context.odisPubKey) + } + + const base64BlindedMessage = await getBlindedIdentifier( + plaintextIdentifier, + identifierPrefix, + blsBlindingClient, + seed + ) + + const base64BlindSig = await getBlindedIdentifierSignature( + account, + signer, + context, + base64BlindedMessage, + clientVersion, + sessionID, + keyVersion, + endpoint ?? CombinerEndpointPNP.PNP_SIGN, + abortController + ) + + return getObfuscatedIdentifierFromSignature( + plaintextIdentifier, + identifierPrefix, + base64BlindSig, + blsBlindingClient + ) +} + +/** + * Blinds the plaintext identifier in preparation for the ODIS request + * + * @remarks Caller should use the same blsBlindingClient instance for unblinding + * + * @param plaintextIdentifier Off-chain identifier, ex: phone number, twitter handle, email, etc. + * @param identifierPrefix Standardized prefix used to prevent collisions between identifiers + * @param blsBlindingClient Optional Performs blinding and unblinding, defaults to WasmBlsBlindingClient + * @param seed Optional Buffer generated from the blindingFactor, if provided + */ +export async function getBlindedIdentifier( + plaintextIdentifier: string, + identifierPrefix: IdentifierPrefix, + blsBlindingClient: BlsBlindingClient, + seed?: Buffer +): Promise { + debug('Retrieving blinded message') + // phone number identifiers don't have prefixes in the blinding stage + // to maintain backwards compatibility wih ASv1 + let identifier = getPrefixedIdentifier(plaintextIdentifier, identifierPrefix) + if (identifierPrefix === IdentifierPrefix.PHONE_NUMBER) { + if (!isE164Number(plaintextIdentifier)) { + throw new Error(`Invalid phone number: ${plaintextIdentifier}`) + } + identifier = plaintextIdentifier + } + return blsBlindingClient.blindMessage(Buffer.from(identifier).toString('base64'), seed) +} + +/** + * Query ODIS for the blinded signature + * + * @remarks + * Response can be passed into getObfuscatedIdentifierFromSignature + * to retrieve the obfuscated identifier + * + * @param account The address making the request to ODIS, from which quota will be charged + * @param signer Object containing the private key used to authenticate the ODIS request + * @param context Specifies which ODIS combiner url should be queried (i.e. mainnet or alfajores) + * @param base64BlindedMessage The blinded prefixed identifier to be sent to ODIS + * @param clientVersion Optional Specifies the client software version + * @param sessionID Optional Used to track user sessions across the client and ODIS + * @param keyVersion Optional For testing. Specifies which version key ODIS should use + * @param endpoint Optional Allows client to specify the legacy endpoint if they desire (will be deprecated) + * @param abortController Optional Allows client to specify a timeout for the ODIS request + */ +export async function getBlindedIdentifierSignature( + account: string, + signer: AuthSigner, + context: ServiceContext, + base64BlindedMessage: string, + clientVersion?: string, + sessionID?: string, + keyVersion?: number, + endpoint?: CombinerEndpointPNP.LEGACY_PNP_SIGN | CombinerEndpointPNP.PNP_SIGN, + abortControlller?: AbortController +): Promise { + const body: SignMessageRequest = { + account, + blindedQueryPhoneNumber: base64BlindedMessage, + version: clientVersion, + authenticationMethod: signer.authenticationMethod, + sessionID, + } + + const response = await queryOdis( + body, + context, + endpoint ?? CombinerEndpointPNP.PNP_SIGN, + SignMessageResponseSchema, + { + [KEY_VERSION_HEADER]: keyVersion?.toString(), + Authorization: await getOdisPnpRequestAuth(body, signer), + }, + abortControlller + ) + + if (!response.success) { + throw new Error(response.error) + } + + return response.signature +} + +/** + * Unblind the response and return the obfuscated identifier + * + * @param plaintextIdentifier Off-chain identifier, ex: phone number, twitter handle, email, etc. + * @param identifierPrefix Standardized prefix used to prevent collisions between identifiers + * @param base64BlindedSignature The blinded signed identifier returned by ODIS + * @param blsBlindingClient Optional Performs blinding and unblinding, defaults to WasmBlsBlindingClient + */ +export async function getObfuscatedIdentifierFromSignature( + plaintextIdentifier: string, + identifierPrefix: IdentifierPrefix, + base64BlindedSignature: string, + blsBlindingClient: BlsBlindingClient +): Promise { + debug('Retrieving unblinded signature') + const base64UnblindedSig = await blsBlindingClient.unblindAndVerifyMessage(base64BlindedSignature) + const sigBuf = Buffer.from(base64UnblindedSig, 'base64') + + debug('Converting sig to pepper') + const pepper = getPepperFromThresholdSignature(sigBuf) + const obfuscatedIdentifier = getIdentifierHash(plaintextIdentifier, identifierPrefix, pepper) + return { + plaintextIdentifier, + obfuscatedIdentifier, + pepper, + unblindedSignature: base64UnblindedSig, + } +} + +/** + * Generates final identifier that is published on-chain. + * + * @remarks + * Concatenates the plaintext prefixed identifier with the pepper derived by hashing the unblinded + * signature returned by ODIS. + * + * @param plaintextIdentifier Off-chain identifier, ex: phone number, twitter handle, email, etc. + * @param identifierPrefix Standardized prefix used to prevent collisions between identifiers + * @param pepper Hash of the unblinded signature returned by ODIS + */ +export const getIdentifierHash = ( + plaintextIdentifier: string, + identifierPrefix: IdentifierPrefix, + pepper: string +): string => { + return baseGetIdentifierHash(sha3, plaintextIdentifier, identifierPrefix, pepper) +} + +/** + * This is the algorithm that creates a pepper from the unblinded message signatures + * It simply hashes it with sha256 and encodes it to hex + * + * @remarks Currently uses 13 chars for a 78 bit pepper + * + * @param sigBuf Unblinded signature returned by ODIS + */ +export function getPepperFromThresholdSignature(sigBuf: Buffer) { + return createHash('sha256').update(sigBuf).digest('base64').slice(0, PEPPER_CHAR_LENGTH) +} diff --git a/packages/sdk/identity/src/odis/index.ts b/packages/sdk/identity/src/odis/index.ts index 53ed9bfc1a1..b4a93a2e0e8 100644 --- a/packages/sdk/identity/src/odis/index.ts +++ b/packages/sdk/identity/src/odis/index.ts @@ -1,13 +1,15 @@ import * as BlsBlindingClient from './bls-blinding-client' import * as CircuitBreaker from './circuit-breaker' -import * as Matchmaking from './matchmaking' +import * as Identifier from './identifier' import * as PhoneNumberIdentifier from './phone-number-identifier' import * as Query from './query' +import * as Quota from './quota' export const OdisUtils = { + Identifier, BlsBlindingClient, Query, - Matchmaking, PhoneNumberIdentifier, CircuitBreaker, + Quota, } diff --git a/packages/sdk/identity/src/odis/matchmaking.test.ts b/packages/sdk/identity/src/odis/matchmaking.test.ts deleted file mode 100644 index c8649e8c52f..00000000000 --- a/packages/sdk/identity/src/odis/matchmaking.test.ts +++ /dev/null @@ -1,82 +0,0 @@ -import { getContactMatches, obfuscateNumberForMatchmaking } from './matchmaking' -import { AuthenticationMethod, EncryptionKeySigner, ErrorMessages, ServiceContext } from './query' - -const mockE164Number = '+14155550000' -const mockE164Number2 = '+14155550002' -const mockE164Number3 = '+14155550003' -const mockContacts = [mockE164Number2, mockE164Number3] -const mockAccount = '0x0000000000000000000000000000000000007E57' - -const serviceContext: ServiceContext = { - odisUrl: 'https://mockodis.com', - odisPubKey: - '7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA', -} -const endpoint = serviceContext.odisUrl + '/getContactMatches' - -const authSigner: EncryptionKeySigner = { - authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, - rawKey: '41e8e8593108eeedcbded883b8af34d2f028710355c57f4c10a056b72486aa04', -} - -describe(getContactMatches, () => { - afterEach(() => { - fetchMock.reset() - }) - - it('Retrieves matches correctly', async () => { - fetchMock.mock(endpoint, { - success: true, - matchedContacts: [{ phoneNumber: obfuscateNumberForMatchmaking(mockE164Number2) }], - }) - - await expect( - getContactMatches( - mockE164Number, - mockContacts, - mockAccount, - mockAccount, - authSigner, - serviceContext, - authSigner - ) - ).resolves.toMatchObject([mockE164Number2]) - }) - - it('Throws quota error', async () => { - fetchMock.mock(endpoint, 403) - - await expect( - getContactMatches( - mockE164Number, - mockContacts, - mockAccount, - mockAccount, - authSigner, - serviceContext - ) - ).rejects.toThrow(ErrorMessages.ODIS_QUOTA_ERROR) - }) - - it('Throws auth error', async () => { - fetchMock.mock(endpoint, 401) - await expect( - getContactMatches( - mockE164Number, - mockContacts, - mockAccount, - mockAccount, - authSigner, - serviceContext - ) - ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) - }) -}) - -describe(obfuscateNumberForMatchmaking, () => { - it('Hashes a number correctly', () => { - expect(obfuscateNumberForMatchmaking(mockE164Number)).toBe( - '2sLQ49R4yTFxeknNQRQEj01WcCx3kLQam29TFbrXcxU=' - ) - }) -}) diff --git a/packages/sdk/identity/src/odis/matchmaking.ts b/packages/sdk/identity/src/odis/matchmaking.ts deleted file mode 100644 index 523637adbac..00000000000 --- a/packages/sdk/identity/src/odis/matchmaking.ts +++ /dev/null @@ -1,120 +0,0 @@ -import { CombinerEndpoint } from '@celo/phone-number-privacy-common' -import { E164Number } from '@celo/phone-utils/lib/io' -import crypto from 'crypto' -import debugFactory from 'debug' -import { - AuthenticationMethod, - AuthSigner, - EncryptionKeySigner, - MatchmakingRequest, - MatchmakingResponse, - queryOdis, - ServiceContext, - signWithDEK, -} from './query' - -const debug = debugFactory('kit:odis:matchmaking') - -// Eventually, the matchmaking process will use blinded numbers same as salt lookups -// But for now numbers are simply hashed using this static salt -const SALT = '__celo__' - -// Uses the phone number privacy service to find mutual matches between Celo users -export async function getContactMatches( - e164NumberCaller: E164Number, - e164NumberContacts: E164Number[], - account: string, - phoneNumberIdentifier: string, - signer: AuthSigner, - context: ServiceContext, - dekSigner?: EncryptionKeySigner, - clientVersion?: string, - sessionID?: string -): Promise { - const selfPhoneNumObfuscated = obfuscateNumberForMatchmaking(e164NumberCaller) - const obfucsatedNumToE164Number = getContactNumsObfuscated(e164NumberContacts) - - const body: MatchmakingRequest = { - account, - userPhoneNumber: selfPhoneNumObfuscated, - contactPhoneNumbers: Object.keys(obfucsatedNumToE164Number), - hashedPhoneNumber: phoneNumberIdentifier, - version: clientVersion ? clientVersion : 'unknown', - authenticationMethod: signer.authenticationMethod, - } - - if (sessionID) { - body.sessionID = sessionID - } - - if (signer.authenticationMethod === AuthenticationMethod.ENCRYPTION_KEY) { - dekSigner = signer as EncryptionKeySigner - } - - if (dekSigner) { - body.signedUserPhoneNumber = signWithDEK(selfPhoneNumObfuscated, dekSigner) - } else { - console.warn('Failure to provide DEK will prevent users from requerying their matches') - } - - const response = await queryOdis( - signer, - body, - context, - CombinerEndpoint.MATCHMAKING - ) - - const matchHashes: string[] = response.matchedContacts.map( - (match: { phoneNumber: string }) => match.phoneNumber - ) - - if (!matchHashes || !matchHashes.length) { - debug('No matches found') - return [] - } - - return getMatchedContacts(obfucsatedNumToE164Number, matchHashes) -} - -function getContactNumsObfuscated(e164NumberMatches: E164Number[]) { - const hashes: Record = {} - for (const e164Number of e164NumberMatches) { - // TODO For large contact lists, would be faster to these hashes - // in a native module. - const hash = obfuscateNumberForMatchmaking(e164Number) - hashes[hash] = e164Number - } - return hashes -} - -// Hashes the phone number using a static salt -// This is different than the phone + unique salt hashing that -// we use for numbers getting verified and going on chain -// Matchmaking doesn't support per-number salts yet -export function obfuscateNumberForMatchmaking(e164Number: string) { - return crypto - .createHash('sha256') - .update(e164Number + SALT) - .digest('base64') -} - -/** - * Constructs a mapping between contact's phone numbers and - * their on-chain identifier - * @param obfucsatedNumToE164Number map of obfuscated number to original number - * @param matchHashes list of obfuscated numbers that are matched - */ -function getMatchedContacts( - obfucsatedNumToE164Number: Record, - matchHashes: string[] -): E164Number[] { - const matches: E164Number[] = [] - for (const match of matchHashes) { - const e164Number = obfucsatedNumToE164Number[match] - if (!e164Number) { - throw new Error('Number missing in hash map, should never happen') - } - matches.push(e164Number) - } - return matches -} diff --git a/packages/sdk/identity/src/odis/phone-number-identifier.test.ts b/packages/sdk/identity/src/odis/phone-number-identifier.test.ts index b8734fe5926..52774707502 100644 --- a/packages/sdk/identity/src/odis/phone-number-identifier.test.ts +++ b/packages/sdk/identity/src/odis/phone-number-identifier.test.ts @@ -1,8 +1,8 @@ +import { Endpoint } from '@celo/phone-number-privacy-common' import { WasmBlsBlindingClient } from './bls-blinding-client' import { getBlindedPhoneNumber, getBlindedPhoneNumberSignature, - getPepperFromThresholdSignature, getPhoneNumberIdentifier, getPhoneNumberIdentifierFromSignature, isBalanceSufficientForSigRetrieval, @@ -30,7 +30,7 @@ const serviceContext: ServiceContext = { odisPubKey: '7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA', } -const endpoint = serviceContext.odisUrl + '/getBlindedMessageSig' +const endpoint = serviceContext.odisUrl + Endpoint.PNP_SIGN const rawKey = '41e8e8593108eeedcbded883b8af34d2f028710355c57f4c10a056b72486aa04' const authSigner: EncryptionKeySigner = { @@ -55,7 +55,10 @@ describe(getPhoneNumberIdentifier, () => { it('Using EncryptionKeySigner', async () => { fetchMock.mock(endpoint, { success: true, - combinedSignature: '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A', + signature: '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A', + performedQueryCount: 5, + totalQuota: 10, + version: '', }) const blsBlindingClient = new WasmBlsBlindingClient(serviceContext.odisPubKey) @@ -81,7 +84,10 @@ describe(getPhoneNumberIdentifier, () => { it('Preblinding the phone number', async () => { fetchMock.mock(endpoint, { success: true, - combinedSignature: '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A', + signature: '0Uj+qoAu7ASMVvm6hvcUGx2eO/cmNdyEgGn0mSoZH8/dujrC1++SZ1N6IP6v2I8A', + performedQueryCount: 5, + totalQuota: 10, + version: '', }) const blsBlindingClient = new WasmBlsBlindingClient(serviceContext.odisPubKey) @@ -120,11 +126,3 @@ describe(getPhoneNumberIdentifier, () => { ).rejects.toThrow(ErrorMessages.ODIS_AUTH_ERROR) }) }) - -describe(getPepperFromThresholdSignature, () => { - it('Hashes sigs correctly', () => { - const base64Sig = 'vJeFZJ3MY5KlpI9+kIIozKkZSR4cMymLPh2GHZUatWIiiLILyOcTiw2uqK/LBReA' - const signature = Buffer.from(base64Sig, 'base64') - expect(getPepperFromThresholdSignature(signature)).toBe('piWqRHHYWtfg9') - }) -}) diff --git a/packages/sdk/identity/src/odis/phone-number-identifier.ts b/packages/sdk/identity/src/odis/phone-number-identifier.ts index 3de4700f1fc..cc4871dbfa7 100644 --- a/packages/sdk/identity/src/odis/phone-number-identifier.ts +++ b/packages/sdk/identity/src/odis/phone-number-identifier.ts @@ -1,19 +1,15 @@ -import { getPhoneHash, isE164Number } from '@celo/base/lib/phoneNumbers' -import { CombinerEndpoint } from '@celo/phone-number-privacy-common' -import { soliditySha3 } from '@celo/utils/lib/solidity' +import { CombinerEndpointPNP } from '@celo/phone-number-privacy-common' import BigNumber from 'bignumber.js' -import { createHash } from 'crypto' import debugFactory from 'debug' -import { BlsBlindingClient, WasmBlsBlindingClient } from './bls-blinding-client' +import { BlsBlindingClient } from './bls-blinding-client' import { - AuthenticationMethod, - AuthSigner, - CombinerSignMessageResponse, - EncryptionKeySigner, - queryOdis, - ServiceContext, - SignMessageRequest, -} from './query' + getBlindedIdentifier, + getBlindedIdentifierSignature, + getObfuscatedIdentifier, + getObfuscatedIdentifierFromSignature, + IdentifierPrefix, +} from './identifier' +import { AuthSigner, ServiceContext } from './query' // ODIS minimum dollar balance for sig retrieval export const ODIS_MINIMUM_DOLLAR_BALANCE = 0.01 @@ -21,9 +17,6 @@ export const ODIS_MINIMUM_DOLLAR_BALANCE = 0.01 export const ODIS_MINIMUM_CELO_BALANCE = 0.005 const debug = debugFactory('kit:odis:phone-number-identifier') -const sha3 = (v: string) => soliditySha3({ type: 'string', value: v }) - -const PEPPER_CHAR_LENGTH = 13 export interface PhoneNumberHashDetails { e164Number: string @@ -35,6 +28,7 @@ export interface PhoneNumberHashDetails { /** * Retrieve the on-chain identifier for the provided phone number * Performs blinding, querying, and unblinding + * @deprecated use getObfuscatedIdentifier instead */ export async function getPhoneNumberIdentifier( e164Number: string, @@ -42,122 +36,104 @@ export async function getPhoneNumberIdentifier( signer: AuthSigner, context: ServiceContext, blindingFactor?: string, - selfPhoneHash?: string, clientVersion?: string, blsBlindingClient?: BlsBlindingClient, - sessionID?: string + sessionID?: string, + keyVersion?: number, + endpoint?: CombinerEndpointPNP.LEGACY_PNP_SIGN | CombinerEndpointPNP.PNP_SIGN ): Promise { debug('Getting phone number pepper') - if (!isE164Number(e164Number)) { - throw new Error(`Invalid phone number: ${e164Number}`) - } - - let seed: Buffer | undefined - if (blindingFactor) { - seed = Buffer.from(blindingFactor) - } else if (signer.authenticationMethod === AuthenticationMethod.ENCRYPTION_KEY) { - seed = Buffer.from((signer as EncryptionKeySigner).rawKey) + const { plaintextIdentifier, obfuscatedIdentifier, pepper, unblindedSignature } = + await getObfuscatedIdentifier( + e164Number, + IdentifierPrefix.PHONE_NUMBER, + account, + signer, + context, + blindingFactor, + clientVersion, + blsBlindingClient, + sessionID, + keyVersion, + endpoint + ) + return { + e164Number: plaintextIdentifier, + phoneHash: obfuscatedIdentifier, + pepper, + unblindedSignature, } - - // Fallback to using Wasm version if not specified - - if (!blsBlindingClient) { - debug('No BLSBlindingClient found, using WasmBlsBlindingClient') - blsBlindingClient = new WasmBlsBlindingClient(context.odisPubKey) - } - - const base64BlindedMessage = await getBlindedPhoneNumber(e164Number, blsBlindingClient, seed) - - const base64BlindSig = await getBlindedPhoneNumberSignature( - account, - signer, - context, - base64BlindedMessage, - selfPhoneHash, - clientVersion, - sessionID - ) - - return getPhoneNumberIdentifierFromSignature(e164Number, base64BlindSig, blsBlindingClient) } /** * Blinds the phone number in preparation for the ODIS request * Caller should use the same blsBlindingClient instance for unblinding + * @deprecated use getBlindedIdentifier instead */ export async function getBlindedPhoneNumber( e164Number: string, blsBlindingClient: BlsBlindingClient, seed?: Buffer ): Promise { - debug('Retrieving blinded message') - const base64PhoneNumber = Buffer.from(e164Number).toString('base64') - return blsBlindingClient.blindMessage(base64PhoneNumber, seed) + return getBlindedIdentifier(e164Number, IdentifierPrefix.PHONE_NUMBER, blsBlindingClient, seed) } /** * Query ODIS for the blinded signature * Response can be passed into getPhoneNumberIdentifierFromSignature * to retrieve the on-chain identifier + * @deprecated use getBlindedIdentifierSignature instead */ export async function getBlindedPhoneNumberSignature( account: string, signer: AuthSigner, context: ServiceContext, base64BlindedMessage: string, - selfPhoneHash?: string, clientVersion?: string, - sessionID?: string + sessionID?: string, + keyVersion?: number, + endpoint?: CombinerEndpointPNP.LEGACY_PNP_SIGN | CombinerEndpointPNP.PNP_SIGN ): Promise { - const body: SignMessageRequest = { + return getBlindedIdentifierSignature( account, - blindedQueryPhoneNumber: base64BlindedMessage, - hashedPhoneNumber: selfPhoneHash, - version: clientVersion ? clientVersion : 'unknown', - authenticationMethod: signer.authenticationMethod, - } - - if (sessionID) { - body.sessionID = sessionID - } - - const response = await queryOdis( signer, - body, context, - CombinerEndpoint.SIGN_MESSAGE + base64BlindedMessage, + clientVersion, + sessionID, + keyVersion, + endpoint ) - return response.combinedSignature } /** * Unblind the response and return the on-chain identifier + * @deprecated use getObfuscatedIdentifieriFromSignature instead */ export async function getPhoneNumberIdentifierFromSignature( e164Number: string, base64BlindedSignature: string, blsBlindingClient: BlsBlindingClient ): Promise { - debug('Retrieving unblinded signature') - const base64UnblindedSig = await blsBlindingClient.unblindAndVerifyMessage(base64BlindedSignature) - const sigBuf = Buffer.from(base64UnblindedSig, 'base64') - - debug('Converting sig to pepper') - const pepper = getPepperFromThresholdSignature(sigBuf) - const phoneHash = getPhoneHash(sha3, e164Number, pepper) - return { e164Number, phoneHash, pepper, unblindedSignature: base64UnblindedSig } -} - -// This is the algorithm that creates a pepper from the unblinded message signatures -// It simply hashes it with sha256 and encodes it to hex -export function getPepperFromThresholdSignature(sigBuf: Buffer) { - // Currently uses 13 chars for a 78 bit pepper - return createHash('sha256').update(sigBuf).digest('base64').slice(0, PEPPER_CHAR_LENGTH) + const { plaintextIdentifier, obfuscatedIdentifier, pepper, unblindedSignature } = + await getObfuscatedIdentifierFromSignature( + e164Number, + IdentifierPrefix.PHONE_NUMBER, + base64BlindedSignature, + blsBlindingClient + ) + return { + e164Number: plaintextIdentifier, + phoneHash: obfuscatedIdentifier, + pepper, + unblindedSignature, + } } /** * Check if balance is sufficient for quota retrieval + * @deprecated use getPnpQuotaStatus instead */ export function isBalanceSufficientForSigRetrieval( dollarBalance: BigNumber.Value, diff --git a/packages/sdk/identity/src/odis/query.ts b/packages/sdk/identity/src/odis/query.ts index 68fd0183cfd..8cbdf00e39c 100644 --- a/packages/sdk/identity/src/odis/query.ts +++ b/packages/sdk/identity/src/odis/query.ts @@ -1,21 +1,19 @@ -import { hexToBuffer } from '@celo/base/lib/address' import { selectiveRetryAsyncWithBackOff } from '@celo/base/lib/async' import { ContractKit } from '@celo/contractkit' import { AuthenticationMethod, CombinerEndpoint, - Domain, DomainEndpoint, DomainRequest, + DomainRequestHeader, DomainResponse, - GetBlindedMessageSigRequest, - GetContactMatchesRequest, - GetContactMatchesResponse, - PhoneNumberPrivacyEndpoint, + OdisRequest, + OdisRequestHeader, + OdisResponse, PhoneNumberPrivacyRequest, + signWithRawKey, } from '@celo/phone-number-privacy-common' import fetch from 'cross-fetch' -import crypto from 'crypto' import debugFactory from 'debug' import { isLeft } from 'fp-ts/lib/Either' import * as t from 'io-ts' @@ -36,19 +34,7 @@ export interface EncryptionKeySigner { export type AuthSigner = WalletKeySigner | EncryptionKeySigner // Re-export types and aliases to maintain backwards compatibility. -export { AuthenticationMethod, PhoneNumberPrivacyRequest } -export type SignMessageRequest = GetBlindedMessageSigRequest -export type MatchmakingRequest = GetContactMatchesRequest -export type MatchmakingResponse = GetContactMatchesResponse - -// Combiner returns a response inconsistent with the SignMessageResponse defined in -// @celo/phone-number-privacy-common. Combiner response type is defined here as a result. -export interface CombinerSignMessageResponse { - success: boolean - combinedSignature: string -} -/** @deprecated Exported as SignMessageResponse for backwards compatibility. */ -export type SignMessageResponse = CombinerSignMessageResponse +export { AuthenticationMethod, PhoneNumberPrivacyRequest, signWithRawKey } export enum ErrorMessages { ODIS_QUOTA_ERROR = 'odisQuotaError', @@ -61,36 +47,74 @@ export enum ErrorMessages { } export interface ServiceContext { - odisUrl: string // Oblivious Decentralized Identifier Service Url + odisUrl: string // combiner url odisPubKey: string } -export const ODIS_ALFAJORES_CONTEXT: ServiceContext = { - odisUrl: 'https://us-central1-celo-phone-number-privacy.cloudfunctions.net', +export const ODIS_STAGING_CONTEXT: ServiceContext = { + odisUrl: 'https://us-central1-celo-phone-number-privacy-stg.cloudfunctions.net/combiner', + odisPubKey: + '7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA', +} + +export const ODIS_ALFAJORES_CONTEXT_PNP: ServiceContext = { + odisUrl: 'https://us-central1-celo-phone-number-privacy.cloudfunctions.net/combiner', odisPubKey: 'kPoRxWdEdZ/Nd3uQnp3FJFs54zuiS+ksqvOm9x8vY6KHPG8jrfqysvIRU0wtqYsBKA7SoAsICMBv8C/Fb2ZpDOqhSqvr/sZbZoHmQfvbqrzbtDIPvUIrHgRS0ydJCMsA', } -export const ODIS_ALFAJORESSTAGING_CONTEXT: ServiceContext = { - odisUrl: 'https://us-central1-celo-phone-number-privacy-stg.cloudfunctions.net', +export const ODIS_ALFAJORES_CONTEXT_DOMAINS: ServiceContext = { + odisUrl: 'https://us-central1-celo-phone-number-privacy.cloudfunctions.net/combiner', odisPubKey: - '7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA', + '+ZrxyPvLChWUX/DyPw6TuGwQH0glDJEbSrSxUARyP5PuqYyP/U4WZTV1e0bAUioBZ6QCJMiLpDwTaFvy8VnmM5RBbLQUMrMg5p4+CBCqj6HhsMfcyUj8V0LyuNdStlCB', } -export const ODIS_MAINNET_CONTEXT: ServiceContext = { - odisUrl: 'https://us-central1-celo-pgpnp-mainnet.cloudfunctions.net', +export const ODIS_MAINNET_CONTEXT_PNP: ServiceContext = { + odisUrl: 'https://us-central1-celo-pgpnp-mainnet.cloudfunctions.net/combiner', odisPubKey: 'FvreHfLmhBjwxHxsxeyrcOLtSonC9j7K3WrS4QapYsQH6LdaDTaNGmnlQMfFY04Bp/K4wAvqQwO9/bqPVCKf8Ze8OZo8Frmog4JY4xAiwrsqOXxug11+htjEe1pj4uMA', } -export function getServiceContext(contextName = 'mainnet') { +export const ODIS_MAINNET_CONTEXT_DOMAINS: ServiceContext = { + odisUrl: 'https://us-central1-celo-pgpnp-mainnet.cloudfunctions.net/combiner', + odisPubKey: + 'LX4tLiuYm8geZ3ztmH7oIWz4ohXt3ePRTd9BbG9RO86NMrApflioiOzKYtIsyjEA0uarnX8Emo+luTY4bwEWpgZDyPYE6UMWAoBaZBdy6NDMgAxSbdNtaQEq51fBjCUA', +} + +export enum OdisAPI { + PNP = 'pnp', + DOMAIN = 'domain', +} + +export enum OdisContextName { + STAGING = 'alfajoresstaging', + ALFAJORES = 'alfajores', + MAINNET = 'mainnet', +} + +export function getServiceContext( + contextName: OdisContextName = OdisContextName.MAINNET, + api: OdisAPI = OdisAPI.PNP +) { switch (contextName) { - case 'alfajores': - return ODIS_ALFAJORES_CONTEXT - case 'alfajoresstaging': - return ODIS_ALFAJORESSTAGING_CONTEXT + case OdisContextName.ALFAJORES: + return { + [OdisAPI.PNP]: ODIS_ALFAJORES_CONTEXT_PNP, + [OdisAPI.DOMAIN]: ODIS_ALFAJORES_CONTEXT_DOMAINS, + }[api] + case OdisContextName.STAGING: + return { + // Intentionally the same on staging + [OdisAPI.PNP]: ODIS_STAGING_CONTEXT, + [OdisAPI.DOMAIN]: ODIS_STAGING_CONTEXT, + }[api] + case OdisContextName.MAINNET: + return { + [OdisAPI.PNP]: ODIS_MAINNET_CONTEXT_PNP, + [OdisAPI.DOMAIN]: ODIS_MAINNET_CONTEXT_DOMAINS, + }[api] default: - return ODIS_MAINNET_CONTEXT + return ODIS_MAINNET_CONTEXT_PNP } } @@ -98,126 +122,40 @@ export function signWithDEK(msg: string, signer: EncryptionKeySigner) { return signWithRawKey(msg, signer.rawKey) } -export function signWithRawKey(msg: string, rawKey: string) { - // NOTE: Elliptic will truncate the raw msg to 64 bytes before signing, - // so make sure to always pass the hex encoded msgDigest instead. - const msgDigest = crypto.createHash('sha256').update(JSON.stringify(msg)).digest('hex') - - // NOTE: elliptic is disabled elsewhere in this library to prevent - // accidental signing of truncated messages. - // tslint:disable-next-line:import-blacklist - const EC = require('elliptic').ec - const ec = new EC('secp256k1') - - // Sign - const key = ec.keyFromPrivate(hexToBuffer(rawKey)) - return JSON.stringify(key.sign(msgDigest).toDER()) -} - -/** - * Make a request to lookup the phone number identifier or perform matchmaking - * @param signer Type of key to sign with. May be undefined if the request is presigned. - * @param body Request to send in the body of the HTTP request. - * @param context Contains service URL and public to determine which instance to contact. - * @param endpoint Endpoint to query (e.g. '/getBlindedMessagePartialSig', '/getContactMatches'). - */ -export async function queryOdis( - signer: AuthSigner, +export async function getOdisPnpRequestAuth( body: PhoneNumberPrivacyRequest, - context: ServiceContext, - endpoint: PhoneNumberPrivacyEndpoint | CombinerEndpoint -): Promise { - debug(`Posting to ${endpoint}`) - - const bodyString = JSON.stringify(body) - + signer: AuthSigner +): Promise { // Sign payload using provided account and authentication method. - let signature: string + const bodyString = JSON.stringify(body) if (signer.authenticationMethod === AuthenticationMethod.ENCRYPTION_KEY) { - signature = signWithDEK(bodyString, signer as EncryptionKeySigner) - } else if (signer.authenticationMethod === AuthenticationMethod.WALLET_KEY) { - const account = body.account - signature = await signer.contractKit.connection.sign(bodyString, account) + return signWithDEK(bodyString, signer as EncryptionKeySigner) } - - const { odisUrl } = context - - const dontRetry = [ - ErrorMessages.ODIS_QUOTA_ERROR, - ErrorMessages.ODIS_RATE_LIMIT_ERROR, - ErrorMessages.ODIS_AUTH_ERROR, - ErrorMessages.ODIS_INPUT_ERROR, - ErrorMessages.ODIS_CLIENT_ERROR, - ] - - return selectiveRetryAsyncWithBackOff( - async () => { - let res: Response - try { - res = await fetch(odisUrl + endpoint, { - method: 'POST', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - Authorization: signature, - }, - body: bodyString, - }) - } catch (error) { - throw new Error(`${ErrorMessages.ODIS_FETCH_ERROR}: ${error}`) - } - - if (res.ok) { - debug('Response ok. Parsing.') - const response = await res.json() - return response as ResponseType - } - - debug(`Response not okay. Status ${res.status}`) - - switch (res.status) { - case 403: - throw new Error(ErrorMessages.ODIS_QUOTA_ERROR) - case 429: - throw new Error(ErrorMessages.ODIS_RATE_LIMIT_ERROR) - case 400: - throw new Error(ErrorMessages.ODIS_INPUT_ERROR) - case 401: - throw new Error(ErrorMessages.ODIS_AUTH_ERROR) - default: - if (res.status >= 400 && res.status < 500) { - // Don't retry error codes in 400s - throw new Error(`${ErrorMessages.ODIS_CLIENT_ERROR} ${res.status}`) - } - throw new Error(`Unknown failure ${res.status}`) - } - }, - 3, - dontRetry, - [] - ) + if (signer.authenticationMethod === AuthenticationMethod.WALLET_KEY) { + return signer.contractKit.connection.sign(bodyString, body.account) + } + throw new Error('AuthenticationMethod not supported') } /** - * Send the given domain request to ODIS (e.g. to get a POPRF evaluation or check quota). + * Send any OdisRequest to the specified CombinerEndpoint for the given ServiceContext * - * @param body Request to send in the body of the HTTP request. + * @param body OdisRequest to send in the body of the HTTP request. * @param context Contains service URL and public to determine which instance to contact. - * @param endpoint Endpoint to query (e.g. '/domain/sign', '/domain/quotaStatus'). - * @param responseSchema io-ts type for the expected response type. Provided to ensure type safety. + * @param endpoint Endpoint to query + * @param responseSchema io-ts schema to ensure type safety of responses + * @param headers custom request headers corresponding to the type of OdisRequest (keyVersion, Authentication, etc.) */ -export async function sendOdisDomainRequest>( - body: RequestType, +export async function queryOdis( + body: R, context: ServiceContext, - endpoint: DomainEndpoint, - responseSchema: t.Type> -): Promise> { + endpoint: CombinerEndpoint, + responseSchema: t.Type, OdisResponse, unknown>, + headers: OdisRequestHeader, + abortController?: AbortController +): Promise> { debug(`Posting to ${endpoint}`) - const bodyString = JSON.stringify(body) - - const { odisUrl } = context - const dontRetry = [ ErrorMessages.ODIS_QUOTA_ERROR, ErrorMessages.ODIS_RATE_LIMIT_ERROR, @@ -230,13 +168,15 @@ export async function sendOdisDomainRequest { let res: Response try { - res = await fetch(odisUrl + endpoint, { + res = await fetch(context.odisUrl + endpoint, { method: 'POST', headers: { Accept: 'application/json', 'Content-Type': 'application/json', + ...headers, }, - body: bodyString, + body: JSON.stringify(body), + signal: abortController?.signal, }) } catch (error) { throw new Error(`${ErrorMessages.ODIS_FETCH_ERROR}: ${error}`) @@ -278,3 +218,28 @@ export async function sendOdisDomainRequest( + body: R, + context: ServiceContext, + endpoint: DomainEndpoint, + responseSchema: t.Type>, + headers?: DomainRequestHeader +): Promise> { + return queryOdis( + body, + context, + endpoint, + responseSchema, + headers as OdisRequestHeader + ) as Promise> +} diff --git a/packages/sdk/identity/src/odis/quota.test.ts b/packages/sdk/identity/src/odis/quota.test.ts new file mode 100644 index 00000000000..7bafddbf022 --- /dev/null +++ b/packages/sdk/identity/src/odis/quota.test.ts @@ -0,0 +1,54 @@ +import { AuthenticationMethod, CombinerEndpoint } from '@celo/phone-number-privacy-common' +import { EncryptionKeySigner, ServiceContext } from './query' +import { getPnpQuotaStatus, PnpClientQuotaStatus } from './quota' + +const mockAccount = '0x0000000000000000000000000000000000007E57' +const serviceContext: ServiceContext = { + odisUrl: 'https://mockodis.com', + odisPubKey: + '7FsWGsFnmVvRfMDpzz95Np76wf/1sPaK0Og9yiB+P8QbjiC8FV67NBans9hzZEkBaQMhiapzgMR6CkZIZPvgwQboAxl65JWRZecGe5V3XO4sdKeNemdAZ2TzQuWkuZoA', +} +const endpoint = serviceContext.odisUrl + CombinerEndpoint.PNP_QUOTA +const rawKey = '41e8e8593108eeedcbded883b8af34d2f028710355c57f4c10a056b72486aa04' + +const authSigner: EncryptionKeySigner = { + authenticationMethod: AuthenticationMethod.ENCRYPTION_KEY, + rawKey, +} + +describe(getPnpQuotaStatus, () => { + afterEach(() => { + fetchMock.reset() + }) + it('returns the correct remaining quota amount', async () => { + const performedQueryCount = 5 + const totalQuota = 10 + const version = '' + fetchMock.mock(endpoint, { + success: true, + totalQuota, + performedQueryCount, + version, + }) + + await expect( + getPnpQuotaStatus(mockAccount, authSigner, serviceContext) + ).resolves.toStrictEqual({ + performedQueryCount, + totalQuota, + remainingQuota: totalQuota - performedQueryCount, + version, + warnings: undefined, + blockNumber: undefined, + }) + }) + + it('throws quota error on failure response', async () => { + fetchMock.mock(endpoint, { + success: false, + version: '', + }) + + await expect(getPnpQuotaStatus(mockAccount, authSigner, serviceContext)).rejects.toThrow() + }) +}) diff --git a/packages/sdk/identity/src/odis/quota.ts b/packages/sdk/identity/src/odis/quota.ts new file mode 100644 index 00000000000..95fd85ff1eb --- /dev/null +++ b/packages/sdk/identity/src/odis/quota.ts @@ -0,0 +1,66 @@ +import { Address } from '@celo/base' +import { + CombinerEndpoint, + PnpQuotaRequest, + PnpQuotaResponseSchema, +} from '@celo/phone-number-privacy-common' +import { AuthSigner, getOdisPnpRequestAuth, queryOdis, ServiceContext } from './query' + +export interface PnpClientQuotaStatus { + version: string + performedQueryCount: number + totalQuota: number + remainingQuota: number + blockNumber?: number + warnings?: string[] +} + +/** + * Query the ODIS quota status of a given account + * + * @param account The address whose ODIS quota we are querying + * @param signer Object containing the private key used to authenticate the ODIS request + * @param context Specifies which ODIS combiner url should be queried (i.e. mainnet or alfajores) + * @param clientVersion Optional Specifies the client software version + * @param sessionID Optional Used to track user sessions across the client and ODIS + * @param abortController Optional Allows client to specify a timeout for the ODIS request + */ +export async function getPnpQuotaStatus( + account: Address, + signer: AuthSigner, + context: ServiceContext, + clientVersion?: string, + sessionID?: string, + abortController?: AbortController +): Promise { + const body: PnpQuotaRequest = { + account, + version: clientVersion, + authenticationMethod: signer.authenticationMethod, + sessionID, + } + + const response = await queryOdis( + body, + context, + CombinerEndpoint.PNP_QUOTA, + PnpQuotaResponseSchema, + { + Authorization: await getOdisPnpRequestAuth(body, signer), + }, + abortController + ) + + if (response.success) { + return { + version: response.version, + performedQueryCount: response.performedQueryCount, + totalQuota: response.totalQuota, + remainingQuota: response.totalQuota - response.performedQueryCount, + warnings: response.warnings, + blockNumber: response.blockNumber, + } + } + + throw new Error(response.error) +} diff --git a/packages/sdk/identity/src/offchain/storage-writers.ts b/packages/sdk/identity/src/offchain/storage-writers.ts index 491bd5419f1..3b6fc8bbe4b 100644 --- a/packages/sdk/identity/src/offchain/storage-writers.ts +++ b/packages/sdk/identity/src/offchain/storage-writers.ts @@ -1,7 +1,7 @@ import { spawnSync } from 'child_process' +import { promises } from 'fs' import { join, parse } from 'path' import { resolvePath } from './utils' - export abstract class StorageWriter { abstract write(_data: Buffer, _dataPath: string): Promise } @@ -15,7 +15,6 @@ export class LocalStorageWriter extends StorageWriter { } protected async writeToFs(data: string | Buffer, dataPath: string): Promise { - const { promises } = await import('fs') const directory = parse(dataPath).dir await promises.mkdir(join(this.root, directory), { recursive: true }) await promises.writeFile(join(this.root, dataPath), data) diff --git a/packages/sdk/keystores/package.json b/packages/sdk/keystores/package.json index d3dfcb66cb9..b648c9aae6b 100644 --- a/packages/sdk/keystores/package.json +++ b/packages/sdk/keystores/package.json @@ -1,6 +1,6 @@ { "name": "@celo/keystores", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "keystore implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,8 +22,8 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/utils": "2.2.1-dev", - "@celo/wallet-local": "2.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/wallet-local": "3.2.1-dev", "@types/ethereumjs-util": "^5.2.0", "ethereumjs-wallet": "^1.0.1" }, diff --git a/packages/sdk/network-utils/package.json b/packages/sdk/network-utils/package.json index 7ec69cb2b21..e95fd5cefb0 100644 --- a/packages/sdk/network-utils/package.json +++ b/packages/sdk/network-utils/package.json @@ -1,6 +1,6 @@ { "name": "@celo/network-utils", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Utilities for fetching static information about the Celo network", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/sdk/phone-utils/package.json b/packages/sdk/phone-utils/package.json index 719c9f8a827..8f419ee2555 100644 --- a/packages/sdk/phone-utils/package.json +++ b/packages/sdk/phone-utils/package.json @@ -1,6 +1,6 @@ { "name": "@celo/phone-utils", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Celo phone utils", "author": "Celo", "license": "Apache-2.0", @@ -22,8 +22,8 @@ "lib/**/*" ], "dependencies": { - "@celo/base": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "@types/country-data": "^0.0.0", "@types/ethereumjs-util": "^5.2.0", "@types/google-libphonenumber": "^7.4.23", diff --git a/packages/sdk/phone-utils/src/getPhoneHash.ts b/packages/sdk/phone-utils/src/getPhoneHash.ts index aef6b90643f..8ebf37e403e 100644 --- a/packages/sdk/phone-utils/src/getPhoneHash.ts +++ b/packages/sdk/phone-utils/src/getPhoneHash.ts @@ -1,9 +1,13 @@ -import { getPhoneHash as baseGetPhoneHash } from '@celo/base/lib/phoneNumbers' +import { getIdentifierHash, getPrefixedIdentifier, IdentifierPrefix } from '@celo/base' import { soliditySha3 } from 'web3-utils' const sha3 = (v: string): string | null => soliditySha3({ type: 'string', value: v }) const getPhoneHash = (phoneNumber: string, salt?: string): string => { - return baseGetPhoneHash(sha3, phoneNumber, salt) + if (salt) { + return getIdentifierHash(sha3, phoneNumber, IdentifierPrefix.PHONE_NUMBER, salt) + } + // backwards compatibility for old phoneUtils getPhoneHash + return sha3(getPrefixedIdentifier(phoneNumber, IdentifierPrefix.PHONE_NUMBER)) as string } export default getPhoneHash diff --git a/packages/sdk/transactions-uri/package.json b/packages/sdk/transactions-uri/package.json index 04fa383627c..4c743935e14 100644 --- a/packages/sdk/transactions-uri/package.json +++ b/packages/sdk/transactions-uri/package.json @@ -1,6 +1,6 @@ { "name": "@celo/transactions-uri", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Celo's transactions uri generation", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -17,7 +17,7 @@ "build": "tsc -b .", "clean": "tsc -b . --clean", "docs": "typedoc", - "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 28", + "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 27", "test:livechain": "yarn --cwd ../../protocol devchain run-tar .tmp/devchain.tar.gz", "test": "jest --runInBand", "lint": "tslint -c tslint.json --project .", @@ -26,15 +26,15 @@ "dependencies": { "@types/debug": "^4.1.5", "@types/qrcode": "^1.3.4", - "@celo/base": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", "bn.js": "4.11.9", "qrcode": "^1.4.4", "web3-eth-abi": "1.3.6" }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "@celo/contractkit": "2.2.1-dev", + "@celo/contractkit": "3.2.1-dev", "dotenv": "^8.2.0", "@celo/flake-tracker": "0.0.1-dev" }, diff --git a/packages/sdk/utils/package.json b/packages/sdk/utils/package.json index 6b500923169..b176e56a671 100644 --- a/packages/sdk/utils/package.json +++ b/packages/sdk/utils/package.json @@ -1,6 +1,6 @@ { "name": "@celo/utils", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Celo common utils", "author": "Celo", "license": "Apache-2.0", @@ -22,8 +22,8 @@ "lib/**/*" ], "dependencies": { - "@celo/base": "2.2.1-dev", - "@types/bn.js": "4.11.6", + "@celo/base": "3.2.1-dev", + "@types/bn.js": "^5.1.0", "@types/elliptic": "^6.4.9", "@types/ethereumjs-util": "^5.2.0", "@types/node": "^10.12.18", diff --git a/packages/sdk/utils/src/attestations.test.ts b/packages/sdk/utils/src/attestations.test.ts deleted file mode 100644 index 4f31d61964a..00000000000 --- a/packages/sdk/utils/src/attestations.test.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { - extractAttestationCodeFromMessage, - extractSecurityCodeWithPrefix, - messageContainsAttestationCode, - sanitizeMessageBase64, -} from './attestations' - -const MESSAGE_1 = - 'Celo : q4BJuVrALpiaroth_dwQ_ps6w8auvNPmi-SVVwstPaFaq8aRq4jeaWSPmI-rZTrJQ_Z0BOUyz9EBNif1Y2XzZQE=' -const MESSAGE_2 = - 'Celo attestation code: IDOp4SaFdr9d_uNUo3SAUp1x-ZvoLAUAX_txx9dC0Q56mqAfisxNeZjh6LGDz2uMtNSo2SP-z93RkeYeB0rcXgA=' -const MESSAGE_3 = - '<#> GTCp4SaFdr9d3uNUo3SAUp1x-ZvoLAUAX3txx9dC0Q56mqAfisxNeZP3WrGDz2uMtNSo2SP-z93RkeYeB0rcWhA= l5k6LvdPDXS' -const MESSAGE_3_WITH_LINK = - '<#> celo://wallet/v/GTCp4SaFdr9d3uNUo3SAUp1x-ZvoLAUAX3txx9dC0Q56mqAfisxNeZP3WrGDz2uMtNSo2SP-z93RkeYeB0rcWhA= l5k6LvdPDXS' -const MESSAGE_4_UNSANITIZED = - '<#> AOvujFUk§HkATAEsmVZRgB2phcFp69eqMqg0ps4Z8688s2-kgmyHybsRWYfTgjYMJv0jmFnjM8KKmb2tThROLAE= l5k6LvdPDXS' - -const MESSAGE_1_DECODED = - '0xab8049b95ac02e989aae8b61fddc10fe9b3ac3c6aebcd3e68be495570b2d3da15aabc691ab88de69648f988fab653ac943f67404e532cfd1013627f56365f36501' -const MESSAGE_2_DECODED = - '0x2033a9e1268576bf5dfee354a37480529d71f99be82c05005ffb71c7d742d10e7a9aa01f8acc4d7998e1e8b183cf6b8cb4d4a8d923fecfddd191e61e074adc5e00' -const MESSAGE_3_DECODED = - '0x1930a9e1268576bf5ddee354a37480529d71f99be82c05005f7b71c7d742d10e7a9aa01f8acc4d7993f75ab183cf6b8cb4d4a8d923fecfddd191e61e074adc5a10' -const MESSAGE_4_DECODED = - '0x00ebee8c5524fc79004c012c995651801da985c169ebd7aa32a834a6ce19f3af3cb36fa4826c87c9bb115987d382360c26fd239859e333c28a99bdad4e144e2c01' - -describe('Attestation Utils', () => { - describe('messageContainsAttestationCode', () => { - it('should check if a message contains a attestation code', () => { - expect(messageContainsAttestationCode(MESSAGE_1)).toBeTruthy() - expect(messageContainsAttestationCode(MESSAGE_2)).toBeTruthy() - expect(messageContainsAttestationCode(MESSAGE_3)).toBeTruthy() - expect(messageContainsAttestationCode(MESSAGE_3_WITH_LINK)).toBeTruthy() - }) - - it('should fail if a message does not contain a attestation code', () => { - expect(messageContainsAttestationCode('asdfasdaf')).toBeFalsy() - expect(messageContainsAttestationCode('')).toBeFalsy() - expect(messageContainsAttestationCode('Howdy there')).toBeFalsy() - }) - }) - - describe('extractAttestationCode', () => { - it('should extract the code from a message', () => { - expect(extractAttestationCodeFromMessage(MESSAGE_1)).toBe(MESSAGE_1_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_2)).toBe(MESSAGE_2_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_3)).toBe(MESSAGE_3_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_3_WITH_LINK)).toBe(MESSAGE_3_DECODED) - expect(extractAttestationCodeFromMessage(MESSAGE_4_UNSANITIZED)).toBe(MESSAGE_4_DECODED) - }) - }) - - describe('extractSecurityCodeWithPrefix', () => { - it('should extract 8 digit code', () => { - expect(extractSecurityCodeWithPrefix('<#> Celo security code: 51365977 5yaJvJcZt2P')).toEqual( - '51365977' - ) - }) - it('should NOT extract not 8 digit code', () => { - expect(extractSecurityCodeWithPrefix('<#> Celo security code: 5136597 5yaJvJcZt2P')).toEqual( - null - ) - }) - }) - - // TODO Update codes to include deeplink prefix - describe('sanitizeBase64', () => { - const CODE_1 = - 'Celo attestation code: NaLrNSYGRQ1JurhgREF1tNF43KDJnO6KaatnD¿hoim1XTq0O0IKNDQuBOF¿Fn5xIAjLQMtWbxbOgrtTBZ1oYAQA=' - const SANITIZED_CODE_1 = - 'Celo attestation code: NaLrNSYGRQ1JurhgREF1tNF43KDJnO6KaatnD_hoim1XTq0O0IKNDQuBOF_Fn5xIAjLQMtWbxbOgrtTBZ1oYAQA=' - const CODE_2 = - 'Celo attestation code: ZxO§ML8EU5K4a§h0jmjDbbV4a6gNJeBjfN9aa9xG-wsnf8§LYNE052gGuPML9s0Yqc§2YDCfwGgoiviV-IilRwA=' - const SANITIZED_CODE_2 = - 'Celo attestation code: ZxO_ML8EU5K4a_h0jmjDbbV4a6gNJeBjfN9aa9xG-wsnf8_LYNE052gGuPML9s0Yqc_2YDCfwGgoiviV-IilRwA=' - const NORMAL_CODE = - 'Celo attestation code: T7p-Mn1_L5zJuycAgAxYVqaJDp5r2TORcb775fdVoARbdJ-rNP-LArWCNJzJ6KjuVg0yskkEM8vVtl1PPmOsWwE=' - - it('sanitizes correctly', () => { - expect(sanitizeMessageBase64(CODE_1)).toBe(SANITIZED_CODE_1) - expect(sanitizeMessageBase64(CODE_2)).toBe(SANITIZED_CODE_2) - expect(sanitizeMessageBase64(NORMAL_CODE)).toBe(NORMAL_CODE) - }) - }) -}) diff --git a/packages/sdk/utils/src/attestations.ts b/packages/sdk/utils/src/attestations.ts deleted file mode 100644 index 8e1d752881b..00000000000 --- a/packages/sdk/utils/src/attestations.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { - base64ToHex, - extractAttestationCodeFromMessage, - getIdentifierPrefix, - hashIdentifier as baseHashIdentifier, - IdentifierType, - isAccountConsideredVerified, - messageContainsAttestationCode, - sanitizeMessageBase64, -} from '@celo/base/lib/attestations' -import { soliditySha3 } from 'web3-utils' -import { privateKeyToAddress } from './address' -import { Signature, SignatureUtils } from './signatureUtils' - -// Exports moved to @celo/base, forwarding them -// here for backwards compatibility -export { - AttestationsStatus, - base64ToHex, - extractAttestationCodeFromMessage, - getIdentifierPrefix, - IdentifierType, - isAccountConsideredVerified, - messageContainsAttestationCode, - sanitizeMessageBase64, -} from '@celo/base/lib/attestations' - -const sha3 = (v: string): string | null => soliditySha3({ type: 'string', value: v }) -export function hashIdentifier(identifier: string, type: IdentifierType, salt?: string) { - return baseHashIdentifier(sha3, identifier, type, salt) -} - -export function getAttestationMessageToSignFromIdentifier(identifier: string, account: string) { - const messageHash: string = soliditySha3( - { type: 'bytes32', value: identifier }, - { type: 'address', value: account } - )! - return messageHash -} - -export function getAttestationMessageToSignFromPhoneNumber( - phoneNumber: string, - account: string, - phoneSalt?: string -) { - return getAttestationMessageToSignFromIdentifier( - hashIdentifier(phoneNumber, IdentifierType.PHONE_NUMBER, phoneSalt), - account - ) -} - -export function attestToIdentifier( - identifier: string, - account: string, - privateKey: string -): Signature { - const issuer = privateKeyToAddress(privateKey) - const { v, r, s } = SignatureUtils.signMessage( - getAttestationMessageToSignFromIdentifier(identifier, account), - privateKey, - issuer - ) - return { v, r, s } -} - -export function extractSecurityCodeWithPrefix(message: string) { - const matches = message.match('(\\d{8})') - if (matches && matches.length === 2) { - return matches[1] - } - return null -} - -export const AttestationUtils = { - IdentifierType, - getIdentifierPrefix, - hashIdentifier, - getAttestationMessageToSignFromIdentifier, - getAttestationMessageToSignFromPhoneNumber, - base64ToHex, - attestToIdentifier, - sanitizeMessageBase64, - messageContainsAttestationCode, - extractAttestationCodeFromMessage, - isAccountConsideredVerified, - extractSecurityCodeWithPrefix, -} diff --git a/packages/sdk/utils/src/index.ts b/packages/sdk/utils/src/index.ts index add1fef34a7..f8bb0f738f3 100644 --- a/packages/sdk/utils/src/index.ts +++ b/packages/sdk/utils/src/index.ts @@ -1,6 +1,5 @@ import * as AddressUtils from './address' -export { AttestationUtils } from './attestations' export * from './contacts' export * from './currencies' export * from './dappkit' diff --git a/packages/sdk/utils/src/typed-data-constructors.ts b/packages/sdk/utils/src/typed-data-constructors.ts index 10cadd918e3..d33d2f83ab3 100644 --- a/packages/sdk/utils/src/typed-data-constructors.ts +++ b/packages/sdk/utils/src/typed-data-constructors.ts @@ -1,3 +1,4 @@ +import { Address } from '@celo/base' import { EIP712TypedData } from './sign-typed-data-utils' export function attestationSecurityCode(code: string): EIP712TypedData { @@ -59,3 +60,43 @@ export const authorizeSigner = ({ role, }, }) + +interface AttestationDetails { + identifier: string + issuer: string + account: string + signer: string + issuedOn: number +} + +export const registerAttestation = ( + chainId: number, + contractAddress: Address, + message?: AttestationDetails +) => { + return { + types: { + EIP712Domain: [ + { name: 'name', type: 'string' }, + { name: 'version', type: 'string' }, + { name: 'chainId', type: 'uint256' }, + { name: 'verifyingContract', type: 'address' }, + ], + OwnershipAttestation: [ + { name: 'identifier', type: 'bytes32' }, + { name: 'issuer', type: 'address' }, + { name: 'account', type: 'address' }, + { name: 'signer', type: 'address' }, + { name: 'issuedOn', type: 'uint64' }, + ], + }, + primaryType: 'OwnershipAttestation', + domain: { + name: 'FederatedAttestations', + version: '1.0', + chainId, + verifyingContract: contractAddress, + }, + message: message ? message : {}, + } +} diff --git a/packages/sdk/wallets/wallet-base/package.json b/packages/sdk/wallets/wallet-base/package.json index 814e635ab1e..3551a975eb0 100644 --- a/packages/sdk/wallets/wallet-base/package.json +++ b/packages/sdk/wallets/wallet-base/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-base", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Wallet base implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,9 +22,9 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/connect": "2.2.1-dev", - "@celo/base": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/base": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", "@types/ethereumjs-util": "^5.2.0", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", diff --git a/packages/sdk/wallets/wallet-hsm-aws/package.json b/packages/sdk/wallets/wallet-hsm-aws/package.json index cef2b79ac67..01907db57f0 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/package.json +++ b/packages/sdk/wallets/wallet-hsm-aws/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-hsm-aws", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "AWS HSM wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,10 +22,10 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/utils": "2.2.1-dev", - "@celo/wallet-base": "2.2.1-dev", - "@celo/wallet-remote": "2.2.1-dev", - "@celo/wallet-hsm": "2.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/wallet-base": "3.2.1-dev", + "@celo/wallet-remote": "3.2.1-dev", + "@celo/wallet-hsm": "3.2.1-dev", "@types/debug": "^4.1.5", "@types/secp256k1": "^4.0.0", "aws-sdk": "^2.705.0", @@ -36,7 +36,7 @@ "secp256k1": "^4.0.0" }, "devDependencies": { - "@celo/connect": "2.2.1-dev", + "@celo/connect": "3.2.1-dev", "elliptic": "^6.5.4", "web3": "1.3.6" }, diff --git a/packages/sdk/wallets/wallet-hsm-azure/package.json b/packages/sdk/wallets/wallet-hsm-azure/package.json index 4ed91dfbc3d..a2c4c15fc64 100644 --- a/packages/sdk/wallets/wallet-hsm-azure/package.json +++ b/packages/sdk/wallets/wallet-hsm-azure/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-hsm-azure", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Azure HSM wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -25,11 +25,11 @@ "@azure/identity": "^1.1.0", "@azure/keyvault-keys": "^4.1.0", "@azure/keyvault-secrets": "^4.1.0", - "@celo/utils": "2.2.1-dev", - "@celo/wallet-base": "2.2.1-dev", - "@celo/wallet-remote": "2.2.1-dev", - "@celo/wallet-hsm": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/wallet-base": "3.2.1-dev", + "@celo/wallet-remote": "3.2.1-dev", + "@celo/wallet-hsm": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", "@types/secp256k1": "^4.0.0", "eth-lib": "^0.2.8", "ethereumjs-util": "^5.2.0", diff --git a/packages/sdk/wallets/wallet-hsm-gcp/.env.example b/packages/sdk/wallets/wallet-hsm-gcp/.env.example new file mode 100644 index 00000000000..ac4727af8e6 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/.env.example @@ -0,0 +1,2 @@ +GOOGLE_APPLICATION_CREDENTIALS= +GCP_VERSION_NAME= diff --git a/packages/sdk/wallets/wallet-hsm-gcp/.gitignore b/packages/sdk/wallets/wallet-hsm-gcp/.gitignore new file mode 100644 index 00000000000..ece2b3953be --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/.gitignore @@ -0,0 +1,3 @@ +lib/ +.env +.serviceAccountKey.json diff --git a/packages/sdk/wallets/wallet-hsm-gcp/.npmignore b/packages/sdk/wallets/wallet-hsm-gcp/.npmignore new file mode 100644 index 00000000000..45e506bacd1 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/.npmignore @@ -0,0 +1,17 @@ +/.devchain/ +/.devchain.tar.gz +/coverage/ +/node_modules/ +/src/ +/tmp/ +/.tmp/ + +/tslint.json +/tsconfig.* +/jest.config.* +*.tgz + +/src + +/lib/**/*.test.* +/lib/test-utils \ No newline at end of file diff --git a/packages/sdk/wallets/wallet-hsm-gcp/jest.config.js b/packages/sdk/wallets/wallet-hsm-gcp/jest.config.js new file mode 100644 index 00000000000..2681a75d5a6 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/jest.config.js @@ -0,0 +1,5 @@ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', + testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], +} diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts deleted file mode 100644 index d983dc23d1b..00000000000 --- a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-signer.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -/// -import { RLPEncodedTx, Signer } from '@celo/connect'; -import { EIP712TypedData } from '@celo/utils/lib/sign-typed-data-utils'; -import { Signature } from '@celo/wallet-hsm'; -import { KeyManagementServiceClient } from '@google-cloud/kms'; -import { BigNumber } from 'bignumber.js'; -export declare class GcpHsmSigner implements Signer { - private client; - private versionName; - private publicKey; - constructor(client: KeyManagementServiceClient, versionName: string, publicKey: BigNumber); - private findCanonicalSignature; - private sign; - signTransaction(addToV: number, encodedTx: RLPEncodedTx): Promise; - signPersonalMessage(data: string): Promise; - signTypedData(typedData: EIP712TypedData): Promise; - getNativeKey(): string; - decrypt(_ciphertext: Buffer): Promise; - computeSharedSecret(_publicKey: string): Promise; -} diff --git a/packages/sdk/wallets/wallet-hsm-gcp/package.json b/packages/sdk/wallets/wallet-hsm-gcp/package.json new file mode 100644 index 00000000000..5a2517e2e20 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/package.json @@ -0,0 +1,47 @@ +{ + "name": "@celo/wallet-hsm-gcp", + "version": "3.2.1-dev", + "description": "GCP HSM wallet implementation", + "author": "Celo", + "license": "Apache-2.0", + "main": "./lib/index.js", + "types": "./lib/index.d.ts", + "keywords": [ + "celo", + "blockchain", + "sdk" + ], + "scripts": { + "build": "tsc -b .", + "clean": "tsc -b . --clean", + "docs": "typedoc && ts-node ../../utils/scripts/linkdocs.ts wallet-hsm-gcp", + "test": "jest --runInBand", + "lint": "tslint -c tslint.json --project .", + "prepublishOnly": "yarn build" + }, + "dependencies": { + "@celo/utils": "3.2.1-dev", + "@celo/wallet-base": "3.2.1-dev", + "@celo/wallet-remote": "3.2.1-dev", + "@celo/wallet-hsm": "3.2.1-dev", + "@google-cloud/kms": "~2.9.0", + "@types/debug": "^4.1.5", + "@types/secp256k1": "^4.0.0", + "eth-lib": "^0.2.8", + "ethereumjs-util": "^5.2.0", + "bignumber.js": "^9.0.0", + "debug": "^4.1.1", + "secp256k1": "^4.0.0" + }, + "devDependencies": { + "@celo/connect": "3.2.1-dev", + "elliptic": "^6.5.4", + "web3": "1.3.6" + }, + "engines": { + "node": ">=8.13.0" + }, + "resolutions": { + "secp256k1": "^4.0.0" + } +} \ No newline at end of file diff --git a/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts new file mode 100644 index 00000000000..6c0bfe0ed7e --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts @@ -0,0 +1,115 @@ +import { RLPEncodedTx, Signer } from '@celo/connect' +import { ensureLeading0x, trimLeading0x } from '@celo/utils/lib/address' +import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' +import { getHashFromEncoded } from '@celo/wallet-base' +import { + bigNumberToBuffer, + bufferToBigNumber, + makeCanonical, + parseBERSignature, + recoverKeyIndex, + Signature, + sixtyFour, + thirtyTwo, +} from '@celo/wallet-hsm' +import { KeyManagementServiceClient } from '@google-cloud/kms' +import { BigNumber } from 'bignumber.js' +import * as ethUtil from 'ethereumjs-util' + +export class GcpHsmSigner implements Signer { + private client: KeyManagementServiceClient + private versionName: string + private publicKey: BigNumber + + constructor(client: KeyManagementServiceClient, versionName: string, publicKey: BigNumber) { + this.client = client + this.versionName = versionName + this.publicKey = publicKey + } + + private async findCanonicalSignature(buffer: Buffer): Promise<{ S: BigNumber; R: BigNumber }> { + let S: BigNumber + let R: BigNumber + + const [signResponse] = await this.client.asymmetricSign({ + name: this.versionName, + digest: { + sha256: buffer, + }, + }) + const { r, s } = parseBERSignature(signResponse.signature as Buffer) + + R = bufferToBigNumber(r) + S = bufferToBigNumber(s) + S = makeCanonical(S) + + return { S: S!, R: R! } + } + + private async sign(buffer: Buffer): Promise { + const { R, S } = await this.findCanonicalSignature(buffer) + const rBuff = bigNumberToBuffer(R, thirtyTwo) + const sBuff = bigNumberToBuffer(S, thirtyTwo) + const recoveryParam = recoverKeyIndex( + Buffer.concat([rBuff, sBuff], sixtyFour), + this.publicKey, + buffer + ) + + return { + r: rBuff, + s: sBuff, + v: recoveryParam, + } + } + + async signTransaction(addToV: number, encodedTx: RLPEncodedTx): Promise { + const hash = getHashFromEncoded(encodedTx.rlpEncode) + const bufferedMessage = Buffer.from(trimLeading0x(hash), 'hex') + const { v, r, s } = await this.sign(bufferedMessage) + + return { + v: v + addToV, + r, + s, + } + } + + async signPersonalMessage(data: string): Promise { + const dataBuff = ethUtil.toBuffer(ensureLeading0x(data)) + const msgHashBuff = ethUtil.hashPersonalMessage(dataBuff) as Buffer + const { v, r, s } = await this.sign(msgHashBuff) + + return { + v: v + 27, + r, + s, + } + } + + async signTypedData(typedData: EIP712TypedData): Promise { + const typedDataHashBuff = generateTypedDataHash(typedData) + const { v, r, s } = await this.sign(typedDataHashBuff) + + return { + v: v + 27, + r, + s, + } + } + + getNativeKey(): string { + return this.versionName + } + + decrypt(_ciphertext: Buffer) { + throw new Error('Decryption operation is not supported on this signer') + // To make the compiler happy + return Promise.resolve(_ciphertext) + } + + computeSharedSecret(_publicKey: string) { + throw new Error('Not implemented') + return Promise.resolve(Buffer.from([])) + } +} diff --git a/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts new file mode 100644 index 00000000000..de12b30b415 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts @@ -0,0 +1,293 @@ +import { CeloTx, EncodedTransaction } from '@celo/connect' +import { + ensureLeading0x, + normalizeAddressWith0x, + privateKeyToAddress, + trimLeading0x, +} from '@celo/utils/lib/address' +import { verifySignature } from '@celo/utils/lib/signatureUtils' +import { recoverTransaction, verifyEIP712TypedDataSigner } from '@celo/wallet-base' +import { asn1FromPublicKey } from '@celo/wallet-hsm' +import { BigNumber } from 'bignumber.js' +// NOTE: elliptic is disabled elsewhere in this library to prevent +// accidental signing of truncated messages. +// tslint:disable-next-line:import-blacklist +import { ec as EC } from 'elliptic' +import * as ethUtil from 'ethereumjs-util' +import Web3 from 'web3' +import { GcpHsmWallet } from './gcp-hsm-wallet' +require('dotenv').config() + +// Note: A lot of this test class was copied from the wallet-hsm-aws test since they work very similarly. + +export const PRIVATE_KEY1 = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' +export const ACCOUNT_ADDRESS1 = normalizeAddressWith0x(privateKeyToAddress(PRIVATE_KEY1)) +export const PRIVATE_KEY2 = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890fdeccc' +export const ACCOUNT_ADDRESS2 = normalizeAddressWith0x(privateKeyToAddress(PRIVATE_KEY2)) + +export const PRIVATE_KEY_NEVER = + '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890ffffff' +export const ACCOUNT_ADDRESS_NEVER = normalizeAddressWith0x(privateKeyToAddress(PRIVATE_KEY_NEVER)) + +export const CHAIN_ID = 44378 + +export const TYPED_DATA = { + types: { + EIP712Domain: [ + { name: 'name', type: 'string' }, + { name: 'version', type: 'string' }, + { name: 'chainId', type: 'uint256' }, + { name: 'verifyingContract', type: 'address' }, + ], + Person: [ + { name: 'name', type: 'string' }, + { name: 'wallet', type: 'address' }, + ], + Mail: [ + { name: 'from', type: 'Person' }, + { name: 'to', type: 'Person' }, + { name: 'contents', type: 'string' }, + ], + }, + primaryType: 'Mail', + domain: { + name: 'Ether Mail', + version: '1', + chainId: 1, + verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC', + }, + message: { + from: { + name: 'Cow', + wallet: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826', + }, + to: { + name: 'Bob', + wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB', + }, + contents: 'Hello, Bob!', + }, +} + +const USING_MOCK = typeof process.env.GCP_VERSION_NAME === 'undefined' +const MOCK_VERSION_NAME = '1d6db902-9a45-4dd5-bd1e-7250b2306f18' +const GCP_VERSION_NAME = USING_MOCK ? MOCK_VERSION_NAME : process.env.GCP_VERSION_NAME! + +const key1 = PRIVATE_KEY1 +const ec = new EC('secp256k1') + +const keys: Map = new Map([[MOCK_VERSION_NAME, key1]]) + +describe('GcpHsmWallet class', () => { + let wallet: GcpHsmWallet + let knownAddress: string + const otherAddress: string = ACCOUNT_ADDRESS2 + + beforeEach(async () => { + wallet = new GcpHsmWallet(GCP_VERSION_NAME) + if (USING_MOCK) { + jest.spyOn(wallet, 'generateKmsClient').mockImplementation((_transport: any) => { + return { + getPublicKey: async ({ name: versionName }: { name: string }) => { + if (!keys.has(versionName)) { + throw new Error( + `3 INVALID_ARGUMENT: Resource name '${versionName}' does not match pattern some_pattern` + ) + } + const privateKey = keys.get(versionName) + const pubKey = ethUtil.privateToPublic(ethUtil.toBuffer(privateKey)) + const temp = new BigNumber(ensureLeading0x(pubKey.toString('hex'))) + const asn1Key = asn1FromPublicKey(temp) + const prefix = '-----BEGIN PUBLIC KEY-----\n' + const postfix = '-----END PUBLIC KEY-----\n' + const pem = + prefix + + asn1Key + .toString('base64') + .match(/.{0,64}/g)! + .join('\n') + + postfix + return [{ pem }] + }, + asymmetricSign: async ({ + name, + digest, + }: { + name: string + digest: { sha256: Buffer } + }) => { + const privateKey = trimLeading0x(keys.get(name)!) + if (privateKey) { + const pkBuffer = Buffer.from(privateKey, 'hex') + const signature = ec.sign(digest.sha256, pkBuffer, { canonical: true }) + return [{ signature: Buffer.from(signature.toDER()) }] + } + throw new Error(`Unable to locate key: ${name}`) + }, + } + }) + } + + await wallet.init() + }) + + test('hasAccount should return false for keys that are not present', async () => { + expect(await wallet.hasAccount('this is not a valid private key')).toBeFalsy() + }) + + test('hasAccount should return true for keys that are present', async () => { + // Valid key should be present + const address = await wallet.getAddressFromVersionName(GCP_VERSION_NAME) + expect(await wallet.hasAccount(address)).toBeTruthy() + }) + + test('throws on invalid key id', async () => { + try { + await wallet.getAddressFromVersionName('invalid') + throw new Error('expected error to have been thrown') + } catch (e: any) { + expect(e.message).toContain( + "3 INVALID_ARGUMENT: Resource name 'invalid' does not match pattern" + ) + } + }) + + describe('signing', () => { + let celoTransaction: CeloTx + const unknownKey: string = '00000000-0000-0000-0000-000000000000' + const unknownAddress = ACCOUNT_ADDRESS_NEVER + + describe('using an unknown key', () => { + beforeEach(async () => { + celoTransaction = { + from: unknownAddress, + to: otherAddress, + chainId: CHAIN_ID, + value: Web3.utils.toWei('1', 'ether'), + nonce: 0, + gas: '10', + gasPrice: '99', + feeCurrency: '0x', + gatewayFeeRecipient: ACCOUNT_ADDRESS_NEVER, + gatewayFee: '0x5678', + data: '0xabcdef', + } + }) + + test('fails getting address from key', async () => { + try { + await wallet.getAddressFromVersionName(unknownKey) + throw new Error('Expected exception to be thrown') + } catch (e: any) { + expect(e.message).toMatch( + new RegExp( + `3 INVALID_ARGUMENT: Resource name '${unknownKey}' does not match pattern .*` + ) + ) + } + }) + + test('fails calling signTransaction', async () => { + try { + await wallet.signTransaction(celoTransaction) + throw new Error('Expected exception to be thrown') + } catch (e: any) { + expect(e.message).toBe(`Could not find address ${unknownAddress}`) + } + }) + + test('fails calling signPersonalMessage', async () => { + const hexStr: string = '0xa1' + try { + await wallet.signPersonalMessage(unknownAddress, hexStr) + throw new Error('Expected exception to be thrown') + } catch (e: any) { + expect(e.message).toBe(`Could not find address ${unknownAddress}`) + } + }) + + test('fails calling signTypedData', async () => { + try { + await wallet.signTypedData(unknownAddress, TYPED_DATA) + throw new Error('Expected exception to be thrown') + } catch (e: any) { + expect(e.message).toBe(`Could not find address ${unknownAddress}`) + } + }) + }) + + describe('using a known key', () => { + const knownKey: string = GCP_VERSION_NAME! + beforeEach(async () => { + knownAddress = await wallet.getAddressFromVersionName(knownKey) + celoTransaction = { + from: knownAddress, + to: otherAddress, + chainId: CHAIN_ID, + value: Web3.utils.toWei('1', 'ether'), + nonce: 0, + gas: '10', + gasPrice: '99', + feeCurrency: '0x', + gatewayFeeRecipient: ACCOUNT_ADDRESS_NEVER, + gatewayFee: '0x5678', + data: '0xabcdef', + } + }) + + describe('when calling signTransaction', () => { + test('succeeds', async () => { + const signedTx: EncodedTransaction = await wallet.signTransaction(celoTransaction) + expect(signedTx).not.toBeUndefined() + }) + test('with same signer', async () => { + const signedTx: EncodedTransaction = await wallet.signTransaction(celoTransaction) + const [, recoveredSigner] = recoverTransaction(signedTx.raw) + expect(normalizeAddressWith0x(recoveredSigner)).toBe(normalizeAddressWith0x(knownAddress)) + }) + // https://github.com/ethereum/go-ethereum/blob/38aab0aa831594f31d02c9f02bfacc0bef48405d/rlp/decode.go#L664 + test('signature with 0x00 prefix is canonicalized', async () => { + // This tx is carefully constructed to produce an S value with the first byte as 0x00 + const celoTransactionZeroPrefix = { + from: await wallet.getAddressFromVersionName(knownKey), + to: ACCOUNT_ADDRESS2, + chainId: CHAIN_ID, + value: Web3.utils.toWei('1', 'ether'), + nonce: 65, + gas: '10', + gasPrice: '99', + feeCurrency: '0x', + gatewayFeeRecipient: ACCOUNT_ADDRESS_NEVER, + gatewayFee: '0x5678', + data: '0xabcdef', + } + const signedTx: EncodedTransaction = await wallet.signTransaction( + celoTransactionZeroPrefix + ) + expect(signedTx.tx.s.startsWith('0x00')).toBeFalsy() + const [, recoveredSigner] = recoverTransaction(signedTx.raw) + expect(normalizeAddressWith0x(recoveredSigner)).toBe(normalizeAddressWith0x(knownAddress)) + }) + }) + + describe('when calling signPersonalMessage', () => { + test('succeeds', async () => { + const hexStr: string = ACCOUNT_ADDRESS1 + const signedMessage = await wallet.signPersonalMessage(knownAddress, hexStr) + expect(signedMessage).not.toBeUndefined() + const valid = verifySignature(hexStr, signedMessage, knownAddress) + expect(valid).toBeTruthy() + }) + }) + + describe('when calling signTypedData', () => { + test('succeeds', async () => { + const signedMessage = await wallet.signTypedData(knownAddress, TYPED_DATA) + expect(signedMessage).not.toBeUndefined() + const valid = verifyEIP712TypedDataSigner(TYPED_DATA, signedMessage, knownAddress) + expect(valid).toBeTruthy() + }) + }) + }) + }) +}) diff --git a/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.ts b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.ts new file mode 100644 index 00000000000..a8567f25b94 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.ts @@ -0,0 +1,82 @@ +import { Address, ReadOnlyWallet } from '@celo/connect' +import { + bigNumberToBuffer, + bufferToBigNumber, + getAddressFromPublicKey, + publicKeyFromAsn1, + publicKeyPrefix, + sixtyFour, +} from '@celo/wallet-hsm' +import { RemoteWallet } from '@celo/wallet-remote' +import { KeyManagementServiceClient } from '@google-cloud/kms' +import { BigNumber } from 'bignumber.js' +import { GcpHsmSigner } from './gcp-hsm-signer' + +/** + * A Cloud HSM wallet built on GCP. + */ +export class GcpHsmWallet extends RemoteWallet implements ReadOnlyWallet { + private client: KeyManagementServiceClient | undefined + + constructor(private readonly versionName: string) { + super() + } + + private generateKmsClient() { + return new KeyManagementServiceClient() + } + + protected async loadAccountSigners(): Promise> { + if (!this.client) { + this.client = this.generateKmsClient() + } + const addressToSigner = new Map() + try { + const publicKey = await this.getPublicKeyFromVersionName(this.versionName) + const address = getAddressFromPublicKey(publicKey) + addressToSigner.set(address, new GcpHsmSigner(this.client, this.versionName, publicKey)) + } catch (e) { + console.error('Error loading account', e) + throw e + } + return addressToSigner + } + + private async getPublicKeyFromVersionName(versionName: string): Promise { + if (!this.client) { + throw new Error('GcpHsmWallet needs to be initialised first') + } + const [pk] = await this.client.getPublicKey({ name: versionName }) + if (!pk.pem) { + throw new Error('PublicKey pem is not defined') + } + const derEncodedPk = this.pemToDerEncode(pk.pem) + const pubKey = publicKeyFromAsn1(Buffer.from(derEncodedPk, 'base64')) + const pkbuff = bigNumberToBuffer(pubKey, sixtyFour) + const pubKeyPrefix = Buffer.from(new Uint8Array([publicKeyPrefix])) + const rawPublicKey = Buffer.concat([pubKeyPrefix, pkbuff]) + return bufferToBigNumber(rawPublicKey) + } + + /** + * Converts key from PEM to DER encoding. + * + * DER (Distinguished Encoding Rules) is a binary encoding for X.509 certificates and private keys. + * Unlike PEM, DER-encoded files do not contain plain text statements such as -----BEGIN CERTIFICATE----- + * + * https://www.ssl.com/guide/pem-der-crt-and-cer-x-509-encodings-and-conversions/#:~:text=DER%20(Distinguished%20Encoding%20Rules)%20is,commonly%20seen%20in%20Java%20contexts. + */ + private pemToDerEncode(pem: string): string { + return pem.split('\n').slice(1, -2).join('').trim() + } + + /** + * Returns the EVM address for the given key + * Useful for initially getting the 'from' field given a keyName + * @param versionName GCP version name for the HSM + */ + async getAddressFromVersionName(versionName: string): Promise
{ + const publicKey = await this.getPublicKeyFromVersionName(versionName) + return getAddressFromPublicKey(publicKey) + } +} diff --git a/packages/sdk/wallets/wallet-hsm-gcp/src/index.ts b/packages/sdk/wallets/wallet-hsm-gcp/src/index.ts new file mode 100644 index 00000000000..5ef8a3b99f1 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/src/index.ts @@ -0,0 +1,2 @@ +export * from './gcp-hsm-signer' +export * from './gcp-hsm-wallet' diff --git a/packages/sdk/wallets/wallet-hsm-gcp/tsconfig.json b/packages/sdk/wallets/wallet-hsm-gcp/tsconfig.json new file mode 100644 index 00000000000..e267672350c --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "@celo/typescript/tsconfig.library.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "lib" + }, + "include": ["src"], + "references": [{ "path": "../../utils" }] +} diff --git a/packages/attestation-proxy/tslint.json b/packages/sdk/wallets/wallet-hsm-gcp/tslint.json similarity index 62% rename from packages/attestation-proxy/tslint.json rename to packages/sdk/wallets/wallet-hsm-gcp/tslint.json index dfc1be41d87..2c11b3bf4e1 100644 --- a/packages/attestation-proxy/tslint.json +++ b/packages/sdk/wallets/wallet-hsm-gcp/tslint.json @@ -2,6 +2,7 @@ "extends": ["@celo/typescript/tslint.json"], "rules": { "no-global-arrow-functions": false, - "no-console": false + "member-ordering": false, + "max-classes-per-file": false } } diff --git a/packages/sdk/wallets/wallet-hsm-gcp/typedoc.json b/packages/sdk/wallets/wallet-hsm-gcp/typedoc.json new file mode 100644 index 00000000000..86412dd4ba5 --- /dev/null +++ b/packages/sdk/wallets/wallet-hsm-gcp/typedoc.json @@ -0,0 +1,13 @@ +{ + "mode": "modules", + "exclude": ["**/*+(index|.test).ts"], + "excludeNotExported": true, + "excludePrivate": true, + "excludeProtected": true, + "includeDeclarations": false, + "ignoreCompilerErrors": true, + "hideGenerator": "true", + "theme": "gitbook", + "out": "../../../docs/developer-resources/wallet-hsm-gcp/reference", + "gitRevision": "master" + } \ No newline at end of file diff --git a/packages/sdk/wallets/wallet-hsm/package.json b/packages/sdk/wallets/wallet-hsm/package.json index b12a2946bb2..9ca3c863ca1 100644 --- a/packages/sdk/wallets/wallet-hsm/package.json +++ b/packages/sdk/wallets/wallet-hsm/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-hsm", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "HSM wallet implementation utils", "author": "Celo", "license": "Apache-2.0", @@ -22,7 +22,7 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/base": "2.2.1-dev", + "@celo/base": "3.2.1-dev", "@types/asn1js": "^0.0.2", "@types/secp256k1": "^4.0.0", "@types/debug": "^4.1.5", diff --git a/packages/sdk/wallets/wallet-ledger/package.json b/packages/sdk/wallets/wallet-ledger/package.json index 4b88675440d..cee86473dcb 100644 --- a/packages/sdk/wallets/wallet-ledger/package.json +++ b/packages/sdk/wallets/wallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-ledger", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Ledger wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,10 +22,10 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/utils": "2.2.1-dev", - "@celo/wallet-base": "2.2.1-dev", - "@celo/wallet-remote": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/wallet-base": "3.2.1-dev", + "@celo/wallet-remote": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", "@types/ethereumjs-util": "^5.2.0", "eth-lib": "^0.2.8", "ethereumjs-util": "^5.2.0", diff --git a/packages/sdk/wallets/wallet-local/package.json b/packages/sdk/wallets/wallet-local/package.json index d0d905a69b9..2650b19e0e0 100644 --- a/packages/sdk/wallets/wallet-local/package.json +++ b/packages/sdk/wallets/wallet-local/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-local", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Local wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,9 +22,9 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/utils": "2.2.1-dev", - "@celo/connect": "2.2.1-dev", - "@celo/wallet-base": "2.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/wallet-base": "3.2.1-dev", "@types/ethereumjs-util": "^5.2.0", "eth-lib": "^0.2.8", "ethereumjs-util": "^5.2.0" diff --git a/packages/sdk/wallets/wallet-remote/package.json b/packages/sdk/wallets/wallet-remote/package.json index 0e4b15e3990..ec396bccdd2 100644 --- a/packages/sdk/wallets/wallet-remote/package.json +++ b/packages/sdk/wallets/wallet-remote/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-remote", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Remote wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,9 +22,9 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/connect": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", - "@celo/wallet-base": "2.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/wallet-base": "3.2.1-dev", "@types/ethereumjs-util": "^5.2.0", "@types/debug": "^4.1.5", "eth-lib": "^0.2.8", diff --git a/packages/sdk/wallets/wallet-rpc/package.json b/packages/sdk/wallets/wallet-rpc/package.json index 9e102875f35..139f0fc7faa 100644 --- a/packages/sdk/wallets/wallet-rpc/package.json +++ b/packages/sdk/wallets/wallet-rpc/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-rpc", - "version": "2.2.1-dev", + "version": "3.2.1-dev", "description": "Geth RPC wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,16 +22,16 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@celo/connect": "2.2.1-dev", - "@celo/utils": "2.2.1-dev", - "@celo/wallet-base": "2.2.1-dev", - "@celo/wallet-remote": "2.2.1-dev", + "@celo/connect": "3.2.1-dev", + "@celo/utils": "3.2.1-dev", + "@celo/wallet-base": "3.2.1-dev", + "@celo/wallet-remote": "3.2.1-dev", "bignumber.js": "^9.0.0", "debug": "^4.1.1" }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "@celo/contractkit": "2.2.1-dev" + "@celo/contractkit": "3.2.1-dev" }, "engines": { "node": ">=8.13.0" diff --git a/scripts/deploy-sdks.ts b/scripts/deploy-sdks.ts index 1cfcb162a91..095e803a370 100644 --- a/scripts/deploy-sdks.ts +++ b/scripts/deploy-sdks.ts @@ -245,7 +245,7 @@ type Answers = { if (sdkNames.includes(depName)) { const versionUpdate = json.dependencies[depName].includes('-dev') || isSdk ? `${newDevVersion}-dev` : newVersion - json.dependencies[depName] = versionUpdate + json.dependencies[depName] = keepCaretOrTilde(json.dependencies[depName], versionUpdate) packageChanged = true } } @@ -255,7 +255,10 @@ type Answers = { json.devDependencies[depName].includes('-dev') || isSdk ? `${newDevVersion}-dev` : newVersion - json.devDependencies[depName] = versionUpdate + json.devDependencies[depName] = keepCaretOrTilde( + json.devDependencies[depName], + versionUpdate + ) packageChanged = true } } @@ -319,6 +322,10 @@ function removeDevSuffix(version: string) { return version.endsWith('-dev') ? version.slice(0, -4) : version } +function keepCaretOrTilde(old: string, next: string): string { + return old.startsWith('^') || old.startsWith('~') ? `${old.charAt(0)}${next}` : next +} + function readPackageJson(filePath: string): PackageJson { return JSON.parse(fs.readFileSync(filePath).toString()) } diff --git a/scripts/run-docker-validator-network.sh b/scripts/run-docker-validator-network.sh deleted file mode 100755 index caceebde22c..00000000000 --- a/scripts/run-docker-validator-network.sh +++ /dev/null @@ -1,471 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -export LC_ALL=en_US.UTF-8 - -# Usage: run-network.sh -COMMAND=${1:-"pull,accounts,run-validator,run-proxy,status,print-env"} -DATA_DIR=${2:-"$HOME/.celo/network"} - -export CELO_IMAGE=${3:-"us.gcr.io/celo-testnet/celo-node:baklava"} -export NETWORK_ID=${4:-"200110"} -export NETWORK_NAME=${5:-"baklava"} -export DEFAULT_PASSWORD=${6:-"1234"} -export CELO_IMAGE_ATTESTATION=${7:-"us.gcr.io/celo-testnet/celo-monorepo@sha256:90ea6739f9d239218245b5dce30e1bb5f05ac8dbc59f8e6f315502635c05ccb1"} -export CELO_PROVIDER=${8:-"https://baklava-forno.celo-testnet.org/"} # https://berlintestnet001-forno.celo-networks-dev.org/ -export DATABASE_URL=${9:-"sqlite://db/attestation.db"} - -export VALIDATOR_NAME=johndoe_$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 8 | head -n 1) -export VALIDATOR_GROUP_NAME=tijuana_$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 8 | head -n 1) - -export CELOCLI="npx celocli" - -export TWILIO_MESSAGING_SERVICE_SID=MG00000000000000000000000000000000 -export TWILIO_VERIFY_SERVICE_SID=VA00000000000000000000000000000000 -export TWILIO_ACCOUNT_SID=AC00000000000000000000000000000000 -export TWILIO_BLACKLIST="" -export TWILIO_AUTH_TOKEN="ffffffffffffffffffffffffffffffff" - -# If the value is true, the script will print the CELO_* environment variables -export FORCE_PRINT_ENV=true - -HOSTNAME=$(hostname) -export ETHSTATS_ARG="$HOSTNAME@$NETWORK_NAME-ethstats.celo-testnet.org" - -ACCOUNTS_DIR="${DATA_DIR}/accounts" -VALIDATOR_DIR="${DATA_DIR}/validator" -PROXY_DIR="${DATA_DIR}/proxy" -FULLNODE_DIR="${DATA_DIR}/fullnode" -ATTESTATION_DIR="${DATA_DIR}/attestations" - - -mkdir -p $DATA_DIR -mkdir -p $ACCOUNTS_DIR -mkdir -p $VALIDATOR_DIR -mkdir -p $PROXY_DIR -mkdir -p $FULLNODE_DIR -mkdir -p $ATTESTATION_DIR - -__PWD=$PWD - -__DIRNAME=$(dirname $0) - -if [[ -f $__DIRNAME/validator-config.rc ]]; then - - echo -e "Loading config from $__DIRNAME/validator-config.rc" - set -o allexport - source $__DIRNAME/validator-config.rc - set +o allexport -fi - - -#### Internal functions -remove_containers () { - echo -e "\tRemoving previous celo containers" - docker rm -f celo-proxy celo-validator celo-attestation-service celo-accounts || echo -e "Containers removed" -} - -make_status_requests () { - echo -e "Checking Proxy and Validator state:" - - echo -n "* eth_blockNumber:" - curl -X POST --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' -H "Content-Type: application/json" localhost:8545 - - echo -n "* Validator net_peerCount:" - curl -X POST --data '{"jsonrpc":"2.0","method":"net_peerCount","params":[],"id":74}' -H "Content-Type: application/json" localhost:8545 - - echo -n "* Validator eth_mining:" - curl -X POST --data '{"jsonrpc":"2.0","method":"eth_mining","params":[],"id":1}' -H "Content-Type: application/json" localhost:8545 - - echo -e "" - -} - -initialize_geth () { - - echo -e "\tInitializing container" - docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c "wget -nv https://www.googleapis.com/storage/v1/b/genesis_blocks/o/$NETWORK_NAME?alt=media -O /root/.celo/genesis.json" - docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c "wget -nv https://storage.googleapis.com/env_bootnodes/$NETWORK_NAME -O /root/.celo/bootnodes" - - docker run -v $PWD:/root/.celo --rm -it $CELO_IMAGE init /celo/genesis.json -} - -#### Main - - -if [[ $COMMAND == *"help"* ]]; then - - echo -e "Script for running a local validator network using docker containers. This script runs:" - echo -e "\t - A Validator node" - echo -e "\t - A Proxy node" - echo -e "\t - An attestation service\n" - - echo -e "Options:" - echo -e "$0 " - echo -e "\t - Command; comma separated list of actions to execute. Options are: help, pull, clean, accounts, run-validator, run-proxy, run-attestation, register-metadata, run-fullnode, status, print-env, get-cooking, stop-validating. Default: pull,accounts,run-validator,run-proxy,status" - echo -e "\t - Data Dir; Local folder where will be created the data dir for the nodes. Default: $HOME/.celo/network" - echo -e "\t - Celo Image; Image to download" - echo -e "\t - Celo Network; Docker image network to use (typically alfajores or baklava, but you can use a commit). " - echo -e "\t - Network Id; 31417 for integration, 44785 for alfajores, etc." - echo -e "\t - Network Name; integration by default" - echo -e "\t - Password; Password to use during the creation of accounts" - - echo -e "\n**********\n\nExamples:\n" - echo -e "\tIf you want to create the local accounts, run a Proxy and a Validator connected to it:" - echo -e "\t$0 pull,accounts,run-validator,run-proxy,status,print-env" - - echo -e "\n\tIf you have already your accounts, proxy and validator set up, you can run the following command to run TGCSO" - echo -e "\t$0 get-cooking" - - echo -e "\n\tIf you want to play TGCSO without being re-using your previously created accounts without restarting the proxy and validator, it's recommended to copy all your CELO environment variables in the 'validator-config.rc' file. The script will source the variables from there. " - - echo -e "\n" - exit 0 -fi - -if [[ $COMMAND == *"pull"* ]]; then - - echo -e "* Downloading docker image: $CELO_IMAGE" - docker pull $CELO_IMAGE - -fi - - -if [[ $COMMAND == *"clean"* ]]; then - - echo -e "* Removing data dir $DATA_DIR" - rm -rf $DATA_DIR/* - mkdir -p $DATA_DIR - mkdir -p $ACCOUNTS_DIR - mkdir -p $VALIDATOR_DIR - mkdir -p $PROXY_DIR - mkdir -p $FULLNODE_DIR - mkdir -p $ATTESTATION_DIR -fi - - -if [[ $COMMAND == *"accounts"* ]]; then - - echo -e "* Creating accounts ..." - cd $ACCOUNTS_DIR - - docker rm -f celo-accounts || echo -e "Containers removed" - - export CELO_VALIDATOR_ADDRESS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account new " |tail -1| cut -d'{' -f 2| tr -cd "[:alnum:]\n" ) - export CELO_VALIDATOR_GROUP_ADDRESS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account new " |tail -1| cut -d'{' -f 2| tr -cd "[:alnum:]\n" ) - - initialize_geth - - cd $VALIDATOR_DIR - export CELO_VALIDATOR_SIGNER_ADDRESS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account new " |tail -1| cut -d'{' -f 2| tr -cd "[:alnum:]\n" ) - - initialize_geth - - echo -e "\tCELO_VALIDATOR_ADDRESS=$CELO_VALIDATOR_ADDRESS" - echo -e "\tCELO_VALIDATOR_GROUP_ADDRESS=$CELO_VALIDATOR_GROUP_ADDRESS" - echo -e "\tCELO_VALIDATOR_SIGNER_ADDRESS=$CELO_VALIDATOR_SIGNER_ADDRESS" - - cd $ACCOUNTS_DIR - - echo -e "Starting local Docker holding the accounts. You can attach to it running 'screen -r -S celo-accounts'\n" - screen -S celo-accounts -d -m docker run --name celo-accounts --restart always -p 127.0.0.1:8545:8545 -v $PWD:/root/.celo $CELO_IMAGE --verbosity 3 --networkid $NETWORK_ID --syncmode full --rpc --rpcaddr 0.0.0.0 --rpcapi eth,net,web3,debug,admin,personal - - - echo -e "\tGenerating the Validator Proof of Possesion" - cd $VALIDATOR_DIR - - __POS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account proof-of-possession $CELO_VALIDATOR_SIGNER_ADDRESS $CELO_VALIDATOR_ADDRESS "| tail -2 ) - export CELO_VALIDATOR_SIGNER_PUBLIC_KEY=$(echo $__POS | cut -d' ' -f 6| tr -cd "[:alnum:]\n" ) - export CELO_VALIDATOR_SIGNER_SIGNATURE=$(echo $__POS | cut -d' ' -f 2| tr -cd "[:alnum:]\n" ) - - echo -e "\tCELO_VALIDATOR_SIGNER_PUBLIC_KEY=$CELO_VALIDATOR_SIGNER_PUBLIC_KEY" - echo -e "\tCELO_VALIDATOR_SIGNER_SIGNATURE=$CELO_VALIDATOR_SIGNER_SIGNATURE" - - - echo -e "\tGenerating the Validator Proof of Possesion of the BLS key" - __BLS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account proof-of-possession $CELO_VALIDATOR_SIGNER_ADDRESS $CELO_VALIDATOR_ADDRESS --bls "| tail -2 ) - export CELO_VALIDATOR_SIGNER_BLS_PUBLIC_KEY=$(echo $__BLS | cut -d' ' -f 6| tr -cd "[:alnum:]\n" ) - export CELO_VALIDATOR_SIGNER_BLS_SIGNATURE=$(echo $__BLS | cut -d' ' -f 2| tr -cd "[:alnum:]\n" ) - - echo -e "\tCELO_VALIDATOR_SIGNER_BLS_PUBLIC_KEY=$CELO_VALIDATOR_SIGNER_BLS_PUBLIC_KEY" - echo -e "\tCELO_VALIDATOR_SIGNER_BLS_SIGNATURE=$CELO_VALIDATOR_SIGNER_BLS_SIGNATURE" - -fi - -if [[ $COMMAND == *"run-proxy"* ]]; then - - echo -e "* Let's run the Proxy ..." - cd $PROXY_DIR - - docker rm -f celo-proxy || echo -e "Containers removed" - - initialize_geth - export BOOTNODE_ENODES=$(docker run -v $PWD:/root/.celo --rm --entrypoint cat $CELO_IMAGE /root/.celo/bootnodes) - - screen -S celo-proxy -d -m docker run --name celo-proxy --restart always -p 30313:30303 -p 30313:30303/udp -p 30503:30503 -p 30503:30503/udp -v $PWD:/root/.celo $CELO_IMAGE --verbosity 3 --networkid $NETWORK_ID --syncmode full --proxy.proxy --proxy.proxiedvalidatoraddress $CELO_VALIDATOR_SIGNER_ADDRESS --proxy.internalendpoint :30503 --etherbase $CELO_VALIDATOR_SIGNER_ADDRESS --bootnodes $BOOTNODE_ENODES --ethstats=proxy-$ETHSTATS_ARG - - sleep 5s - - echo -e "The Proxy should be starting. You can attach to it running 'screen -r -S celo-proxy'\n" - -fi - - - - - -if [[ $COMMAND == *"run-validator"* ]]; then - - echo -e "* Let's run the Validator ..." - cd $VALIDATOR_DIR - - docker rm -f celo-validator || echo -e "Containers removed" - export PROXY_ENODE=$(docker exec celo-proxy geth --exec "admin.nodeInfo['enode'].split('//')[1].split('@')[0]" attach | tr -d '"') - export PROXY_INTERNAL_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' celo-proxy) - export PROXY_EXTERNAL_IP=$(curl -s ipecho.net/plain; echo| tr -cd "[:alnum:]\n") - - export ENODE="enode://$PROXY_ENODE@$PROXY_INTERNAL_IP:30503;enode://$PROXY_ENODE@$PROXY_EXTERNAL_IP:30303" - - echo -e "\tConnecting Validator to Proxy running at $ENODE" - docker run -v $PWD:/root/.celo --entrypoint sh --rm $CELO_IMAGE -c "echo $DEFAULT_PASSWORD > /root/.celo/.password" - screen -S celo-validator -d -m docker run --name celo-validator --restart always -p 30303:30303 -p 30303:30303/udp -v $PWD:/root/.celo $CELO_IMAGE --verbosity 3 --networkid $NETWORK_ID --syncmode full --mine --istanbul.blockperiod=5 --istanbul.requesttimeout=3000 --etherbase $CELO_VALIDATOR_SIGNER_ADDRESS --nodiscover --proxy.proxied --proxy.proxyenodeurlpair=$ENODE --unlock=$CELO_VALIDATOR_SIGNER_ADDRESS --password /root/.celo/.password --ethstats=validator-$ETHSTATS_ARG - - sleep 5s - - echo -e "The Validator should be starting. You can attach to it running 'screen -r -S celo-validator'\n" - -fi - - -if [[ $COMMAND == *"stop-validating"* ]]; then - - echo -e "* Let's stop of validate ..." - - if [ -z ${CELO_VALIDATOR_ADDRESS+x} ]; then echo "CELO_VALIDATOR_ADDRESS is unset"; exit 1; fi - if [ -z ${CELO_VALIDATOR_GROUP_ADDRESS+x} ]; then echo "CELO_VALIDATOR_GROUP_ADDRESS is unset"; exit 1; fi - - - echo -e "\tDe-registering Validator $CELO_VALIDATOR_ADDRESS" - $CELOCLI validator:deaffiliate --from $CELO_VALIDATOR_ADDRESS - $CELOCLI validator:deregister --from $CELO_VALIDATOR_ADDRESS - - $CELOCLI election:revoke --from $CELO_VALIDATOR_ADDRESS --for $CELO_VALIDATOR_GROUP_ADDRESS --value 10000000000000000000000 - $CELOCLI election:revoke --from $CELO_VALIDATOR_GROUP_ADDRESS --for $CELO_VALIDATOR_GROUP_ADDRESS --value 10000000000000000000000 - - echo -e "\tDeregister validator group:" - $CELOCLI validatorgroup:deregister --from $CELO_VALIDATOR_GROUP_ADDRESS - - docker stop celo-validator celo-proxy -fi - - -if [[ $COMMAND == *"run-attestation"* ]]; then - - echo -e "* Let's run the attestation service ..." - cd $ATTESTATION_DIR - docker rm -f celo-attestations celo-attestation-service || echo -e "Containers removed" - - initialize_geth - - echo -e "\tPulling docker image: $CELO_IMAGE_ATTESTATION" - docker pull $CELO_IMAGE_ATTESTATION - - if [ -z ${CELO_ATTESTATION_SIGNER_ADDRESS+x} ]; then - echo -e "CELO_ATTESTATION_SIGNER_ADDRESS is unset. Generating address."; - export CELO_ATTESTATION_SIGNER_ADDRESS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account new " |tail -1| cut -d'{' -f 2| tr -cd "[:alnum:]\n" ) - else - echo -e "Using existing CELO_ATTESTATION_SIGNER_ADDRESS=$CELO_ATTESTATION_SIGNER_ADDRESS"; - fi - - - echo -e "\tGenerating attestation proof of possession" - __POS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account proof-of-possession $CELO_ATTESTATION_SIGNER_ADDRESS $CELO_VALIDATOR_ADDRESS "| tail -2 ) - export CELO_ATTESTATION_SIGNER_PUBLIC_KEY=$(echo $__POS | cut -d' ' -f 6| tr -cd "[:alnum:]\n" ) - export CELO_ATTESTATION_SIGNER_SIGNATURE=$(echo $__POS | cut -d' ' -f 2| tr -cd "[:alnum:]\n" ) - - echo -e "\tStarting celo-attestations node" - docker run -v $PWD:/root/.celo --entrypoint sh --rm $CELO_IMAGE -c "echo $DEFAULT_PASSWORD > /root/.celo/.password" - screen -S celo-attestations -d -m docker run --name celo-attestations -it --restart always -p 127.0.0.1:8545:8545 -v $PWD:/root/.celo $CELO_IMAGE --verbosity 3 --networkid $NETWORK_ID --syncmode full --rpc --rpcaddr 0.0.0.0 --rpcapi eth,net,web3,debug,admin --unlock $CELO_ATTESTATION_SIGNER_ADDRESS --password /root/.celo/.password - export CELO_PROVIDER=http://localhost:8545 - - echo -e "\tStarting attestation service" - screen -S celo-attestation-service -d -m docker run --name celo-attestation-service -it --restart always --entrypoint /bin/bash --network host -e ATTESTATION_SIGNER_ADDRESS=0x$CELO_ATTESTATION_SIGNER_ADDRESS -e CELO_VALIDATOR_ADDRESS=0x$CELO_VALIDATOR_ADDRESS -e CELO_PROVIDER=$CELO_PROVIDER -e DATABASE_URL=$DATABASE_URL -e SMS_PROVIDERS=twilio -e TWILIO_MESSAGING_SERVICE_SID=$TWILIO_MESSAGING_SERVICE_SID -e TWILIO_VERIFY_SERVICE_SID=$TWILIO_VERIFY_SERVICE_SID -e TWILIO_ACCOUNT_SID=$TWILIO_ACCOUNT_SID -e TWILIO_BLACKLIST=$TWILIO_BLACKLIST -e TWILIO_AUTH_TOKEN=$TWILIO_AUTH_TOKEN -e PORT=80 -p 80:80 $CELO_IMAGE_ATTESTATION -c " cd /celo-monorepo/packages/attestation-service && yarn run db:migrate && yarn start " - - echo -e "\tAttestation service should be running, you can check running 'screen -ls'" - echo -e "\tYou can re-attach to the attestation-service node running:" - echo -e "\t 'screen -r -S celo-attestations'\n" - echo -e "\tOr the attestations service running:" - echo -e "\t 'screen -r -S celo-attestation-service'\n" - - echo -e "\n************************************************************************\n" - echo -e "Attestation Celo Environment Variables (copy to validator-config.rc to re-use them!):\n\n" - echo -e "CELO_ATTESTATION_SIGNER_ADDRESS=$CELO_ATTESTATION_SIGNER_ADDRESS" - echo -e "\n************************************************************************\n" - - echo -e "\tFor authorizing the attestation signer you need to run the following commands where you are running celo-accounts" - echo -e "\n************************************************************************\n" - echo -e "export CELO_ATTESTATION_SIGNER_SIGNATURE=$CELO_ATTESTATION_SIGNER_SIGNATURE" - echo -e "export CELO_ATTESTATION_SIGNER_ADDRESS=$CELO_ATTESTATION_SIGNER_ADDRESS" - echo -e $CELOCLI account:authorize --from $CELO_VALIDATOR_ADDRESS --role attestation --signature 0x$CELO_ATTESTATION_SIGNER_SIGNATURE --signer 0x$CELO_ATTESTATION_SIGNER_ADDRESS - echo -e "\n************************************************************************\n" - - -fi - - -if [[ $COMMAND == *"register-metadata"* ]]; then - - if [ -z ${CELO_VALIDATOR_ADDRESS+x} ]; then echo "CELO_VALIDATOR_ADDRESS is unset"; exit 1; fi - if [ -z ${CELO_VALIDATOR_GROUP_ADDRESS+x} ]; then echo "CELO_VALIDATOR_GROUP_ADDRESS is unset"; exit 1; fi - if [ -z ${ATTESTATION_SERVICE_URL+x} ]; then echo "ATTESTATION_SERVICE_URL is unset"; exit 1; fi - if [ -z ${METADATA_URL+x} ]; then echo "METADATA_URL is unset"; exit 1; fi - if [ -z ${GROUP_METADATA_URL+x} ]; then echo "GROUP_METADATA_URL is unset"; exit 1; fi - - - echo -e "* Registering attestation metadata ..." - $CELOCLI account:create-metadata ./metadata.json --from 0x$CELO_VALIDATOR_ADDRESS - - echo -e "\tSpecify the URL where this Attestation Service is" - $CELOCLI account:claim-attestation-service-url ./metadata.json --url $ATTESTATION_SERVICE_URL --from 0x$CELO_VALIDATOR_ADDRESS - echo -e "\tClaiming our group address" - $CELOCLI account:claim-account ./metadata.json --address 0x$CELO_VALIDATOR_GROUP_ADDRESS --from 0x$CELO_VALIDATOR_ADDRESS - - echo -e "\tRegistering metadata URL" - $CELOCLI account:register-metadata --url $METADATA_URL --from $CELO_VALIDATOR_ADDRESS - - $CELOCLI account:get-metadata $CELO_VALIDATOR_ADDRESS - - #$CELOCLI identity:test-attestation-service --from $CELO_VALIDATOR_ADDRESS --phoneNumber $PHONE_NUMBER --message "test message" - echo -e "\tRegistering group metadata URL" - $CELOCLI account:create-metadata ./group-metadata.json --from 0x$CELO_VALIDATOR_GROUP_ADDRESS - $CELOCLI account:claim-account ./group-metadata.json --address 0x$CELO_VALIDATOR_ADDRESS --from 0x$CELO_VALIDATOR_GROUP_ADDRESS - $CELOCLI account:register-metadata --url $GROUP_METADATA_URL --from $CELO_VALIDATOR_GROUP_ADDRESS -fi - -if [[ $COMMAND == *"status"* ]]; then - - make_status_requests - -fi - -if [[ $COMMAND == *"run-fullnode"* ]]; then - - echo -e "* Let's run the full node ..." - cd $FULLNODE_DIR - - docker rm -f celo-fullnode || echo -e "Container removed" - - export BOOTNODE_ENODES=$(docker run -v $PWD:/root/.celo --rm --entrypoint cat $CELO_IMAGE /root/.celo/bootnodes) - - if [ -z ${CELO_ACCOUNT_ADDRESS+x} ]; then - echo "CELO_ACCOUNT_ADDRESS is unset, creating account"; - export CELO_ACCOUNT_ADDRESS=$(docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c " printf '%s\n' $DEFAULT_PASSWORD $DEFAULT_PASSWORD | geth account new " |tail -1| cut -d'{' -f 2| tr -cd "[:alnum:]\n" ) - else - echo "CELO_ACCOUNT_ADDRESS is set to '$CELO_ACCOUNT_ADDRESS'"; - fi - - docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c "wget -nv https://storage.googleapis.com/env_bootnodes/$NETWORK_NAME -O /root/.celo/bootnodes" - docker run -v $PWD:/root/.celo --entrypoint /bin/sh -it $CELO_IMAGE -c "wget -nv https://www.googleapis.com/storage/v1/b/genesis_blocks/o/$NETWORK_NAME?alt=media -O /root/.celo/genesis.json" - docker run -v $PWD:/root/.celo $CELO_IMAGE init /root/.celo/genesis.json - - echo -e "\tStarting the Full Node" - - screen -S celo-fullnode -d -m docker run --name celo-fullnode --restart always -p 127.0.0.1:8545:8545 -p 127.0.0.1:8546:8546 -p 30303:30303 -p 30303:30303/udp -v $PWD:/root/.celo $CELO_IMAGE --verbosity 3 --networkid $NETWORK_ID --syncmode full --rpc --rpcaddr 0.0.0.0 --rpcapi eth,net,web3,debug,admin,personal,txpool --lightserv 90 --lightpeers 1000 --maxpeers 1100 --etherbase $CELO_ACCOUNT_ADDRESS --bootnodes $BOOTNODE_ENODES - - sleep 2s - - echo -e "\n************************************************************************\n" - echo -e "Celo Full Node Environment Variables (copy to validator-config.rc to re-use them!):\n\n" - echo -e "CELO_ACCOUNT_ADDRESS=$CELO_ACCOUNT_ADDRESS" - echo -e "\n************************************************************************\n" - - echo -e "\tEverything should be running, you can check running 'screen -ls'" - screen -ls - - echo -e "\tYou can re-attach to the full node running:" - echo -e "\t 'screen -r -S celo-fullnode'\n" -fi - -if [[ $COMMAND == *"print-env"* ]] || [[ $FORCE_PRINT_ENV == *"true"* ]]; then - - echo -e "\n************************************************************************\n" - echo -e "Celo Environment Variables (copy to validator-config.rc to re-use them!):\n\n" - echo -e "CELO_VALIDATOR_ADDRESS=$CELO_VALIDATOR_ADDRESS" - echo -e "CELO_VALIDATOR_GROUP_ADDRESS=$CELO_VALIDATOR_GROUP_ADDRESS" - echo -e "CELO_VALIDATOR_SIGNER_ADDRESS=$CELO_VALIDATOR_SIGNER_ADDRESS" - echo -e "CELO_VALIDATOR_SIGNER_PUBLIC_KEY=$CELO_VALIDATOR_SIGNER_PUBLIC_KEY" - echo -e "CELO_VALIDATOR_SIGNER_SIGNATURE=$CELO_VALIDATOR_SIGNER_SIGNATURE" - echo -e "CELO_VALIDATOR_SIGNER_BLS_PUBLIC_KEY=$CELO_VALIDATOR_SIGNER_BLS_PUBLIC_KEY" - echo -e "CELO_VALIDATOR_SIGNER_BLS_SIGNATURE=$CELO_VALIDATOR_SIGNER_BLS_SIGNATURE" - echo -e "\n************************************************************************\n" - -fi - -if [[ $COMMAND == *"get-cooking"* ]]; then - - echo -e "* Prepping validator for The Great Celo Stake Off..." - - echo -e "\t1. Unlocking accounts .." - $CELOCLI account:unlock --account $CELO_VALIDATOR_GROUP_ADDRESS --password $DEFAULT_PASSWORD - $CELOCLI account:unlock --account $CELO_VALIDATOR_ADDRESS --password $DEFAULT_PASSWORD - - echo -e "\t2. Registering accounts .." - $CELOCLI account:register --from $CELO_VALIDATOR_GROUP_ADDRESS --name $VALIDATOR_GROUP_NAME || echo -e "$CELO_VALIDATOR_GROUP_ADDRESS already registered" - $CELOCLI account:register --from $CELO_VALIDATOR_ADDRESS --name $VALIDATOR_NAME || echo -e "$CELO_VALIDATOR_ADDRESS already registered" - - echo -e "\t3. Locking Gold .." - $CELOCLI lockedgold:lock --from $CELO_VALIDATOR_GROUP_ADDRESS --value 10000000000000000000000 - $CELOCLI lockedgold:lock --from $CELO_VALIDATOR_ADDRESS --value 10000000000000000000000 - - $CELOCLI lockedgold:show $CELO_VALIDATOR_GROUP_ADDRESS - $CELOCLI lockedgold:show $CELO_VALIDATOR_ADDRESS - - echo -e "\t4. Run for election .." - echo -e "\t * Authorize the validator signing key" - $CELOCLI account:authorize --from $CELO_VALIDATOR_ADDRESS --role validator --signature 0x$CELO_VALIDATOR_SIGNER_SIGNATURE --signer 0x$CELO_VALIDATOR_SIGNER_ADDRESS || echo -e "Validator Signing Key $CELO_VALIDATOR_ADDRESS already authorized" - - $CELOCLI account:show $CELO_VALIDATOR_ADDRESS - - echo -e "\t * Register Validator Group address" - $CELOCLI validatorgroup:register --from $CELO_VALIDATOR_GROUP_ADDRESS --commission 0.1 || echo -e "Validator Group $CELO_VALIDATOR_GROUP_ADDRESS already registered" - - $CELOCLI validatorgroup:show $CELO_VALIDATOR_GROUP_ADDRESS - - echo -e "\t * Register Validator" - $CELOCLI validator:register --from $CELO_VALIDATOR_ADDRESS --ecdsaKey $CELO_VALIDATOR_SIGNER_PUBLIC_KEY --blsKey $CELO_VALIDATOR_SIGNER_BLS_PUBLIC_KEY --blsSignature $CELO_VALIDATOR_SIGNER_BLS_SIGNATURE || echo -e "Validator $CELO_VALIDATOR_GROUP_ADDRESS already registered" - - echo -e "\t * Affiliate Validator with Validator Group" - $CELOCLI validator:affiliate $CELO_VALIDATOR_GROUP_ADDRESS --from $CELO_VALIDATOR_ADDRESS - - echo -e "\t * Accept affiliation" - $CELOCLI validatorgroup:member --accept $CELO_VALIDATOR_ADDRESS --from $CELO_VALIDATOR_GROUP_ADDRESS - - $CELOCLI validator:show $CELO_VALIDATOR_ADDRESS - $CELOCLI validatorgroup:show $CELO_VALIDATOR_GROUP_ADDRESS - - echo -e "\t * Vote Validator Group" - $CELOCLI election:vote --from $CELO_VALIDATOR_ADDRESS --for $CELO_VALIDATOR_GROUP_ADDRESS --value 10000000000000000000000 || echo -e "Validator $CELO_VALIDATOR_ADDRESS already vote to $CELO_VALIDATOR_GROUP_ADDRESS" - $CELOCLI election:vote --from $CELO_VALIDATOR_GROUP_ADDRESS --for $CELO_VALIDATOR_GROUP_ADDRESS --value 10000000000000000000000 || echo -e "Validator $CELO_VALIDATOR_ADDRESS already vote to $CELO_VALIDATOR_GROUP_ADDRESS" - - echo -e "\t * Checking votes" - $CELOCLI election:show $CELO_VALIDATOR_GROUP_ADDRESS --group - $CELOCLI election:show $CELO_VALIDATOR_GROUP_ADDRESS --voter - $CELOCLI election:show $CELO_VALIDATOR_ADDRESS --voter - - echo -e "\t State of the validation elections" - $CELOCLI election:list - - echo -e "\t Current elected validators" - $CELOCLI election:current - - echo -e "\t Checking if validator is elected and signing blocks" - $CELOCLI validator:status --validator $CELO_VALIDATOR_ADDRESS - -fi - -cd $__PWD - - - - - diff --git a/scripts/validator-config.rc b/scripts/validator-config.rc deleted file mode 100644 index d612f8b71da..00000000000 --- a/scripts/validator-config.rc +++ /dev/null @@ -1,35 +0,0 @@ -# Example configuration. Fill in your details here. - -#DEFAULT_PASSWORD="1234" - -#VALIDATOR_GROUP_NAME="validator-group" -#VALIDATOR_NAME="validator-0" - -#TWILIO_MESSAGING_SERVICE_SID= -#TWILIO_VERIFY_SERVICE_SID= -#TWILIO_ACCOUNT_SID= -#TWILIO_BLACKLIST="" -#TWILIO_AUTH_TOKEN="" - -#CELO_VALIDATOR_ADDRESS= -#CELO_VALIDATOR_GROUP_ADDRESS= -#CELO_VALIDATOR_SIGNER_ADDRESS= -#CELO_VALIDATOR_SIGNER_PUBLIC_KEY= -#CELO_VALIDATOR_SIGNER_SIGNATURE= -#CELO_VALIDATOR_SIGNER_BLS_PUBLIC_KEY= -#CELO_VALIDATOR_SIGNER_BLS_SIGNATURE= -#CELO_ATTESTATION_SIGNER_ADDRESS= -#CELO_ACCOUNT_ADDRESS= - -# Attestation Service metadata -#ATTESTATION_SERVICE_URL= -#METADATA_URL= -#GROUP_METADATA_URL= - -#CELO_IMAGE="us.gcr.io/celo-testnet/celo-node:baklava" -#NETWORK_ID=200110 -#NETWORK_NAME=baklava -#CELO_IMAGE_ATTESTATION="us.gcr.io/celo-testnet/celo-monorepo:attestation-service-8f87dda20f1854c9532a5cbcf8ff556f48dff413" -#CELO_PROVIDER="http://localhost:8545" -#DATABASE_URL="sqlite://db/attestation.db" -#CELOCLI=celocli # ~/Projects/Celo/celo-monorepo/packages/cli/bin/run diff --git a/yarn.lock b/yarn.lock index e2c1792c774..0e21941cd06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1245,10 +1245,10 @@ resolved "https://registry.yarnpkg.com/@celo/base/-/base-1.5.1.tgz#53e16cd36c51f9eaeec0321f6752de6385f2a131" integrity sha512-76MAosahwCDjkBsqfgnKT2CbyjV6TdzIztHJvAuJ+VrKeaIFe/IMoPwIxPy95xDJmHhD0zqPWMixGeyVGAwYQw== -"@celo/base@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/base/-/base-2.2.0.tgz#cb769b0644408327cbe631400a8455d195a657ab" - integrity sha512-+jo52+er1TV9Qe6nCmzQ2dLt6M8J9STEJDaU+uiPyMVhMBcnYBpWzu9FJJPERmttejOC7hFuudrJI83vJulc4Q== +"@celo/base@1.5.2", "@celo/base@^1.2.0": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/base/-/base-1.5.2.tgz#168ab5e4e30b374079d8d139fafc52ca6bfd4100" + integrity sha512-KGf6Dl9E6D01vAfkgkjL2sG+zqAjspAogILIpWstljWdG5ifyA75jihrnDEHaMCoQS0KxHvTdP1XYS/GS6BEyQ== "@celo/bls12377js@0.1.1": version "0.1.1" @@ -1258,29 +1258,27 @@ "@stablelib/blake2xs" "0.10.4" big-integer "^1.6.44" -"@celo/connect@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/connect/-/connect-2.2.0.tgz#e931ba2622f1967a3e2190f46cac59ab6f6373a3" - integrity sha512-IAT1f3+ZYMod0H6M8HorZj8bNhfgxjL7GlofdNZRceTo1Cy8iyNr+26K+x5sHeXI8QgTUKdaxLWgmCQCEU7ARw== +"@celo/connect@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/connect/-/connect-1.5.2.tgz#09f0b03bda6f8a6d523fd010492f204cbe82aabd" + integrity sha512-IHsvYp1HizIPfPPeIHyvsmJytIf7HNtNWo9CqCbsqfNfmw53q6dFJu2p5X0qz/fUnR5840cUga8cEyuYZTfp+w== dependencies: - "@celo/base" "2.2.0" - "@celo/utils" "2.2.0" + "@celo/utils" "1.5.2" "@types/debug" "^4.1.5" "@types/utf8" "^2.1.6" bignumber.js "^9.0.0" debug "^4.1.1" utf8 "3.0.0" -"@celo/contractkit@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/contractkit/-/contractkit-2.2.0.tgz#5cfcfdb4e5ec22f8ca071405c0d552b632137912" - integrity sha512-nIgCGDnOtCG5QtPJFzaDOOk12O6A8Bjk+tey46okeasvcT1uw2mQpLoelQ/PloTSbLQty3/IATNSPrQWqXShFA== +"@celo/contractkit@1.5.2", "@celo/contractkit@^1.2.0": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/contractkit/-/contractkit-1.5.2.tgz#be15d570f3044a190dabb6bbe53d5081c78ea605" + integrity sha512-b0r5TlfYDEscxze1Ai2jyJayiVElA9jvEehMD6aOSNtVhfP8oirjFIIffRe0Wzw1MSDGkw+q1c4m0Yw5sEOlvA== dependencies: - "@celo/base" "2.2.0" - "@celo/connect" "2.2.0" - "@celo/utils" "2.2.0" - "@celo/wallet-local" "2.2.0" - "@types/bn.js" "^5.1.0" + "@celo/base" "1.5.2" + "@celo/connect" "1.5.2" + "@celo/utils" "1.5.2" + "@celo/wallet-local" "1.5.2" "@types/debug" "^4.1.5" bignumber.js "^9.0.0" cross-fetch "^3.0.6" @@ -1290,15 +1288,14 @@ semver "^7.3.5" web3 "1.3.6" -"@celo/identity@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/identity/-/identity-2.2.0.tgz#a218faa2d53d5e4941c4da24a0ec2c65dd8eadc8" - integrity sha512-8VrbtC51+7Hw2oiuRzVhNU/HvK8dapUuzl1yN9lWlETgfHsiiJMk8ucw4oqJc137siBRxUdHIxuHgsDXzUzsdQ== +"@celo/identity-prev@npm:@celo/identity@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@celo/identity/-/identity-1.2.0.tgz#822ce8f2237a8498fad6910a2d2707f6b67a6999" + integrity sha512-vpipC8qyEueIKKY0skPXaNwUDIhodGPv9wfFZ5mywzTIz46dbT0VmNSYkvOnoXlqvAjrwdzgvETbVMmpHpj3Xw== dependencies: - "@celo/base" "2.2.0" - "@celo/contractkit" "2.2.0" - "@celo/phone-number-privacy-common" "1.0.39" - "@celo/utils" "2.2.0" + "@celo/base" "^1.2.0" + "@celo/contractkit" "^1.2.0" + "@celo/utils" "^1.2.0" "@types/debug" "^4.1.5" bignumber.js "^9.0.0" blind-threshold-bls "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a" @@ -1308,7 +1305,25 @@ fp-ts "2.1.1" io-ts "2.0.1" -"@celo/poprf@^0.1.6": +"@celo/phone-number-privacy-common@1.0.39": + version "1.0.39" + resolved "https://registry.yarnpkg.com/@celo/phone-number-privacy-common/-/phone-number-privacy-common-1.0.39.tgz#3c9568f70378d24d11afcc4306024c5cf4f8efe9" + integrity sha512-0sbeuoYCN2ZQYO1CryR0Hf9HhOQKuIDZraWFMpUlwrUKk5qKmSMlV16xobG4VL5qUpXHgIRjKPfmcaf0rkrn8A== + dependencies: + "@celo/base" "1.5.2" + "@celo/contractkit" "1.5.2" + "@celo/utils" "1.5.2" + bignumber.js "^9.0.0" + blind-threshold-bls "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a" + btoa "1.2.1" + bunyan "1.8.12" + bunyan-debug-stream "2.0.0" + bunyan-gke-stackdriver "0.1.2" + dotenv "^8.2.0" + elliptic "^6.5.4" + is-base64 "^1.1.0" + +"@celo/poprf@^0.1.9": version "0.1.9" resolved "https://registry.yarnpkg.com/@celo/poprf/-/poprf-0.1.9.tgz#38c514ce0f572b80edeb9dc280b6cf5e9d7c2a75" integrity sha512-+993EA/W+TBCZyY5G0B2EVdXnPX6t2AldgRAIMaT9WIqTwZKi/TcdJDUQl8mj7HEHMPHlpgCBOVgaHkUcwo/5A== @@ -1354,31 +1369,47 @@ web3-eth-abi "1.3.6" web3-utils "1.3.6" -"@celo/utils@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/utils/-/utils-2.2.0.tgz#a852435391b1abc492aa9436837e49beb906cf70" - integrity sha512-oCDZt44Ch30/4m+G+7gcuiKmo/WgptMpmxxSLH+h3Wmc6LUWS/F/9SFcdlTbJF0sH3LOXchczO+HUlATJ+vQNQ== +"@celo/utils@1.5.2", "@celo/utils@^1.2.0": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/utils/-/utils-1.5.2.tgz#ddb7f3b50c801225ab41d2355fbe010976329099" + integrity sha512-JyKjuVMbdkyFOb1TpQw6zqamPQWYg7I9hOnva3MeIcQ3ZrJIaNHx0/I+JXFjuu3YYBc1mG8nXp2uPJJTGrwzCQ== dependencies: - "@celo/base" "2.2.0" - "@types/bn.js" "^5.1.0" + "@celo/base" "1.5.2" + "@types/country-data" "^0.0.0" "@types/elliptic" "^6.4.9" "@types/ethereumjs-util" "^5.2.0" + "@types/google-libphonenumber" "^7.4.17" + "@types/lodash" "^4.14.170" "@types/node" "^10.12.18" + "@types/randombytes" "^2.0.0" + bigi "^1.1.0" bignumber.js "^9.0.0" + bip32 "2.0.5" + bip39 "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2" + bls12377js "https://github.com/celo-org/bls12377js#cb38a4cfb643c778619d79b20ca3e5283a2122a6" + bn.js "4.11.8" + buffer-reverse "^1.0.1" + country-data "^0.0.31" + crypto-js "^3.1.9-1" elliptic "^6.5.4" ethereumjs-util "^5.2.0" + fp-ts "2.1.1" + google-libphonenumber "^3.2.15" io-ts "2.0.1" + keccak256 "^1.0.0" + lodash "^4.17.21" + numeral "^2.0.6" web3-eth-abi "1.3.6" web3-utils "1.3.6" -"@celo/wallet-base@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/wallet-base/-/wallet-base-2.2.0.tgz#423a6af2a49d6c93aa786a99799a3ecc022a3160" - integrity sha512-zL05/tJzPWWvGGaQKEkcEYCLJRJwl7PLskJNWCiloGLfmPd7L1g96ulU1ZGffeO+kVIcUvwtQ9AS7ky4CbHybQ== +"@celo/wallet-base@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/wallet-base/-/wallet-base-1.5.2.tgz#ae8df425bf3c702277bb1b63a761a2ec8429e7aa" + integrity sha512-NYJu7OtSRFpGcvSMl2Wc8zN32S6oTkAzKqhH7rXisQ0I2q4yNwCzoquzPVYB0G2UVUFKuuxgsA5V+Zda/LQCyw== dependencies: - "@celo/base" "2.2.0" - "@celo/connect" "2.2.0" - "@celo/utils" "2.2.0" + "@celo/base" "1.5.2" + "@celo/connect" "1.5.2" + "@celo/utils" "1.5.2" "@types/debug" "^4.1.5" "@types/ethereumjs-util" "^5.2.0" bignumber.js "^9.0.0" @@ -1386,14 +1417,14 @@ eth-lib "^0.2.8" ethereumjs-util "^5.2.0" -"@celo/wallet-local@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/wallet-local/-/wallet-local-2.2.0.tgz#a4ad9a010265edf81cf41d6a3f3b35047181ddf2" - integrity sha512-l+RJkieGlnUT+q39/aGrRnFlhbwQsiPGsLoDebW7OuYncExRGf0Pid48ke+yrl7/0nBxNXDSRuNMW9qI0AlHSw== +"@celo/wallet-local@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/wallet-local/-/wallet-local-1.5.2.tgz#66ea5fb763e19724309e3d56f312f1a342e12b91" + integrity sha512-Aas4SwqQc8ap0OFAOZc+jBR4cXr20V9AReHNEI8Y93R3g1+RlSEJ1Zmsu4vN+Rriz58YqgMnr+pihorw8QydFQ== dependencies: - "@celo/connect" "2.2.0" - "@celo/utils" "2.2.0" - "@celo/wallet-base" "2.2.0" + "@celo/connect" "1.5.2" + "@celo/utils" "1.5.2" + "@celo/wallet-base" "1.5.2" "@types/ethereumjs-util" "^5.2.0" eth-lib "^0.2.8" ethereumjs-util "^5.2.0" @@ -2257,7 +2288,7 @@ faye-websocket "0.11.4" tslib "^2.1.0" -"@firebase/database@0.6.13", "@firebase/database@^0.6.0": +"@firebase/database@0.6.13": version "0.6.13" resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.6.13.tgz#b96fe0c53757dd6404ee085fdcb45c0f9f525c17" integrity sha512-NommVkAPzU7CKd1gyehmi3lz0K78q0KOfiex7Nfy7MBMwknLm7oNqKovXSgQV1PCLvKXvvAplDSFhDhzIf9obA== @@ -2447,7 +2478,7 @@ optionalDependencies: "@trufflesuite/bigint-buffer" "1.1.9" -"@gar/promisify@^1.1.3": +"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== @@ -2469,32 +2500,6 @@ retry-request "^4.0.0" teeny-request "^3.11.3" -"@google-cloud/common@^2.1.1": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-2.4.0.tgz#2783b7de8435024a31453510f2dab5a6a91a4c82" - integrity sha512-zWFjBS35eI9leAHhjfeOYlK5Plcuj/77EzstnrJIZbKgF/nkqjcQuGiMCpzCwOfPyUbz8ZaEOYgbHa759AKbjg== - dependencies: - "@google-cloud/projectify" "^1.0.0" - "@google-cloud/promisify" "^1.0.0" - arrify "^2.0.0" - duplexify "^3.6.0" - ent "^2.2.0" - extend "^3.0.2" - google-auth-library "^5.5.0" - retry-request "^4.0.0" - teeny-request "^6.0.0" - -"@google-cloud/firestore@^3.0.0": - version "3.8.6" - resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-3.8.6.tgz#9e6dea57323a5824563430a759244825fb01d834" - integrity sha512-ox80NbrM1MLJgvAAUd1quFLx/ie/nSjrk1PtscSicpoYDlKb9e6j7pHrVpbopBMyliyfNl3tLJWaDh+x+uCXqw== - dependencies: - deep-equal "^2.0.0" - functional-red-black-tree "^1.0.1" - google-gax "^1.15.3" - readable-stream "^3.4.0" - through2 "^3.0.0" - "@google-cloud/firestore@^4.5.0": version "4.15.1" resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-4.15.1.tgz#ed764fc76823ce120e68fe8c27ef1edd0650cd93" @@ -2505,6 +2510,13 @@ google-gax "^2.24.1" protobufjs "^6.8.6" +"@google-cloud/kms@~2.9.0": + version "2.9.0" + resolved "https://registry.yarnpkg.com/@google-cloud/kms/-/kms-2.9.0.tgz#3f7e51a3e30795a69ded4ea4f96609a59b503001" + integrity sha512-AWzkMdpQewBMhsdu3Os5UNvYsgJU8y6uSDtXFK36llmk7DeZbqRFpDviGkSImOIOOJgz1Spu1WN61veKZW9yTQ== + dependencies: + google-gax "^2.24.1" + "@google-cloud/monitoring@0.7.1": version "0.7.1" resolved "https://registry.yarnpkg.com/@google-cloud/monitoring/-/monitoring-0.7.1.tgz#9afd2c8b237f01675dcaea8c5c7b3de9b58e24ad" @@ -2523,14 +2535,6 @@ split-array-stream "^2.0.0" stream-events "^1.0.4" -"@google-cloud/paginator@^2.0.0": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-2.0.3.tgz#c7987ad05d1c3ebcef554381be80e9e8da4e4882" - integrity sha512-kp/pkb2p/p0d8/SKUu4mOq8+HGwF8NPzHWkj+VKrIPQPyMRw8deZtrO/OcSiy9C/7bpfU5Txah5ltUNfPkgEXg== - dependencies: - arrify "^2.0.0" - extend "^3.0.2" - "@google-cloud/paginator@^3.0.6", "@google-cloud/paginator@^3.0.7": version "3.0.7" resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b" @@ -2554,11 +2558,6 @@ resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-0.3.3.tgz#bde9103d50b20a3ea3337df8c6783a766e70d41d" integrity sha512-7522YHQ4IhaafgSunsFF15nG0TGVmxgXidy9cITMe+256RgqfcrfWphiMufW+Ou4kqagW/u3yxwbzVEW3dk2Uw== -"@google-cloud/projectify@^1.0.0": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-1.0.4.tgz#28daabebba6579ed998edcadf1a8f3be17f3b5f0" - integrity sha512-ZdzQUN02eRsmTKfBj9FDL0KNDIFNjBn/d6tHQmA/+FImH5DO6ZV8E7FzxMgAUiVAUq41RFAkb25p1oHOZ8psfg== - "@google-cloud/projectify@^2.0.0": version "2.1.1" resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-2.1.1.tgz#ae6af4fee02d78d044ae434699a630f8df0084ef" @@ -2569,11 +2568,6 @@ resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-0.4.0.tgz#4fbfcf4d85bb6a2e4ccf05aa63d2b10d6c9aad9b" integrity sha512-4yAHDC52TEMCNcMzVC8WlqnKKKq+Ssi2lXoUg9zWWkZ6U6tq9ZBRYLHHCRdfU+EU9YJsVmivwGcKYCjRGjnf4Q== -"@google-cloud/promisify@^1.0.0": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-1.0.4.tgz#ce86ffa94f9cfafa2e68f7b3e4a7fad194189723" - integrity sha512-VccZDcOql77obTnFh0TbNED/6ZbbmHDf8UMNnzO1d5g9V0Htfm4k5cllY8P1tJsRKC3zWYGRLaViiupcgVjBoQ== - "@google-cloud/promisify@^2.0.0": version "2.0.4" resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-2.0.4.tgz#9d8705ecb2baa41b6b2673f3a8e9b7b7e1abc52a" @@ -2658,34 +2652,6 @@ through2 "^3.0.0" xdg-basedir "^3.0.0" -"@google-cloud/storage@^4.1.2": - version "4.7.2" - resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-4.7.2.tgz#37a21729fe4a2b27c816443808a55aa890ebc70d" - integrity sha512-nlXYhJyC6ErFQX34tMLruknJ9fljN3JepgXEC9MZlQ64/2h9Ee8MJ7FCowdBnTiZ863IkbvctWtNZRrSxfyqSQ== - dependencies: - "@google-cloud/common" "^2.1.1" - "@google-cloud/paginator" "^2.0.0" - "@google-cloud/promisify" "^1.0.0" - arrify "^2.0.0" - compressible "^2.0.12" - concat-stream "^2.0.0" - date-and-time "^0.14.2" - duplexify "^3.5.0" - extend "^3.0.2" - gaxios "^3.0.0" - gcs-resumable-upload "^2.2.4" - hash-stream-validation "^0.2.2" - mime "^2.2.0" - mime-types "^2.0.8" - onetime "^5.1.0" - p-limit "^2.2.0" - pumpify "^2.0.0" - readable-stream "^3.4.0" - snakeize "^0.1.0" - stream-events "^1.0.1" - through2 "^3.0.0" - xdg-basedir "^4.0.0" - "@google-cloud/storage@^5.3.0": version "5.20.5" resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-5.20.5.tgz#1de71fc88d37934a886bc815722c134b162d335d" @@ -2812,13 +2778,6 @@ "@grpc/proto-loader" "^0.7.0" "@types/node" ">=12.12.47" -"@grpc/grpc-js@~1.3.6": - version "1.3.8" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.8.tgz#0d7dce9de7aeb20702a28f0704e61b0bf34061c1" - integrity sha512-4qJqqn+CU/nBydz9ePJP+oa8dz0U42Ut/GejlbyaQ1xTkynCc+ndNHHnISlNeHawDsv4MOAyP3mV/EnDNUw2zA== - dependencies: - "@types/node" ">=12.12.47" - "@grpc/proto-loader@0.6.9": version "0.6.9" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz#4014eef366da733f8e04a9ddd7376fe8a58547b7" @@ -2838,7 +2797,7 @@ lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.5.0", "@grpc/proto-loader@^0.5.1": +"@grpc/proto-loader@^0.5.0": version "0.5.6" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== @@ -4307,7 +4266,7 @@ npmlog "^6.0.2" write-file-atomic "^4.0.1" -"@mapbox/node-pre-gyp@^1.0.4": +"@mapbox/node-pre-gyp@^1.0.0", "@mapbox/node-pre-gyp@^1.0.4": version "1.0.10" resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c" integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA== @@ -4421,6 +4380,14 @@ treeverse "^2.0.0" walk-up-path "^1.0.0" +"@npmcli/fs@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257" + integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ== + dependencies: + "@gar/promisify" "^1.0.1" + semver "^7.3.5" + "@npmcli/fs@^2.1.0": version "2.1.2" resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" @@ -4472,6 +4439,14 @@ pacote "^13.0.3" semver "^7.3.5" +"@npmcli/move-file@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + "@npmcli/move-file@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" @@ -5469,6 +5444,11 @@ fs-extra "^9.1.0" lodash "^4.17.21" +"@truffle/blockchain-utils@^0.0.11": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.0.11.tgz#9886f4cb7a9f20deded4451ac78f8567ae5c0d75" + integrity sha512-9MyQ/20M96clhIcC7fVFIckGSB8qMsmcdU6iYt98HXJ9GOLNKsCaJFz1OVsJncVreYwTUhoEXTrVBc8zrmPDJQ== + "@truffle/blockchain-utils@^0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.4.tgz#1365b88c3d2922a066d947e93748f09b0fac2e93" @@ -5624,6 +5604,14 @@ lodash "^4.17.21" original-require "^1.0.1" +"@truffle/contract-schema@^3.0.14", "@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.12": + version "3.4.12" + resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.12.tgz#038518c7a6af81d8ce3df16e8b0d114062d04d0c" + integrity sha512-XpMMps/bqHwiRuCyLiEEGWEAvGGzGj4u1X1+lzxrtIsrwbQhSZcdgEbXl9vGxOOJWOup3HXRCIsjlao27kS4OA== + dependencies: + ajv "^6.10.0" + debug "^4.3.1" + "@truffle/contract-schema@^3.2.5", "@truffle/contract-schema@^3.4.9": version "3.4.9" resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.9.tgz#57119245452e49f7b1ea6c71900bb6c053d76c8c" @@ -5640,14 +5628,6 @@ ajv "^6.10.0" debug "^4.3.1" -"@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.12": - version "3.4.12" - resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.12.tgz#038518c7a6af81d8ce3df16e8b0d114062d04d0c" - integrity sha512-XpMMps/bqHwiRuCyLiEEGWEAvGGzGj4u1X1+lzxrtIsrwbQhSZcdgEbXl9vGxOOJWOup3HXRCIsjlao27kS4OA== - dependencies: - ajv "^6.10.0" - debug "^4.3.1" - "@truffle/contract-sources@^0.1.6", "@truffle/contract-sources@^0.1.8": version "0.1.12" resolved "https://registry.yarnpkg.com/@truffle/contract-sources/-/contract-sources-0.1.12.tgz#7a3dfec1bcf6f3632c0f54e522fb6f12b0bdf34b" @@ -5850,6 +5830,11 @@ resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.11.tgz#2789c0042d7e796dcbb840c7a9b5d2bcd8e0e2d8" integrity sha512-ju6TucjlJkfYMmdraYY/IBJaFb+Sa+huhYtOoyOJ+G29KcgytUVnDzKGwC7Kgk6IsxQMm62Mc1E0GZzFbGGipw== +"@truffle/error@^0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.6.tgz#75d499845b4b3a40537889e7d04c663afcaee85d" + integrity sha512-QUM9ZWiwlXGixFGpV18g5I6vua6/r+ZV9W/5DQA5go9A3eZUNPHPaTKMIQPJLYn6+ZV5jg5H28zCHq56LHF3yA== + "@truffle/error@^0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.1.1.tgz#e52026ac8ca7180d83443dca73c03e07ace2a301" @@ -5887,6 +5872,11 @@ resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.12.tgz#ed609cc538753e79438eb5a9bda7c2fda8ec2535" integrity sha512-5Hyhrf42wvxCdzv6r8q94lDEQa1onMj6A+/lHTTmirfzqIpk4V32yV22DeFL5QuDFfPaParIT5oHOcQGVAg6XQ== +"@truffle/expect@^0.0.10": + version "0.0.10" + resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.10.tgz#efe2f1fae224393437eba6b5b322d48ebf02ed0d" + integrity sha512-9jnqWyyqDUpO9wulBF7s+vUvOh3hjxzaFtuP7yeNRNx80svlB5GsUTLr11atRda02zrBmEo8hzFrU/DKacr4/w== + "@truffle/expect@^0.0.13": version "0.0.13" resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.13.tgz#c8e23edc1a1c3b13f768611e6199113026cf8bf2" @@ -6189,13 +6179,6 @@ "@types/connect" "*" "@types/node" "*" -"@types/btoa@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/btoa/-/btoa-1.2.3.tgz#2c8e7093f902bf8f0e10992a731a4996aa1a5732" - integrity sha512-ANNCZICS/ofxhzUl8V1DniBJs+sFQ+Yg5am1ZwVEf/sxoKY/J2+h5Fuw3xUErlZ7eJLdgzukBjZwnsV6+/2Rmg== - dependencies: - "@types/node" "*" - "@types/bunyan@1.8.8", "@types/bunyan@^1.8.8": version "1.8.8" resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.8.tgz#8d6d33f090f37c07e2a80af30ae728450a101008" @@ -6327,20 +6310,6 @@ "@types/bn.js" "*" "@types/node" "*" -"@types/express-rate-limit@^5.0.0": - version "5.1.3" - resolved "https://registry.yarnpkg.com/@types/express-rate-limit/-/express-rate-limit-5.1.3.tgz#79f2ca40d90455a5798da6f8e06d8a3d35f4a1d6" - integrity sha512-H+TYy3K53uPU2TqPGFYaiWc2xJV6+bIFkDd/Ma2/h67Pa6ARk9kWE0p/K9OH1Okm0et9Sfm66fmXoAxsH2PHXg== - dependencies: - "@types/express" "*" - -"@types/express-request-id@1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@types/express-request-id/-/express-request-id-1.4.3.tgz#8e0f5c091314eaf9009d2d5d9d6c431907f0676c" - integrity sha512-vOQzyPe5Y5LNefpEiBwD8RpXu2ZD2Vy5pTMEzVrOLRKYk5iSE1kMC+4FIQD5xtMEwmrYuVhEpC/xLD479XK8Xg== - dependencies: - "@types/express-serve-static-core" "*" - "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": version "4.17.30" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04" @@ -6359,16 +6328,6 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@*", "@types/express@^4.17.12", "@types/express@^4.17.13", "@types/express@^4.17.6": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - "@types/express@4.17.14": version "4.17.14" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" @@ -6388,6 +6347,21 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" +"@types/express@^4.17.13", "@types/express@^4.17.6": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/fetch-mock@^7.3.5": + version "7.3.5" + resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-7.3.5.tgz#7aee678c4e7c7e1a168bae8fdab5b8d712e377f6" + integrity sha512-sLecm9ohBdGIpYUP9rWk5/XIKY2xHMYTBJIcJuBBM8IJWnYoQ1DAj8F4OVjnfD0API1drlkWEV0LPNk+ACuhsg== + "@types/form-data@0.0.33": version "0.0.33" resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-0.0.33.tgz#c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8" @@ -6395,7 +6369,7 @@ dependencies: "@types/node" "*" -"@types/fs-extra@^8.0.0", "@types/fs-extra@^8.0.1", "@types/fs-extra@^8.1.0": +"@types/fs-extra@^8.0.0", "@types/fs-extra@^8.1.0": version "8.1.2" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f" integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg== @@ -6617,14 +6591,6 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@2.5.12": - version "2.5.12" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66" - integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw== - dependencies: - "@types/node" "*" - form-data "^3.0.0" - "@types/node-fetch@^2.5.7": version "2.6.2" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" @@ -6675,7 +6641,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== -"@types/node@^8.0.0", "@types/node@^8.10.59": +"@types/node@^8.0.0": version "8.10.66" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== @@ -6721,11 +6687,6 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc" integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A== -"@types/promise.allsettled@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/promise.allsettled/-/promise.allsettled-1.0.3.tgz#6f3166618226a570b98c8250fc78687a912e56d5" - integrity sha512-b/IFHHTkYkTqu41IH9UtpICwqrpKj2oNlb4KHPzFQDMiz+h1BgAeATeO0/XTph4+UkH9W2U0E4B4j64KWOovag== - "@types/prompt@1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/prompt/-/prompt-1.1.1.tgz#b78e9964db26910e41aea68fbfb204adcb548e16" @@ -6914,7 +6875,7 @@ "@types/cookiejar" "*" "@types/node" "*" -"@types/supertest@^2.0.9": +"@types/supertest@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.12.tgz#ddb4a0568597c9aadff8dbec5b2e8fddbe8692fc" integrity sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ== @@ -7046,167 +7007,11 @@ typedarray-to-buffer "^3.1.5" yaeti "^0.0.6" -"@webassemblyjs/ast@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" - integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ== - dependencies: - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" - -"@webassemblyjs/floating-point-hex-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" - integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== - -"@webassemblyjs/helper-api-error@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" - integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== - -"@webassemblyjs/helper-buffer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" - integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== - -"@webassemblyjs/helper-code-frame@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" - integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ== - dependencies: - "@webassemblyjs/wast-printer" "1.8.5" - -"@webassemblyjs/helper-fsm@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" - integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== - -"@webassemblyjs/helper-module-context@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" - integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g== - dependencies: - "@webassemblyjs/ast" "1.8.5" - mamacro "^0.0.3" - -"@webassemblyjs/helper-wasm-bytecode@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" - integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== - -"@webassemblyjs/helper-wasm-section@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" - integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - -"@webassemblyjs/ieee754@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" - integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" - integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" - integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== - -"@webassemblyjs/wasm-edit@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" - integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/helper-wasm-section" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-opt" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - "@webassemblyjs/wast-printer" "1.8.5" - -"@webassemblyjs/wasm-gen@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" - integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" - -"@webassemblyjs/wasm-opt@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" - integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - -"@webassemblyjs/wasm-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" - integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" - -"@webassemblyjs/wast-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" - integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/floating-point-hex-parser" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-code-frame" "1.8.5" - "@webassemblyjs/helper-fsm" "1.8.5" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/wast-printer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" - integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" - "@xtuc/long" "4.2.2" - "@xmldom/xmldom@^0.7.0": version "0.7.5" resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A== -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" @@ -7225,7 +7030,7 @@ abab@^2.0.3, abab@^2.0.5: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== -abbrev@1, abbrev@^1.0.0: +abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -7381,7 +7186,7 @@ acorn-walk@^8.1.1, acorn-walk@^8.2.0: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^6.0.7, acorn@^6.2.1: +acorn@^6.0.7: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== @@ -7439,7 +7244,7 @@ agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" -agentkeepalive@^4.2.1: +agentkeepalive@^4.1.3, agentkeepalive@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== @@ -7456,11 +7261,6 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== - ajv-formats@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" @@ -7468,12 +7268,7 @@ ajv-formats@^2.1.1: dependencies: ajv "^8.0.0" -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.5, ajv@^6.12.6, ajv@^6.6.1, ajv@^6.9.1: +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.5, ajv@^6.12.6, ajv@^6.6.1, ajv@^6.9.1: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -7510,13 +7305,6 @@ anser@^1.4.9: resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b" integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww== -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - integrity sha512-TdlOggdA/zURfMYa7ABC66j+oqfMew58KpJMbUlH3bcZP1b+cBHIHDDn5uH9INsxrHBPjsqM0tDB4jPTF/vgJA== - dependencies: - string-width "^2.0.0" - ansi-align@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" @@ -7659,7 +7447,7 @@ antlr4ts@^0.5.0-alpha.4: resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a" integrity sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ== -any-promise@1.3.0, any-promise@^1.0.0, any-promise@^1.3.0: +any-promise@1.3.0, any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== @@ -7792,7 +7580,7 @@ append-buffer@^1.0.2: dependencies: buffer-equal "^1.0.0" -aproba@^1.0.3, aproba@^1.1.1: +aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== @@ -8150,14 +7938,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - assertion-error@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" @@ -8233,6 +8013,13 @@ async@1.x, async@^1.3.0, async@^1.4.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== +async@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" + integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ== + dependencies: + lodash "^4.17.10" + async@2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" @@ -9159,11 +8946,6 @@ big-integer@1.6.x, big-integer@^1.6.15, big-integer@^1.6.17, big-integer@^1.6.44 resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - big.js@^6.0.3: version "6.2.1" resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f" @@ -9196,6 +8978,11 @@ bignumber.js@7.2.1, bignumber.js@^7.2.0, bignumber.js@^7.2.1: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ== +bignumber.js@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" + integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== + "bignumber.js@git+https://github.com/debris/bignumber.js#master": version "2.0.7" resolved "git+https://github.com/debris/bignumber.js#c7a38de919ed75e6fb6ba38051986e294b328df9" @@ -9364,7 +9151,7 @@ bluebird@^2.9.33: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" integrity sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ== -bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.4, bluebird@^3.5.5, bluebird@^3.7.2: +bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.4: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -9399,22 +9186,6 @@ bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3, bn.js@^5.2.0, bn.js@^5.2 resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - body-parser@1.20.0, body-parser@^1.16.0, body-parser@^1.18.3, body-parser@^1.19.0: version "1.20.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" @@ -9443,19 +9214,6 @@ bottleneck@^2.15.3: resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.19.5.tgz#5df0b90f59fd47656ebe63c78a98419205cadd91" integrity sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw== -boxen@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw== - dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" - term-size "^1.2.0" - widest-line "^2.0.0" - boxen@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" @@ -9624,13 +9382,6 @@ browserify-sign@^4.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== - dependencies: - pako "~1.0.5" - browserslist@^3.2.6: version "3.2.8" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" @@ -9759,7 +9510,7 @@ buffer-xor@^2.0.1: dependencies: safe-buffer "^5.1.1" -buffer@4.9.2, buffer@^4.3.0: +buffer@4.9.2: version "4.9.2" resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== @@ -9808,11 +9559,6 @@ builtin-modules@^1.1.1: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ== -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== - builtins@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" @@ -9891,11 +9637,6 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -9916,26 +9657,29 @@ bytewise@~1.1.0: bytewise-core "^1.2.2" typewise "^1.0.3" -cacache@^12.0.2: - version "12.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" - integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== +cacache@^15.2.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" + integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" + "@npmcli/fs" "^1.0.0" + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" + rimraf "^3.0.2" + ssri "^8.0.1" + tar "^6.0.2" unique-filename "^1.1.1" - y18n "^4.0.0" cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0: version "16.1.3" @@ -10079,7 +9823,7 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg== -camelcase@^4.0.0, camelcase@^4.1.0: +camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw== @@ -10106,11 +9850,6 @@ capture-exit@^2.0.0: dependencies: rsvp "^4.8.4" -capture-stack-trace@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" - integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw== - cardinal@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" @@ -10194,15 +9933,6 @@ chainsaw@~0.1.0: dependencies: traverse ">=0.3.0 <0.4" -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" @@ -10222,6 +9952,15 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" @@ -10365,7 +10104,7 @@ chokidar@3.3.1: optionalDependencies: fsevents "~2.1.2" -chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.4.1, chokidar@^3.5.1: +chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.5.1: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -10380,7 +10119,7 @@ chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.4.1, chokidar@^3.5.1: optionalDependencies: fsevents "~2.3.2" -chokidar@^2.0.0, chokidar@^2.1.5, chokidar@^2.1.8: +chokidar@^2.0.0: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== @@ -10409,16 +10148,6 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -ci-info@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" - integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== - ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -10503,17 +10232,12 @@ clean-stack@^3.0.0: dependencies: escape-string-regexp "4.0.0" -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - integrity sha512-3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg== - cli-boxes@^2.2.0, cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-color@^1.2.0, cli-color@^1.4.0: +cli-color@^1.2.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.4.0.tgz#7d10738f48526824f8fe7da51857cb0f572fe01f" integrity sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w== @@ -10764,14 +10488,6 @@ cloneable-readable@^1.0.0: process-nextick-args "^2.0.0" readable-stream "^2.3.5" -cls-bluebird@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee" - integrity sha512-XVb0RPmHQyy35Tz9z34gvtUcBKUK8A/1xkGCyeFc9B0C7Zr5SysgFaswRVdwI5NEMcO+3JKlIDGIOgERSn9NdA== - dependencies: - is-bluebird "^1.0.2" - shimmer "^1.1.0" - cmd-shim@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724" @@ -10880,10 +10596,10 @@ color@^3.1.3: color-convert "^1.9.3" color-string "^1.6.0" -colorette@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@2.0.19: + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== colorette@^1.0.7: version "1.4.0" @@ -10957,7 +10673,7 @@ commander@3.0.2, commander@^3.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.12.1, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.8.1: +commander@^2.12.1, commander@^2.19.0, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -10967,16 +10683,16 @@ commander@^4.0.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" - integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== - commander@^8.1.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.1.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== + commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" @@ -11017,7 +10733,7 @@ complex.js@2.0.11: resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.0.11.tgz#09a873fbf15ffd8c18c9c2201ccef425c32b8bf1" integrity sha512-6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw== -component-emitter@^1.2.0, component-emitter@^1.2.1: +component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -11057,7 +10773,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@^1.6.2: +concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -11093,7 +10809,7 @@ conf@^10.1.2: pkg-up "^3.1.0" semver "^7.3.5" -config-chain@^1.1.12, config-chain@^1.1.13: +config-chain@^1.1.12: version "1.1.13" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== @@ -11101,18 +10817,6 @@ config-chain@^1.1.12, config-chain@^1.1.13: ini "^1.3.4" proto-list "~1.2.1" -configstore@^3.0.0: - version "3.1.5" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.5.tgz#e9af331fadc14dabd544d3e7e76dc446a09a530f" - integrity sha512-nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA== - dependencies: - dot-prop "^4.2.1" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - unique-string "^1.0.0" - write-file-atomic "^2.0.0" - xdg-basedir "^3.0.0" - configstore@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7" @@ -11147,11 +10851,6 @@ connect@^3.6.2, connect@^3.6.5: parseurl "~1.3.3" utils-merge "1.0.1" -console-browserify@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" - integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== - console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -11165,11 +10864,6 @@ constant-case@^2.0.0: snake-case "^2.1.0" upper-case "^1.1.1" -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ== - content-disposition@0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" @@ -11290,23 +10984,11 @@ cookie@0.5.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== -cookiejar@^2.1.0, cookiejar@^2.1.1: +cookiejar@^2.1.1, cookiejar@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" - copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" @@ -11420,13 +11102,6 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.5.3" -create-error-class@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - integrity sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw== - dependencies: - capture-stack-trace "^1.0.0" - create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2, create-hash@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" @@ -11478,24 +11153,13 @@ cross-fetch@^2.1.0, cross-fetch@^2.1.1: node-fetch "^2.6.7" whatwg-fetch "^2.0.4" -cross-fetch@^3.0.6, cross-fetch@^3.1.4: +cross-fetch@^3.0.6, cross-fetch@^3.1.4, cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== dependencies: node-fetch "2.6.7" -cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" @@ -11513,6 +11177,17 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^6.0.0, cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -11540,7 +11215,7 @@ crypto-addr-codec@^0.1.7: safe-buffer "^5.2.0" sha3 "^2.1.1" -crypto-browserify@3.12.0, crypto-browserify@^3.11.0: +crypto-browserify@3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== @@ -11647,11 +11322,6 @@ cycle@1.0.x: resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" integrity sha512-TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA== -cyclist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" - integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A== - d@1, d@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" @@ -11691,11 +11361,6 @@ dataloader@2.1.0: resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ== -date-and-time@^0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.14.2.tgz#a4266c3dead460f6c231fe9674e585908dac354e" - integrity sha512-EFTCh9zRSEpGPmJaexg7HTuzZHh6cnJj1ui7IGCFNXzd2QdpsNh05Db5TF3xzJm30YN+A8/6xHSuRcQqoc3kFA== - date-and-time@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.6.3.tgz#2daee52df67c28bd93bce862756ac86b68cf4237" @@ -11758,7 +11423,7 @@ debug@4.3.1: dependencies: ms "2.1.2" -debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7: +debug@^3.0.1, debug@^3.1.0, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -11889,27 +11554,6 @@ deep-eql@^3.0.1: dependencies: type-detect "^4.0.0" -deep-equal@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9" - integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw== - dependencies: - call-bind "^1.0.0" - es-get-iterator "^1.1.1" - get-intrinsic "^1.0.1" - is-arguments "^1.0.4" - is-date-object "^1.0.2" - is-regex "^1.1.1" - isarray "^2.0.5" - object-is "^1.1.4" - object-keys "^1.1.1" - object.assign "^4.1.2" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.3" - which-boxed-primitive "^1.0.1" - which-collection "^1.0.1" - which-typed-array "^1.1.2" - deep-equal@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" @@ -12143,7 +11787,7 @@ detect-installed@^2.0.4: dependencies: get-installed-path "^2.0.3" -detect-libc@^1.0.2, detect-libc@^1.0.3: +detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== @@ -12192,7 +11836,7 @@ detox@^17.13.2: yargs "^16.0.3" yargs-unparser "^2.0.0" -dezalgo@^1.0.0: +dezalgo@^1.0.0, dezalgo@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig== @@ -12300,11 +11944,6 @@ dom-walk@^0.1.0: resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - domelementtype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" @@ -12340,7 +11979,7 @@ dot-case@^2.1.0: dependencies: no-case "^2.2.0" -dot-prop@^4.1.0, dot-prop@^4.2.1: +dot-prop@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4" integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ== @@ -12398,11 +12037,6 @@ dotignore@~0.1.2: dependencies: minimatch "^3.0.4" -dottie@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154" - integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg== - double-ended-queue@2.1.0-0: version "2.1.0-0" resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" @@ -12441,7 +12075,7 @@ duplexer@^0.1.1, duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0: +duplexify@^3.5.0, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== @@ -12492,16 +12126,6 @@ ecurve@^1.0.6: bigi "^1.1.0" safe-buffer "^5.0.1" -editorconfig@^0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" - integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g== - dependencies: - commander "^2.19.0" - lru-cache "^4.1.5" - semver "^5.6.0" - sigmund "^1.0.1" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -12570,16 +12194,6 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng== - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - enabled@2.0.x: version "2.0.0" resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" @@ -12616,7 +12230,7 @@ encoding-down@^6.3.0: level-codec "^9.0.0" level-errors "^2.0.0" -encoding@^0.1.11, encoding@^0.1.13: +encoding@^0.1.11, encoding@^0.1.12, encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -12642,24 +12256,6 @@ ends-with@^0.2.0: resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a" integrity sha512-lRppY4dK3VkqBdR242sKcAJeYc8Gf/DhoX9AWvWI2RzccmLnqBQfwm2k4oSDv5MPDjUqawCauXhZkyWxkVhRsg== -enhanced-resolve@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f" - integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.4.0" - tapable "^1.0.0" - -enhanced-resolve@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" - integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.5.0" - tapable "^1.0.0" - enquirer@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -12692,7 +12288,7 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: +errno@~0.1.1: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== @@ -12755,7 +12351,7 @@ es-array-method-boxes-properly@^1.0.0: resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== -es-get-iterator@^1.0.2, es-get-iterator@^1.1.1: +es-get-iterator@^1.0.2: version "1.1.2" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7" integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ== @@ -13638,7 +13234,7 @@ ethers@4.0.0-beta.3: uuid "2.0.1" xmlhttprequest "1.8.0" -ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: +ethers@^4.0.0-beta.1, ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: version "4.0.49" resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894" integrity sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg== @@ -14032,18 +13628,6 @@ export-files@^2.0.1: dependencies: lazy-cache "^1.0.3" -express-rate-limit@^5.1.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2" - integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg== - -express-request-id@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/express-request-id/-/express-request-id-1.4.1.tgz#66feaf1f0be3deca13f3abfe1c098e49b12f2c28" - integrity sha512-qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw== - dependencies: - uuid "^3.3.2" - express@^4.14.0, express@^4.16.4, express@^4.17.1: version "4.18.1" resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" @@ -14282,7 +13866,7 @@ fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-safe-stringify@^2.0.6: +fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== @@ -14401,6 +13985,22 @@ fetch-mock@9.10.4: querystring "^0.2.0" whatwg-url "^6.5.0" +fetch-mock@^9.11.0: + version "9.11.0" + resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-9.11.0.tgz#371c6fb7d45584d2ae4a18ee6824e7ad4b637a3f" + integrity sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q== + dependencies: + "@babel/core" "^7.0.0" + "@babel/runtime" "^7.0.0" + core-js "^3.0.0" + debug "^4.1.1" + glob-to-regexp "^0.4.0" + is-subset "^0.1.1" + lodash.isequal "^4.5.0" + path-to-regexp "^2.2.1" + querystring "^0.2.0" + whatwg-url "^6.5.0" + fetch-ponyfill@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz#ae3ce5f732c645eab87e4ae8793414709b239893" @@ -14408,11 +14008,6 @@ fetch-ponyfill@^4.0.0: dependencies: node-fetch "~1.7.1" -figgy-pudding@^3.5.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" - integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== - figures@3.2.0, figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -14593,16 +14188,6 @@ find-yarn-workspace-root@^2.0.0: dependencies: micromatch "^4.0.2" -findup-sync@3.0.0, findup-sync@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" - integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" - findup-sync@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-1.0.0.tgz#6f7e4b57b6ee3a4037b4414eaedea3f58f71e0ec" @@ -14623,6 +14208,16 @@ findup-sync@^2.0.0: micromatch "^3.0.4" resolve-dir "^1.0.1" +findup-sync@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" + integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== + dependencies: + detect-file "^1.0.0" + is-glob "^4.0.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + fined@^1.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" @@ -14634,20 +14229,6 @@ fined@^1.0.1: object.pick "^1.2.0" parse-filepath "^1.0.1" -firebase-admin@^8.10.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-8.13.0.tgz#997d34ae8357d7dc162ba622148bbebcf7f2e923" - integrity sha512-krXj5ncWMJBhCpXSn9UFY6zmDWjFjqgx+1e9ATXKFYndEjmKtNBuJzqdrAdDh7aTUR7X6+0TPx4Hbc08kd0lwQ== - dependencies: - "@firebase/database" "^0.6.0" - "@types/node" "^8.10.59" - dicer "^0.3.0" - jsonwebtoken "^8.5.1" - node-forge "^0.7.6" - optionalDependencies: - "@google-cloud/firestore" "^3.0.0" - "@google-cloud/storage" "^4.1.2" - firebase-admin@^9.12.0: version "9.12.0" resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.12.0.tgz#d7e889e97c9c31610efbcd131bb6d06a783af757" @@ -14664,14 +14245,6 @@ firebase-admin@^9.12.0: "@google-cloud/firestore" "^4.5.0" "@google-cloud/storage" "^5.3.0" -firebase-functions-test@^0.2.0: - version "0.2.3" - resolved "https://registry.yarnpkg.com/firebase-functions-test/-/firebase-functions-test-0.2.3.tgz#90d6da662d604ed013a3735c6cdba5984e0d57ea" - integrity sha512-zYX0QTm53wCazuej7O0xqbHl90r/v1PTXt/hwa0jo1YF8nDM+iBKnLDlkIoW66MDd0R6aGg4BvKzTTdJpvigUA== - dependencies: - "@types/lodash" "^4.14.104" - lodash "^4.17.5" - firebase-functions-test@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/firebase-functions-test/-/firebase-functions-test-0.3.3.tgz#d26626d6c3edb03cd27eb79c12980c2551722517" @@ -14680,7 +14253,7 @@ firebase-functions-test@^0.3.3: "@types/lodash" "^4.14.104" lodash "^4.17.5" -firebase-functions@^3.15.7, firebase-functions@^3.6.0: +firebase-functions@^3.15.7: version "3.23.0" resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.23.0.tgz#ac8da127ff3e97c354f3cd740a71534572d1f4ca" integrity sha512-/jujnNChTWIuoXK3IPNGYu1zjXF1fYRy88uYbkrJhs3dhK6EdXZi0rX6JUEOCB7h6IkRQvbio+bvtaoI7h+4Lg== @@ -14822,7 +14395,7 @@ flow-stoplight@^1.0.0: resolved "https://registry.yarnpkg.com/flow-stoplight/-/flow-stoplight-1.0.0.tgz#4a292c5bcff8b39fa6cc0cb1a853d86f27eeff7b" integrity sha512-rDjbZUKpN8OYhB0IE/vY/I8UWO/602IIJEU/76Tv4LvYnwHCk0BCsvz4eRr9n+FQcri7L5cyaXOo0+/Kh4HisA== -flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: +flush-write-stream@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== @@ -14898,7 +14471,7 @@ form-data-encoder@1.7.1: resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.1.tgz#ac80660e4f87ee0d3d3c3638b7da8278ddb8ec96" integrity sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg== -form-data@^2.2.0, form-data@^2.3.1, form-data@^2.5.0: +form-data@^2.2.0, form-data@^2.5.0: version "2.5.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== @@ -14934,10 +14507,15 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formidable@^1.2.0: - version "1.2.6" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168" - integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ== +formidable@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.1.tgz#81269cbea1a613240049f5f61a9d97731517414f" + integrity sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ== + dependencies: + dezalgo "^1.0.4" + hexoid "^1.0.0" + once "^1.4.0" + qs "^6.11.0" forwarded@0.2.0: version "0.2.0" @@ -14966,14 +14544,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -from2@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g== - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - from@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" @@ -14989,6 +14559,15 @@ fs-exists-sync@^0.1.0: resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== +fs-extra@6.0.1, fs-extra@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" + integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^0.30.0: version "0.30.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0" @@ -15036,15 +14615,6 @@ fs-extra@^5.0.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" - integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^7.0.0, fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -15100,16 +14670,6 @@ fs-readdir-recursive@^1.1.0: resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== -fs-write-stream-atomic@^1.0.8: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - integrity sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA== - dependencies: - graceful-fs "^4.1.2" - iferr "^0.1.5" - imurmurhash "^0.1.4" - readable-stream "1 || 2" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -15288,28 +14848,6 @@ gaxios@^1.0.2, gaxios@^1.0.4, gaxios@^1.2.1, gaxios@^1.2.2, gaxios@^1.5.0: https-proxy-agent "^2.2.1" node-fetch "^2.3.0" -gaxios@^2.0.0, gaxios@^2.1.0: - version "2.3.4" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-2.3.4.tgz#eea99353f341c270c5f3c29fc46b8ead56f0a173" - integrity sha512-US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA== - dependencies: - abort-controller "^3.0.0" - extend "^3.0.2" - https-proxy-agent "^5.0.0" - is-stream "^2.0.0" - node-fetch "^2.3.0" - -gaxios@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.2.0.tgz#11b6f0e8fb08d94a10d4d58b044ad3bec6dd486a" - integrity sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q== - dependencies: - abort-controller "^3.0.0" - extend "^3.0.2" - https-proxy-agent "^5.0.0" - is-stream "^2.0.0" - node-fetch "^2.3.0" - gaxios@^4.0.0: version "4.3.3" resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22" @@ -15329,14 +14867,6 @@ gcp-metadata@^1.0.0: gaxios "^1.0.2" json-bigint "^0.3.0" -gcp-metadata@^3.4.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-3.5.0.tgz#6d28343f65a6bbf8449886a0c0e4a71c77577055" - integrity sha512-ZQf+DLZ5aKcRpLzYUyBS3yo3N0JSa82lNDO8rj3nMSlovLcz2riKFBsYgDzeXcv75oo5eqB2lx+B14UvPoCRnA== - dependencies: - gaxios "^2.1.0" - json-bigint "^0.3.0" - gcp-metadata@^4.2.0: version "4.3.1" resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9" @@ -15357,18 +14887,6 @@ gcs-resumable-upload@^1.0.0: pumpify "^1.5.1" stream-events "^1.0.4" -gcs-resumable-upload@^2.2.4: - version "2.3.3" - resolved "https://registry.yarnpkg.com/gcs-resumable-upload/-/gcs-resumable-upload-2.3.3.tgz#02c616ed17eff6676e789910aeab3907d412c5f8" - integrity sha512-sf896I5CC/1AxeaGfSFg3vKMjUq/r+A3bscmVzZm10CElyRanN0XwPu/MxeIO4LSP+9uF6yKzXvNsaTsMXUG6Q== - dependencies: - abort-controller "^3.0.0" - configstore "^5.0.0" - gaxios "^2.0.0" - google-auth-library "^5.0.0" - pumpify "^2.0.0" - stream-events "^1.0.4" - generate-function@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" @@ -15415,7 +14933,7 @@ get-installed-path@^4.0.8: dependencies: global-modules "1.0.0" -get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== @@ -15535,10 +15053,10 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== -getopts@2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" - integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA== +getopts@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4" + integrity sha512-5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA== getpass@^0.1.1: version "0.1.7" @@ -15836,7 +15354,7 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3: +glob@^8.0.1: version "8.0.3" resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== @@ -15847,13 +15365,6 @@ glob@^8.0.1, glob@^8.0.3: minimatch "^5.0.1" once "^1.3.0" -global-dirs@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg== - dependencies: - ini "^1.3.4" - global-dirs@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" @@ -15877,13 +15388,6 @@ global-modules@1.0.0, global-modules@^1.0.0: is-windows "^1.0.1" resolve-dir "^1.0.0" -global-modules@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== - dependencies: - global-prefix "^3.0.0" - global-modules@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" @@ -15913,15 +15417,6 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== - dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" - global@~4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" @@ -16001,21 +15496,6 @@ google-auth-library@^3.0.0, google-auth-library@^3.1.1: lru-cache "^5.0.0" semver "^5.5.0" -google-auth-library@^5.0.0, google-auth-library@^5.5.0: - version "5.10.1" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-5.10.1.tgz#504ec75487ad140e68dd577c21affa363c87ddff" - integrity sha512-rOlaok5vlpV9rSiUu5EpR0vVpc+PhN62oF4RyX/6++DG1VsaulAFEMlDYBLjJDDPI6OcNOCGAKy9UVB/3NIDXg== - dependencies: - arrify "^2.0.0" - base64-js "^1.3.0" - ecdsa-sig-formatter "^1.0.11" - fast-text-encoding "^1.0.0" - gaxios "^2.1.0" - gcp-metadata "^3.4.0" - gtoken "^4.1.0" - jws "^4.0.0" - lru-cache "^5.0.0" - google-auth-library@^6.1.3: version "6.1.6" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.1.6.tgz#deacdcdb883d9ed6bac78bb5d79a078877fdf572" @@ -16085,27 +15565,6 @@ google-gax@^0.25.0: semver "^6.0.0" walkdir "^0.3.2" -google-gax@^1.15.3: - version "1.15.4" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-1.15.4.tgz#dc37dea2a8c58717cd50db40f01b21cbf9da7739" - integrity sha512-Wzl43ueWEKNsLcMJ33sPps179nD7wn6Jcl/P+ZQNS+HxdCJcoQEgJe3AmulsJnatwjBE3pVPIE4HFJNhpRGvUw== - dependencies: - "@grpc/grpc-js" "~1.3.6" - "@grpc/proto-loader" "^0.5.1" - "@types/fs-extra" "^8.0.1" - "@types/long" "^4.0.0" - abort-controller "^3.0.0" - duplexify "^3.6.0" - google-auth-library "^5.0.0" - is-stream-ended "^0.1.4" - lodash.at "^4.6.0" - lodash.has "^4.5.2" - node-fetch "^2.6.0" - protobufjs "^6.8.9" - retry-request "^4.0.0" - semver "^6.0.0" - walkdir "^0.4.0" - google-gax@^2.0.1, google-gax@^2.24.1: version "2.30.5" resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.5.tgz#e836f984f3228900a8336f608c83d75f9cb73eff" @@ -16138,13 +15597,6 @@ google-p12-pem@^1.0.0: node-forge "^0.10.0" pify "^4.0.0" -google-p12-pem@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-2.0.5.tgz#b1c44164d567ae894f7a19b4ff362a06be5b793b" - integrity sha512-7RLkxwSsMsYh9wQ5Vb2zRtkAHvqPvfoMGag+nugl1noYO7gf0844Yr9TIFA5NEBMAeVt2Z+Imu7CQMp3oNatzQ== - dependencies: - node-forge "^0.10.0" - google-p12-pem@^3.1.3: version "3.1.4" resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b" @@ -16217,23 +15669,6 @@ got@9.6.0, got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -got@^6.7.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - integrity sha512-Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg== - dependencies: - create-error-class "^3.0.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - unzip-response "^2.0.1" - url-parse-lax "^1.0.0" - got@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" @@ -16324,16 +15759,6 @@ gtoken@^2.3.2: mime "^2.2.0" pify "^4.0.0" -gtoken@^4.1.0: - version "4.1.4" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-4.1.4.tgz#925ff1e7df3aaada06611d30ea2d2abf60fcd6a7" - integrity sha512-VxirzD0SWoFUo5p8RDP8Jt2AGyOmyYcT/pOUgDKJCK+iSw0TMqwrVfY37RXTNmoKwrzmDHSk0GMT9FsgVmnVSA== - dependencies: - gaxios "^2.1.0" - google-p12-pem "^2.0.0" - jws "^4.0.0" - mime "^2.2.0" - gtoken@^5.0.4: version "5.3.2" resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f" @@ -16607,6 +16032,11 @@ hermes-profile-transformer@^0.0.6: dependencies: source-map "^0.7.3" +hexoid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" + integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== + highlight.js@^10.2.0, highlight.js@^10.4.1: version "10.7.3" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" @@ -16726,17 +16156,6 @@ http-call@^5.1.2, http-call@^5.2.2, http-call@^5.3.0: parse-json "^4.0.0" tunnel-agent "^0.6.0" -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -16811,11 +16230,6 @@ http2-wrapper@^2.1.10: quick-lru "^5.1.1" resolve-alpn "^1.2.0" -https-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg== - https-proxy-agent@5, https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -16876,7 +16290,7 @@ hyperlinker@^1.0.0: resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ== -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -16919,17 +16333,7 @@ ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -iferr@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA== - -ignore-by-default@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA== - -ignore-walk@3.0.4, ignore-walk@^3.0.1: +ignore-walk@3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== @@ -16994,14 +16398,6 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== -import-local@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== - dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" - import-local@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" @@ -17025,16 +16421,11 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -infer-owner@^1.0.3, infer-owner@^1.0.4: +infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== -inflection@1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" - integrity sha512-lRy4DxuIFWXlJU7ed8UiTJOSTqStqYdEb4CEbtXfNbkdj3nH1L+reUWiE10VWcJS2yR7tge8Z74pJjtBjNwj0w== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -17048,11 +16439,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA== - inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -17068,7 +16454,7 @@ ini@2.0.0: resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== -ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -17198,11 +16584,6 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" -interpret@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" - integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== - interpret@^1.0.0, interpret@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" @@ -17334,11 +16715,6 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-bluebird@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2" - integrity sha512-PDRu1vVip5dGQg5tfn2qVCCyxbBYu5MhYUJwSfL/RoGBI97n1fxvilVazxzptZW0gcmsMH17H4EVZZI5E/RSeA== - is-boolean-object@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" @@ -17362,13 +16738,6 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-ci@^1.0.10: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" - integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== - dependencies: - ci-info "^1.5.0" - is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -17397,7 +16766,7 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-date-object@^1.0.1, is-date-object@^1.0.2: +is-date-object@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== @@ -17548,14 +16917,6 @@ is-hex-prefixed@1.0.0: resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" integrity sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA== -is-installed-globally@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" - integrity sha512-ERNhMg+i/XgDwPIPF3u24qpajVreaiSuvpb1Uu0jugw7KKcxGyCX8cgp8P5fwTmAuXku6beDHHECdKArjlg7tw== - dependencies: - global-dirs "^0.1.0" - is-path-inside "^1.0.0" - is-installed-globally@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" @@ -17589,7 +16950,7 @@ is-lower-case@^1.1.0: dependencies: lower-case "^1.1.0" -is-map@^2.0.1, is-map@^2.0.2: +is-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== @@ -17609,11 +16970,6 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== -is-npm@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - integrity sha512-9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg== - is-npm@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" @@ -17670,13 +17026,6 @@ is-object@^1.0.1, is-object@~1.0.1: resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g== - dependencies: - path-is-inside "^1.0.1" - is-path-inside@^3.0.1, is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -17729,12 +17078,7 @@ is-property@^1.0.2: resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g== -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - integrity sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw== - -is-regex@^1.0.4, is-regex@^1.1.1, is-regex@^1.1.4, is-regex@~1.1.4: +is-regex@^1.0.4, is-regex@^1.1.4, is-regex@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -17766,7 +17110,7 @@ is-retry-allowed@^2.2.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== -is-set@^2.0.1, is-set@^2.0.2: +is-set@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== @@ -17883,11 +17227,6 @@ is-valid-glob@^1.0.0: resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA== -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -17895,14 +17234,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - is-windows@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.1.1.tgz#be310715431cfabccc54ab3951210fa0b6d01abe" @@ -19076,21 +18407,6 @@ jose@^2.0.5: dependencies: "@panva/asn1.js" "^1.0.0" -jose@^4.8.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/jose/-/jose-4.9.2.tgz#268994df4443b9c191de0b001c2e3796ac6cf368" - integrity sha512-EqKvu2PqJCD3Jrg3PvcYZVS7D21qMVLSYMDAFcOdGUEOpJSLNtJO7NjLANvu3SYHVl6pdP2ff7ve6EZW2nX7Nw== - -js-beautify@^1.8.8: - version "1.14.6" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz#b23ca5d74a462c282c7711bb51150bcc97f2b507" - integrity sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw== - dependencies: - config-chain "^1.1.13" - editorconfig "^0.15.3" - glob "^8.0.3" - nopt "^6.0.0" - js-sdsl@^4.1.4: version "4.3.0" resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" @@ -19231,7 +18547,7 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -19424,7 +18740,7 @@ jsonschema@^1.2.0: resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== -jsonwebtoken@^8.3.0, jsonwebtoken@^8.4.0, jsonwebtoken@^8.5.1: +jsonwebtoken@^8.3.0, jsonwebtoken@^8.5.1: version "8.5.1" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== @@ -19639,23 +18955,25 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -knex@^0.21.1: - version "0.21.21" - resolved "https://registry.yarnpkg.com/knex/-/knex-0.21.21.tgz#b1335c75afd15ff83371b096e9cc4c4eafab8c05" - integrity sha512-cjw5qO1EzVKjbywcVa61IQJMLt7PfYBRI/2NwCA/B9beXgbw652wDNLz+JM+UKKNsfwprq0ugYqBYc9q4JN36A== +knex@^2.1.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/knex/-/knex-2.4.2.tgz#a34a289d38406dc19a0447a78eeaf2d16ebedd61" + integrity sha512-tMI1M7a+xwHhPxjbl/H9K1kHX+VncEYcvCx5K00M16bWvpYPKAZd6QrCu68PtHAdIZNQPWZn0GVhqVBEthGWCg== dependencies: - colorette "1.2.1" - commander "^6.2.0" - debug "4.3.1" + colorette "2.0.19" + commander "^9.1.0" + debug "4.3.4" + escalade "^3.1.1" esm "^3.2.25" - getopts "2.2.5" + get-package-type "^0.1.0" + getopts "2.3.0" interpret "^2.2.0" - liftoff "3.1.0" - lodash "^4.17.20" - pg-connection-string "2.4.0" - tarn "^3.0.1" + lodash "^4.17.21" + pg-connection-string "2.5.0" + rechoir "^0.8.0" + resolve-from "^5.0.0" + tarn "^3.0.2" tildify "2.0.0" - v8flags "^3.2.0" kuler@^2.0.0: version "2.0.0" @@ -19670,13 +18988,6 @@ last-run@^1.1.0: default-resolution "^2.0.0" es6-weak-map "^2.0.1" -latest-version@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - integrity sha512-Be1YRHWWlZaSsrz2U+VInk+tO0EwLIyV+23RhWLINJYwg/UIikxjlj3MhH37/6/EDCAusjajvMkMMUXRaMWl/w== - dependencies: - package-json "^4.0.0" - latest-version@^5.0.0, latest-version@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" @@ -20054,7 +19365,7 @@ libnpmpublish@^6.0.4: semver "^7.3.7" ssri "^9.0.0" -liftoff@3.1.0, liftoff@^3.1.0: +liftoff@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3" integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog== @@ -20125,29 +19436,6 @@ load-json-file@^6.2.0: strip-bom "^4.0.0" type-fest "^0.6.0" -loader-runner@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" - integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== - -loader-utils@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== - dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" - -loader-utils@^1.2.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -20398,7 +19686,7 @@ lodash@4.17.14: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== -lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -20523,7 +19811,7 @@ lru-cache@^3.2.0: dependencies: pseudomap "^1.0.1" -lru-cache@^4.0.1, lru-cache@^4.1.3, lru-cache@^4.1.5: +lru-cache@^4.0.1, lru-cache@^4.1.3: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -20637,6 +19925,28 @@ make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6: socks-proxy-agent "^7.0.0" ssri "^9.0.0" +make-fetch-happen@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" + integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== + dependencies: + agentkeepalive "^4.1.3" + cacache "^15.2.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.2" + promise-retry "^2.0.1" + socks-proxy-agent "^6.0.0" + ssri "^8.0.0" + make-iterator@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" @@ -20651,11 +19961,6 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" -mamacro@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" - integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== - map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -20831,22 +20136,6 @@ memoizee@^0.4.14: next-tick "^1.1.0" timers-ext "^0.1.7" -memory-fs@^0.4.0, memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ== - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -memory-fs@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" - integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - memory-level@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/memory-level/-/memory-level-1.0.0.tgz#7323c3fd368f9af2f71c3cd76ba403a17ac41692" @@ -20927,16 +20216,7 @@ merkle-patricia-tree@4.0.0: rlp "^2.2.4" semaphore-async-await "^1.5.1" -messagebird@^3.5.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/messagebird/-/messagebird-3.8.1.tgz#88442536363a4d96440f0aea34cdbc500370c677" - integrity sha512-qNt9tRlTin2JUkIGIqDCbC5hxP7+m+krfOpvTcTObxsJV4uZk4Lktg7pI/DZFB9vYYzNu9DaHT0At8jPIz1kpw== - dependencies: - jose "^4.8.0" - safe-buffer "^5.2.1" - scmp "^2.1.0" - -methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: +methods@^1.1.2, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== @@ -21253,12 +20533,12 @@ mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.16, mime-types@~2.1.19, m dependencies: mime-db "1.52.0" -mime@1.6.0, mime@^1.4.1: +mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.2.0, mime@^2.4.1, mime@^2.5.2: +mime@2.6.0, mime@^2.2.0, mime@^2.4.1, mime@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== @@ -21386,6 +20666,17 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" +minipass-fetch@^1.3.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" + integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== + dependencies: + minipass "^3.1.0" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + minipass-fetch@^2.0.3: version "2.1.2" resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" @@ -21412,7 +20703,7 @@ minipass-json-stream@^1.0.1: jsonparse "^1.3.1" minipass "^3.0.0" -minipass-pipeline@^1.2.4: +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== @@ -21441,6 +20732,18 @@ minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: dependencies: yallist "^4.0.0" +minipass@^3.1.0, minipass@^3.1.3: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^4.0.0: + version "4.2.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06" + integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ== + minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" @@ -21448,7 +20751,7 @@ minizlib@^1.3.3: dependencies: minipass "^2.9.0" -minizlib@^2.1.1, minizlib@^2.1.2: +minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -21456,22 +20759,6 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mississippi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" - integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^3.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -21704,14 +20991,7 @@ module-not-found-error@^1.0.1: resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0" integrity sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g== -moment-timezone@^0.5.21: - version "0.5.37" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz#adf97f719c4e458fdb12e2b4e87b8bec9f4eef1e" - integrity sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0", moment@^2.10.6, moment@^2.19.3, moment@^2.22.1, moment@^2.24.0, moment@^2.29.0: +moment@^2.10.6, moment@^2.19.3, moment@^2.22.1, moment@^2.29.0: version "2.29.4" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -21727,18 +21007,6 @@ morgan@^1.10.0, morgan@^1.8.2: on-finished "~2.3.0" on-headers "~1.0.2" -move-concurrently@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - integrity sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ== - dependencies: - aproba "^1.1.1" - copy-concurrently "^1.0.0" - fs-write-stream-atomic "^1.0.8" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.3" - mri@^1.1.4: version "1.2.0" resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" @@ -21849,11 +21117,6 @@ multimatch@^5.0.0: arrify "^2.0.1" minimatch "^3.0.4" -mustache@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64" - integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== - mute-stdout@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" @@ -21994,21 +21257,12 @@ ncp@~2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== -needle@^2.2.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" - integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - -negotiator@0.6.3, negotiator@^0.6.3: +negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: +neo-async@^2.6.0: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -22025,15 +21279,6 @@ netmask@^2.0.2: resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== -nexmo@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/nexmo/-/nexmo-2.4.2.tgz#12187611c85e490b22ac8d7c639a1bf49b0f561c" - integrity sha512-9DYMSyKgVunboK8hDb6wuFawXfNPGxfooQs7mv4m5DWxVywtAx03PNYB7GUqZWwevmH9iGwijlQBVPgachmitw== - dependencies: - jsonwebtoken "^8.4.0" - request "^2.88.0" - uuid "^2.0.2" - next-tick@1, next-tick@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" @@ -22143,11 +21388,6 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-forge@^0.7.6: - version "0.7.6" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" - integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== - node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -22173,6 +21413,22 @@ node-gyp-build@~4.1.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb" integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ== +node-gyp@8.x: + version "8.4.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" + integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^9.1.0" + nopt "^5.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + node-gyp@^9.0.0: version "9.1.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8" @@ -22219,35 +21475,6 @@ node-interval-tree@^1.3.3: dependencies: shallowequal "^1.0.2" -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - node-notifier@^8.0.0: version "8.0.2" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" @@ -22260,22 +21487,6 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-pre-gyp@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" - integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - node-releases@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" @@ -22291,22 +21502,6 @@ node-version@^1.0.0: resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d" integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ== -nodemon@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.1.tgz#576f0aad0f863aabf8c48517f6192ff987cd5071" - integrity sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg== - dependencies: - chokidar "^2.1.5" - debug "^3.1.0" - ignore-by-default "^1.0.1" - minimatch "^3.0.4" - pstree.remy "^1.1.6" - semver "^5.5.0" - supports-color "^5.2.0" - touch "^3.1.0" - undefsafe "^2.0.2" - update-notifier "^2.5.0" - nofilter@^1.0.3, nofilter@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e" @@ -22329,14 +21524,6 @@ nopt@3.x: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - nopt@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" @@ -22344,20 +21531,6 @@ nopt@^5.0.0: dependencies: abbrev "1" -nopt@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" - integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== - dependencies: - abbrev "^1.0.0" - -nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg== - dependencies: - abbrev "1" - normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -22417,7 +21590,7 @@ now-and-later@^2.0.0: dependencies: once "^1.3.2" -npm-bundled@^1.0.1, npm-bundled@^1.1.1: +npm-bundled@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== @@ -22467,15 +21640,6 @@ npm-package-arg@^9.0.0, npm-package-arg@^9.0.1: semver "^7.3.5" validate-npm-package-name "^4.0.0" -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-packlist@^5.1.0, npm-packlist@^5.1.1: version "5.1.3" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b" @@ -22530,7 +21694,7 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npmlog@^4.0.1, npmlog@^4.0.2: +npmlog@^4.0.1: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -22675,7 +21839,7 @@ object-inspect@^1.12.2, object-inspect@^1.9.0, object-inspect@~1.12.2: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== -object-is@^1.0.1, object-is@^1.1.4: +object-is@^1.0.1: version "1.1.5" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== @@ -22722,7 +21886,7 @@ object.assign@4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4: +object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -22805,6 +21969,24 @@ oboe@2.1.5: dependencies: http-https "^1.0.0" +"old-identity-sdk@npm:@celo/identity@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/identity/-/identity-1.5.2.tgz#6401aeefbf7893374f6f940c9e0918d0a75d0411" + integrity sha512-/9JTL5P4xTY37hgu6qh5tU1d2GS3duBjP3QL600Zz1KAQrUVgb8g8JPpiRY21oEK6L7ZoNTukQJIuM3sbi//vg== + dependencies: + "@celo/base" "1.5.2" + "@celo/contractkit" "1.5.2" + "@celo/phone-number-privacy-common" "1.0.39" + "@celo/utils" "1.5.2" + "@types/debug" "^4.1.5" + bignumber.js "^9.0.0" + blind-threshold-bls "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a" + cross-fetch "3.0.4" + debug "^4.1.1" + elliptic "^6.5.4" + fp-ts "2.1.1" + io-ts "2.0.1" + omni-fetch@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/omni-fetch/-/omni-fetch-0.2.3.tgz#56a6f46ad170b6d978982cca5bd1c6b70597a58d" @@ -22963,11 +22145,6 @@ original-require@^1.0.1: resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" integrity sha512-5vdKMbE58WaE61uVD+PKyh8xdM398UnjPBLotW2sjG5MzHARwta/+NtMBCBA0t2WQblGYBvq5vsiZpWokwno+A== -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A== - os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -23003,14 +22180,6 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -23190,16 +22359,6 @@ pac-resolver@^5.0.0: ip "^1.1.5" netmask "^2.0.2" -package-json@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - integrity sha512-q/R5GrMek0vzgoomq6rm9OX+3PQve8sLwTirmK30YB3Cu0Bbt9OX9M/SIUnroN5BGJkzwGsFwDaRGD9EwBOlCA== - dependencies: - got "^6.7.1" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" - package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -23242,20 +22401,6 @@ pacote@^13.0.3, pacote@^13.6.1: ssri "^9.0.0" tar "^6.1.11" -pako@~1.0.5: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - -parallel-transform@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" - integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== - dependencies: - cyclist "^1.0.1" - inherits "^2.0.3" - readable-stream "^2.1.5" - param-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" @@ -23458,11 +22603,6 @@ patch-package@^6.2.2: slash "^2.0.0" tmp "^0.0.33" -path-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== - path-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5" @@ -23497,7 +22637,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== -path-is-inside@^1.0.1, path-is-inside@^1.0.2: +path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w== @@ -23613,23 +22753,11 @@ pg-connection-string@0.1.3: resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" integrity sha512-i0NV/CrSkFTaiOQs9AGy3tq0dkSjtTd4d7DfsjeDVZAA4aIHInwfFEmriNYGGJUfZ5x6IAC/QddoUpUJjQAi0w== -pg-connection-string@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10" - integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ== - -pg-connection-string@^2.5.0: +pg-connection-string@2.5.0, pg-connection-string@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== -pg-hstore@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.3.tgz#d1978c12a85359830b1388d3b0ff233b88928e96" - integrity sha512-qpeTpdkguFgfdoidtfeTho1Q1zPVPbtMHgs8eQ+Aan05iLmIs3Z3oo5DOZRclPGoQ4i68I1kCtQSJSa7i0ZVYg== - dependencies: - underscore "^1.7.0" - pg-int8@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" @@ -23640,7 +22768,7 @@ pg-packet-stream@^1.1.0: resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914" integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg== -pg-pool@^2.0.10, pg-pool@^2.0.4: +pg-pool@^2.0.10: version "2.0.10" resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a" integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg== @@ -23666,19 +22794,6 @@ pg-types@^2.1.0, pg-types@^2.2.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@7.12.1: - version "7.12.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.12.1.tgz#880636d46d2efbe0968e64e9fe0eeece8ef72a7e" - integrity sha512-l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA== - dependencies: - buffer-writer "2.0.0" - packet-reader "1.0.0" - pg-connection-string "0.1.3" - pg-pool "^2.0.4" - pg-types "^2.1.0" - pgpass "1.x" - semver "4.3.2" - pg@^7.18.0: version "7.18.2" resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.2.tgz#4e219f05a00aff4db6aab1ba02f28ffa4513b0bb" @@ -24287,13 +23402,6 @@ progress@^2.0.0, progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -prom-client@11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-11.2.0.tgz#4a52b29a6e9960f8b0b27054b87ad37ad120562e" - integrity sha512-4gUAq/GR5C8q5eWxOa7tA60AtmkMpbyBd/2btCayvd3h/7HzS0p/kESKRwggJgbFrfdhTCBpOwPAwKiI01Q0VQ== - dependencies: - tdigest "^0.1.1" - prom-client@12.0.0: version "12.0.0" resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-12.0.0.tgz#9689379b19bd3f6ab88a9866124db9da3d76c6ed" @@ -24467,7 +23575,7 @@ protobufjs@6.11.2: "@types/node" ">=13.7.0" long "^4.0.0" -protobufjs@6.11.3, protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8, protobufjs@^6.8.9: +protobufjs@6.11.3, protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8: version "6.11.3" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== @@ -24570,11 +23678,6 @@ psl@^1.1.28, psl@^1.1.33: resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== -pstree.remy@^1.1.6: - version "1.1.8" - resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" - integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== - public-encrypt@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" @@ -24659,7 +23762,7 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -pumpify@^1.3.3, pumpify@^1.3.5, pumpify@^1.5.1: +pumpify@^1.3.5, pumpify@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== @@ -24687,7 +23790,7 @@ punycode@2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" integrity sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA== -punycode@^1.2.4, punycode@^1.3.2: +punycode@^1.3.2: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== @@ -24764,12 +23867,7 @@ qs@6.10.3: dependencies: side-channel "^1.0.4" -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -qs@^6.4.0, qs@^6.5.1, qs@^6.5.2, qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: +qs@^6.10.3, qs@^6.11.0, qs@^6.4.0, qs@^6.5.2, qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== @@ -24790,11 +23888,6 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA== - querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -24859,16 +23952,6 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-body@2.5.1, raw-body@^2.2.0, raw-body@^2.3.3: version "2.5.1" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" @@ -24879,7 +23962,7 @@ raw-body@2.5.1, raw-body@^2.2.0, raw-body@^2.3.3: iconv-lite "0.4.24" unpipe "1.0.0" -rc@1.2.8, rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: +rc@1.2.8, rc@^1.1.2, rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -25049,19 +24132,6 @@ read@1, read@1.0.x, read@^1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" @@ -25081,16 +24151,29 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@~0.0.2: - version "0.0.4" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" - integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw== - -readable-stream@~1.0.15: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== - dependencies: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@~0.0.2: + version "0.0.4" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" + integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw== + +readable-stream@~1.0.15: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== + dependencies: core-util-is "~1.0.0" inherits "~2.0.1" isarray "0.0.1" @@ -25162,6 +24245,13 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== + dependencies: + resolve "^1.20.0" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -25259,7 +24349,7 @@ regexp-to-ast@0.4.0: resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.4.0.tgz#f3dbcb42726cd71902ba50193f63eab5325cd7cb" integrity sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw== -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0, regexp.prototype.flags@^1.4.3: +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== @@ -25294,14 +24384,6 @@ regexpu-core@^5.1.0: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" -registry-auth-token@^3.0.1: - version "3.4.0" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e" - integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A== - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - registry-auth-token@^4.0.0: version "4.2.2" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" @@ -25309,13 +24391,6 @@ registry-auth-token@^4.0.0: dependencies: rc "1.2.8" -registry-url@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - integrity sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA== - dependencies: - rc "^1.0.1" - registry-url@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" @@ -25537,13 +24612,6 @@ resolve-alpn@^1.2.0: resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== -resolve-cwd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg== - dependencies: - resolve-from "^3.0.0" - resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -25662,13 +24730,6 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -retry-as-promised@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543" - integrity sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg== - dependencies: - any-promise "^1.3.0" - retry-request@^4.0.0, retry-request@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.2.2.tgz#b7d82210b6d2651ed249ba3497f07ea602f1a903" @@ -25697,7 +24758,7 @@ revalidator@0.1.x: resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b" integrity sha512-xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg== -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -25797,13 +24858,6 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -run-queue@^1.0.0, run-queue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - integrity sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg== - dependencies: - aproba "^1.1.1" - rustbn.js@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca" @@ -25931,15 +24985,6 @@ scheduler@0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - scmp@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a" @@ -25967,6 +25012,11 @@ scrypt-js@3.0.1, scrypt-js@^3.0.0, scrypt-js@^3.0.1: scryptsy "^2.1.0" semver "^6.3.0" +scryptsy@2.1.0, scryptsy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" + integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== + scryptsy@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-1.2.1.tgz#a3225fa4b2524f802700761e2855bdf3b2d92163" @@ -25974,11 +25024,6 @@ scryptsy@^1.2.1: dependencies: pbkdf2 "^3.0.3" -scryptsy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" - integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== - secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" @@ -26039,13 +25084,6 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -semver-diff@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" - integrity sha512-gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw== - dependencies: - semver "^5.0.3" - semver-diff@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" @@ -26060,7 +25098,7 @@ semver-greatest-satisfied-range@^1.1.0: dependencies: sver-compat "^1.5.0" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -26075,6 +25113,11 @@ semver@5.5.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== +semver@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" + integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== + semver@7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" @@ -26138,46 +25181,6 @@ seq-queue@^0.0.5: resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q== -sequelize-cli@^5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.1.tgz#0b9c2fc04d082cc8ae0a8fe270b96bb606152bab" - integrity sha512-ZM4kUZvY3y14y+Rq3cYxGH7YDJz11jWHcN2p2x7rhAIemouu4CEXr5ebw30lzTBtyXV4j2kTO+nUjZOqzG7k+Q== - dependencies: - bluebird "^3.5.3" - cli-color "^1.4.0" - fs-extra "^7.0.1" - js-beautify "^1.8.8" - lodash "^4.17.5" - resolve "^1.5.0" - umzug "^2.1.0" - yargs "^13.1.0" - -sequelize-pool@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d" - integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA== - -sequelize@5.21.5: - version "5.21.5" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.5.tgz#44056f3ab8862ccbfeebd5e03ce041c570477ea2" - integrity sha512-n9hR5K4uQGmBGK/Y/iqewCeSFmKVsd0TRnh0tfoLoAkmXbKC4tpeK96RhKs7d+TTMtrJlgt2TNLVBaAxEwC4iw== - dependencies: - bluebird "^3.5.0" - cls-bluebird "^2.1.0" - debug "^4.1.1" - dottie "^2.0.0" - inflection "1.12.0" - lodash "^4.17.15" - moment "^2.24.0" - moment-timezone "^0.5.21" - retry-as-promised "^3.2.0" - semver "^6.3.0" - sequelize-pool "^2.3.0" - toposort-class "^1.0.1" - uuid "^3.3.3" - validator "^10.11.0" - wkx "^0.4.8" - serialize-error@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a" @@ -26195,13 +25198,6 @@ serialize-javascript@6.0.0: dependencies: randombytes "^2.1.0" -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" - serve-static@1.15.0, serve-static@^1.13.1: version "1.15.0" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" @@ -26256,16 +25252,11 @@ setimmediate@1.0.4: resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f" integrity sha512-/TjEmXQVEzdod/FFskf3o7oOAsGhHf2j1dZqRFbDzq4F3mvvxflIIi4Hd3bLQE9y/CpwqfSQam5JakI/mi3Pog== -setimmediate@^1.0.4, setimmediate@^1.0.5, setimmediate@~1.0.4: +setimmediate@^1.0.5, setimmediate@~1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -26359,12 +25350,7 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== -shimmer@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" - integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== - -side-channel@^1.0.3, side-channel@^1.0.4: +side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== @@ -26373,11 +25359,6 @@ side-channel@^1.0.3, side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -sigmund@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g== - signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" @@ -26528,6 +25509,15 @@ socks-proxy-agent@5, socks-proxy-agent@^5.0.0: debug "4" socks "^2.3.3" +socks-proxy-agent@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce" + integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + socks-proxy-agent@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" @@ -26662,11 +25652,6 @@ sort-keys@^4.0.0: dependencies: is-plain-obj "^2.0.0" -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -26701,7 +25686,7 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.12: +source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -26824,14 +25809,16 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -sqlite3@4.0.9: - version "4.0.9" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.9.tgz#cff74550fa5a1159956815400bdef69245557640" - integrity sha512-IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA== +sqlite3@^5.0.8: + version "5.0.8" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.0.8.tgz#b4b7eab7156debec80866ef492e01165b4688272" + integrity sha512-f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ== dependencies: - nan "^2.12.1" - node-pre-gyp "^0.11.0" - request "^2.87.0" + "@mapbox/node-pre-gyp" "^1.0.0" + node-addon-api "^4.2.0" + tar "^6.1.11" + optionalDependencies: + node-gyp "8.x" sqlstring@^2.3.2: version "2.3.3" @@ -26853,12 +25840,12 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" - integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== +ssri@^8.0.0, ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== dependencies: - figgy-pudding "^3.5.1" + minipass "^3.1.1" ssri@^9.0.0, ssri@^9.0.1: version "9.0.1" @@ -26931,14 +25918,6 @@ stoppable@^1.1.0: resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b" integrity sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw== -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - stream-buffers@2.2.x: version "2.2.0" resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4" @@ -26952,14 +25931,6 @@ stream-combiner@^0.2.2: duplexer "~0.1.1" through "~2.3.4" -stream-each@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" - integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - stream-events@^1.0.1, stream-events@^1.0.4, stream-events@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5" @@ -26972,17 +25943,6 @@ stream-exhaust@^1.0.1: resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw== -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - stream-shift@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" @@ -27088,7 +26048,7 @@ string.prototype.trimstart@^1.0.5: define-properties "^1.1.4" es-abstract "^1.19.5" -string_decoder@^1.0.0, string_decoder@^1.1.1: +string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== @@ -27232,21 +26192,22 @@ sudo-prompt@^9.0.0: resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz#77efb84309c9ca489527a4e749f287e6bdd52afd" integrity sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw== -superagent@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" - integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA== +superagent@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6" + integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g== dependencies: - component-emitter "^1.2.0" - cookiejar "^2.1.0" - debug "^3.1.0" - extend "^3.0.0" - form-data "^2.3.1" - formidable "^1.2.0" - methods "^1.1.1" - mime "^1.4.1" - qs "^6.5.1" - readable-stream "^2.3.5" + component-emitter "^1.3.0" + cookiejar "^2.1.3" + debug "^4.3.4" + fast-safe-stringify "^2.1.1" + form-data "^4.0.0" + formidable "^2.0.1" + methods "^1.1.2" + mime "2.6.0" + qs "^6.10.3" + readable-stream "^3.6.0" + semver "^7.3.7" superstatic@^7.1.0: version "7.1.0" @@ -27280,13 +26241,13 @@ superstatic@^7.1.0: optionalDependencies: re2 "^1.15.8" -supertest@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/supertest/-/supertest-4.0.2.tgz#c2234dbdd6dc79b6f15b99c8d6577b90e4ce3f36" - integrity sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ== +supertest@^6.2.3: + version "6.2.3" + resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.2.3.tgz#291b220126e5faa654d12abe1ada3658757c8c67" + integrity sha512-3GSdMYTMItzsSYjnIcljxMVZKPW1J9kYHZY+7yLfD0wpPwww97GeImZC1oOk0S5+wYl2niJwuFusBJqwLqYM3g== dependencies: methods "^1.1.2" - superagent "^3.8.3" + superagent "^7.1.3" supports-color@5.4.0: version "5.4.0" @@ -27302,13 +26263,6 @@ supports-color@6.0.0: dependencies: has-flag "^3.0.0" -supports-color@6.1.0, supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" @@ -27335,13 +26289,20 @@ supports-color@^3.1.0: dependencies: has-flag "^1.0.0" -supports-color@^5.0.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: +supports-color@^5.0.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -27462,11 +26423,6 @@ tail@^2.0.0: resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.4.tgz#90dd4c5a174a3fa39dcb65a1df1950a4a0093a41" integrity sha512-PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ== -tapable@^1.0.0, tapable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== - tape@^4.4.0, tape@^4.6.3: version "4.16.0" resolved "https://registry.yarnpkg.com/tape/-/tape-4.16.0.tgz#18310f57b71c0ac21b3ef94fe5c16033b3d6362b" @@ -27532,7 +26488,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^4, tar@^4.0.2, tar@^4.3.0: +tar@^4.0.2, tar@^4.3.0: version "4.4.19" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== @@ -27545,6 +26501,18 @@ tar@^4, tar@^4.0.2, tar@^4.3.0: safe-buffer "^5.2.1" yallist "^3.1.1" +tar@^6.0.2: + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^4.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + tar@^6.1.0, tar@^6.1.11, tar@^6.1.2: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" @@ -27569,7 +26537,7 @@ tarn@^1.1.5: resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.5.tgz#7be88622e951738b9fa3fb77477309242cdddc2d" integrity sha512-PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g== -tarn@^3.0.1: +tarn@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693" integrity sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ== @@ -27626,17 +26594,6 @@ teeny-request@^3.11.3: node-fetch "^2.2.0" uuid "^3.3.2" -teeny-request@^6.0.0: - version "6.0.3" - resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.3.tgz#b617f9d5b7ba95c76a3f257f6ba2342b70228b1f" - integrity sha512-TZG/dfd2r6yeji19es1cUIwAlVD8y+/svB1kAC2Y0bjEyysrfbO8EZvJBRwIE6WkwmUoB7uvWLwTIhJbMXZ1Dw== - dependencies: - http-proxy-agent "^4.0.0" - https-proxy-agent "^5.0.0" - node-fetch "^2.2.0" - stream-events "^1.0.5" - uuid "^7.0.0" - teeny-request@^7.1.3: version "7.2.0" resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-7.2.0.tgz#41347ece068f08d741e7b86df38a4498208b2633" @@ -27676,13 +26633,6 @@ tempfile@^2.0.0: temp-dir "^1.0.0" uuid "^3.0.1" -term-size@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - integrity sha512-7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ== - dependencies: - execa "^0.7.0" - term-size@^2.1.0: version "2.2.1" resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" @@ -27696,30 +26646,6 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -terser-webpack-plugin@^1.4.1: - version "1.4.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" - integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== - dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" - source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" - -terser@^4.1.2: - version "4.8.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" - integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -27857,13 +26783,6 @@ timed-out@^4.0.0, timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== -timers-browserify@^2.0.4: - version "2.0.12" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" - integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== - dependencies: - setimmediate "^1.0.4" - timers-ext@^0.1.5, timers-ext@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6" @@ -27949,11 +26868,6 @@ to-absolute-glob@^2.0.0: is-absolute "^1.0.0" is-negated-glob "^1.0.0" -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA== - to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" @@ -28013,28 +26927,11 @@ to-through@^2.0.0: dependencies: through2 "^2.0.3" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== -toposort-class@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" - integrity sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg== - -touch@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" - integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== - dependencies: - nopt "~1.0.10" - tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -28118,6 +27015,31 @@ triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== +truffle-artifactor@^4.0.30: + version "4.0.30" + resolved "https://registry.yarnpkg.com/truffle-artifactor/-/truffle-artifactor-4.0.30.tgz#c06448fbf3406f8f697dae86c281e0f8cd7e5f69" + integrity sha512-3ZriLaKQ1UZ7Fhf70PUAWq0/0461oiYOLheabdQrNiggwzAwt1URMoLLByqDGmCmVBimbf/RHA4VYGd62343aA== + dependencies: + "@truffle/contract-schema" "^3.0.14" + fs-extra "6.0.1" + lodash "^4.17.13" + +truffle-contract@^4.0.31: + version "4.0.31" + resolved "https://registry.yarnpkg.com/truffle-contract/-/truffle-contract-4.0.31.tgz#e43b7f648e2db352c857d1202d710029b107b68d" + integrity sha512-u3q+p1wiX5C2GpnluGx/d2iaJk7bcWshk2/TohiJyA2iQiTfkS7M4n9D9tY3JqpXR8PmD/TrA69RylO0RhITFA== + dependencies: + "@truffle/blockchain-utils" "^0.0.11" + "@truffle/contract-schema" "^3.0.14" + "@truffle/error" "^0.0.6" + bignumber.js "^7.2.1" + ethers "^4.0.0-beta.1" + truffle-interface-adapter "^0.2.5" + web3 "1.2.1" + web3-core-promievent "1.2.1" + web3-eth-abi "1.2.1" + web3-utils "1.2.1" + truffle-flattener@^1.4.0: version "1.6.0" resolved "https://registry.yarnpkg.com/truffle-flattener/-/truffle-flattener-1.6.0.tgz#abb64488b711e6cca0a9d3e449f6a85e35964c5d" @@ -28139,6 +27061,32 @@ truffle-hdwallet-provider@0.0.3: web3 "^0.18.2" web3-provider-engine "^8.4.0" +truffle-interface-adapter@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/truffle-interface-adapter/-/truffle-interface-adapter-0.2.5.tgz#aa0bee635517b4a8e06adcdc99eacb993e68c243" + integrity sha512-EL39OpP8FcZ99ne1Rno3jImfb92Nectd4iVsZzoEUCBfbwHe7sr0k+i45guoruSoP8nMUE81Mov2s8I5pi6d9Q== + dependencies: + bn.js "^4.11.8" + ethers "^4.0.32" + lodash "^4.17.13" + web3 "1.2.1" + +truffle-provisioner@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/truffle-provisioner/-/truffle-provisioner-0.1.5.tgz#f940b2e0aa3a26d5227dfc4ebe8d29ebc68a9e03" + integrity sha512-XSzD4Tj1T16E8qwoIHnQ9sOuvoemP1yqxX9Jg0VvvoLTdl8X17uau6dN08JgNR09hJroTrXPbkAi5Y8IfKhVMw== + +truffle-resolver@^5.0.16: + version "5.0.16" + resolved "https://registry.yarnpkg.com/truffle-resolver/-/truffle-resolver-5.0.16.tgz#5488a5431ce2ea81782780f0b9ee3836f3b56c4b" + integrity sha512-ek8y6KSGLvqDZhTXzDlwFaUtwSCBtDZ4k624xNAj/RZIyqodGs1a9MBTQZ6BzpQ6uc4yC9ZlSzdClhNHugYwqg== + dependencies: + "@truffle/expect" "^0.0.10" + async "2.6.1" + detect-installed "^2.0.4" + get-installed-path "^4.0.8" + truffle-provisioner "^0.1.5" + truffle-security@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/truffle-security/-/truffle-security-1.7.3.tgz#c9dd7a0e7f35adb36d40878fa6939cf9446d210d" @@ -28392,11 +27340,6 @@ tsutils@^3.0.0, tsutils@^3.9.1: dependencies: tslib "^1.8.1" -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw== - tunnel-agent@^0.4.0: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -28506,7 +27449,7 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -28716,13 +27659,6 @@ ultron@~1.1.0: resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== -umzug@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184" - integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw== - dependencies: - bluebird "^3.7.2" - unbox-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" @@ -28746,11 +27682,6 @@ unc-path-regex@^0.1.0, unc-path-regex@^0.1.2: resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== -undefsafe@^2.0.2: - version "2.0.5" - resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c" - integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA== - underscore@1.12.1: version "1.12.1" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e" @@ -28761,7 +27692,7 @@ underscore@1.9.1: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== -underscore@>1.4.4, "underscore@>= 1.3.1", underscore@^1.7.0: +underscore@>1.4.4, "underscore@>= 1.3.1": version "1.13.4" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee" integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ== @@ -28917,11 +27848,6 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -unzip-response@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - integrity sha512-N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw== - unzipper@^0.10.10: version "0.10.11" resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e" @@ -28956,22 +27882,6 @@ update-browserslist-db@^1.0.5: escalade "^3.1.1" picocolors "^1.0.0" -update-notifier@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" - integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw== - dependencies: - boxen "^1.2.1" - chalk "^2.0.1" - configstore "^3.0.0" - import-lazy "^2.1.0" - is-ci "^1.0.10" - is-installed-globally "^0.1.0" - is-npm "^1.0.0" - latest-version "^3.0.0" - semver-diff "^2.0.0" - xdg-basedir "^3.0.0" - update-notifier@^4.1.1: version "4.1.3" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" @@ -29093,14 +28003,6 @@ url@0.10.3: punycode "1.3.2" querystring "0.2.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ== - dependencies: - punycode "1.3.2" - querystring "0.2.0" - urlgrey@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-1.0.0.tgz#72d2f904482d0b602e3c7fa599343d699bbe1017" @@ -29183,13 +28085,6 @@ util.promisify@^1.0.0: has-symbols "^1.0.1" object.getownpropertydescriptors "^2.1.1" -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ== - dependencies: - inherits "2.0.1" - util@^0.10.3: version "0.10.4" resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" @@ -29197,13 +28092,6 @@ util@^0.10.3: dependencies: inherits "2.0.3" -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== - dependencies: - inherits "2.0.3" - util@^0.12.0, util@^0.12.4: version "0.12.4" resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" @@ -29252,17 +28140,12 @@ uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - integrity sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg== - uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.0, uuid@^7.0.3: +uuid@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== @@ -29277,11 +28160,6 @@ v8-compile-cache-lib@^3.0.1: resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== -v8-compile-cache@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" - integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== - v8-compile-cache@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" @@ -29339,11 +28217,6 @@ validate-npm-package-name@^4.0.0: dependencies: builtins "^5.0.0" -validator@^10.11.0: - version "10.11.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228" - integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw== - value-or-function@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" @@ -29426,11 +28299,6 @@ vlq@^1.0.0: resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468" integrity sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w== -vm-browserify@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" - integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== - vm2@^3.9.8: version "3.9.11" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" @@ -29499,11 +28367,6 @@ walkdir@^0.3.0, walkdir@^0.3.2: resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.3.2.tgz#ac8437a288c295656848ebc19981ebc677a5f590" integrity sha512-0Twghia4Z5wDGDYWURlhZmI47GvERMCsXIu0QZWVVZyW9ZjpbbZvD9Zy9M6cWiQQRRbAcYajIyKNavaZZDt1Uw== -walkdir@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39" - integrity sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ== - walker@^1.0.7, walker@^1.0.8, walker@~1.0.5: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" @@ -29511,24 +28374,6 @@ walker@^1.0.7, walker@^1.0.8, walker@~1.0.5: dependencies: makeerror "1.0.12" -watchpack-chokidar2@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" - integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== - dependencies: - chokidar "^2.1.8" - -watchpack@^1.6.0: - version "1.7.5" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" - integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== - dependencies: - graceful-fs "^4.1.2" - neo-async "^2.5.0" - optionalDependencies: - chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.1" - wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" @@ -29541,6 +28386,15 @@ weak-map@^1.0.5: resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== +web3-bzz@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.1.tgz#c3bd1e8f0c02a13cd6d4e3c3e9e1713f144f6f0d" + integrity sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw== + dependencies: + got "9.6.0" + swarm-js "0.1.39" + underscore "1.9.1" + web3-bzz@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.2.tgz#a3b9f613c49fd3e120e0997088a73557d5adb724" @@ -29618,6 +28472,15 @@ web3-core-helpers@1.0.0-beta.55: web3-eth-iban "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-core-helpers@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz#f5f32d71c60a4a3bd14786118e633ce7ca6d5d0d" + integrity sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw== + dependencies: + underscore "1.9.1" + web3-eth-iban "1.2.1" + web3-utils "1.2.1" + web3-core-helpers@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz#484974f4bd4a487217b85b0d7cfe841af0907619" @@ -29691,6 +28554,17 @@ web3-core-method@1.0.0-beta.55: web3-core-subscriptions "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-core-method@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.1.tgz#9df1bafa2cd8be9d9937e01c6a47fc768d15d90a" + integrity sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ== + dependencies: + underscore "1.9.1" + web3-core-helpers "1.2.1" + web3-core-promievent "1.2.1" + web3-core-subscriptions "1.2.1" + web3-utils "1.2.1" + web3-core-method@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.2.tgz#d4fe2bb1945b7152e5f08e4ea568b171132a1e56" @@ -29769,6 +28643,14 @@ web3-core-method@1.8.2: web3-core-subscriptions "1.8.2" web3-utils "1.8.2" +web3-core-promievent@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz#003e8a3eb82fb27b6164a6d5b9cad04acf733838" + integrity sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw== + dependencies: + any-promise "1.3.0" + eventemitter3 "3.1.2" + web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -29820,6 +28702,17 @@ web3-core-promievent@1.8.2: dependencies: eventemitter3 "4.0.4" +web3-core-requestmanager@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz#fa2e2206c3d738db38db7c8fe9c107006f5c6e3d" + integrity sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg== + dependencies: + underscore "1.9.1" + web3-core-helpers "1.2.1" + web3-providers-http "1.2.1" + web3-providers-ipc "1.2.1" + web3-providers-ws "1.2.1" + web3-core-requestmanager@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" @@ -29907,6 +28800,15 @@ web3-core-subscriptions@1.0.0-beta.55: eventemitter3 "^3.1.0" lodash "^4.17.11" +web3-core-subscriptions@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz#8c2368a839d4eec1c01a4b5650bbeb82d0e4a099" + integrity sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g== + dependencies: + eventemitter3 "3.1.2" + underscore "1.9.1" + web3-core-helpers "1.2.1" + web3-core-subscriptions@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz#bf4ba23a653a003bdc3551649958cc0b080b068e" @@ -29979,6 +28881,16 @@ web3-core@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-core@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.1.tgz#7278b58fb6495065e73a77efbbce781a7fddf1a9" + integrity sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg== + dependencies: + web3-core-helpers "1.2.1" + web3-core-method "1.2.1" + web3-core-requestmanager "1.2.1" + web3-utils "1.2.1" + web3-core@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.2.tgz#334b99c8222ef9cfd0339e27352f0b58ea789a2f" @@ -30069,6 +28981,15 @@ web3-core@1.8.2: web3-core-requestmanager "1.8.2" web3-utils "1.8.2" +web3-eth-abi@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz#9b915b1c9ebf82f70cca631147035d5419064689" + integrity sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g== + dependencies: + ethers "4.0.0-beta.3" + underscore "1.9.1" + web3-utils "1.2.1" + web3-eth-abi@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" @@ -30128,6 +29049,23 @@ web3-eth-abi@1.8.2: "@ethersproject/abi" "^5.6.3" web3-utils "1.8.2" +web3-eth-accounts@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz#2741a8ef337a7219d57959ac8bd118b9d68d63cf" + integrity sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ== + dependencies: + any-promise "1.3.0" + crypto-browserify "3.12.0" + eth-lib "0.2.7" + scryptsy "2.1.0" + semver "6.2.0" + underscore "1.9.1" + uuid "3.3.2" + web3-core "1.2.1" + web3-core-helpers "1.2.1" + web3-core-method "1.2.1" + web3-utils "1.2.1" + web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -30261,6 +29199,20 @@ web3-eth-admin@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-eth-contract@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.1.tgz#3542424f3d341386fd9ff65e78060b85ac0ea8c4" + integrity sha512-kYFESbQ3boC9bl2rYVghj7O8UKMiuKaiMkxvRH5cEDHil8V7MGEGZNH0slSdoyeftZVlaWSMqkRP/chfnKND0g== + dependencies: + underscore "1.9.1" + web3-core "1.2.1" + web3-core-helpers "1.2.1" + web3-core-method "1.2.1" + web3-core-promievent "1.2.1" + web3-core-subscriptions "1.2.1" + web3-eth-abi "1.2.1" + web3-utils "1.2.1" + web3-eth-contract@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz#84e92714918a29e1028ee7718f0712536e14e9a1" @@ -30362,6 +29314,20 @@ web3-eth-contract@1.8.2: web3-eth-abi "1.8.2" web3-utils "1.8.2" +web3-eth-ens@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz#a0e52eee68c42a8b9865ceb04e5fb022c2d971d5" + integrity sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q== + dependencies: + eth-ens-namehash "2.0.8" + underscore "1.9.1" + web3-core "1.2.1" + web3-core-helpers "1.2.1" + web3-core-promievent "1.2.1" + web3-eth-abi "1.2.1" + web3-eth-contract "1.2.1" + web3-utils "1.2.1" + web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -30470,6 +29436,14 @@ web3-eth-iban@1.0.0-beta.55: bn.js "4.11.8" web3-utils "1.0.0-beta.55" +web3-eth-iban@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz#2c3801718946bea24e9296993a975c80b5acf880" + integrity sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ== + dependencies: + bn.js "4.11.8" + web3-utils "1.2.1" + web3-eth-iban@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz#76bec73bad214df7c4192388979a59fc98b96c5a" @@ -30526,6 +29500,17 @@ web3-eth-iban@1.8.2: bn.js "^5.2.1" web3-utils "1.8.2" +web3-eth-personal@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz#244e9911b7b482dc17c02f23a061a627c6e47faf" + integrity sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg== + dependencies: + web3-core "1.2.1" + web3-core-helpers "1.2.1" + web3-core-method "1.2.1" + web3-net "1.2.1" + web3-utils "1.2.1" + web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -30610,6 +29595,25 @@ web3-eth-personal@1.8.2: web3-net "1.8.2" web3-utils "1.8.2" +web3-eth@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.1.tgz#b9989e2557c73a9e8ffdc107c6dafbe72c79c1b0" + integrity sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA== + dependencies: + underscore "1.9.1" + web3-core "1.2.1" + web3-core-helpers "1.2.1" + web3-core-method "1.2.1" + web3-core-subscriptions "1.2.1" + web3-eth-abi "1.2.1" + web3-eth-accounts "1.2.1" + web3-eth-contract "1.2.1" + web3-eth-ens "1.2.1" + web3-eth-iban "1.2.1" + web3-eth-personal "1.2.1" + web3-net "1.2.1" + web3-utils "1.2.1" + web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -30752,6 +29756,15 @@ web3-net@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-net@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.1.tgz#edd249503315dd5ab4fa00220f6509d95bb7ab10" + integrity sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw== + dependencies: + web3-core "1.2.1" + web3-core-method "1.2.1" + web3-utils "1.2.1" + web3-net@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.2.tgz#5c3226ca72df7c591422440ce6f1203fd42ddad9" @@ -30916,6 +29929,14 @@ web3-provider-engine@^8.4.0: xhr "^2.2.0" xtend "^4.0.1" +web3-providers-http@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.1.tgz#c93ea003a42e7b894556f7e19dd3540f947f5013" + integrity sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ== + dependencies: + web3-core-helpers "1.2.1" + xhr2-cookies "1.1.0" + web3-providers-http@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.2.tgz#155e55c1d69f4c5cc0b411ede40dea3d06720956" @@ -30978,6 +29999,15 @@ web3-providers-http@1.8.2: es6-promise "^4.2.8" web3-core-helpers "1.8.2" +web3-providers-ipc@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz#017bfc687a8fc5398df2241eb98f135e3edd672c" + integrity sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA== + dependencies: + oboe "2.1.4" + underscore "1.9.1" + web3-core-helpers "1.2.1" + web3-providers-ipc@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" @@ -31037,6 +30067,15 @@ web3-providers-ipc@1.8.2: oboe "2.1.5" web3-core-helpers "1.8.2" +web3-providers-ws@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz#2d941eaf3d5a8caa3214eff8dc16d96252b842cb" + integrity sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA== + dependencies: + underscore "1.9.1" + web3-core-helpers "1.2.1" + websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" + web3-providers-ws@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" @@ -31118,6 +30157,16 @@ web3-providers@1.0.0-beta.55: websocket "^1.0.28" xhr2-cookies "1.1.0" +web3-shh@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.1.tgz#4460e3c1e07faf73ddec24ccd00da46f89152b0c" + integrity sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA== + dependencies: + web3-core "1.2.1" + web3-core-method "1.2.1" + web3-core-subscriptions "1.2.1" + web3-net "1.2.1" + web3-shh@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.2.tgz#44ed998f2a6ba0ec5cb9d455184a0f647826a49c" @@ -31324,6 +30373,19 @@ web3@*, web3@^1.2.4: web3-shh "1.7.5" web3-utils "1.7.5" +web3@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.1.tgz#5d8158bcca47838ab8c2b784a2dee4c3ceb4179b" + integrity sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw== + dependencies: + web3-bzz "1.2.1" + web3-core "1.2.1" + web3-eth "1.2.1" + web3-eth-personal "1.2.1" + web3-net "1.2.1" + web3-shh "1.2.1" + web3-utils "1.2.1" + web3@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.2.tgz#b1b8b69aafdf94cbaeadbb68a8aa1df2ef266aec" @@ -31445,60 +30507,6 @@ webidl-conversions@^6.1.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== -webpack-cli@3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.6.tgz#2c8c399a2642133f8d736a359007a052e060032c" - integrity sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A== - dependencies: - chalk "2.4.2" - cross-spawn "6.0.5" - enhanced-resolve "4.1.0" - findup-sync "3.0.0" - global-modules "2.0.0" - import-local "2.0.0" - interpret "1.2.0" - loader-utils "1.2.3" - supports-color "6.1.0" - v8-compile-cache "2.0.3" - yargs "13.2.4" - -webpack-sources@^1.4.0, webpack-sources@^1.4.1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack@4.39.1: - version "4.39.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.1.tgz#60ed9fb2b72cd60f26ea526c404d2a4cc97a1bd8" - integrity sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/wasm-edit" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.2.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.1.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.1" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.1" - watchpack "^1.6.0" - webpack-sources "^1.4.1" - websocket-driver@>=0.5.1: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" @@ -31604,7 +30612,7 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0: tr46 "^2.1.0" webidl-conversions "^6.1.0" -which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2: +which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== @@ -31615,16 +30623,6 @@ which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" @@ -31749,13 +30747,6 @@ winston@^3.0.0: triple-beam "^1.3.0" winston-transport "^4.5.0" -wkx@^0.4.8: - version "0.4.8" - resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003" - integrity sha512-ikPXMM9IR/gy/LwiOSqWlSL3X/J5uk9EO2hHNRXS41eTLXaUFEVw9fn/593jW/tE5tedNg8YjT5HkCa4FqQZyQ== - dependencies: - "@types/node" "*" - word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -31766,13 +30757,6 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== - dependencies: - errno "~0.1.7" - workerpool@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58" @@ -32137,7 +31121,7 @@ yaml@^1.10.0, yaml@^1.10.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs-parser@13.1.2, yargs-parser@^13.1.0, yargs-parser@^13.1.1, yargs-parser@^13.1.2: +yargs-parser@13.1.2, yargs-parser@^13.1.1, yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== @@ -32230,40 +31214,7 @@ yargs-unparser@2.0.0, yargs-unparser@^2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@13.2.4: - version "13.2.4" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" - integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - os-locale "^3.1.0" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.0" - -yargs@13.3.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.1" - -yargs@13.3.2, yargs@^13.1.0, yargs@^13.3.0: +yargs@13.3.2, yargs@^13.3.0: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== From bb768d8d990163c6ab767487b50af63e3593d6a1 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 3 Mar 2023 17:04:20 -0500 Subject: [PATCH 009/184] added resolutions --- package.json | 4 +++- packages/protocol/package.json | 2 +- yarn.lock | 34 ++-------------------------------- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index 5abeaea663e..aad53b4b959 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,8 @@ "typescript-tslint-plugin": "^0.5.4" }, "resolutions": { - "ganache": "npm:@soloseng/ganache@7.7.5-beta.3" + "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", + "@types/bn.js": "4.11.6", + "bignumber.js": "9.0.0" } } diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 13c710d3ea3..1f42fc35ae2 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -100,7 +100,7 @@ "@celo/phone-utils": "3.2.1-dev", "@celo/typechain-target-web3-v1-celo": "0.2.0", "@celo/typescript": "0.0.1", - "@types/bn.js": "4.11.6", + "@types/bn.js": "^5.1.0", "@types/chai": "^4.1.3", "@types/chai-subset": "1.3.3", "@types/mathjs": "^4.4.1", diff --git a/yarn.lock b/yarn.lock index 0e21941cd06..3d3bc14233d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6157,14 +6157,7 @@ dependencies: bignumber.js "*" -"@types/bn.js@*", "@types/bn.js@^5.1.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682" - integrity sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g== - dependencies: - "@types/node" "*" - -"@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5": +"@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5", "@types/bn.js@^5.1.0": version "4.11.6" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== @@ -8968,34 +8961,11 @@ bigint-mod-arith@^3.1.0: resolved "https://registry.yarnpkg.com/bigint-mod-arith/-/bigint-mod-arith-3.1.2.tgz#658e416bc593a463d97b59766226d0a3021a76b1" integrity sha512-nx8J8bBeiRR+NlsROFH9jHswW5HO8mgfOSqW0AmjicMMvaONDa8AO+5ViKDUUNytBPWiwfvZP4/Bj4Y3lUfvgQ== -bignumber.js@*, bignumber.js@9.1.0, bignumber.js@^9.0.0, bignumber.js@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62" - integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A== - -bignumber.js@7.2.1, bignumber.js@^7.2.0, bignumber.js@^7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" - integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ== - -bignumber.js@9.0.0: +bignumber.js@*, bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js#master", "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", bignumber.js@~8.0.2: version "9.0.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== -"bignumber.js@git+https://github.com/debris/bignumber.js#master": - version "2.0.7" - resolved "git+https://github.com/debris/bignumber.js#c7a38de919ed75e6fb6ba38051986e294b328df9" - -"bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2": - version "2.0.7" - resolved "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" - -bignumber.js@~8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.0.2.tgz#d8c4e1874359573b1ef03011a2d861214aeef137" - integrity sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw== - bin-links@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.3.tgz#3842711ef3db2cd9f16a5f404a996a12db355a6e" From 91dca89faea51386c60a046dba13c1836bf3ea7f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 4 Mar 2023 14:10:07 -0500 Subject: [PATCH 010/184] remove lib --- .../wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts | 29 ------------- .../lib/gcp-hsm-wallet.test.d.ts | 41 ------------------- .../sdk/wallets/wallet-hsm-gcp/lib/index.d.ts | 2 - 3 files changed, 72 deletions(-) delete mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts delete mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts delete mode 100644 packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts deleted file mode 100644 index 89aed1e1d41..00000000000 --- a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Address, ReadOnlyWallet } from '@celo/connect'; -import { RemoteWallet } from '@celo/wallet-remote'; -import { GcpHsmSigner } from './gcp-hsm-signer'; -/** - * A Cloud HSM wallet built on GCP. - */ -export declare class GcpHsmWallet extends RemoteWallet implements ReadOnlyWallet { - private readonly versionName; - private client; - constructor(versionName: string); - private generateKmsClient; - protected loadAccountSigners(): Promise>; - private getPublicKeyFromVersionName; - /** - * Converts key from PEM to DER encoding. - * - * DER (Distinguished Encoding Rules) is a binary encoding for X.509 certificates and private keys. - * Unlike PEM, DER-encoded files do not contain plain text statements such as -----BEGIN CERTIFICATE----- - * - * https://www.ssl.com/guide/pem-der-crt-and-cer-x-509-encodings-and-conversions/#:~:text=DER%20(Distinguished%20Encoding%20Rules)%20is,commonly%20seen%20in%20Java%20contexts. - */ - private pemToDerEncode; - /** - * Returns the EVM address for the given key - * Useful for initially getting the 'from' field given a keyName - * @param versionName GCP version name for the HSM - */ - getAddressFromVersionName(versionName: string): Promise
; -} diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts deleted file mode 100644 index 89a78e233f2..00000000000 --- a/packages/sdk/wallets/wallet-hsm-gcp/lib/gcp-hsm-wallet.test.d.ts +++ /dev/null @@ -1,41 +0,0 @@ -export declare const PRIVATE_KEY1 = "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"; -export declare const ACCOUNT_ADDRESS1: string; -export declare const PRIVATE_KEY2 = "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890fdeccc"; -export declare const ACCOUNT_ADDRESS2: string; -export declare const PRIVATE_KEY_NEVER = "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890ffffff"; -export declare const ACCOUNT_ADDRESS_NEVER: string; -export declare const CHAIN_ID = 44378; -export declare const TYPED_DATA: { - types: { - EIP712Domain: { - name: string; - type: string; - }[]; - Person: { - name: string; - type: string; - }[]; - Mail: { - name: string; - type: string; - }[]; - }; - primaryType: string; - domain: { - name: string; - version: string; - chainId: number; - verifyingContract: string; - }; - message: { - from: { - name: string; - wallet: string; - }; - to: { - name: string; - wallet: string; - }; - contents: string; - }; -}; diff --git a/packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts b/packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts deleted file mode 100644 index a618782df6d..00000000000 --- a/packages/sdk/wallets/wallet-hsm-gcp/lib/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './gcp-hsm-signer'; -export * from './gcp-hsm-wallet'; From cde57f80f0a2c7bab6131061aae4d17d7bc7a811 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 7 Mar 2023 11:42:10 -0500 Subject: [PATCH 011/184] removed leftover old dependencies --- packages/protocol/package.json | 3 - yarn.lock | 343 +++------------------------------ 2 files changed, 24 insertions(+), 322 deletions(-) diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 1f42fc35ae2..95318ccad49 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -83,9 +83,6 @@ "solhint": "^2.3.1", "solidity-bytes-utils": "0.0.7", "truffle": "5.7.3", - "truffle-artifactor": "^4.0.30", - "truffle-contract": "^4.0.31", - "truffle-resolver": "^5.0.16", "truffle-security": "^1.7.3", "twilio": "^3.57.0", "weak-map": "^1.0.5", diff --git a/yarn.lock b/yarn.lock index 3d3bc14233d..470cea09c07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5444,11 +5444,6 @@ fs-extra "^9.1.0" lodash "^4.17.21" -"@truffle/blockchain-utils@^0.0.11": - version "0.0.11" - resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.0.11.tgz#9886f4cb7a9f20deded4451ac78f8567ae5c0d75" - integrity sha512-9MyQ/20M96clhIcC7fVFIckGSB8qMsmcdU6iYt98HXJ9GOLNKsCaJFz1OVsJncVreYwTUhoEXTrVBc8zrmPDJQ== - "@truffle/blockchain-utils@^0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.4.tgz#1365b88c3d2922a066d947e93748f09b0fac2e93" @@ -5604,14 +5599,6 @@ lodash "^4.17.21" original-require "^1.0.1" -"@truffle/contract-schema@^3.0.14", "@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.12": - version "3.4.12" - resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.12.tgz#038518c7a6af81d8ce3df16e8b0d114062d04d0c" - integrity sha512-XpMMps/bqHwiRuCyLiEEGWEAvGGzGj4u1X1+lzxrtIsrwbQhSZcdgEbXl9vGxOOJWOup3HXRCIsjlao27kS4OA== - dependencies: - ajv "^6.10.0" - debug "^4.3.1" - "@truffle/contract-schema@^3.2.5", "@truffle/contract-schema@^3.4.9": version "3.4.9" resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.9.tgz#57119245452e49f7b1ea6c71900bb6c053d76c8c" @@ -5628,6 +5615,14 @@ ajv "^6.10.0" debug "^4.3.1" +"@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.12": + version "3.4.12" + resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.12.tgz#038518c7a6af81d8ce3df16e8b0d114062d04d0c" + integrity sha512-XpMMps/bqHwiRuCyLiEEGWEAvGGzGj4u1X1+lzxrtIsrwbQhSZcdgEbXl9vGxOOJWOup3HXRCIsjlao27kS4OA== + dependencies: + ajv "^6.10.0" + debug "^4.3.1" + "@truffle/contract-sources@^0.1.6", "@truffle/contract-sources@^0.1.8": version "0.1.12" resolved "https://registry.yarnpkg.com/@truffle/contract-sources/-/contract-sources-0.1.12.tgz#7a3dfec1bcf6f3632c0f54e522fb6f12b0bdf34b" @@ -5830,11 +5825,6 @@ resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.11.tgz#2789c0042d7e796dcbb840c7a9b5d2bcd8e0e2d8" integrity sha512-ju6TucjlJkfYMmdraYY/IBJaFb+Sa+huhYtOoyOJ+G29KcgytUVnDzKGwC7Kgk6IsxQMm62Mc1E0GZzFbGGipw== -"@truffle/error@^0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.6.tgz#75d499845b4b3a40537889e7d04c663afcaee85d" - integrity sha512-QUM9ZWiwlXGixFGpV18g5I6vua6/r+ZV9W/5DQA5go9A3eZUNPHPaTKMIQPJLYn6+ZV5jg5H28zCHq56LHF3yA== - "@truffle/error@^0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.1.1.tgz#e52026ac8ca7180d83443dca73c03e07ace2a301" @@ -5872,11 +5862,6 @@ resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.12.tgz#ed609cc538753e79438eb5a9bda7c2fda8ec2535" integrity sha512-5Hyhrf42wvxCdzv6r8q94lDEQa1onMj6A+/lHTTmirfzqIpk4V32yV22DeFL5QuDFfPaParIT5oHOcQGVAg6XQ== -"@truffle/expect@^0.0.10": - version "0.0.10" - resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.10.tgz#efe2f1fae224393437eba6b5b322d48ebf02ed0d" - integrity sha512-9jnqWyyqDUpO9wulBF7s+vUvOh3hjxzaFtuP7yeNRNx80svlB5GsUTLr11atRda02zrBmEo8hzFrU/DKacr4/w== - "@truffle/expect@^0.0.13": version "0.0.13" resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.13.tgz#c8e23edc1a1c3b13f768611e6199113026cf8bf2" @@ -8006,13 +7991,6 @@ async@1.x, async@^1.3.0, async@^1.4.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== -async@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" - integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ== - dependencies: - lodash "^4.17.10" - async@2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" @@ -13204,7 +13182,7 @@ ethers@4.0.0-beta.3: uuid "2.0.1" xmlhttprequest "1.8.0" -ethers@^4.0.0-beta.1, ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: +ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: version "4.0.49" resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894" integrity sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg== @@ -14529,15 +14507,6 @@ fs-exists-sync@^0.1.0: resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== -fs-extra@6.0.1, fs-extra@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" - integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^0.30.0: version "0.30.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0" @@ -14585,6 +14554,15 @@ fs-extra@^5.0.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" + integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^7.0.0, fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -19656,7 +19634,7 @@ lodash@4.17.14: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== -lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -24982,11 +24960,6 @@ scrypt-js@3.0.1, scrypt-js@^3.0.0, scrypt-js@^3.0.1: scryptsy "^2.1.0" semver "^6.3.0" -scryptsy@2.1.0, scryptsy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" - integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== - scryptsy@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-1.2.1.tgz#a3225fa4b2524f802700761e2855bdf3b2d92163" @@ -24994,6 +24967,11 @@ scryptsy@^1.2.1: dependencies: pbkdf2 "^3.0.3" +scryptsy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" + integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== + secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" @@ -25083,11 +25061,6 @@ semver@5.5.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== -semver@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" - integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== - semver@7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" @@ -26985,31 +26958,6 @@ triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== -truffle-artifactor@^4.0.30: - version "4.0.30" - resolved "https://registry.yarnpkg.com/truffle-artifactor/-/truffle-artifactor-4.0.30.tgz#c06448fbf3406f8f697dae86c281e0f8cd7e5f69" - integrity sha512-3ZriLaKQ1UZ7Fhf70PUAWq0/0461oiYOLheabdQrNiggwzAwt1URMoLLByqDGmCmVBimbf/RHA4VYGd62343aA== - dependencies: - "@truffle/contract-schema" "^3.0.14" - fs-extra "6.0.1" - lodash "^4.17.13" - -truffle-contract@^4.0.31: - version "4.0.31" - resolved "https://registry.yarnpkg.com/truffle-contract/-/truffle-contract-4.0.31.tgz#e43b7f648e2db352c857d1202d710029b107b68d" - integrity sha512-u3q+p1wiX5C2GpnluGx/d2iaJk7bcWshk2/TohiJyA2iQiTfkS7M4n9D9tY3JqpXR8PmD/TrA69RylO0RhITFA== - dependencies: - "@truffle/blockchain-utils" "^0.0.11" - "@truffle/contract-schema" "^3.0.14" - "@truffle/error" "^0.0.6" - bignumber.js "^7.2.1" - ethers "^4.0.0-beta.1" - truffle-interface-adapter "^0.2.5" - web3 "1.2.1" - web3-core-promievent "1.2.1" - web3-eth-abi "1.2.1" - web3-utils "1.2.1" - truffle-flattener@^1.4.0: version "1.6.0" resolved "https://registry.yarnpkg.com/truffle-flattener/-/truffle-flattener-1.6.0.tgz#abb64488b711e6cca0a9d3e449f6a85e35964c5d" @@ -27031,32 +26979,6 @@ truffle-hdwallet-provider@0.0.3: web3 "^0.18.2" web3-provider-engine "^8.4.0" -truffle-interface-adapter@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/truffle-interface-adapter/-/truffle-interface-adapter-0.2.5.tgz#aa0bee635517b4a8e06adcdc99eacb993e68c243" - integrity sha512-EL39OpP8FcZ99ne1Rno3jImfb92Nectd4iVsZzoEUCBfbwHe7sr0k+i45guoruSoP8nMUE81Mov2s8I5pi6d9Q== - dependencies: - bn.js "^4.11.8" - ethers "^4.0.32" - lodash "^4.17.13" - web3 "1.2.1" - -truffle-provisioner@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/truffle-provisioner/-/truffle-provisioner-0.1.5.tgz#f940b2e0aa3a26d5227dfc4ebe8d29ebc68a9e03" - integrity sha512-XSzD4Tj1T16E8qwoIHnQ9sOuvoemP1yqxX9Jg0VvvoLTdl8X17uau6dN08JgNR09hJroTrXPbkAi5Y8IfKhVMw== - -truffle-resolver@^5.0.16: - version "5.0.16" - resolved "https://registry.yarnpkg.com/truffle-resolver/-/truffle-resolver-5.0.16.tgz#5488a5431ce2ea81782780f0b9ee3836f3b56c4b" - integrity sha512-ek8y6KSGLvqDZhTXzDlwFaUtwSCBtDZ4k624xNAj/RZIyqodGs1a9MBTQZ6BzpQ6uc4yC9ZlSzdClhNHugYwqg== - dependencies: - "@truffle/expect" "^0.0.10" - async "2.6.1" - detect-installed "^2.0.4" - get-installed-path "^4.0.8" - truffle-provisioner "^0.1.5" - truffle-security@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/truffle-security/-/truffle-security-1.7.3.tgz#c9dd7a0e7f35adb36d40878fa6939cf9446d210d" @@ -28356,15 +28278,6 @@ weak-map@^1.0.5: resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== -web3-bzz@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.1.tgz#c3bd1e8f0c02a13cd6d4e3c3e9e1713f144f6f0d" - integrity sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw== - dependencies: - got "9.6.0" - swarm-js "0.1.39" - underscore "1.9.1" - web3-bzz@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.2.tgz#a3b9f613c49fd3e120e0997088a73557d5adb724" @@ -28442,15 +28355,6 @@ web3-core-helpers@1.0.0-beta.55: web3-eth-iban "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-core-helpers@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz#f5f32d71c60a4a3bd14786118e633ce7ca6d5d0d" - integrity sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.2.1" - web3-utils "1.2.1" - web3-core-helpers@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz#484974f4bd4a487217b85b0d7cfe841af0907619" @@ -28524,17 +28428,6 @@ web3-core-method@1.0.0-beta.55: web3-core-subscriptions "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-core-method@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.1.tgz#9df1bafa2cd8be9d9937e01c6a47fc768d15d90a" - integrity sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-core-promievent "1.2.1" - web3-core-subscriptions "1.2.1" - web3-utils "1.2.1" - web3-core-method@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.2.tgz#d4fe2bb1945b7152e5f08e4ea568b171132a1e56" @@ -28613,14 +28506,6 @@ web3-core-method@1.8.2: web3-core-subscriptions "1.8.2" web3-utils "1.8.2" -web3-core-promievent@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz#003e8a3eb82fb27b6164a6d5b9cad04acf733838" - integrity sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw== - dependencies: - any-promise "1.3.0" - eventemitter3 "3.1.2" - web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -28672,17 +28557,6 @@ web3-core-promievent@1.8.2: dependencies: eventemitter3 "4.0.4" -web3-core-requestmanager@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz#fa2e2206c3d738db38db7c8fe9c107006f5c6e3d" - integrity sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-providers-http "1.2.1" - web3-providers-ipc "1.2.1" - web3-providers-ws "1.2.1" - web3-core-requestmanager@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" @@ -28770,15 +28644,6 @@ web3-core-subscriptions@1.0.0-beta.55: eventemitter3 "^3.1.0" lodash "^4.17.11" -web3-core-subscriptions@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz#8c2368a839d4eec1c01a4b5650bbeb82d0e4a099" - integrity sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g== - dependencies: - eventemitter3 "3.1.2" - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-core-subscriptions@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz#bf4ba23a653a003bdc3551649958cc0b080b068e" @@ -28851,16 +28716,6 @@ web3-core@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-core@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.1.tgz#7278b58fb6495065e73a77efbbce781a7fddf1a9" - integrity sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg== - dependencies: - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-requestmanager "1.2.1" - web3-utils "1.2.1" - web3-core@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.2.tgz#334b99c8222ef9cfd0339e27352f0b58ea789a2f" @@ -28951,15 +28806,6 @@ web3-core@1.8.2: web3-core-requestmanager "1.8.2" web3-utils "1.8.2" -web3-eth-abi@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz#9b915b1c9ebf82f70cca631147035d5419064689" - integrity sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g== - dependencies: - ethers "4.0.0-beta.3" - underscore "1.9.1" - web3-utils "1.2.1" - web3-eth-abi@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" @@ -29019,23 +28865,6 @@ web3-eth-abi@1.8.2: "@ethersproject/abi" "^5.6.3" web3-utils "1.8.2" -web3-eth-accounts@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz#2741a8ef337a7219d57959ac8bd118b9d68d63cf" - integrity sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ== - dependencies: - any-promise "1.3.0" - crypto-browserify "3.12.0" - eth-lib "0.2.7" - scryptsy "2.1.0" - semver "6.2.0" - underscore "1.9.1" - uuid "3.3.2" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-utils "1.2.1" - web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -29169,20 +28998,6 @@ web3-eth-admin@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-eth-contract@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.1.tgz#3542424f3d341386fd9ff65e78060b85ac0ea8c4" - integrity sha512-kYFESbQ3boC9bl2rYVghj7O8UKMiuKaiMkxvRH5cEDHil8V7MGEGZNH0slSdoyeftZVlaWSMqkRP/chfnKND0g== - dependencies: - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-promievent "1.2.1" - web3-core-subscriptions "1.2.1" - web3-eth-abi "1.2.1" - web3-utils "1.2.1" - web3-eth-contract@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz#84e92714918a29e1028ee7718f0712536e14e9a1" @@ -29284,20 +29099,6 @@ web3-eth-contract@1.8.2: web3-eth-abi "1.8.2" web3-utils "1.8.2" -web3-eth-ens@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz#a0e52eee68c42a8b9865ceb04e5fb022c2d971d5" - integrity sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q== - dependencies: - eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-promievent "1.2.1" - web3-eth-abi "1.2.1" - web3-eth-contract "1.2.1" - web3-utils "1.2.1" - web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -29406,14 +29207,6 @@ web3-eth-iban@1.0.0-beta.55: bn.js "4.11.8" web3-utils "1.0.0-beta.55" -web3-eth-iban@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz#2c3801718946bea24e9296993a975c80b5acf880" - integrity sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ== - dependencies: - bn.js "4.11.8" - web3-utils "1.2.1" - web3-eth-iban@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz#76bec73bad214df7c4192388979a59fc98b96c5a" @@ -29470,17 +29263,6 @@ web3-eth-iban@1.8.2: bn.js "^5.2.1" web3-utils "1.8.2" -web3-eth-personal@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz#244e9911b7b482dc17c02f23a061a627c6e47faf" - integrity sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg== - dependencies: - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-net "1.2.1" - web3-utils "1.2.1" - web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -29565,25 +29347,6 @@ web3-eth-personal@1.8.2: web3-net "1.8.2" web3-utils "1.8.2" -web3-eth@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.1.tgz#b9989e2557c73a9e8ffdc107c6dafbe72c79c1b0" - integrity sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA== - dependencies: - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-subscriptions "1.2.1" - web3-eth-abi "1.2.1" - web3-eth-accounts "1.2.1" - web3-eth-contract "1.2.1" - web3-eth-ens "1.2.1" - web3-eth-iban "1.2.1" - web3-eth-personal "1.2.1" - web3-net "1.2.1" - web3-utils "1.2.1" - web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -29726,15 +29489,6 @@ web3-net@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-net@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.1.tgz#edd249503315dd5ab4fa00220f6509d95bb7ab10" - integrity sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw== - dependencies: - web3-core "1.2.1" - web3-core-method "1.2.1" - web3-utils "1.2.1" - web3-net@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.2.tgz#5c3226ca72df7c591422440ce6f1203fd42ddad9" @@ -29899,14 +29653,6 @@ web3-provider-engine@^8.4.0: xhr "^2.2.0" xtend "^4.0.1" -web3-providers-http@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.1.tgz#c93ea003a42e7b894556f7e19dd3540f947f5013" - integrity sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ== - dependencies: - web3-core-helpers "1.2.1" - xhr2-cookies "1.1.0" - web3-providers-http@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.2.tgz#155e55c1d69f4c5cc0b411ede40dea3d06720956" @@ -29969,15 +29715,6 @@ web3-providers-http@1.8.2: es6-promise "^4.2.8" web3-core-helpers "1.8.2" -web3-providers-ipc@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz#017bfc687a8fc5398df2241eb98f135e3edd672c" - integrity sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA== - dependencies: - oboe "2.1.4" - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-providers-ipc@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" @@ -30037,15 +29774,6 @@ web3-providers-ipc@1.8.2: oboe "2.1.5" web3-core-helpers "1.8.2" -web3-providers-ws@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz#2d941eaf3d5a8caa3214eff8dc16d96252b842cb" - integrity sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" - web3-providers-ws@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" @@ -30127,16 +29855,6 @@ web3-providers@1.0.0-beta.55: websocket "^1.0.28" xhr2-cookies "1.1.0" -web3-shh@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.1.tgz#4460e3c1e07faf73ddec24ccd00da46f89152b0c" - integrity sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA== - dependencies: - web3-core "1.2.1" - web3-core-method "1.2.1" - web3-core-subscriptions "1.2.1" - web3-net "1.2.1" - web3-shh@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.2.tgz#44ed998f2a6ba0ec5cb9d455184a0f647826a49c" @@ -30343,19 +30061,6 @@ web3@*, web3@^1.2.4: web3-shh "1.7.5" web3-utils "1.7.5" -web3@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.1.tgz#5d8158bcca47838ab8c2b784a2dee4c3ceb4179b" - integrity sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw== - dependencies: - web3-bzz "1.2.1" - web3-core "1.2.1" - web3-eth "1.2.1" - web3-eth-personal "1.2.1" - web3-net "1.2.1" - web3-shh "1.2.1" - web3-utils "1.2.1" - web3@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.2.tgz#b1b8b69aafdf94cbaeadbb68a8aa1df2ef266aec" From 7955d93d8a99528a3822b938d65f4e519b1901a1 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:27:20 -0500 Subject: [PATCH 012/184] fixed revert assersion error message --- packages/protocol/lib/test-utils.ts | 37 ++++++++-- packages/protocol/runTests.js | 5 +- packages/protocol/test/common/accounts.ts | 70 +++++++++++++------ .../addresssortedlinkedlistwithmedian.ts | 42 ++++++----- packages/protocol/test/common/feeburner.ts | 54 ++++++++++---- .../test/common/feecurrencywhitelist.ts | 37 +++++++--- .../protocol/test/common/gaspriceminimum.ts | 41 ++++++++--- packages/protocol/test/common/goldtoken.ts | 35 +++++++--- packages/protocol/test/common/registry.ts | 9 ++- packages/protocol/test/identity/escrow.ts | 21 +++--- .../protocol/test/stability/grandamento.ts | 3 +- packages/protocol/truffle-config.js | 8 +-- 12 files changed, 257 insertions(+), 105 deletions(-) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 027526831aa..cabcd7f5022 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -131,9 +131,9 @@ export const assertThrowsAsync = async (promise: any, errorMessage: string = '') assert.equal(true, failed, errorMessage) } -export async function assertRevertWithReason(promise: any, expectedRevertReason: string = '') { +export async function assertTXRevertWithReason(promise: any, expectedRevertReason: string = '') { try { - await promise + await promise assert.fail('Expected transaction to revert') } catch (error) { // Only ever tested with ganache. @@ -142,10 +142,37 @@ export async function assertRevertWithReason(promise: any, expectedRevertReason: // When it's a transaction (eg a non-view send call), error.message has a shape like: // `Returned error: VM Exception while processing transaction: revert ${revertMessage} -- Reason given: ${revertMessage}.` // Therefore we try to parse the first instance of `${revertMessage}`. + + const revertFound: boolean = + error.message.search(expectedRevertReason) >= 0 + const msg: string = + expectedRevertReason === '' ? `Expected "revert", got ${error} instead` : expectedRevertReason + assert(revertFound, msg) + } +} +export async function assertRevertWithReason(promise: any, expectedRevertReason: string = '') { + try { + await promise + assert.fail('Expected transaction to revert') + } catch (error) { + // Only ever tested with ganache. + // When it's a view call, error.message has a shape like: + // `Returned error: VM Exception while processing transaction: revert ${revertMessage}` + // When it's a transaction (eg a non-view send call), error.message has a shape like: + // `Transaction: ${transactionHash} exited with an error (status 0). Reason given: ${revertMessage}. + // Please check that the transaction: + // - satisfies all conditions set by Solidity `require` statements. + // - does not trigger a Solidity `revert` statement.` + // Therefore we try to parse the instance of `${revertMessage}`. + + // const foundRevertReason = error.message + // .split('. Reason given: ')[0] + // .split('Returned error: VM Exception while processing transaction: revert ')[1] + // assert.equal(foundRevertReason, expectedRevertReason, `Incorrect revert message: ${error.message} \n ${foundRevertReason}`) + const foundRevertReason = error.message - .split(' -- Reason given: ')[0] - .split('Returned error: VM Exception while processing transaction: revert ')[1] - assert.equal(foundRevertReason, expectedRevertReason, 'Incorrect revert message') + .split(' Reason given: ')[1].split('.')[0] + assert.strictEqual(foundRevertReason, expectedRevertReason, `Incorrect revert message: ${error.message} \n ${foundRevertReason}`) } } diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index e7d17518b7e..e056c6cb0d3 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -15,7 +15,10 @@ const isCI = process.env.CI === 'true' async function startGanache() { const server = ganache.server({ wallet: { mnemonic: network.mnemonic, defaultBalance: network.defaultBalance }, - miner: { blockGasLimit: 20000000, gasPrice: network.gasPrice }, + miner: { + blockGasLimit: 20000000, + defaultGasPrice: network.defaultGasPrice, + }, chain: { networkId: network.network_id, allowUnlimitedContractSize: true }, }) diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index 64b4247a87e..e1d3ad7ed50 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -7,6 +7,7 @@ import { assertLogMatches2, assertRevert, assertRevertWithReason, + assertTXRevertWithReason, } from '@celo/protocol/lib/test-utils' import { toFixed } from '@celo/utils/lib/fixidity' import { parseSolidityStringArray } from '@celo/utils/lib/parsing' @@ -98,7 +99,10 @@ contract('Accounts', (accounts: string[]) => { }) it('should revert when the key is invalid', async () => { - await assertRevert(accountsInstance.setAccountDataEncryptionKey('0x32132931293')) + await assertTXRevertWithReason( + accountsInstance.setAccountDataEncryptionKey('0x32132931293'), + 'data encryption key length <= 32' + ) }) it('should allow a key that is longer than 33 bytes', async () => { @@ -262,8 +266,9 @@ contract('Accounts', (accounts: string[]) => { it('should set a revert with the wrong signature for a different address', async () => { const sig = await getParsedSignatureOfAddress(web3, account, accounts[1]) - await assertRevert( - accountsInstance.setAccount(name, dataEncryptionKey, accounts[2], sig.v, sig.r, sig.s) + await assertTXRevertWithReason( + accountsInstance.setAccount(name, dataEncryptionKey, accounts[2], sig.v, sig.r, sig.s), + 'Invalid signature' ) }) }) @@ -272,7 +277,10 @@ contract('Accounts', (accounts: string[]) => { describe('#setWalletAddress', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevert(accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0')) + await assertTXRevertWithReason( + accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), + 'Unknown account' + ) }) }) @@ -312,7 +320,10 @@ contract('Accounts', (accounts: string[]) => { it('should set a revert with the wrong signature for a different address', async () => { const sig = await getParsedSignatureOfAddress(web3, account, accounts[1]) - await assertRevert(accountsInstance.setWalletAddress(accounts[2], sig.v, sig.r, sig.s)) + await assertTXRevertWithReason( + accountsInstance.setWalletAddress(accounts[2], sig.v, sig.r, sig.s), + 'Invalid signature' + ) }) }) }) @@ -320,7 +331,7 @@ contract('Accounts', (accounts: string[]) => { describe('#setMetadataURL', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevert(accountsInstance.setMetadataURL(caller)) + await assertTXRevertWithReason(accountsInstance.setMetadataURL(caller), 'Unknown account') }) }) @@ -347,7 +358,7 @@ contract('Accounts', (accounts: string[]) => { }) }) - describe('#batchGetMetadataURL', () => { + describe.only('#batchGetMetadataURL', () => { it('returns multiple metadata URLs', async () => { const randomStrings = accounts.map((_) => web3.utils.randomHex(20).slice(2)) await Promise.all( @@ -370,7 +381,10 @@ contract('Accounts', (accounts: string[]) => { describe('#addStorageRoot', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevert(accountsInstance.addStorageRoot(storageRoot)) + await assertTXRevertWithReason( + accountsInstance.addStorageRoot(storageRoot), + 'Unknown account' + ) }) }) @@ -407,7 +421,7 @@ contract('Accounts', (accounts: string[]) => { describe('#removeStorageRoot', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevert(accountsInstance.removeStorageRoot(0)) + await assertTXRevertWithReason(accountsInstance.removeStorageRoot(0), 'Unknown account') }) }) @@ -418,7 +432,10 @@ contract('Accounts', (accounts: string[]) => { describe('when there are no storage roots', async () => { it('should revert with message', async () => { - await assertRevert(accountsInstance.removeStorageRoot(0), 'Invalid storage root index') + await assertTXRevertWithReason( + accountsInstance.removeStorageRoot(0), + 'Invalid storage root index' + ) }) }) @@ -459,7 +476,7 @@ contract('Accounts', (accounts: string[]) => { const badFraction = toFixed(1.2) it('should not be callable by a non-account', async () => { - await assertRevertWithReason( + await assertTXRevertWithReason( accountsInstance.setPaymentDelegation(beneficiary, fraction), 'Not an account' ) @@ -480,14 +497,14 @@ contract('Accounts', (accounts: string[]) => { }) it('should not allow a fraction greater than 1', async () => { - await assertRevertWithReason( + await assertTXRevertWithReason( accountsInstance.setPaymentDelegation(beneficiary, badFraction), 'Fraction must not be greater than 1' ) }) it('should not allow a beneficiary with address 0x0', async () => { - await assertRevertWithReason( + await assertTXRevertWithReason( accountsInstance.setPaymentDelegation(NULL_ADDRESS, fraction), 'Beneficiary cannot be address 0x0' ) @@ -540,7 +557,10 @@ contract('Accounts', (accounts: string[]) => { describe('#setName', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevert(accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0')) + await assertTXRevertWithReason( + accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), + 'Unknown account' + ) }) }) @@ -630,7 +650,7 @@ contract('Accounts', (accounts: string[]) => { describe('smart contract signers', async () => { it("can't complete an authorization that hasn't been started", async () => { - await assertRevert( + await assertTXRevertWithReason( accountsInstance.completeSignerAuthorization(account, role, { from: signer }), 'Signer authorization not started' ) @@ -771,7 +791,10 @@ contract('Accounts', (accounts: string[]) => { assert.isFalse(await accountsInstance.hasDefaultSigner(account, role)) assert.equal(await accountsInstance.getDefaultSigner(account, role), account) - await assertRevert(accountsInstance.setIndexedSigner(signer, role)) + await assertTXRevertWithReason( + accountsInstance.setIndexedSigner(signer, role), + 'Must authorize signer before setting as default' + ) await accountsInstance.authorizeSignerWithSignature(signer, role, sig.v, sig.r, sig.s) await accountsInstance.setIndexedSigner(signer, role) @@ -912,7 +935,10 @@ contract('Accounts', (accounts: string[]) => { it(`should revert if the ${description} is an account`, async () => { await accountsInstance.createAccount({ from: authorized }) - await assertRevert(testInstance.fn(authorized, sig.v, sig.r, sig.s)) + await assertTXRevertWithReason( + testInstance.fn(authorized, sig.v, sig.r, sig.s), + 'Cannot re-authorize address or locked gold account for another account' + ) }) it(`should revert if the ${description} is already authorized`, async () => { @@ -922,14 +948,18 @@ contract('Accounts', (accounts: string[]) => { await testInstance.fn(authorized, otherSig.v, otherSig.r, otherSig.s, { from: otherAccount, }) - await assertRevert(testInstance.fn(authorized, sig.v, sig.r, sig.s)) + await assertTXRevertWithReason( + testInstance.fn(authorized, sig.v, sig.r, sig.s), + 'Cannot re-authorize address or locked gold account for another account' + ) }) it('should revert if the signature is incorrect', async () => { const nonVoter = accounts[3] const incorrectSig = await getSignature(account, nonVoter) - await assertRevert( - testInstance.fn(authorized, incorrectSig.v, incorrectSig.r, incorrectSig.s) + await assertTXRevertWithReason( + testInstance.fn(authorized, incorrectSig.v, incorrectSig.r, incorrectSig.s), + 'Invalid signature' ) }) diff --git a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts index 1492a0cfc84..060b8105825 100644 --- a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts +++ b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts @@ -1,5 +1,5 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' -import { assertRevert, assertSameAddress } from '@celo/protocol/lib/test-utils' +import { assertSameAddress, assertTXRevertWithReason } from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { AddressSortedLinkedListWithMedianTestContract, @@ -55,25 +55,28 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if key is 0', async () => { - await assertRevert( + await assertTXRevertWithReason( addressSortedLinkedListWithMedianTest.insert( NULL_ADDRESS, numerator, NULL_ADDRESS, NULL_ADDRESS - ) + ), + 'invalid key' ) }) it('should revert if lesser is equal to key', async () => { - await assertRevert( - addressSortedLinkedListWithMedianTest.insert(key, numerator, key, NULL_ADDRESS) + await assertTXRevertWithReason( + addressSortedLinkedListWithMedianTest.insert(key, numerator, key, NULL_ADDRESS), + 'invalid key' ) }) it('should revert if greater is equal to key', async () => { - await assertRevert( - addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, key) + await assertTXRevertWithReason( + addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, key), + 'invalid key' ) }) @@ -88,8 +91,9 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert when inserting an element already in the list', async () => { - await assertRevert( - addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, NULL_ADDRESS) + await assertTXRevertWithReason( + addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, NULL_ADDRESS), + 'invalid key' ) }) }) @@ -119,25 +123,28 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if the key is not in the list', async () => { - await assertRevert( + await assertTXRevertWithReason( addressSortedLinkedListWithMedianTest.update( accounts[8], newNumerator, NULL_ADDRESS, NULL_ADDRESS - ) + ), + 'key not in list' ) }) it('should revert if lesser is equal to key', async () => { - await assertRevert( - addressSortedLinkedListWithMedianTest.update(key, newNumerator, key, NULL_ADDRESS) + await assertTXRevertWithReason( + addressSortedLinkedListWithMedianTest.update(key, newNumerator, key, NULL_ADDRESS), + 'invalid key' ) }) it('should revert if greater is equal to key', async () => { - await assertRevert( - addressSortedLinkedListWithMedianTest.update(key, newNumerator, NULL_ADDRESS, key) + await assertTXRevertWithReason( + addressSortedLinkedListWithMedianTest.update(key, newNumerator, NULL_ADDRESS, key), + 'invalid key' ) }) }) @@ -175,7 +182,10 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if the key is not in the list', async () => { - await assertRevert(addressSortedLinkedListWithMedianTest.remove(accounts[8])) + await assertTXRevertWithReason( + addressSortedLinkedListWithMedianTest.remove(accounts[8]), + 'key not in list' + ) }) }) diff --git a/packages/protocol/test/common/feeburner.ts b/packages/protocol/test/common/feeburner.ts index e9bbccc6606..aaa40d6a5b6 100644 --- a/packages/protocol/test/common/feeburner.ts +++ b/packages/protocol/test/common/feeburner.ts @@ -1,6 +1,11 @@ // TODO remove magic numbers import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertEqualBN, assertGtBN, assertRevert, timeTravel } from '@celo/protocol/lib/test-utils' +import { + assertEqualBN, + assertGtBN, + assertTXRevertWithReason, + timeTravel, +} from '@celo/protocol/lib/test-utils' import { fixed1, toFixed } from '@celo/utils/lib/fixidity' import BigNumber from 'bignumber.js' import { @@ -197,8 +202,9 @@ contract('FeeBurner', (accounts: string[]) => { }) it('Only owner can take tokens out', async () => { - await assertRevert( - feeBurner.transfer(tokenA.address, user, new BigNumber(1e18), { from: user }) + await assertTXRevertWithReason( + feeBurner.transfer(tokenA.address, user, new BigNumber(1e18), { from: user }), + 'Ownable: caller is not the owner' ) }) @@ -226,7 +232,10 @@ contract('FeeBurner', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(feeBurner.initialize(registry.address, [], [], [], [], { from: user })) + await assertTXRevertWithReason( + feeBurner.initialize(registry.address, [], [], [], [], { from: user }), + 'contract already initialized' + ) }) }) @@ -257,22 +266,25 @@ contract('FeeBurner', (accounts: string[]) => { }) it("doesn't remove if the indexes doesn't match", async () => { - await assertRevert(feeBurner.removeRouter(tokenA.address, exchange.address, 0)) + await assertTXRevertWithReason(feeBurner.removeRouter(tokenA.address, exchange.address, 0)), + 'Index does not match' }) }) describe('#setDailyBurnLimit()', () => { it('should only be called by owner', async () => { - await assertRevert( - feeBurner.setDailyBurnLimit(stableToken.address, goldAmountForRate, { from: user }) + await assertTXRevertWithReason( + feeBurner.setDailyBurnLimit(stableToken.address, goldAmountForRate, { from: user }), + 'Ownable: caller is not the owner' ) }) }) describe('#setMaxSplipagge()', () => { it('should only be called by owner', async () => { - await assertRevert( - feeBurner.setMaxSplippage(stableToken.address, maxSlippage, { from: user }) + await assertTXRevertWithReason( + feeBurner.setMaxSplippage(stableToken.address, maxSlippage, { from: user }), + 'Ownable: caller is not the owner' ) }) }) @@ -285,9 +297,12 @@ contract('FeeBurner', (accounts: string[]) => { await exchange.sell(goldTokenAmount, 0, true, { from: user }) }) - it("Can't burn when forzen", async () => { + it("Can't burn when frozen", async () => { await freezer.freeze(feeBurner.address) - await assertRevert(feeBurner.burnMentoTokens()) + await assertTXRevertWithReason( + feeBurner.burnMentoTokens(), + "can't call when contract is frozen" + ) }) it('burns contract balance', async () => { @@ -330,7 +345,10 @@ contract('FeeBurner', (accounts: string[]) => { from: user, }) - await assertRevert(feeBurner.burn()) + await assertTXRevertWithReason( + feeBurner.burn(), + 'Calculated buyAmount was less than specified minBuyAmount' + ) assertEqualBN(await stableToken.balanceOf(feeBurner.address), new BigNumber(3000)) }) @@ -366,7 +384,7 @@ contract('FeeBurner', (accounts: string[]) => { // Uniswap can get the address of a pair by using an init code pair hash. Unfortunately, this hash is harcoded // in the file UniswapV2Library.sol. The hash writen now there is meant to run in the CI. If you're seeing this problem you can // 1. Skip these tests locally, as they will run in the CI anyway or - // 2. Change the hash, you can get the hash for the parciular test deployment with the following: + // 2. Change the hash, you can get the hash for the particular test deployment with the following: // // tslint:disable-next-line // console.log('Uniswap INIT CODE PAIR HASH:', await uniswapFactory.INIT_CODE_PAIR_HASH()) @@ -396,7 +414,10 @@ contract('FeeBurner', (accounts: string[]) => { it("Can't burn when frozen", async () => { await freezer.freeze(feeBurner.address) - await assertRevert(feeBurner.burnNonMentoTokens()) + await assertTXRevertWithReason( + feeBurner.burnNonMentoTokens(), + "can't call when contract is frozen" + ) }) it('Uniswap trade test', async () => { @@ -449,7 +470,10 @@ contract('FeeBurner', (accounts: string[]) => { it("Doesn't exchange non-Mento when slippage is too high", async () => { await feeBurner.setMaxSplippage(tokenA.address, maxSlippage) - await assertRevert(feeBurner.burnNonMentoTokens()) + await assertTXRevertWithReason( + feeBurner.burnNonMentoTokens(), + 'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT' + ) assertEqualBN(await tokenA.balanceOf(feeBurner.address), new BigNumber(10e18)) }) diff --git a/packages/protocol/test/common/feecurrencywhitelist.ts b/packages/protocol/test/common/feecurrencywhitelist.ts index c23fca6afb8..7b0e2cb0a04 100644 --- a/packages/protocol/test/common/feecurrencywhitelist.ts +++ b/packages/protocol/test/common/feecurrencywhitelist.ts @@ -1,4 +1,4 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' +import { assertTXRevertWithReason } from '@celo/protocol/lib/test-utils' import { FeeCurrencyWhitelistContract, FeeCurrencyWhitelistInstance } from 'types' const FeeCurrencyWhitelist: FeeCurrencyWhitelistContract = artifacts.require('FeeCurrencyWhitelist') @@ -22,7 +22,10 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(feeCurrencyWhitelist.initialize()) + await assertTXRevertWithReason( + feeCurrencyWhitelist.initialize(), + 'contract already initialized' + ) }) }) @@ -34,7 +37,10 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertRevert(feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner })) + await assertTXRevertWithReason( + feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -49,7 +55,10 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertRevert(feeCurrencyWhitelist.addNonMentoToken(aTokenAddress, { from: nonOwner })) + await assertTXRevertWithReason( + feeCurrencyWhitelist.addNonMentoToken(aTokenAddress, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -67,11 +76,17 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it("Doesn't remove if the index is wrong", async () => { - await assertRevert(feeCurrencyWhitelist.removeToken(accounts[0], 0)) + await assertTXRevertWithReason( + feeCurrencyWhitelist.removeToken(accounts[0], 0), + 'Index does not match' + ) }) it('should not allow a non-owner to remove Mento token', async () => { - await assertRevert(feeCurrencyWhitelist.removeToken(accounts[0], 0, { from: nonOwner })) + await assertTXRevertWithReason( + feeCurrencyWhitelist.removeToken(accounts[0], 0, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -98,12 +113,16 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it("Doesn't remove if the index is wrong", async () => { - await assertRevert(feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1)) + await assertTXRevertWithReason( + feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1), + 'Index does not match' + ) }) it('should not allow a non-owner to remove non-Mento token', async () => { - await assertRevert( - feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1, { from: nonOwner }) + await assertTXRevertWithReason( + feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) diff --git a/packages/protocol/test/common/gaspriceminimum.ts b/packages/protocol/test/common/gaspriceminimum.ts index 8f87e70e635..fb95cb760bc 100644 --- a/packages/protocol/test/common/gaspriceminimum.ts +++ b/packages/protocol/test/common/gaspriceminimum.ts @@ -1,5 +1,9 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' -import { assertEqualBN, assertLogMatches2, assertRevert } from '@celo/protocol/lib/test-utils' +import { + assertEqualBN, + assertLogMatches2, + assertTXRevertWithReason, +} from '@celo/protocol/lib/test-utils' import { fromFixed, toFixed } from '@celo/utils/lib/fixidity' import BigNumber from 'bignumber.js' import { @@ -64,13 +68,14 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert( + await assertTXRevertWithReason( gasPriceMinimum.initialize( registry.address, gasPriceMinimumFloor, targetDensity, adjustmentSpeed - ) + ), + 'contract already initialized' ) }) }) @@ -97,11 +102,17 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided fraction is greater than one', async () => { - await assertRevert(gasPriceMinimum.setAdjustmentSpeed(toFixed(3 / 2))) + await assertTXRevertWithReason( + gasPriceMinimum.setAdjustmentSpeed(toFixed(3 / 2)), + 'adjustment speed must be smaller than 1' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(gasPriceMinimum.setAdjustmentSpeed(newAdjustmentSpeed, { from: nonOwner })) + await assertTXRevertWithReason( + gasPriceMinimum.setAdjustmentSpeed(newAdjustmentSpeed, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -127,14 +138,18 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided fraction is greater than one', async () => { - await assertRevert(gasPriceMinimum.setTargetDensity(toFixed(3 / 2))) + await assertTXRevertWithReason( + gasPriceMinimum.setTargetDensity(toFixed(3 / 2)), + 'target density must be smaller than 1' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( + await assertTXRevertWithReason( gasPriceMinimum.setTargetDensity(newTargetDensity, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -161,14 +176,18 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided floor is zero', async () => { - await assertRevert(gasPriceMinimum.setGasPriceMinimumFloor(0)) + await assertTXRevertWithReason( + gasPriceMinimum.setGasPriceMinimumFloor(0), + 'gas price minimum floor must be greater than zero' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( + await assertTXRevertWithReason( gasPriceMinimum.setGasPriceMinimumFloor(newGasPriceMinFloor, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) diff --git a/packages/protocol/test/common/goldtoken.ts b/packages/protocol/test/common/goldtoken.ts index 86c7f31b047..b04e3c92e81 100644 --- a/packages/protocol/test/common/goldtoken.ts +++ b/packages/protocol/test/common/goldtoken.ts @@ -1,6 +1,11 @@ +// TODO (soloseng) gas price issue import { NULL_ADDRESS } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertBalance, assertEqualBN, assertRevert } from '@celo/protocol/lib/test-utils' +import { + assertBalance, + assertEqualBN, + assertTXRevertWithReason, +} from '@celo/protocol/lib/test-utils' import { BigNumber } from 'bignumber.js' import _ from 'lodash' import { @@ -156,7 +161,8 @@ contract('GoldToken', (accounts: string[]) => { it('should transfer balance from one user to another', async () => { const startBalanceFrom = await goldToken.balanceOf(sender) const startBalanceTo = await goldToken.balanceOf(receiver) - await goldToken.transfer(receiver, ONE_GOLDTOKEN) + const resp = await goldToken.transfer(receiver, ONE_GOLDTOKEN) + console.log('TX receipt:', resp.receipt) await assertBalance(sender, startBalanceFrom.minus(ONE_GOLDTOKEN)) await assertBalance(receiver, startBalanceTo.plus(ONE_GOLDTOKEN)) }) @@ -175,7 +181,10 @@ contract('GoldToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevert(goldToken.transfer(NULL_ADDRESS, ONE_GOLDTOKEN)) + await assertTXRevertWithReason( + goldToken.transfer(NULL_ADDRESS, ONE_GOLDTOKEN, { gasPrice: 0 }), + 'transfer attempted to reserved address 0x0' + ) }) it('should not allow transferring more than the sender has', async () => { @@ -184,7 +193,10 @@ contract('GoldToken', (accounts: string[]) => { const value = web3.utils.toBN( (await goldToken.balanceOf(sender)).plus(ONE_GOLDTOKEN.times(4)) ) - await assertRevert(goldToken.transfer(receiver, value)) + await assertTXRevertWithReason( + goldToken.transfer(receiver, value), + 'transfer value exceeded balance of sender' + ) }) }) @@ -202,8 +214,9 @@ contract('GoldToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevert( - goldToken.transferFrom(sender, NULL_ADDRESS, ONE_GOLDTOKEN, { from: receiver }) + await assertTXRevertWithReason( + goldToken.transferFrom(sender, NULL_ADDRESS, ONE_GOLDTOKEN, { from: receiver }), + 'transfer attempted to reserved address 0x0' ) }) @@ -214,14 +227,18 @@ contract('GoldToken', (accounts: string[]) => { (await goldToken.balanceOf(sender)).plus(ONE_GOLDTOKEN.times(4)) ) await goldToken.approve(receiver, value) - await assertRevert(goldToken.transferFrom(sender, receiver, value, { from: receiver })) + await assertTXRevertWithReason( + goldToken.transferFrom(sender, receiver, value, { from: receiver }), + 'transfer value exceeded balance of sender' + ) }) it('should not allow transferring more than the spender is allowed', async () => { - await assertRevert( + await assertTXRevertWithReason( goldToken.transferFrom(sender, receiver, ONE_GOLDTOKEN.plus(1), { from: receiver, - }) + }), + "transfer value exceeded sender's allowance for recipient" ) }) }) diff --git a/packages/protocol/test/common/registry.ts b/packages/protocol/test/common/registry.ts index 6612f5968d5..16ab67a00ac 100644 --- a/packages/protocol/test/common/registry.ts +++ b/packages/protocol/test/common/registry.ts @@ -1,4 +1,4 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' +import { assertRevert, assertTXRevertWithReason } from '@celo/protocol/lib/test-utils' import { soliditySha3 } from '@celo/utils/lib/solidity' import { RegistryInstance } from 'types' @@ -24,7 +24,7 @@ contract('Registry', (accounts: any) => { }) it('should not be callable again', async () => { - await assertRevert(registry.initialize()) + await assertTXRevertWithReason(registry.initialize(), 'contract already initialized') }) }) @@ -35,7 +35,10 @@ contract('Registry', (accounts: any) => { }) it('should not allow a different user to set an address', async () => { - await assertRevert(registry.setAddressFor(anIdentifier, anAddress, { from: accounts[1] })) + await assertTXRevertWithReason( + registry.setAddressFor(anIdentifier, anAddress, { from: accounts[1] }), + 'Ownable: caller is not the owner' + ) }) it('should emit an event', async () => { diff --git a/packages/protocol/test/identity/escrow.ts b/packages/protocol/test/identity/escrow.ts index 04475d73789..26a9e003277 100644 --- a/packages/protocol/test/identity/escrow.ts +++ b/packages/protocol/test/identity/escrow.ts @@ -7,6 +7,7 @@ import { assertObjectWithBNEqual, assertRevert, assertRevertWithReason, + assertTXRevertWithReason, assumeOwnership, timeTravel, } from '@celo/protocol/lib/test-utils' @@ -179,7 +180,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow more trusted issuers to be added', async () => { - await assertRevertWithReason( + await assertTXRevertWithReason( escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: owner }), "defaultTrustedIssuers.length can't exceed allowed number of trustedIssuers" ) @@ -189,10 +190,8 @@ contract('Escrow', (accounts: string[]) => { await escrow.removeDefaultTrustedIssuer(expectedTrustedIssuers[0], 0, { from: owner }) await escrow.addDefaultTrustedIssuer(trustedIssuer1) expectedTrustedIssuers.push(trustedIssuer1) - assert.deepEqual( - (await escrow.getDefaultTrustedIssuers()).sort(), - expectedTrustedIssuers.slice(1).sort() - ) + const sortedDefaultTrustedIssuers = [...(await escrow.getDefaultTrustedIssuers())].sort() + assert.deepEqual(sortedDefaultTrustedIssuers, expectedTrustedIssuers.slice(1).sort()) }) }) }) @@ -854,7 +853,7 @@ contract('Escrow', (accounts: string[]) => { escrow.withdraw(uniquePaymentIDWithdraw, parsedSig.v, parsedSig.r, parsedSig.s, { from: receiver, }), - 'Invalid withdraw value.' + 'Invalid withdraw value' ) }) }) @@ -1005,7 +1004,7 @@ contract('Escrow', (accounts: string[]) => { await completeAttestations(receiver, aPhoneHash, minAttestations - 1) await assertRevertWithReason( withdrawAndCheckState(sender, receiver, aPhoneHash, uniquePaymentIDWithdraw, [], []), - 'This account does not have the required attestations to withdraw this payment.' + 'This account does not have the required attestations to withdraw this payment' ) }) it("should withdraw properly when sender's second payment has an identifier", async () => { @@ -1068,7 +1067,7 @@ contract('Escrow', (accounts: string[]) => { [], [] ), - 'This account does not have the required attestations to withdraw this payment.' + 'This account does not have the required attestations to withdraw this payment' ) }) it('should allow users to withdraw if attestation is found in FederatedAttestations', async () => { @@ -1115,7 +1114,7 @@ contract('Escrow', (accounts: string[]) => { it('should not allow a user to withdraw a payment if no attestations exist for trustedIssuers', async () => { await assertRevertWithReason( withdrawAndCheckState(sender, receiver, aPhoneHash, uniquePaymentIDWithdraw, [], []), - 'This account does not have the required attestations to withdraw this payment.' + 'This account does not have the required attestations to withdraw this payment' ) }) }) @@ -1251,7 +1250,7 @@ contract('Escrow', (accounts: string[]) => { it('should not allow sender to revoke payment before payment has expired', async () => { await assertRevertWithReason( escrow.revoke(uniquePaymentIDRevoke, { from: sender }), - 'Transaction not redeemable for sender yet.' + 'Transaction not redeemable for sender yet' ) }) @@ -1259,7 +1258,7 @@ contract('Escrow', (accounts: string[]) => { await timeTravel(oneDayInSecs, web3) await assertRevertWithReason( escrow.revoke(uniquePaymentIDRevoke, { from: receiver }), - 'Only sender of payment can attempt to revoke payment.' + 'Only sender of payment can attempt to revoke payment' ) }) }) diff --git a/packages/protocol/test/stability/grandamento.ts b/packages/protocol/test/stability/grandamento.ts index c87a97e7a72..efcf0e25958 100644 --- a/packages/protocol/test/stability/grandamento.ts +++ b/packages/protocol/test/stability/grandamento.ts @@ -5,6 +5,7 @@ import { assertLogMatches2, assertRevert, assertRevertWithReason, + assertTXRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { fromFixed, reciprocal, toFixed } from '@celo/utils/lib/fixidity' @@ -1160,7 +1161,7 @@ contract('GrandaMento', (accounts: string[]) => { // Add an entry for StableTokenEUR so the tx doesn't revert // as a result of the registry lookup. await registry.setAddressFor(CeloContractName.StableTokenEUR, stableToken.address) - await assertRevertWithReason( + await assertTXRevertWithReason( grandaMento.getStableTokenExchangeLimits(CeloContractName.StableTokenEUR), 'Max stable token exchange amount must be defined' ) diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index fee564ffe9b..4bae58fd989 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -46,8 +46,8 @@ const defaultConfig = { port: hostPort, network_id: 1101, from: OG_FROM, - gas: gasLimit, - gasPrice: 100000000000, + blockGasLimit: gasLimit, + defaultGasPrice: 100000000000, } const freeGasConfig = { ...defaultConfig, ...{ gasPrice: 0 } } @@ -67,8 +67,8 @@ const networks = { development: { ...defaultConfig, from: DEVELOPMENT_FROM, - gasPrice: 0, - gas: gasLimit, + defaultGasPrice: 0, + blockGasLimit: gasLimit, defaultBalance: 200000000, maxFeePerGas: 875000000, mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic', From 493fca7aa4c9348a9ef158a3b77f0978c75ce04f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:21:14 -0400 Subject: [PATCH 013/184] WIP notes --- packages/protocol/test/common/integration.ts | 1 + .../test/common/metatransactionwallet.ts | 1 + packages/protocol/test/common/proxy.ts | 1 + .../test/compatibility/ast-version.ts | 39 ++++++++++--------- packages/protocol/test/customHooks.ts | 2 + .../test/governance/voting/release_gold.ts | 1 + packages/sdk/base/src/signatureUtils.ts | 1 + 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index 13e4bca7c82..7cd795bf43a 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -1,3 +1,4 @@ +// TODO (soloseng) gas price issue import { ensureLeading0x, NULL_ADDRESS } from '@celo/base/lib/address' import { constitution } from '@celo/protocol/governanceConstitution' import { diff --git a/packages/protocol/test/common/metatransactionwallet.ts b/packages/protocol/test/common/metatransactionwallet.ts index 6e09a782393..1a9a0437972 100644 --- a/packages/protocol/test/common/metatransactionwallet.ts +++ b/packages/protocol/test/common/metatransactionwallet.ts @@ -1,3 +1,4 @@ +/// TODO: (soloseng) signer issues import { constructMetaTransactionExecutionDigest, getDomainDigest, diff --git a/packages/protocol/test/common/proxy.ts b/packages/protocol/test/common/proxy.ts index 30b630c36b0..98d2966b75b 100644 --- a/packages/protocol/test/common/proxy.ts +++ b/packages/protocol/test/common/proxy.ts @@ -230,6 +230,7 @@ contract('Proxy', (accounts: string[]) => { }) it('recovers funds from an incorrectly intialized implementation', async () => { + //TODO: (soloseng) gasprice = 0 issue const Freezer: FreezerContract = artifacts.require('Freezer') const GoldToken: GoldTokenContract = artifacts.require('GoldToken') // @ts-ignore diff --git a/packages/protocol/test/compatibility/ast-version.ts b/packages/protocol/test/compatibility/ast-version.ts index 98de2807288..bd826c1b086 100644 --- a/packages/protocol/test/compatibility/ast-version.ts +++ b/packages/protocol/test/compatibility/ast-version.ts @@ -1,27 +1,30 @@ -import { getContractVersion } from '@celo/protocol/lib/compatibility/ast-version' -import { DEFAULT_VERSION_STRING } from '@celo/protocol/lib/compatibility/version' -import { getTestArtifacts } from '@celo/protocol/test/compatibility/common' -import { assert } from 'chai' +// TODO: (soloseng): find source of error: \ +// issue may be comming from @ethereumjs/vm package runCall -const testCases = { - original: getTestArtifacts('original'), - versioned: getTestArtifacts('versioned'), -} +// import { getContractVersion } from '@celo/protocol/lib/compatibility/ast-version' +// import { DEFAULT_VERSION_STRING } from '@celo/protocol/lib/compatibility/version' +// import { getTestArtifacts } from '@celo/protocol/test/compatibility/common' +// import { assert } from 'chai' + +// const testCases = { +// original: getTestArtifacts('original'), +// versioned: getTestArtifacts('versioned'), +// } describe('#getContractVersion()', () => { describe('when the contract implements getVersionNumber()', () => { - it('returns the correct version number', async () => { - const version = await getContractVersion( - testCases.versioned.getArtifactByName('TestContract') - ) - assert.equal(version.toString(), '1.2.3.4') - }) + // xit('returns the correct version number', async () => { + // const version = await getContractVersion( + // testCases.versioned.getArtifactByName('TestContract') + // ) + // assert.equal(version.toString(), '1.2.3.4') + // }) }) describe('when the contract does not implement getVersionNumber()', () => { - it('returns the default version number', async () => { - const version = await getContractVersion(testCases.original.getArtifactByName('TestContract')) - assert.equal(version.toString(), DEFAULT_VERSION_STRING) - }) + // xit('returns the default version number', async () => { + // const version = await getContractVersion(testCases.original.getArtifactByName('TestContract')) + // assert.equal(version.toString(), DEFAULT_VERSION_STRING) + // }) }) }) diff --git a/packages/protocol/test/customHooks.ts b/packages/protocol/test/customHooks.ts index 1da6ba454b3..7d16f055ffb 100644 --- a/packages/protocol/test/customHooks.ts +++ b/packages/protocol/test/customHooks.ts @@ -1,3 +1,5 @@ +//TODO: (soloseng) fix: Argument of type 'string' is not assignable to parameter of type 'ProvidesHookCallback'. + import { retryAsync } from '@celo/utils/lib/async' // Handles flakey `error: Invalid JSON RPC response: ""` error that seems to be caused by port exhaustion in CI. diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index e16d9d9769b..96dac682d9f 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -1,3 +1,4 @@ +// TODO: (soloseng) error caused by non-zero gasprice import { NULL_ADDRESS } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils' diff --git a/packages/sdk/base/src/signatureUtils.ts b/packages/sdk/base/src/signatureUtils.ts index d85e80fcf84..0e52c689264 100644 --- a/packages/sdk/base/src/signatureUtils.ts +++ b/packages/sdk/base/src/signatureUtils.ts @@ -17,6 +17,7 @@ export function NativeSigner( } export interface Signature { + //TODO: soloseng: should this be converted to Bigint? v: number r: string s: string From f0addc4d8a69daca15badce25621fb3b4272ab1d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:26:02 -0400 Subject: [PATCH 014/184] WIP todos --- packages/protocol/contracts/common/UsingPrecompiles.sol | 3 ++- .../contracts/uniswap/test/libraries/UniswapV2Library.sol | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/protocol/contracts/common/UsingPrecompiles.sol b/packages/protocol/contracts/common/UsingPrecompiles.sol index 144955921d9..596bb94ccb2 100644 --- a/packages/protocol/contracts/common/UsingPrecompiles.sol +++ b/packages/protocol/contracts/common/UsingPrecompiles.sol @@ -104,6 +104,7 @@ contract UsingPrecompiles { * @param index Index of requested validator in the validator set. * @return Address of validator at the requested index. */ + // TODO: (soloseng) add to precompiles function validatorSignerAddressFromCurrentSet(uint256 index) public view returns (address) { bytes memory out; bool success; @@ -134,6 +135,7 @@ contract UsingPrecompiles { * @notice Gets the size of the current elected validator set. * @return Size of the current elected validator set. */ + // TODO:(soloseng) add to precompiles. function numberValidatorsInCurrentSet() public view returns (uint256) { bytes memory out; bool success; @@ -268,5 +270,4 @@ contract UsingPrecompiles { function minQuorumSizeInCurrentSet() public view returns (uint256) { return minQuorumSize(block.number); } - } diff --git a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol index cc7182d5383..29c1ca8bab8 100644 --- a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol +++ b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol @@ -35,8 +35,9 @@ library UniswapV2Library { // This variable was hardcoded for Uniswap Eth Mainnet deployment // hex"96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f" // init code hash // Hash in the CI "bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" - hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" + //TODO:(soloseng) swicth back to this // hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" // hex"f0bd447d72bc4c5cd510462381a98e87f097a4d31106d6dd8b5922227696ef7a" + hex"a3cc3b88aa878e73a27f19b6bb136f2e229563b9b45b3d86ced9b3725dd480ed" ) ) ) From 0a6cfa9eb948bfcddac8b83877f34e91da90272a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 28 Mar 2023 13:26:02 -0400 Subject: [PATCH 015/184] updated web3 & ethereumjs in utils & protocol --- .../common/test/domains.test.ts | 5 +- .../common/test/interfaces/requests.test.ts | 13 +- .../protocol/lib/fed-attestations-utils.ts | 18 +- packages/protocol/lib/meta-tx-utils.ts | 31 +- packages/protocol/lib/test-utils.ts | 2 +- packages/protocol/package.json | 23 +- packages/protocol/runTests.js | 6 +- packages/protocol/test/common/accounts.ts | 29 +- .../test/common/metatransactionwallet.ts | 1 - .../test/governance/network/governance.ts | 81 +- packages/sdk/connect/src/connection.ts | 3 +- packages/sdk/contractkit/package.json | 2 +- .../wrappers/MetaTransactionWallet.test.ts | 7 +- packages/sdk/utils/package.json | 8 +- packages/sdk/utils/src/address.ts | 4 +- packages/sdk/utils/src/ecies.test.ts | 26 +- packages/sdk/utils/src/io.ts | 2 +- packages/sdk/utils/src/istanbul.ts | 4 +- .../utils/src/sign-typed-data-utils.test.ts | 49 +- .../sdk/utils/src/sign-typed-data-utils.ts | 16 +- packages/sdk/utils/src/signatureUtils.ts | 69 +- .../wallets/wallet-base/src/signing-utils.ts | 6 +- .../wallet-local/src/local-wallet.test.ts | 2 +- yarn.lock | 3124 +++-------------- 24 files changed, 681 insertions(+), 2850 deletions(-) diff --git a/packages/phone-number-privacy/common/test/domains.test.ts b/packages/phone-number-privacy/common/test/domains.test.ts index 92b97a101ae..814e0ced3dc 100644 --- a/packages/phone-number-privacy/common/test/domains.test.ts +++ b/packages/phone-number-privacy/common/test/domains.test.ts @@ -6,6 +6,7 @@ import { noNumber, noString, } from '@celo/utils/lib/sign-typed-data-utils' +import { bufferToHex } from '@ethereumjs/util' import { DomainIdentifiers } from '../src/domains/constants' import { Domain, domainEIP712, DomainOptions } from '../src/domains/domains' import { SequentialDelayDomain } from '../src/domains/sequential-delay' @@ -31,9 +32,9 @@ describe('domainEIP712()', () => { address: defined('0x0000000000000000000000000000000000000b0b'), salt: noString, } - const expectedHash = '966edacc6cdf76b4536da958e82e360213b957508767a393ccf5c6b73db241d1' + const expectedHash = '0x966edacc6cdf76b4536da958e82e360213b957508767a393ccf5c6b73db241d1' const typedData = domainEIP712(domain) // console.debug(JSON.stringify(typedData, null, 2)) - expect(generateTypedDataHash(typedData).toString('hex')).toEqual(expectedHash) + expect(bufferToHex(generateTypedDataHash(typedData))).toEqual(expectedHash) }) }) diff --git a/packages/phone-number-privacy/common/test/interfaces/requests.test.ts b/packages/phone-number-privacy/common/test/interfaces/requests.test.ts index d0f8a7d1e5c..6feb23ae586 100644 --- a/packages/phone-number-privacy/common/test/interfaces/requests.test.ts +++ b/packages/phone-number-privacy/common/test/interfaces/requests.test.ts @@ -7,6 +7,7 @@ import { noString, } from '@celo/utils/lib/sign-typed-data-utils' import { LocalWallet } from '@celo/wallet-local' +import { bufferToHex } from '@ethereumjs/util' import { Domain, DomainIdentifiers, @@ -64,10 +65,10 @@ describe('domainRestrictedSignatureRequestEIP712()', () => { blindedMessage: '', sessionID: noString, } - const expectedHash = '9914e6bc3bd0d63727eeae4008654920b9879654f7159b1d5ab33768e61f56df' + const expectedHash = '0x9914e6bc3bd0d63727eeae4008654920b9879654f7159b1d5ab33768e61f56df' const typedData = domainRestrictedSignatureRequestEIP712(request) // console.debug(JSON.stringify(typedData, null, 2)) - expect(generateTypedDataHash(typedData).toString('hex')).toEqual(expectedHash) + expect(bufferToHex(generateTypedDataHash(typedData))).toEqual(expectedHash) }) }) @@ -88,10 +89,10 @@ describe('domainQuotaStatusRequestEIP712()', () => { }, sessionID: noString, } - const expectedHash = '0c1545b83f28d8d0f24886fa0d21ac540af706dd6f9ee6d045bac17780a2656e' + const expectedHash = '0x0c1545b83f28d8d0f24886fa0d21ac540af706dd6f9ee6d045bac17780a2656e' const typedData = domainQuotaStatusRequestEIP712(request) //console.debug(JSON.stringify(typedData, null, 2)) - expect(generateTypedDataHash(typedData).toString('hex')).toEqual(expectedHash) + expect(bufferToHex(generateTypedDataHash(typedData))).toEqual(expectedHash) }) }) @@ -112,10 +113,10 @@ describe('disableDomainRequestEIP712()', () => { }, sessionID: noString, } - const expectedHash = 'd30be7d1b1bb3a9a0b2b2148d9ea3fcae7775dc31ce984d658f90295887a323a' + const expectedHash = '0xd30be7d1b1bb3a9a0b2b2148d9ea3fcae7775dc31ce984d658f90295887a323a' const typedData = disableDomainRequestEIP712(request) console.debug(JSON.stringify(typedData, null, 2)) - expect(generateTypedDataHash(typedData).toString('hex')).toEqual(expectedHash) + expect(bufferToHex(generateTypedDataHash(typedData))).toEqual(expectedHash) }) }) diff --git a/packages/protocol/lib/fed-attestations-utils.ts b/packages/protocol/lib/fed-attestations-utils.ts index 62f1936ac7f..7ad9f5b5d70 100644 --- a/packages/protocol/lib/fed-attestations-utils.ts +++ b/packages/protocol/lib/fed-attestations-utils.ts @@ -1,8 +1,10 @@ -import { ensureLeading0x } from '@celo/base' -import { Address } from '@celo/utils/lib/address' -import { generateTypedDataHash, structHash } from '@celo/utils/lib/sign-typed-data-utils' -import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' -import { registerAttestation as getTypedData } from '@celo/utils/lib/typed-data-constructors' +import { Address } from '@celo/utils/lib/address'; +import { generateTypedDataHash, structHash } from '@celo/utils/lib/sign-typed-data-utils'; +import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils'; +import { registerAttestation as getTypedData } from '@celo/utils/lib/typed-data-constructors'; +import { + bufferToHex +} from '@ethereumjs/util'; export const getSignatureForAttestation = async ( identifier: string, @@ -31,14 +33,12 @@ export const getSignatureForAttestation = async ( ) }) - const messageHash = ensureLeading0x(generateTypedDataHash(typedData).toString('hex')) + const messageHash = bufferToHex(generateTypedDataHash(typedData)) const parsedSignature = parseSignatureWithoutPrefix(messageHash, signature, signer) return parsedSignature } export const getDomainDigest = (contractAddress: Address) => { const typedData = getTypedData(1, contractAddress) - return ensureLeading0x( - structHash('EIP712Domain', typedData.domain, typedData.types).toString('hex') - ) + return bufferToHex( structHash('EIP712Domain', typedData.domain, typedData.types)) } \ No newline at end of file diff --git a/packages/protocol/lib/meta-tx-utils.ts b/packages/protocol/lib/meta-tx-utils.ts index dbff5b9030a..6e15bcb97ec 100644 --- a/packages/protocol/lib/meta-tx-utils.ts +++ b/packages/protocol/lib/meta-tx-utils.ts @@ -1,6 +1,9 @@ -import { Address, ensureLeading0x } from '@celo/utils/lib/address' -import { generateTypedDataHash, structHash } from '@celo/utils/lib/sign-typed-data-utils' -import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' +import { Address } from '@celo/utils/lib/address'; +import { generateTypedDataHash, structHash } from '@celo/utils/lib/sign-typed-data-utils'; +import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils'; +import { + bufferToHex +} from '@ethereumjs/util'; export interface MetaTransaction { destination: Address @@ -40,14 +43,14 @@ const getTypedData = (walletAddress: Address, tx?: MetaTransaction) => { export const getDomainDigest = (walletAddress: Address) => { const typedData = getTypedData(walletAddress) - return ensureLeading0x( - structHash('EIP712Domain', typedData.domain, typedData.types).toString('hex') + return bufferToHex( + structHash('EIP712Domain', typedData.domain, typedData.types) ) } export const constructMetaTransactionExecutionDigest = (walletAddress: Address, tx: MetaTransaction) => { const typedData = getTypedData(walletAddress, tx) - return ensureLeading0x(generateTypedDataHash(typedData).toString('hex')) + return bufferToHex(generateTypedDataHash(typedData) ) } export const getSignatureForMetaTransaction = async ( @@ -57,21 +60,7 @@ export const getSignatureForMetaTransaction = async ( ) => { const typedData = getTypedData(walletAddress, tx) - const signature = await new Promise((resolve, reject) => { - web3.currentProvider.send( - { - method: 'eth_signTypedData', - params: [signer, typedData], - }, - (error, resp) => { - if (error) { - reject(error) - } else { - resolve(resp.result) - } - } - ) - }) + const signature= await web3.currentProvider.request({ method: 'eth_signTypedData',params: [signer, typedData],}) const messageHash = constructMetaTransactionExecutionDigest(walletAddress, tx) const parsedSignature = parseSignatureWithoutPrefix(messageHash, signature, signer) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index cabcd7f5022..ba58459f0b0 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -9,7 +9,7 @@ import BigNumber from 'bignumber.js'; import chai from 'chai'; import chaiSubset from 'chai-subset'; import { spawn, SpawnOptions } from 'child_process'; -import { keccak256 } from 'ethereumjs-util'; +import { keccak256 } from 'ethereum-cryptography/keccak'; import { GovernanceApproverMultiSigInstance, GovernanceInstance, diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 95318ccad49..0cbd240f17a 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -45,17 +45,19 @@ "generate-stabletoken-files": "ts-node ./scripts/generate-stabletoken-files.ts" }, "dependencies": { - "@0x/sol-compiler": "^3.1.11", - "@0x/sol-coverage": "^3.0.8", - "@0x/sol-profiler": "^3.0.0", - "@0x/sol-trace": "^2.0.16", - "@0x/subproviders": "^5.0.0", + "@0x/sol-compiler": "^4.8.3", + "@0x/sol-coverage": "^4.0.47", + "@0x/sol-profiler": "^4.1.37", + "@0x/sol-trace": "^3.0.47", + "@0x/subproviders": "^7.0.1", "@celo/base": "3.2.1-dev", "@celo/bls12377js": "0.1.1", "@celo/connect": "3.2.1-dev", "@celo/cryptographic-utils": "3.2.1-dev", "@celo/utils": "3.2.1-dev", + "@ethereumjs/util": "8.0.2", "@ethereumjs/vm": "npm:@soloseng/ethereumjs-vm@6.2.3", + "@ganache/console.log": "0.3.0", "@openzeppelin/upgrades": "^2.8.0", "@truffle/artifactor": "4.0.180", "@truffle/contract": "4.6.10", @@ -68,7 +70,6 @@ "csv-stringify": "^4.3.1", "elliptic": "^6.5.4", "ethereumjs-abi": "^0.6.8", - "ethereumjs-util": "^5.2.0", "ethereumjs-wallet": "^0.6.3", "fs-extra": "^5.0.0", "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", @@ -86,11 +87,11 @@ "truffle-security": "^1.7.3", "twilio": "^3.57.0", "weak-map": "^1.0.5", - "web3": "1.3.6", - "web3-core": "1.3.6", - "web3-core-helpers": "1.3.6", - "web3-provider-engine": "^15.0.0", - "web3-utils": "1.3.6" + "web3": "1.8.2", + "web3-core": "1.8.2", + "web3-core-helpers": "1.8.2", + "web3-provider-engine": "^16.0.5", + "web3-utils": "1.8.2" }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index e056c6cb0d3..07acffeca3a 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -19,7 +19,11 @@ async function startGanache() { blockGasLimit: 20000000, defaultGasPrice: network.defaultGasPrice, }, - chain: { networkId: network.network_id, allowUnlimitedContractSize: true }, + chain: { + networkId: network.network_id, + chainId: 1, + allowUnlimitedContractSize: true, + }, }) server.listen(8545, (err, blockchain) => { diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index e1d3ad7ed50..8aad558f342 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -1,4 +1,4 @@ -import { Address, ensureLeading0x, NULL_ADDRESS } from '@celo/base/lib/address' +import { Address, NULL_ADDRESS } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils' import { @@ -14,6 +14,7 @@ import { parseSolidityStringArray } from '@celo/utils/lib/parsing' import { authorizeSigner as buildAuthorizeSignerTypedData } from '@celo/utils/lib/typed-data-constructors' import { generateTypedDataHash } from '@celo/utils/src/sign-typed-data-utils' import { parseSignatureWithoutPrefix } from '@celo/utils/src/signatureUtils' +import { bufferToHex } from '@ethereumjs/util' import BigNumber from 'bignumber.js' import { AccountsContract, @@ -358,7 +359,7 @@ contract('Accounts', (accounts: string[]) => { }) }) - describe.only('#batchGetMetadataURL', () => { + describe('#batchGetMetadataURL', () => { it('returns multiple metadata URLs', async () => { const randomStrings = accounts.map((_) => web3.utils.randomHex(20).slice(2)) await Promise.all( @@ -593,31 +594,21 @@ contract('Accounts', (accounts: string[]) => { role: string, accountsContractAddress: string ) => { + const chainID = await web3.eth.getChainId() const typedData = buildAuthorizeSignerTypedData({ account: _account, signer, - accountsContractAddress, + chainId: chainID, role, - chainId: 1, + accountsContractAddress, }) - const signature = await new Promise((resolve, reject) => { - web3.currentProvider.send( - { - method: 'eth_signTypedData', - params: [signer, typedData], - }, - (error, resp) => { - if (error) { - reject(error) - } else { - resolve(resp.result) - } - } - ) + const signature = await web3.currentProvider.request({ + method: 'eth_signTypedData', + params: [signer, typedData], }) - const messageHash = ensureLeading0x(generateTypedDataHash(typedData).toString('hex')) + const messageHash = bufferToHex(generateTypedDataHash(typedData)) const parsedSignature = parseSignatureWithoutPrefix(messageHash, signature, signer) return parsedSignature } diff --git a/packages/protocol/test/common/metatransactionwallet.ts b/packages/protocol/test/common/metatransactionwallet.ts index 1a9a0437972..6e09a782393 100644 --- a/packages/protocol/test/common/metatransactionwallet.ts +++ b/packages/protocol/test/common/metatransactionwallet.ts @@ -1,4 +1,3 @@ -/// TODO: (soloseng) signer issues import { constructMetaTransactionExecutionDigest, getDomainDigest, diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index 9953f909d44..9812055b5c3 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -1,4 +1,5 @@ -import { NULL_ADDRESS } from '@celo/base/lib/address' +// TODO: (soloseng) gas price; +import { NULL_ADDRESS, trimLeading0x } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils' import { @@ -6,6 +7,7 @@ import { assertEqualBN, assertLogMatches2, assertRevert, + assertTXRevertWithReason, matchAny, mineToNextEpoch, stripHexEncoding, @@ -14,8 +16,10 @@ import { import { concurrentMap } from '@celo/utils/lib/async' import { zip } from '@celo/utils/lib/collections' import { fixed1, multiply, toFixed } from '@celo/utils/lib/fixidity' +import { bufferToHex, toBuffer } from '@ethereumjs/util' import BigNumber from 'bignumber.js' -import { keccak256 } from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' +import { hexToBytes, utf8ToBytes } from 'ethereum-cryptography/utils' import { AccountsContract, AccountsInstance, @@ -150,50 +154,41 @@ contract('Governance', (accounts: string[]) => { transactionSuccess1 = { value: 0, destination: testTransactions.address, - data: Buffer.from( - stripHexEncoding( - // @ts-ignore - testTransactions.contract.methods.setValue(1, 1, true).encodeABI() - ), - 'hex' + data: toBuffer( + // @ts-ignore + testTransactions.contract.methods.setValue(1, 1, true).encodeABI() ), } transactionSuccess2 = { value: 0, destination: testTransactions.address, - data: Buffer.from( - stripHexEncoding( - // @ts-ignore - testTransactions.contract.methods.setValue(2, 1, true).encodeABI() - ), - 'hex' + data: toBuffer( + // @ts-ignore + testTransactions.contract.methods.setValue(2, 1, true).encodeABI() ), } transactionFail = { value: 0, destination: testTransactions.address, - data: Buffer.from( - stripHexEncoding( - // @ts-ignore - testTransactions.contract.methods.setValue(3, 1, false).encodeABI() - ), - 'hex' + data: toBuffer( + // @ts-ignore + testTransactions.contract.methods.setValue(3, 1, false).encodeABI() ), } salt = '0x657ed9d64e84fa3d1af43b3a307db22aba2d90a158015df1c588c02e24ca08f0' - hotfixHash = keccak256( - web3.eth.abi.encodeParameters( - ['uint256[]', 'address[]', 'bytes', 'uint256[]', 'bytes32'], - [ - [String(transactionSuccess1.value)], - [transactionSuccess1.destination.toString()], - transactionSuccess1.data, - [String(transactionSuccess1.data.length)], - salt, - ] - ) - ) as Buffer - hotfixHashStr = '0x' + hotfixHash.toString('hex') + const encoded_param = web3.eth.abi.encodeParameters( + ['uint256[]', 'address[]', 'bytes', 'uint256[]', 'bytes32'], + [ + [String(transactionSuccess1.value)], + [transactionSuccess1.destination.toString()], + transactionSuccess1.data, + [String(transactionSuccess1.data.length)], + salt, + ] + ) + + hotfixHash = toBuffer(keccak256(hexToBytes(trimLeading0x(encoded_param)))) + hotfixHashStr = bufferToHex(hotfixHash) }) describe('#initialize()', () => { @@ -3161,7 +3156,7 @@ contract('Governance', (accounts: string[]) => { }) describe('#hotfixWhitelistValidatorTally', () => { - const newHotfixHash = '0x' + keccak256('celo bug fix').toString('hex') + const newHotfixHash = bufferToHex(toBuffer(keccak256(utf8ToBytes('celo bug fix')))) const validators = zip( (_account, signer) => ({ account: _account, signer }), @@ -3295,24 +3290,26 @@ contract('Governance', (accounts: string[]) => { }) describe('#executeHotfix()', () => { - const executeHotfixTx = () => - governance.executeHotfix( + const executeHotfixTx = () => { + return governance.executeHotfix( [transactionSuccess1.value], [transactionSuccess1.destination], // @ts-ignore bytes type - transactionSuccess1.data, + transactionSuccess1.data, //submitting TX [transactionSuccess1.data.length], - salt + salt, + { gas: 2000000 } ) + } it('should revert when hotfix not approved', async () => { - await assertRevert(executeHotfixTx()) + await assertTXRevertWithReason(executeHotfixTx(), 'hotfix not approved') }) it('should revert when hotfix not prepared for current epoch', async () => { await mineToNextEpoch(web3) await governance.approveHotfix(hotfixHashStr, { from: approver }) - await assertRevert(executeHotfixTx()) + await assertTXRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') }) it('should revert when hotfix prepared but not for current epoch', async () => { @@ -3322,7 +3319,7 @@ contract('Governance', (accounts: string[]) => { await governance.whitelistHotfix(hotfixHashStr, { from: accounts[2] }) await governance.prepareHotfix(hotfixHashStr, { from: accounts[2] }) await mineToNextEpoch(web3) - await assertRevert(executeHotfixTx()) + await assertTXRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') }) describe('when hotfix is approved and prepared for current epoch', () => { @@ -3361,7 +3358,7 @@ contract('Governance', (accounts: string[]) => { it('should not be executable again', async () => { await executeHotfixTx() - await assertRevert(executeHotfixTx()) + await assertTXRevertWithReason(executeHotfixTx(), 'hotfix already executed') }) }) }) diff --git a/packages/sdk/connect/src/connection.ts b/packages/sdk/connect/src/connection.ts index 3ca1de6ee0c..6dfed026360 100644 --- a/packages/sdk/connect/src/connection.ts +++ b/packages/sdk/connect/src/connection.ts @@ -1,6 +1,7 @@ import { ensureLeading0x, toChecksumAddress } from '@celo/utils/lib/address' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' import { parseSignatureWithoutPrefix, Signature } from '@celo/utils/lib/signatureUtils' +import { bufferToHex } from '@ethereumjs/util' import debugFactory from 'debug' import Web3 from 'web3' import { AbiCoder } from './abi-types' @@ -306,7 +307,7 @@ export class Connection { ) }) - const messageHash = ensureLeading0x(generateTypedDataHash(typedData).toString('hex')) + const messageHash = bufferToHex(generateTypedDataHash(typedData)) return parseSignatureWithoutPrefix(messageHash, signature, signer) } diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index bfd6b99534a..dfbacdf2d6c 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -51,7 +51,7 @@ "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", - "jest": "^26.6.3", + "jest": "^29.0.2", "ts-node": "8.3.0", "typedoc": "^0.19.2", "typedoc-plugin-markdown": "^2.2.16", diff --git a/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts b/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts index cffcb3e6097..9278abd16c9 100644 --- a/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts +++ b/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts @@ -1,8 +1,9 @@ -import { Address, ensureLeading0x } from '@celo/base/lib/address' +import { Address } from '@celo/base/lib/address' import { Signature } from '@celo/base/lib/signatureUtils' import { testWithGanache } from '@celo/dev-utils/lib/ganache-test' import MTWContract from '@celo/protocol/build/contracts/MetaTransactionWallet.json' import { generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' +import { bufferToHex } from '@ethereumjs/util' import BigNumber from 'bignumber.js' import { newKitFromWeb3 } from '../kit' import { GoldTokenWrapper } from './GoldTokenWrapper' @@ -51,9 +52,9 @@ testWithGanache('MetaTransactionWallet Wrapper', (web3) => { // Ganache returns 1 in chainId assembly code // @ts-ignore wallet.chainId = () => Promise.resolve(chainId) - // Give the wallet some funds await gold.transfer(wallet.address, new BigNumber(20e18).toFixed()).sendAndWaitForReceipt() + // .sendAndWaitForReceipt({ gasPrice: 100 }) emptyAccounts = [0, 0, 0, 0, 0].map(() => web3.utils.randomHex(20)) }) @@ -127,7 +128,7 @@ testWithGanache('MetaTransactionWallet Wrapper', (web3) => { 0, chainId ) - const offChainDigest = ensureLeading0x(generateTypedDataHash(typedData).toString('hex')) + const offChainDigest = bufferToHex(generateTypedDataHash(typedData)) expect(onChainDigest).toEqual(offChainDigest) }) diff --git a/packages/sdk/utils/package.json b/packages/sdk/utils/package.json index b176e56a671..d28b7104d70 100644 --- a/packages/sdk/utils/package.json +++ b/packages/sdk/utils/package.json @@ -23,16 +23,16 @@ ], "dependencies": { "@celo/base": "3.2.1-dev", + "@ethereumjs/util": "8.0.2", "@types/bn.js": "^5.1.0", "@types/elliptic": "^6.4.9", - "@types/ethereumjs-util": "^5.2.0", "@types/node": "^10.12.18", "bignumber.js": "^9.0.0", "elliptic": "^6.5.4", - "ethereumjs-util": "^5.2.0", + "ethereum-cryptography": "1.2.0", "io-ts": "2.0.1", - "web3-eth-abi": "1.3.6", - "web3-utils": "1.3.6" + "web3-eth-abi": "1.8.2", + "web3-utils": "1.8.2" }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", diff --git a/packages/sdk/utils/src/address.ts b/packages/sdk/utils/src/address.ts index 2da818fe166..7f001df3b06 100644 --- a/packages/sdk/utils/src/address.ts +++ b/packages/sdk/utils/src/address.ts @@ -6,7 +6,7 @@ import { pubToAddress, toBuffer, toChecksumAddress, -} from 'ethereumjs-util' +} from '@ethereumjs/util' // Exports moved to @celo/base, forwarding them // here for backwards compatibility export { @@ -25,7 +25,7 @@ export { NULL_ADDRESS, trimLeading0x, } from '@celo/base/lib/address' -export { isValidChecksumAddress, toChecksumAddress } from 'ethereumjs-util' +export { isValidChecksumAddress, toChecksumAddress } from '@ethereumjs/util' export const privateKeyToAddress = (privateKey: string) => toChecksumAddress(ensureLeading0x(privateToAddress(hexToBuffer(privateKey)).toString('hex'))) diff --git a/packages/sdk/utils/src/ecies.test.ts b/packages/sdk/utils/src/ecies.test.ts index 5a341483553..8c98d79118a 100644 --- a/packages/sdk/utils/src/ecies.test.ts +++ b/packages/sdk/utils/src/ecies.test.ts @@ -1,20 +1,20 @@ +import { privateToPublic } from '@ethereumjs/util' import { randomBytes } from 'crypto' import { ECIES } from './ecies' -const eutil = require('ethereumjs-util') describe('ECIES', () => { describe('encrypt', () => { it('should encrypt a message without error', () => { const privKey = randomBytes(32) - const pubKey = eutil.privateToPublic(privKey) - const message = new Buffer(`foo`) + const pubKey = privateToPublic(privKey) + const message = Buffer.from(`foo`) const encrypted = ECIES.Encrypt(pubKey, message) expect(encrypted.length).toBeGreaterThanOrEqual(113) }) it('should throw an error if priv key is given', () => { const privKey = randomBytes(32) - const message = new Buffer('foo') + const message = Buffer.from('foo') try { ECIES.Encrypt(privKey, message) expect(false).toBe(true) @@ -26,18 +26,18 @@ describe('ECIES', () => { describe('roundtrip', () => { it('should return the same plaintext after roundtrip', () => { - const plaintext = new Buffer('spam') + const plaintext = Buffer.from('spam') const privKey = randomBytes(32) - const pubKey = eutil.privateToPublic(privKey) + const pubKey = privateToPublic(privKey) const encrypted = ECIES.Encrypt(pubKey, plaintext) const decrypted = ECIES.Decrypt(privKey, encrypted) expect(decrypted.toString()).toEqual(plaintext.toString()) }) it('should only decrypt if correct priv key is given', () => { - const plaintext = new Buffer('spam') + const plaintext = Buffer.from('spam') const privKey = randomBytes(32) - const pubKey = eutil.privateToPublic(privKey) + const pubKey = privateToPublic(privKey) const fakePrivKey = randomBytes(32) try { ECIES.Encrypt(pubKey, plaintext) @@ -51,7 +51,7 @@ describe('ECIES', () => { it('should be able to encrypt and decrypt a longer message (1024 bytes)', () => { const plaintext = randomBytes(1024) const privKey = randomBytes(32) - const pubKey = eutil.privateToPublic(privKey) + const pubKey = privateToPublic(privKey) const encrypted = ECIES.Encrypt(pubKey, plaintext) const decrypted = ECIES.Decrypt(privKey, encrypted) expect(decrypted.toString()).toEqual(plaintext.toString()) @@ -62,7 +62,7 @@ describe('ECIES', () => { describe('AES128CTR', () => { describe('encrypt', () => { it('should encrypt a message without error', () => { - const plaintext = new Buffer('spam') + const plaintext = Buffer.from('spam') const encKey = randomBytes(16) const macKey = randomBytes(16) const encrypted = ECIES.AES128EncryptAndHMAC(encKey, macKey, plaintext) @@ -72,7 +72,7 @@ describe('AES128CTR', () => { describe('roundtrip', () => { it('should return the same plaintext after roundtrip', () => { - const plaintext = new Buffer('spam') + const plaintext = Buffer.from('spam') const encKey = randomBytes(16) const macKey = randomBytes(16) const encrypted = ECIES.AES128EncryptAndHMAC(encKey, macKey, plaintext) @@ -81,7 +81,7 @@ describe('AES128CTR', () => { }) it('should only decrypt if correct priv key is given', () => { - const plaintext = new Buffer('spam') + const plaintext = Buffer.from('spam') const encKey = randomBytes(16) const macKey = randomBytes(16) const fakeKey = randomBytes(16) @@ -104,7 +104,7 @@ describe('AES128CTR', () => { describe('authentication', () => { it('should reject invalid mac', () => { try { - const plaintext = new Buffer('spam') + const plaintext = Buffer.from('spam') const encKey = randomBytes(16) const macKey = randomBytes(16) const fakeKey = randomBytes(16) diff --git a/packages/sdk/utils/src/io.ts b/packages/sdk/utils/src/io.ts index 8453ab1dc64..aa7a049833a 100644 --- a/packages/sdk/utils/src/io.ts +++ b/packages/sdk/utils/src/io.ts @@ -1,5 +1,5 @@ import { URL_REGEX } from '@celo/base/lib/io' -import { isValidPublic, toChecksumAddress } from 'ethereumjs-util' +import { isValidPublic, toChecksumAddress } from '@ethereumjs/util' import { either } from 'fp-ts/lib/Either' import * as t from 'io-ts' import { isValidAddress } from './address' diff --git a/packages/sdk/utils/src/istanbul.ts b/packages/sdk/utils/src/istanbul.ts index 36f2be2ae6d..4ee6bcb080e 100644 --- a/packages/sdk/utils/src/istanbul.ts +++ b/packages/sdk/utils/src/istanbul.ts @@ -1,5 +1,5 @@ +import { bufferToHex, toChecksumAddress } from '@ethereumjs/util' import BigNumber from 'bignumber.js' -import { toChecksumAddress } from 'ethereumjs-util' import * as rlp from 'rlp' import { Address } from './address' @@ -44,7 +44,7 @@ export function parseBlockExtraData(data: string): IstanbulExtra { const buffer = Buffer.from(data.replace(/^0x/, ''), 'hex') const decode: any = rlp.decode('0x' + buffer.slice(ISTANBUL_EXTRA_VANITY_BYTES).toString('hex')) return { - addedValidators: decode[0].map((addr: Buffer) => toChecksumAddress(addr.toString('hex'))), + addedValidators: decode[0].map((addr: Buffer) => toChecksumAddress(bufferToHex(addr))), addedValidatorsPublicKeys: decode[1].map((key: Buffer) => '0x' + key.toString('hex')), removedValidators: bigNumberFromBuffer(decode[2]), seal: '0x' + decode[3].toString('hex'), diff --git a/packages/sdk/utils/src/sign-typed-data-utils.test.ts b/packages/sdk/utils/src/sign-typed-data-utils.test.ts index 93801395e9c..cb6e48f0d2f 100644 --- a/packages/sdk/utils/src/sign-typed-data-utils.test.ts +++ b/packages/sdk/utils/src/sign-typed-data-utils.test.ts @@ -1,6 +1,7 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { BigNumber } from 'bignumber.js' -import { keccak } from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' +import { utf8ToBytes } from 'ethereum-cryptography/utils' import { EIP712Object, EIP712ObjectValue, @@ -54,7 +55,7 @@ const TEST_TYPES: EIP712TestCase[] = [ dataEncoding: Buffer.concat([ Buffer.from('000000000000000000000000000000000000000000000000000000000000a1ce', 'hex'), Buffer.from('0000000000000000000000000000000000000000000000000000000000000b0b', 'hex'), - keccak('hello bob!'), + keccak256(utf8ToBytes('hello bob!')), ]), }, { @@ -67,7 +68,7 @@ const TEST_TYPES: EIP712TestCase[] = [ dataEncoding: Buffer.concat([ Buffer.from('000000000000000000000000000000000000000000000000000000000000a1ce', 'hex'), Buffer.from('0000000000000000000000000000000000000000000000000000000000000b0b', 'hex'), - keccak(Buffer.from('0xdeadbeef', 'utf8')), + keccak256(Buffer.from('0xdeadbeef', 'utf8')), ]), }, ], @@ -107,29 +108,29 @@ const TEST_TYPES: EIP712TestCase[] = [ }, }, dataEncoding: Buffer.concat([ - keccak( + keccak256( Buffer.concat([ - keccak('Person(address wallet,string name)'), + keccak256(utf8ToBytes('Person(address wallet,string name)')), Buffer.from( '000000000000000000000000000000000000000000000000000000000000a1ce', 'hex' ), - keccak('Alice'), + keccak256(utf8ToBytes('Alice')), ]) ), - keccak( + keccak256( Buffer.concat([ - keccak('Person(address wallet,string name)'), + keccak256(utf8ToBytes('Person(address wallet,string name)')), Buffer.from( '0000000000000000000000000000000000000000000000000000000000000b0b', 'hex' ), - keccak('Bob'), + keccak256(utf8ToBytes('Bob')), ]) ), - keccak( + keccak256( Buffer.concat([ - keccak('Asset(address token,uint256 amount)'), + keccak256(utf8ToBytes('Asset(address token,uint256 amount)')), Buffer.from( '000000000000000000000000000000000000000000000000000000000000ce10', 'hex' @@ -201,13 +202,13 @@ const TEST_TYPES: EIP712TestCase[] = [ ], }, dataEncoding: Buffer.concat([ - keccak( + keccak256( Buffer.concat([ - keccak( + keccak256( Buffer.concat([ - keccak( + keccak256( Buffer.concat([ - keccak('Tile(bool occupied,uint8 occupantId)'), + keccak256(utf8ToBytes('Tile(bool occupied,uint8 occupantId)')), Buffer.from( '0000000000000000000000000000000000000000000000000000000000000001', 'hex' @@ -218,9 +219,9 @@ const TEST_TYPES: EIP712TestCase[] = [ ), ]) ), - keccak( + keccak256( Buffer.concat([ - keccak('Tile(bool occupied,uint8 occupantId)'), + keccak256(utf8ToBytes('Tile(bool occupied,uint8 occupantId)')), Buffer.from( '0000000000000000000000000000000000000000000000000000000000000000', 'hex' @@ -233,11 +234,11 @@ const TEST_TYPES: EIP712TestCase[] = [ ), ]) ), - keccak( + keccak256( Buffer.concat([ - keccak( + keccak256( Buffer.concat([ - keccak('Tile(bool occupied,uint8 occupantId)'), + keccak256(utf8ToBytes('Tile(bool occupied,uint8 occupantId)')), Buffer.from( '0000000000000000000000000000000000000000000000000000000000000001', 'hex' @@ -248,9 +249,9 @@ const TEST_TYPES: EIP712TestCase[] = [ ), ]) ), - keccak( + keccak256( Buffer.concat([ - keccak('Tile(bool occupied,uint8 occupantId)'), + keccak256(utf8ToBytes('Tile(bool occupied,uint8 occupantId)')), Buffer.from( '0000000000000000000000000000000000000000000000000000000000000001', 'hex' @@ -282,7 +283,7 @@ describe('encodeType()', () => { describe('typeHash()', () => { for (const { primaryType, types, typeEncoding } of TEST_TYPES) { it(`should hash type ${primaryType} correctly`, () => { - expect(typeHash(primaryType, types)).toEqual(keccak(typeEncoding)) + expect(typeHash(primaryType, types)).toEqual(keccak256(utf8ToBytes(typeEncoding))) }) } }) @@ -304,7 +305,7 @@ describe('structHash()', () => { if (examples.length > 0) { it(`should hash data ${primaryType} correctly`, () => { for (const { data, dataEncoding } of examples) { - const expected = keccak(Buffer.concat([typeHash(primaryType, types), dataEncoding])) + const expected = keccak256(Buffer.concat([typeHash(primaryType, types), dataEncoding])) expect(structHash(primaryType, data, types)).toEqual(expected) } }) diff --git a/packages/sdk/utils/src/sign-typed-data-utils.ts b/packages/sdk/utils/src/sign-typed-data-utils.ts index 52c155543b4..793273b7db4 100644 --- a/packages/sdk/utils/src/sign-typed-data-utils.ts +++ b/packages/sdk/utils/src/sign-typed-data-utils.ts @@ -1,6 +1,8 @@ import { NULL_ADDRESS, trimLeading0x } from '@celo/base/lib/address' +import { toBuffer } from '@ethereumjs/util' import { BigNumber } from 'bignumber.js' -import { keccak } from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' +import { hexToBytes, utf8ToBytes } from 'ethereum-cryptography/utils' import * as t from 'io-ts' import coder from 'web3-eth-abi' @@ -126,7 +128,7 @@ export const noString: EIP712Optional = { * @return A Buffer containing the hash of the typed data. */ export function generateTypedDataHash(typedData: EIP712TypedData): Buffer { - return keccak( + return keccak256( Buffer.concat([ Buffer.from('1901', 'hex'), structHash('EIP712Domain', typedData.domain, typedData.types), @@ -183,7 +185,7 @@ export function encodeType(primaryType: string, types: EIP712Types): string { } export function typeHash(primaryType: string, types: EIP712Types): Buffer { - return keccak(encodeType(primaryType, types)) as Buffer + return keccak256(utf8ToBytes(encodeType(primaryType, types))) as Buffer } /** Encodes a single EIP-712 value to a 32-byte buffer */ @@ -200,12 +202,12 @@ function encodeValue(valueType: string, value: EIP712ObjectValue, types: EIP712T // Converting to Buffer before passing to `keccak` prevents an issue where the string is // interpretted as a hex-encoded string when is starts with 0x. // https://github.com/ethereumjs/ethereumjs-util/blob/7e3be1d97b4e11fbc4924836b8c444e644f643ac/index.js#L155-L183 - return keccak(Buffer.from(value as string, 'utf8')) as Buffer + return keccak256(Buffer.from(value as string, 'utf8')) as Buffer } if (valueType === 'bytes') { // Allow the user to use either utf8 (plain string) or hex encoding for their bytes. // Note: keccak throws if the value cannot be converted into a Buffer, - return keccak(value as string) as Buffer + return toBuffer(keccak256(hexToBytes(trimLeading0x(value as string)))) } // Encode structs as its hashStruct (e.g. keccak(typeHash || encodeData(struct)) ). @@ -219,7 +221,7 @@ function encodeValue(valueType: string, value: EIP712ObjectValue, types: EIP712T // Note: If a fixed length is provided in the type, it is not checked. const match = EIP712_ARRAY_REGEXP.exec(valueType) const memberType: string = match?.groups?.memberType! - return keccak( + return keccak256( Buffer.concat( (value as EIP712ObjectValue[]).map((member) => encodeValue(memberType, member, types)) ) @@ -248,7 +250,7 @@ export function encodeData(primaryType: string, data: EIP712Object, types: EIP71 } export function structHash(primaryType: string, data: EIP712Object, types: EIP712Types): Buffer { - return keccak( + return keccak256( Buffer.concat([typeHash(primaryType, types), encodeData(primaryType, data, types)]) ) as Buffer } diff --git a/packages/sdk/utils/src/signatureUtils.ts b/packages/sdk/utils/src/signatureUtils.ts index 8c2b6ba8c91..ea86a7f7752 100644 --- a/packages/sdk/utils/src/signatureUtils.ts +++ b/packages/sdk/utils/src/signatureUtils.ts @@ -1,4 +1,13 @@ import { NativeSigner, serializeSignature, Signature, Signer } from '@celo/base/lib/signatureUtils' +import { + bufferToHex, + ecrecover, + ecsign, + fromRpcSig, + privateToPublic, + pubToAddress, + toBuffer, +} from '@ethereumjs/util' import { isHexStrict, soliditySha3 } from 'web3-utils' import { ensureLeading0x, eqAddress, privateKeyToAddress, trimLeading0x } from './address' import { EIP712TypedData, generateTypedDataHash } from './sign-typed-data-utils' @@ -12,7 +21,6 @@ export { Signature, Signer, } from '@celo/base/lib/signatureUtils' -const ethjsutil = require('ethereumjs-util') // If messages is a hex, the length of it should be the number of bytes function messageLength(message: string) { @@ -41,16 +49,11 @@ export async function addressToPublicKey( // Note: Eth.sign typing displays incorrect parameter order const sig = await signFn(data, signer) - const rawsig = ethjsutil.fromRpcSig(sig) + const rawsig = fromRpcSig(sig) const prefixedMsg = hashMessageWithPrefix(data) - const pubKey = ethjsutil.ecrecover( - Buffer.from(prefixedMsg.slice(2), 'hex'), - rawsig.v, - rawsig.r, - rawsig.s - ) + const pubKey = ecrecover(Buffer.from(prefixedMsg.slice(2), 'hex'), rawsig.v, rawsig.r, rawsig.s) - const computedAddr = ethjsutil.pubToAddress(pubKey).toString('hex') + const computedAddr = pubToAddress(pubKey).toString('hex') if (!eqAddress(computedAddr, signer)) { throw new Error('computed address !== signer') } @@ -68,9 +71,9 @@ export function LocalSigner(privateKey: string): Signer { } export function signedMessageToPublicKey(message: string, v: number, r: string, s: string) { - const pubKeyBuf = ethjsutil.ecrecover( + const pubKeyBuf = ecrecover( Buffer.from(message.slice(2), 'hex'), - v, + BigInt(v), Buffer.from(r.slice(2), 'hex'), Buffer.from(s.slice(2), 'hex') ) @@ -86,21 +89,16 @@ export function signMessage(message: string, privateKey: string, address: string } export function signMessageWithoutPrefix(messageHash: string, privateKey: string, address: string) { - const publicKey = ethjsutil.privateToPublic(ethjsutil.toBuffer(privateKey)) - const derivedAddress: string = ethjsutil.bufferToHex(ethjsutil.pubToAddress(publicKey)) + const publicKey = privateToPublic(toBuffer(privateKey)) + const derivedAddress: string = bufferToHex(pubToAddress(publicKey)) if (derivedAddress.toLowerCase() !== address.toLowerCase()) { throw new Error('Provided private key does not match address of intended signer') } - const { r, s, v } = ethjsutil.ecsign( - ethjsutil.toBuffer(messageHash), - ethjsutil.toBuffer(privateKey) - ) - if ( - !isValidSignature(address, messageHash, v, ethjsutil.bufferToHex(r), ethjsutil.bufferToHex(s)) - ) { + const { r, s, v } = ecsign(toBuffer(messageHash), toBuffer(privateKey)) + if (!isValidSignature(address, messageHash, Number(v), bufferToHex(r), bufferToHex(s))) { throw new Error('Unable to validate signature') } - return { v, r: ethjsutil.bufferToHex(r), s: ethjsutil.bufferToHex(s) } + return { v: Number(v), r: bufferToHex(r), s: bufferToHex(s) } } export function verifySignature(message: string, signature: string, signer: string) { @@ -141,14 +139,9 @@ function recoverEIP712TypedDataSigner( ): string { const dataBuff = generateTypedDataHash(typedData) const { r, s, v } = parseFunction(trimLeading0x(signature)) - const publicKey = ethjsutil.ecrecover( - ethjsutil.toBuffer(dataBuff), - v, - ethjsutil.toBuffer(r), - ethjsutil.toBuffer(s) - ) + const publicKey = ecrecover(toBuffer(dataBuff), BigInt(v), toBuffer(r), toBuffer(s)) // TODO test error handling on this - return ethjsutil.bufferToHex(ethjsutil.pubToAddress(publicKey)) + return bufferToHex(pubToAddress(publicKey)) } /** @@ -203,13 +196,8 @@ export function verifyEIP712TypedDataSigner( export function guessSigner(message: string, signature: string): string { const messageHash = hashMessageWithPrefix(message) const { r, s, v } = parseSignatureAsRsv(signature.slice(2)) - const publicKey = ethjsutil.ecrecover( - ethjsutil.toBuffer(messageHash), - v, - ethjsutil.toBuffer(r), - ethjsutil.toBuffer(s) - ) - return ethjsutil.bufferToHex(ethjsutil.pubToAddress(publicKey)) + const publicKey = ecrecover(toBuffer(messageHash), BigInt(v), toBuffer(r), toBuffer(s)) + return bufferToHex(pubToAddress(publicKey)) } function parseSignatureAsVrs(signature: string) { @@ -234,13 +222,10 @@ function parseSignatureAsRsv(signature: string) { function isValidSignature(signer: string, message: string, v: number, r: string, s: string) { try { - const publicKey = ethjsutil.ecrecover( - ethjsutil.toBuffer(message), - v, - ethjsutil.toBuffer(r), - ethjsutil.toBuffer(s) - ) - const retrievedAddress: string = ethjsutil.bufferToHex(ethjsutil.pubToAddress(publicKey)) + const publicKey = ecrecover(toBuffer(message), BigInt(v), toBuffer(r), toBuffer(s)) + + const retrievedAddress: string = bufferToHex(pubToAddress(publicKey)) + return eqAddress(retrievedAddress, signer) } catch (err) { return false diff --git a/packages/sdk/wallets/wallet-base/src/signing-utils.ts b/packages/sdk/wallets/wallet-base/src/signing-utils.ts index 3f7e3b7e259..a5cb35e9068 100644 --- a/packages/sdk/wallets/wallet-base/src/signing-utils.ts +++ b/packages/sdk/wallets/wallet-base/src/signing-utils.ts @@ -3,6 +3,7 @@ import { CeloTx, EncodedTransaction, RLPEncodedTx } from '@celo/connect' import { inputCeloTxFormatter } from '@celo/connect/lib/utils/formatter' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' +import { bufferToHex } from '@ethereumjs/util' import debugFactory from 'debug' // @ts-ignore-next-line import { account as Account, bytes as Bytes, hash as Hash, RLP } from 'eth-lib' @@ -217,9 +218,8 @@ export function verifyEIP712TypedDataSigner( signedData: string, expectedAddress: string ): boolean { - const dataBuff = generateTypedDataHash(typedData) - const trimmedData = dataBuff.toString('hex') - return verifySignatureWithoutPrefix(ensureLeading0x(trimmedData), signedData, expectedAddress) + const dataHex = bufferToHex(generateTypedDataHash(typedData)) + return verifySignatureWithoutPrefix(dataHex, signedData, expectedAddress) } export function verifySignatureWithoutPrefix( diff --git a/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts b/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts index f75e6a80b7f..4f34b5e927a 100644 --- a/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts +++ b/packages/sdk/wallets/wallet-local/src/local-wallet.test.ts @@ -78,7 +78,7 @@ describe('Local wallet class', () => { wallet.addAccount('this is not a valid private key') throw new Error('Expected exception to be thrown') } catch (e: any) { - expect(e.message).toBe('Expected private key to be an Uint8Array with length 32') + expect(e.message).toBe('Expected 32 bytes of private key') } }) diff --git a/yarn.lock b/yarn.lock index 470cea09c07..fb58584481c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,228 +2,246 @@ # yarn lockfile v1 -"@0x/assert@^2.1.6": - version "2.1.6" - resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-2.1.6.tgz#61c5854b555bca1f1f0503754f2fd0169bee0ef1" - integrity sha512-Gu8eBnFdEuIAH2GubWYOSVz/BIoRccKof68AziduYDHxh4nSPM6NUH52xtfUGk4nXljiOXU1XHZJhcjTObI+8Q== - dependencies: - "@0x/json-schemas" "^4.0.2" - "@0x/typescript-typings" "^4.3.0" - "@0x/utils" "^4.5.2" - lodash "^4.17.11" +"@0x/assert@^3.0.35": + version "3.0.35" + resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.35.tgz#7aca28d2423ac26200a44d232b9e9bd0a67879f2" + integrity sha512-OqG7CEfBK5OJmaiBBKALYqPiftYpj4p/JTdfZouVtRYYT4dLgFysMfZLbFo/X08PIauGmPtv/GnW/tQwXEZpxg== + dependencies: + "@0x/json-schemas" "^6.4.5" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@types/node" "12.12.54" + lodash "^4.17.21" valid-url "^1.0.9" -"@0x/dev-utils@^2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-2.3.3.tgz#9b6df00fea357fa6da02b35ca93fc89d100e1992" - integrity sha512-Pi664W/jj1U6WU+kHEPyKpflBnmKRsclB69RaL7wpnvOOFjAPhFV2/0FvIZ25w62rMzKEpfD1/1NcZ7NjAk7OQ== - dependencies: - "@0x/subproviders" "^5.0.4" - "@0x/types" "^2.4.3" - "@0x/typescript-typings" "^4.3.0" - "@0x/utils" "^4.5.2" - "@0x/web3-wrapper" "^6.0.13" +"@0x/dev-utils@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-5.0.1.tgz#bd2f69a18104add32a8ba351677ce36484687030" + integrity sha512-R9qN1LNmnOcXAVEovd4Op+YRcMi3LFGr5npCN0vXZ/0FsC2FGawzfph9ugA5ibbDQBnQg74IAtaF2Dicyr7UdA== + dependencies: + "@0x/subproviders" "^7.0.1" + "@0x/types" "^3.3.7" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@0x/web3-wrapper" "^8.0.0" + "@types/node" "12.12.54" "@types/web3-provider-engine" "^14.0.0" chai "^4.0.1" - ethereum-types "^2.1.6" - lodash "^4.17.11" + chai-as-promised "^7.1.0" + chai-bignumber "^3.0.0" + dirty-chai "^2.0.1" + ethereum-types "^3.7.1" + lodash "^4.17.21" + web3-provider-engine "16.0.4" -"@0x/json-schemas@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-4.0.2.tgz#6f7c1dcde04d3acc3e8ca2f24177b9705c10e772" - integrity sha512-JHOwESZeWKAzT5Z42ZNvOvQUQ5vuRIFQWS0FNjYwV8Cv4/dRlLHd7kwxxsvlm9NxgXnOW0ddEDBbVGxhVSYNIg== +"@0x/json-schemas@^6.4.5": + version "6.4.5" + resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.4.5.tgz#c509411360fcf0a6aa5774ba99e337ac4427fdf0" + integrity sha512-G43tVIGMwWwaEFts3vwRKSnpnRmv1pOsfHtQTdIuh8+tnChlgGoWcBN8cht1wHNv/mUzYL/CBxoT/OZvlJFY8A== dependencies: - "@0x/typescript-typings" "^4.3.0" - "@types/node" "*" - jsonschema "^1.2.0" + "@0x/typescript-typings" "^5.3.2" + "@types/node" "12.12.54" + ajv "^6.12.5" lodash.values "^4.3.0" -"@0x/sol-compiler@^3.1.11", "@0x/sol-compiler@^3.1.15": - version "3.1.15" - resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-3.1.15.tgz#aaaad55008dddd69ad1e3226aa4a2832e0dd13b3" - integrity sha512-IobhcQ/whFRL942/ykKc0fV6/YstHhvnQJ0noUZ9GabMDtaBlW6k5vAerSkXZU/YyOd8sD9nw7QSm295D6HoTA== - dependencies: - "@0x/assert" "^2.1.6" - "@0x/json-schemas" "^4.0.2" - "@0x/sol-resolver" "^2.0.11" - "@0x/types" "^2.4.3" - "@0x/typescript-typings" "^4.3.0" - "@0x/utils" "^4.5.2" - "@0x/web3-wrapper" "^6.0.13" +"@0x/sol-compiler@^4.8.3": + version "4.8.3" + resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.8.3.tgz#9be058bad352ad3d3b81713dd18c69596fac7eef" + integrity sha512-ZYAoXK7J5VcU3g1EL8vjc9SCLIJCenIlcJ4m1pxSrUrHbnRHLesTRj8GTsV/PRqjwHgQNeCiT62ina3Qk8aKdg== + dependencies: + "@0x/assert" "^3.0.35" + "@0x/json-schemas" "^6.4.5" + "@0x/sol-resolver" "^3.1.13" + "@0x/types" "^3.3.7" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@0x/web3-wrapper" "^8.0.0" + "@types/node" "12.12.54" "@types/yargs" "^11.0.0" chalk "^2.3.0" chokidar "^3.0.2" - ethereum-types "^2.1.6" - ethereumjs-util "^5.1.1" - lodash "^4.17.11" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" + lodash "^4.17.21" mkdirp "^0.5.1" pluralize "^7.0.0" require-from-string "^2.0.1" semver "5.5.0" - solc "^0.5.5" + solc "^0.8" source-map-support "^0.5.0" + strip-comments "^2.0.1" web3-eth-abi "^1.0.0-beta.24" - yargs "^10.0.3" + yargs "^17.5.1" -"@0x/sol-coverage@^3.0.8": - version "3.0.12" - resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-3.0.12.tgz#4ca602495f7bcc4f045854850cd7f20fdf64e984" - integrity sha512-V4Iq8LU8HWNctVCt+gMHKcZ0moiawpna7bd3SWQuiQIig0iNpXBBCQl9SEIwpboTcv4Xhzo4cZuCGsWwKAQSpw== +"@0x/sol-coverage@^4.0.47": + version "4.0.47" + resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.47.tgz#53b4f14118fe9758fb1b60114bd01c9e3eaa7e9f" + integrity sha512-9L4eke1j5N7HWCTuPcCss7h2K1cOVEz2vQAwmdEQyVklw+YfSYJBVVEYyglcFvrf0vUCmilKppsAqfYceWW3pg== dependencies: - "@0x/sol-tracing-utils" "^6.0.19" - "@0x/subproviders" "^5.0.4" - "@0x/typescript-typings" "^4.3.0" + "@0x/sol-tracing-utils" "^7.3.3" + "@0x/subproviders" "^7.0.1" + "@0x/typescript-typings" "^5.3.2" "@types/minimatch" "^3.0.3" - ethereum-types "^2.1.6" - lodash "^4.17.11" + "@types/node" "12.12.54" + ethereum-types "^3.7.1" + lodash "^4.17.21" minimatch "^3.0.4" - web3-provider-engine "14.0.6" - -"@0x/sol-profiler@^3.0.0": - version "3.1.14" - resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-3.1.14.tgz#5cbdb20b0f55a521791b977750c19939e0cda726" - integrity sha512-XGBNgG6p5il8d831jrm9Xt3BQgjZxcywX1r5TOquHlBnfae9RFf/klNA60w8dW3GygugnIc9PzKtgR1EgWN3Ng== - dependencies: - "@0x/sol-tracing-utils" "^6.0.19" - "@0x/subproviders" "^5.0.4" - "@0x/typescript-typings" "^4.3.0" - "@0x/utils" "^4.5.2" - ethereum-types "^2.1.6" - ethereumjs-util "^5.1.1" - lodash "^4.17.11" - web3-provider-engine "14.0.6" + web3-provider-engine "16.0.4" + +"@0x/sol-profiler@^4.1.37": + version "4.1.37" + resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.37.tgz#6172f1f67b243ccf8098941ab95abaf882adaa82" + integrity sha512-vOj+xp6sJpYY/4Dmf9OXYsaLYoz+6EdmmUASVJrQMANuuC15CjQ5UdMOih+LlRvfKV9wKp+YvKeYInhf2v9/iw== + dependencies: + "@0x/sol-tracing-utils" "^7.3.3" + "@0x/subproviders" "^7.0.1" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@types/node" "12.12.54" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" + lodash "^4.17.21" + web3-provider-engine "16.0.4" -"@0x/sol-resolver@^2.0.11": - version "2.0.11" - resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-2.0.11.tgz#282d545a423baf0d478c498fd3adf607339d5504" - integrity sha512-TGvkuWoEMghPB4OZaPz49OJ/J0cw/I3yV7VLbE/OeN0K/J2P8uOkzhNgWLOVSi8EK3hcJ1JVc0iDSkCnzGj4xQ== +"@0x/sol-resolver@^3.1.13": + version "3.1.13" + resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-3.1.13.tgz#d985be51cec600384c4df101ad33956b844e3ed7" + integrity sha512-nQHqW7sOsDEH4ejH9nu60sCgFXEW08LM0v+5DimA/R7MizOW4LAG7OoHM+Oq8uPcHbeU0peFEDOW0idBsIzZ6g== dependencies: - "@0x/types" "^2.4.3" - "@0x/typescript-typings" "^4.3.0" - lodash "^4.17.11" + "@0x/types" "^3.3.7" + "@0x/typescript-typings" "^5.3.2" + "@types/node" "12.12.54" + lodash "^4.17.21" -"@0x/sol-trace@^2.0.16": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-2.0.20.tgz#4c14af3f5c30ab50882e9667926ca9533446711d" - integrity sha512-lkw+8l+InqXKoyVFPCxdLA0oZnLLPvmpFm+lIJwEkPjrbwIyhvQbwSwyzPW/1XUWj0wIwWOpq6PSyofWZgt4KA== +"@0x/sol-trace@^3.0.47": + version "3.0.47" + resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.47.tgz#1da8ec5cacd85893cb9c017dffa0a9cd774a052d" + integrity sha512-ufGVN57iMGoO+ke9rCLnnYdjnoZGi0EHLcQyivB//WdVtFWWZx5sdcIOR1FDZQXp0lvchh3gbbd5kDV0gZs7zA== dependencies: - "@0x/sol-tracing-utils" "^6.0.19" - "@0x/subproviders" "^5.0.4" - "@0x/typescript-typings" "^4.3.0" + "@0x/sol-tracing-utils" "^7.3.3" + "@0x/subproviders" "^7.0.1" + "@0x/typescript-typings" "^5.3.2" + "@types/node" "12.12.54" chalk "^2.3.0" - ethereum-types "^2.1.6" - ethereumjs-util "^5.1.1" - lodash "^4.17.11" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" + lodash "^4.17.21" loglevel "^1.6.1" - web3-provider-engine "14.0.6" - -"@0x/sol-tracing-utils@^6.0.19": - version "6.0.19" - resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-6.0.19.tgz#3c119c7e5b6d2bd1c94663985b7641aec85ef625" - integrity sha512-5tQOEo+dUYWiclT7UDy5IRm/EPEwDzCqAY3J8l0ecIsssBk0r2YLKKf/ugWkdwASGeAxiepjYpC+mxcxOT6yDA== - dependencies: - "@0x/dev-utils" "^2.3.3" - "@0x/sol-compiler" "^3.1.15" - "@0x/sol-resolver" "^2.0.11" - "@0x/subproviders" "^5.0.4" - "@0x/typescript-typings" "^4.3.0" - "@0x/utils" "^4.5.2" - "@0x/web3-wrapper" "^6.0.13" + web3-provider-engine "16.0.4" + +"@0x/sol-tracing-utils@^7.3.3": + version "7.3.3" + resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.3.3.tgz#05aef503007297d55bf537260c582573b88aa605" + integrity sha512-piLT43xm0ASDkIHQ+1i9dnboAIiP3geAjaDoHZRSCOmkjq07H9Cr1AB+8lWSCweoiPpTeJNuv/h/K1yDv0nTVQ== + dependencies: + "@0x/dev-utils" "^5.0.1" + "@0x/sol-compiler" "^4.8.3" + "@0x/sol-resolver" "^3.1.13" + "@0x/subproviders" "^7.0.1" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@0x/web3-wrapper" "^8.0.0" + "@types/node" "12.12.54" "@types/solidity-parser-antlr" "^0.2.3" chalk "^2.3.0" - ethereum-types "^2.1.6" - ethereumjs-util "^5.1.1" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" ethers "~4.0.4" glob "^7.1.2" istanbul "^0.4.5" - lodash "^4.17.11" + lodash "^4.17.21" loglevel "^1.6.1" mkdirp "^0.5.1" rimraf "^2.6.2" semaphore-async-await "^1.5.1" - solc "^0.5.5" + solc "^0.8" solidity-parser-antlr "^0.4.2" -"@0x/subproviders@^5.0.0", "@0x/subproviders@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-5.0.4.tgz#e4b165634ef6a50c4bd41baacf0dbd2a9390c2f8" - integrity sha512-1LiGcOXkP5eUOl/0JRqkrqYtCvIL4NJj1GbbLIRq4TvkfqrRbF7zJM2SaayxPo3Z48zVsqk0ZE5+RrNAdK/Rrg== - dependencies: - "@0x/assert" "^2.1.6" - "@0x/types" "^2.4.3" - "@0x/typescript-typings" "^4.3.0" - "@0x/utils" "^4.5.2" - "@0x/web3-wrapper" "^6.0.13" - "@ledgerhq/hw-app-eth" "^4.3.0" - "@ledgerhq/hw-transport-u2f" "4.24.0" +"@0x/subproviders@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-7.0.1.tgz#3e74cbe61ae746bea67766821f226398978a0cc0" + integrity sha512-S5LrUg12szE8T3U+2ymcdiH4zOkSyGJIh3FRN9jXspwQCe6+fggEymt6n0SyK3p1QiHipVkCxhjTR/53+shwsg== + dependencies: + "@0x/assert" "^3.0.35" + "@0x/types" "^3.3.7" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@0x/web3-wrapper" "^8.0.0" + "@ethereumjs/common" "^2.6.3" + "@ethereumjs/tx" "^3.5.1" + "@ledgerhq/hw-app-eth" "^5.53.0" + "@ledgerhq/hw-transport-webusb" "^5.53.1" "@types/hdkey" "^0.7.0" + "@types/node" "12.12.54" "@types/web3-provider-engine" "^14.0.0" bip39 "^2.5.0" bn.js "^4.11.8" - ethereum-types "^2.1.6" - ethereumjs-tx "^1.3.5" - ethereumjs-util "^5.1.1" - ganache-core "^2.6.0" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" + ganache "^7.4.0" hdkey "^0.7.1" json-rpc-error "2.0.0" - lodash "^4.17.11" + lodash "^4.17.21" semaphore-async-await "^1.5.1" - web3-provider-engine "14.0.6" + web3-provider-engine "16.0.4" optionalDependencies: - "@ledgerhq/hw-transport-node-hid" "^4.3.0" + "@ledgerhq/hw-transport-node-hid" "^5.51.1" -"@0x/types@^2.4.3": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@0x/types/-/types-2.4.3.tgz#ea014889789e9013fdf48ce97b79f2c016e10fb3" - integrity sha512-3z4ca9fb9pyTu9lJhTSll5EuEthkA3tLAayyZixCoCnwi4ok6PJ83PnMMsSxlRY2iXr7QGbrQr6nU64YWk2WjA== +"@0x/types@^3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@0x/types/-/types-3.3.7.tgz#2a8556b3398b6d6fac942c63de23ab22836624ee" + integrity sha512-6lPXPnvKaIfAJ5hIgs81SytqNCPCLstQ/DA598iLpb90KKjjz8QsdrfII4JeKdrEREvLcWSH9SeH4sNPWyLhlA== dependencies: - "@types/node" "*" - bignumber.js "~8.0.2" - ethereum-types "^2.1.6" + "@types/node" "12.12.54" + bignumber.js "~9.0.2" + ethereum-types "^3.7.1" -"@0x/typescript-typings@^4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-4.3.0.tgz#4813a996ac5101841d1c22f4aa1738ab56168857" - integrity sha512-6IH2JyKyl33+40tJ5rEhaMPTS2mVuRvoNmoXlCd/F0GPYSsDHMGObIXOkx+Qsw5SyCmqNs/3CTLeeCCqiSUdaw== +"@0x/typescript-typings@^5.3.2": + version "5.3.2" + resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-5.3.2.tgz#b2b2a46ebff7f9d885b1357feae615225cb0bb31" + integrity sha512-VIo8PS/IRXrI1aEzM8TenUMViX4MFMKBnIAwqC4K/ewVDSnKyYZSk8fzw0XZph6tN07obchPf+1sHIWYe8EUow== dependencies: "@types/bn.js" "^4.11.0" + "@types/node" "12.12.54" "@types/react" "*" - bignumber.js "~8.0.2" - ethereum-types "^2.1.6" + bignumber.js "~9.0.2" + ethereum-types "^3.7.1" popper.js "1.14.3" -"@0x/utils@^4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-4.5.2.tgz#6cc89f2d0dda341e0fb4e76049a35abfb67a4ac5" - integrity sha512-NWfNcvyiOhouk662AWxX0ZVe4ednBZJS9WZT/by3DBCY/WvN7WHMpEy9M5rBCxO+JJndLYeB5eBztDp7W+Ytkw== +"@0x/utils@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-7.0.0.tgz#322168b21cf11741003c9cc490b13adafbe57393" + integrity sha512-g+Bp0eHUGhnVGeVZqGn7UVtpzs/FuoXksiDaajfJrHFW0owwo5YwpwFIAVU7/ca0B6IKa74e71gskLwWGINEFg== dependencies: - "@0x/types" "^2.4.3" - "@0x/typescript-typings" "^4.3.0" - "@types/node" "*" + "@0x/types" "^3.3.7" + "@0x/typescript-typings" "^5.3.2" + "@types/mocha" "^5.2.7" + "@types/node" "12.12.54" abortcontroller-polyfill "^1.1.9" - bignumber.js "~8.0.2" + bignumber.js "~9.0.2" chalk "^2.3.0" detect-node "2.0.3" - ethereum-types "^2.1.6" - ethereumjs-util "^5.1.1" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" ethers "~4.0.4" - isomorphic-fetch "2.2.1" + isomorphic-fetch "^3.0.0" js-sha3 "^0.7.0" - lodash "^4.17.11" + lodash "^4.17.21" -"@0x/web3-wrapper@^6.0.13": - version "6.0.13" - resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-6.0.13.tgz#2e666221bd44ceebe02762028214d4aa41ad7247" - integrity sha512-LQjKBCCNdkJuhcJld+/sy+G0+sJu5qp9VDNNwJGLDxWIJpgoshhUpBPi7vUnZ79UY4SYuNcC4yM9yI61cs7ZiA== - dependencies: - "@0x/assert" "^2.1.6" - "@0x/json-schemas" "^4.0.2" - "@0x/typescript-typings" "^4.3.0" - "@0x/utils" "^4.5.2" - ethereum-types "^2.1.6" - ethereumjs-util "^5.1.1" +"@0x/web3-wrapper@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-8.0.0.tgz#c92bd794363e99b7181810547199bd8cd6aca6e8" + integrity sha512-bDaoXT+3L/hhDARQot8OSfdfReAscQYMUIB/Xy2ZLqwS6ajpGpYS13uVQ+UWmFWgNq4cAWBB96PWVEbL8gVgig== + dependencies: + "@0x/assert" "^3.0.35" + "@0x/json-schemas" "^6.4.5" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@types/node" "12.12.54" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" ethers "~4.0.4" - lodash "^4.17.11" + lodash "^4.17.21" "@ampproject/remapping@^2.1.0": version "2.2.0" @@ -1240,11 +1258,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@celo/base@1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@celo/base/-/base-1.5.1.tgz#53e16cd36c51f9eaeec0321f6752de6385f2a131" - integrity sha512-76MAosahwCDjkBsqfgnKT2CbyjV6TdzIztHJvAuJ+VrKeaIFe/IMoPwIxPy95xDJmHhD0zqPWMixGeyVGAwYQw== - "@celo/base@1.5.2", "@celo/base@^1.2.0": version "1.5.2" resolved "https://registry.yarnpkg.com/@celo/base/-/base-1.5.2.tgz#168ab5e4e30b374079d8d139fafc52ca6bfd4100" @@ -1336,39 +1349,6 @@ lodash "~4.17.19" typechain "2.0.0" -"@celo/utils@1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@celo/utils/-/utils-1.5.1.tgz#cd5b0309750a25683d9b07c14e643aee2c6a3670" - integrity sha512-3ZqZ/YSvzcESd72+8oNOvIM5HieJt3zusRCBPIl97qnqlnCIIq22gxcvpKL1afac0q79t24jkbdl5wsAkD/ROA== - dependencies: - "@celo/base" "1.5.1" - "@types/country-data" "^0.0.0" - "@types/elliptic" "^6.4.9" - "@types/ethereumjs-util" "^5.2.0" - "@types/google-libphonenumber" "^7.4.17" - "@types/lodash" "^4.14.170" - "@types/node" "^10.12.18" - "@types/randombytes" "^2.0.0" - bigi "^1.1.0" - bignumber.js "^9.0.0" - bip32 "2.0.5" - bip39 "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2" - bls12377js "https://github.com/celo-org/bls12377js#cb38a4cfb643c778619d79b20ca3e5283a2122a6" - bn.js "4.11.8" - buffer-reverse "^1.0.1" - country-data "^0.0.31" - crypto-js "^3.1.9-1" - elliptic "^6.5.4" - ethereumjs-util "^5.2.0" - fp-ts "2.1.1" - google-libphonenumber "^3.2.15" - io-ts "2.0.1" - keccak256 "^1.0.0" - lodash "^4.17.21" - numeral "^2.0.6" - web3-eth-abi "1.3.6" - web3-utils "1.3.6" - "@celo/utils@1.5.2", "@celo/utils@^1.2.0": version "1.5.2" resolved "https://registry.yarnpkg.com/@celo/utils/-/utils-1.5.2.tgz#ddb7f3b50c801225ab41d2355fbe010976329099" @@ -1597,7 +1577,7 @@ "@ethereumjs/util" "^8.0.0" crc-32 "^1.2.0" -"@ethereumjs/common@^2.5.0", "@ethereumjs/common@^2.6.4": +"@ethereumjs/common@^2.5.0", "@ethereumjs/common@^2.6.3", "@ethereumjs/common@^2.6.4": version "2.6.5" resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.5.tgz#0a75a22a046272579d91919cb12d84f2756e8d30" integrity sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA== @@ -1701,7 +1681,7 @@ ethereum-cryptography "^1.1.2" ethers "^5.7.1" -"@ethereumjs/tx@^3.3.2": +"@ethereumjs/tx@^3.3.0", "@ethereumjs/tx@^3.3.2", "@ethereumjs/tx@^3.5.1": version "3.5.2" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.5.2.tgz#197b9b6299582ad84f9527ca961466fce2296c1c" integrity sha512-gQDNJWKrSDGu2w7w0PzVXVBNMzb7wwdDOmOqczmhNjqFxFuIbhVJDwiGEnxFNC2/b8ifcZzY7MLcluizohRzNw== @@ -2467,6 +2447,14 @@ "@ganache/utils" "0.3.0" ethereumjs-util "7.1.5" +"@ganache/console.log@0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@ganache/console.log/-/console.log-0.3.0.tgz#be7bb0875e883d7c219c3543cc7e854203c5233d" + integrity sha512-cRkjY3gn1zxPxy+PKK/xl12p3KbGwXeS7oGTkXFeey4bhQgd5QBa/+HNMVPflT2BcWLZ91Ir+CRRiRekeyHUWQ== + dependencies: + "@ethereumjs/util" "8.0.2" + "@ganache/utils" "0.3.0" + "@ganache/utils@0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@ganache/utils/-/utils-0.3.0.tgz#f95d7a4746d4e062febf3ce59f65f6ca1336be8a" @@ -3414,14 +3402,12 @@ resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796" integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg== -"@ledgerhq/devices@^4.78.0": - version "4.78.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.78.0.tgz#149b572f0616096e2bd5eb14ce14d0061c432be6" - integrity sha512-tWKS5WM/UU82czihnVjRwz9SXNTQzWjGJ/7+j/xZ70O86nlnGJ1aaFbs5/WTzfrVKpOKgj1ZoZkAswX67i/JTw== +"@ledgerhq/cryptoassets@^5.53.0": + version "5.53.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/cryptoassets/-/cryptoassets-5.53.0.tgz#11dcc93211960c6fd6620392e4dd91896aaabe58" + integrity sha512-M3ibc3LRuHid5UtL7FI3IC6nMEppvly98QHFoSa7lJU0HDzQxY6zHec/SPM4uuJUC8sXoGVAiRJDkgny54damw== dependencies: - "@ledgerhq/errors" "^4.78.0" - "@ledgerhq/logs" "^4.72.0" - rxjs "^6.5.3" + invariant "2" "@ledgerhq/devices@^5.11.0", "@ledgerhq/devices@^5.51.1": version "5.51.1" @@ -3443,11 +3429,6 @@ rxjs "6" semver "^7.3.5" -"@ledgerhq/errors@^4.78.0": - version "4.78.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.78.0.tgz#23daf3af54d03b1bda3e616002b555da1bdb705a" - integrity sha512-FX6zHZeiNtegBvXabK6M5dJ+8OV8kQGGaGtuXDeK/Ss5EmG4Ltxc6Lnhe8hiHpm9pCHtktOsnUVL7IFBdHhYUg== - "@ledgerhq/errors@^5.11.0", "@ledgerhq/errors@^5.50.0": version "5.50.0" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.50.0.tgz#e3a6834cb8c19346efca214c1af84ed28e69dad9" @@ -3458,13 +3439,17 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.10.2.tgz#ba104d495eae5ee91264de91a9ba8e3dcaa1a4ea" integrity sha512-iMfEJPWaan8QaZw87WMUnFFRJqveE3FpU2ObTE0ydTJLPJNOUJjjurGBklqdWM/j5BIQvpi3byGKFChfNg8CaQ== -"@ledgerhq/hw-app-eth@^4.3.0": - version "4.78.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.78.0.tgz#fbd7ffe7f371d0c32a53f38c5149ab8d13514297" - integrity sha512-m4s4Zhy4lwYJjZB3xPeGV/8mxQcnoui+Eu1KDEl6atsquZHUpbtern/0hZl88+OlFUz0XrX34W3I9cqj61Y6KA== +"@ledgerhq/hw-app-eth@^5.53.0": + version "5.53.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-5.53.0.tgz#5df2d7427db9f387099d0cc437e9730101d7c404" + integrity sha512-LKi/lDA9tW0GdoYP1ng0VY/PXNYjSrwZ1cj0R0MQ9z+knmFlPcVkGK2MEqE8W8cXrC0tjsUXITMcngvpk5yfKA== dependencies: - "@ledgerhq/errors" "^4.78.0" - "@ledgerhq/hw-transport" "^4.78.0" + "@ledgerhq/cryptoassets" "^5.53.0" + "@ledgerhq/errors" "^5.50.0" + "@ledgerhq/hw-transport" "^5.51.1" + "@ledgerhq/logs" "^5.50.0" + bignumber.js "^9.0.1" + ethers "^5.2.0" "@ledgerhq/hw-app-eth@~5.11.0": version "5.11.0" @@ -3474,16 +3459,16 @@ "@ledgerhq/errors" "^5.11.0" "@ledgerhq/hw-transport" "^5.11.0" -"@ledgerhq/hw-transport-node-hid-noevents@^4.78.0": - version "4.78.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.78.0.tgz#6f0dbe1bbfad6516b42ad2d6b6b34a8b07e4cd46" - integrity sha512-CJPVR4wksq+apiXH2GnsttguBxmj9zdM2HjqZ3dHZN8SFW/9Xj3k+baS+pYoUISkECVxDrdfaW3Bd5dWv+jPUg== +"@ledgerhq/hw-transport-node-hid-noevents@^5.51.1": + version "5.51.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-5.51.1.tgz#71f37f812e448178ad0bcc2258982150d211c1ab" + integrity sha512-9wFf1L8ZQplF7XOY2sQGEeOhpmBRzrn+4X43kghZ7FBDoltrcK+s/D7S+7ffg3j2OySyP6vIIIgloXylao5Scg== dependencies: - "@ledgerhq/devices" "^4.78.0" - "@ledgerhq/errors" "^4.78.0" - "@ledgerhq/hw-transport" "^4.78.0" - "@ledgerhq/logs" "^4.72.0" - node-hid "^0.7.9" + "@ledgerhq/devices" "^5.51.1" + "@ledgerhq/errors" "^5.50.0" + "@ledgerhq/hw-transport" "^5.51.1" + "@ledgerhq/logs" "^5.50.0" + node-hid "2.1.1" "@ledgerhq/hw-transport-node-hid-noevents@^6.27.4": version "6.27.4" @@ -3496,19 +3481,19 @@ "@ledgerhq/logs" "^6.10.0" node-hid "2.1.1" -"@ledgerhq/hw-transport-node-hid@^4.3.0": - version "4.78.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.78.0.tgz#abd99e0f918b810a61c035e5ab8c2bd8807aff55" - integrity sha512-OMrY2ecfQ1XjMAuuHqu3n3agMPR06HN1s0ENrKc+Twbb5A17jujpv07WzjxfTN2V1G7vgeZpRqrg2ulhowWbdg== +"@ledgerhq/hw-transport-node-hid@^5.51.1": + version "5.51.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-5.51.1.tgz#fe8eb81e18929663540698c80905952cdbe542d5" + integrity sha512-Y2eVCCdhVs2Lfr7N2x2cNb+ogcZ24ZATO4QxaQ7LogjiPwYmzmvuXFn8zFjMSrKUCn9CtbptXcuiu0NkGsjWlw== dependencies: - "@ledgerhq/devices" "^4.78.0" - "@ledgerhq/errors" "^4.78.0" - "@ledgerhq/hw-transport" "^4.78.0" - "@ledgerhq/hw-transport-node-hid-noevents" "^4.78.0" - "@ledgerhq/logs" "^4.72.0" - lodash "^4.17.15" - node-hid "^0.7.9" - usb "^1.6.0" + "@ledgerhq/devices" "^5.51.1" + "@ledgerhq/errors" "^5.50.0" + "@ledgerhq/hw-transport" "^5.51.1" + "@ledgerhq/hw-transport-node-hid-noevents" "^5.51.1" + "@ledgerhq/logs" "^5.50.0" + lodash "^4.17.21" + node-hid "2.1.1" + usb "^1.7.0" "@ledgerhq/hw-transport-node-hid@^6.27.4": version "6.27.4" @@ -3524,24 +3509,17 @@ node-hid "2.1.1" usb "^1.7.0" -"@ledgerhq/hw-transport-u2f@4.24.0": - version "4.24.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.24.0.tgz#d67cfc4abf6d9a900ed45f2e2df7fe06dfdff5c7" - integrity sha512-/gFjhkM0sJfZ7iUf8HoIkGufAWgPacrbb1LW0TvWnZwvsATVJ1BZJBtrr90Wo401PKsjVwYtFt3Ce4gOAUv9jQ== - dependencies: - "@ledgerhq/hw-transport" "^4.24.0" - u2f-api "0.2.7" - -"@ledgerhq/hw-transport@^4.24.0", "@ledgerhq/hw-transport@^4.78.0": - version "4.78.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.78.0.tgz#714786658e1f2fbc0569e06e2abf8d15d310d931" - integrity sha512-xQu16OMPQjFYLjqCysij+8sXtdWv2YLxPrB6FoLvEWGTlQ7yL1nUBRQyzyQtWIYqZd4THQowQmzm1VjxuN6SZw== +"@ledgerhq/hw-transport-webusb@^5.53.1": + version "5.53.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-5.53.1.tgz#3df8c401417571e3bcacc378d8aca587214b05ae" + integrity sha512-A/f+xcrkIAZiJrvPpDvsrjxQX4cI2kbdiunQkwsYmOG3Bp4z89ZnsBiC7YBst4n2/g+QgTg0/KPVtODU5djooQ== dependencies: - "@ledgerhq/devices" "^4.78.0" - "@ledgerhq/errors" "^4.78.0" - events "^3.0.0" + "@ledgerhq/devices" "^5.51.1" + "@ledgerhq/errors" "^5.50.0" + "@ledgerhq/hw-transport" "^5.51.1" + "@ledgerhq/logs" "^5.50.0" -"@ledgerhq/hw-transport@^5.11.0": +"@ledgerhq/hw-transport@^5.11.0", "@ledgerhq/hw-transport@^5.51.1": version "5.51.1" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz#8dd14a8e58cbee4df0c29eaeef983a79f5f22578" integrity sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw== @@ -3568,11 +3546,6 @@ "@ledgerhq/errors" "^5.11.0" events "^3.1.0" -"@ledgerhq/logs@^4.72.0": - version "4.72.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-4.72.0.tgz#43df23af013ad1135407e5cf33ca6e4c4c7708d5" - integrity sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA== - "@ledgerhq/logs@^5.50.0": version "5.50.0" resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186" @@ -6135,13 +6108,6 @@ dependencies: "@babel/types" "^7.3.0" -"@types/bignumber.js@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@types/bignumber.js/-/bignumber.js-5.0.0.tgz#d9f1a378509f3010a3255e9cc822ad0eeb4ab969" - integrity sha512-0DH7aPGCClywOFaxxjE6UwpN2kQYe9LwuDQMv+zYA97j5GkOMo8e66LYT+a8JYU7jfmUFRZLa9KycxHDsKXJCA== - dependencies: - bignumber.js "*" - "@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5", "@types/bn.js@^5.1.0": version "4.11.6" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" @@ -6554,7 +6520,7 @@ dependencies: "@types/node" "*" -"@types/mocha@^5.2.5": +"@types/mocha@^5.2.5", "@types/mocha@^5.2.7": version "5.2.7" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea" integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ== @@ -6599,6 +6565,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a" integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ== +"@types/node@12.12.54": + version "12.12.54" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.54.tgz#a4b58d8df3a4677b6c08bfbc94b7ad7a7a5f82d1" + integrity sha512-ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w== + "@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" @@ -6966,25 +6937,6 @@ dependencies: "@types/yargs-parser" "*" -"@web3-js/scrypt-shim@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@web3-js/scrypt-shim/-/scrypt-shim-0.1.0.tgz#0bf7529ab6788311d3e07586f7d89107c3bea2cc" - integrity sha512-ZtZeWCc/s0nMcdx/+rZwY1EcuRdemOK9ag21ty9UsHkFxsNb/AaoucUz0iPuyGe0Ku+PFuRmWZG7Z7462p9xPw== - dependencies: - scryptsy "^2.1.0" - semver "^6.3.0" - -"@web3-js/websocket@^1.0.29": - version "1.0.30" - resolved "https://registry.yarnpkg.com/@web3-js/websocket/-/websocket-1.0.30.tgz#9ea15b7b582cf3bf3e8bc1f4d3d54c0731a87f87" - integrity sha512-fDwrD47MiDrzcJdSeTLF75aCcxVVt8B1N74rA+vh2XCAvFy4tEWJjtnUtj2QG7/zlQ6g9cQ88bZFBxwd9/FmtA== - dependencies: - debug "^2.2.0" - es5-ext "^0.10.50" - nan "^2.14.0" - typedarray-to-buffer "^3.1.5" - yaeti "^0.0.6" - "@xmldom/xmldom@^0.7.0": version "0.7.5" resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" @@ -7071,13 +7023,6 @@ abstract-level@1.0.3, abstract-level@^1.0.0, abstract-level@^1.0.2, abstract-lev module-error "^1.0.1" queue-microtask "^1.2.3" -abstract-leveldown@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz#5cb89f958a44f526779d740d1440e743e0c30a57" - integrity sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ== - dependencies: - xtend "~4.0.0" - abstract-leveldown@7.2.0, abstract-leveldown@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz#08d19d4e26fb5be426f7a57004851b39e1795a2e" @@ -7090,13 +7035,6 @@ abstract-leveldown@7.2.0, abstract-leveldown@^7.2.0: level-supports "^2.0.1" queue-microtask "^1.2.3" -abstract-leveldown@^2.4.1, abstract-leveldown@~2.7.1: - version "2.7.2" - resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz#87a44d7ebebc341d59665204834c8b7e0932cc93" - integrity sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w== - dependencies: - xtend "~4.0.0" - abstract-leveldown@^5.0.0, abstract-leveldown@~5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz#f7128e1f86ccabf7d2893077ce5d06d798e386c6" @@ -7122,6 +7060,13 @@ abstract-leveldown@~2.6.0: dependencies: xtend "~4.0.0" +abstract-leveldown@~2.7.1: + version "2.7.2" + resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz#87a44d7ebebc341d59665204834c8b7e0932cc93" + integrity sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w== + dependencies: + xtend "~4.0.0" + abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3: version "6.2.3" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz#036543d87e3710f2528e47040bc3261b77a9a8eb" @@ -7551,13 +7496,6 @@ app-module-path@^2.2.0: resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" integrity sha512-gkco+qxENJV+8vFcDiiFhuoSvRXb2a/QPqpSoWhVz829VNJfOTnELbBmPmNKFxf3xdNnw4DWCkzkDaavcX/1YQ== -append-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" - integrity sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA== - dependencies: - buffer-equal "^1.0.0" - aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -7597,11 +7535,6 @@ archiver@^5.0.0: tar-stream "^2.2.0" zip-stream "^4.1.0" -archy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw== - are-we-there-yet@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" @@ -7684,25 +7617,11 @@ arr-diff@^4.0.0: resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== -arr-filter@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee" - integrity sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA== - dependencies: - make-iterator "^1.0.0" - arr-flatten@^1.0.1, arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== -arr-map@^2.0.0, arr-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4" - integrity sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw== - dependencies: - make-iterator "^1.0.0" - arr-union@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" @@ -7732,11 +7651,6 @@ array-differ@^3.0.0: resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg== -array-each@^1.0.0, array-each@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" - integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA== - array-filter@~0.0.0: version "0.0.1" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" @@ -7757,21 +7671,6 @@ array-ify@^1.0.0: resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== -array-initial@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795" - integrity sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw== - dependencies: - array-slice "^1.0.0" - is-number "^4.0.0" - -array-last@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336" - integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg== - dependencies: - is-number "^4.0.0" - array-map@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" @@ -7787,20 +7686,6 @@ array-slice@^0.2.3: resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q== -array-slice@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" - integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== - -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -7938,16 +7823,6 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== -async-done@^1.2.0, async-done@^1.2.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2" - integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.2" - process-nextick-args "^2.0.0" - stream-exhaust "^1.0.1" - async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" @@ -7979,25 +7854,11 @@ async-retry@^1.2.1, async-retry@^1.3.3: dependencies: retry "0.13.1" -async-settle@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b" - integrity sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw== - dependencies: - async-done "^1.2.2" - async@1.x, async@^1.3.0, async@^1.4.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== -async@2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" - integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg== - dependencies: - lodash "^4.17.11" - async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1, async@^2.6.3, async@^2.6.4: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" @@ -8120,167 +7981,6 @@ axios@^0.26.1: dependencies: follow-redirects "^1.14.8" -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g== - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.0.14, babel-core@^6.26.0: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - integrity sha512-gCtfYORSG1fUMX4kKraymq607FWgMWg+j42IFPc18kFQEsmtaibP4UrqsXt8FlEJle25HUd4tsoDR7H2wDhe9Q== - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - integrity sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ== - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - integrity sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA== - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - integrity sha512-qe5csbhbvq6ccry9G7tkXbzNtcDiH4r51rrPUbwwoTzZ18AqxWYRZT6AOmxrpxKnQBW0pYlBI/8vh73Z//78nQ== - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q== - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - integrity sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - integrity sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - integrity sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg== - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - integrity sha512-RYqaPD0mQyQIFRu7Ho5wE2yvA/5jxqCIj/Lv4BXNq23mHYu/vxikOy2JueLiBxQknwapwrJeNCesvY0ZcfnlHg== - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - integrity sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw== - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ== - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-jest@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" @@ -8321,20 +8021,6 @@ babel-jest@^29.1.2: graceful-fs "^4.2.9" slash "^3.0.0" -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - integrity sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA== - dependencies: - babel-runtime "^6.22.0" - babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" @@ -8397,249 +8083,11 @@ babel-plugin-polyfill-regenerator@^0.4.0: dependencies: "@babel/helper-define-polyfill-provider" "^0.3.2" -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - integrity sha512-4Zp4unmHgw30A1eWI5EpACji2qMocisdXhAftfhXoSV9j0Tvj6nRFE3tOmRY912E0FMRm/L5xWE7MGVT2FoLnw== - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - integrity sha512-Z/flU+T9ta0aIEKl1tGEmN/pZiI1uXmCiGFRegKacQfEJzp7iNsKloZmyJlQr+75FCJtiFfGIK03SiCvCt9cPQ== - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - integrity sha512-Gx9CH3Q/3GKbhs07Bszw5fPTlU+ygrOGfAhEt7W2JICwufpC4SuO0mG0+4NykPBSYPMJhqvVlDBU17qB1D+hMQ== - babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ== -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - integrity sha512-7BgYJujNCg0Ti3x0c/DL3tStvnKS6ktIYOmo9wginv/dfZOrbSZ+qG4IRRHMBOzZ5Awb1skTiAsQXg/+IWkZYw== - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - integrity sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - integrity sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - integrity sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw== - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - integrity sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag== - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - integrity sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw== - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - integrity sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - integrity sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - integrity sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - integrity sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg== - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - integrity sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - integrity sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA== - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" - integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q== - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - integrity sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg== - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - integrity sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw== - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - integrity sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA== - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - integrity sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ== - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - integrity sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - integrity sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - integrity sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ== - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - integrity sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - integrity sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - integrity sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ== - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - integrity sha512-LzXDmbMkklvNhprr20//RStKVcT8Cu+SQtX18eMHLhjHf2yFzwtQ0S2f0jQ+89rokoNdmwoSqYzAhq86FxlLSQ== - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - integrity sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg== - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - integrity sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" @@ -8658,42 +8106,6 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-env@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" - integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg== - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^3.2.6" - invariant "^2.2.2" - semver "^5.3.0" - babel-preset-fbjs@^3.2.0, babel-preset-fbjs@^3.3.0: version "3.4.0" resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c" @@ -8743,20 +8155,7 @@ babel-preset-jest@^29.0.2: babel-plugin-jest-hoist "^29.0.2" babel-preset-current-node-syntax "^1.0.0" -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A== - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: +babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== @@ -8764,70 +8163,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg== - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA== - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babelify@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/babelify/-/babelify-7.3.0.tgz#aa56aede7067fd7bd549666ee16dc285087e88e5" - integrity sha512-vID8Fz6pPN5pJMdlUnNFSfrlcx5MUule4k9aKs/zbZPyXxMTcRrB0M4Tarw22L8afr8eYSWxDPYCob3TdrqtlA== - dependencies: - babel-core "^6.0.14" - object-assign "^4.0.0" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - -bach@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880" - integrity sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg== - dependencies: - arr-filter "^1.1.1" - arr-flatten "^1.0.1" - arr-map "^2.0.0" - array-each "^1.0.0" - array-initial "^1.0.0" - array-last "^1.1.1" - async-done "^1.2.2" - async-settle "^1.0.0" - now-and-later "^2.0.0" - backoff@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f" @@ -8939,7 +8274,7 @@ bigint-mod-arith@^3.1.0: resolved "https://registry.yarnpkg.com/bigint-mod-arith/-/bigint-mod-arith-3.1.2.tgz#658e416bc593a463d97b59766226d0a3021a76b1" integrity sha512-nx8J8bBeiRR+NlsROFH9jHswW5HO8mgfOSqW0AmjicMMvaONDa8AO+5ViKDUUNytBPWiwfvZP4/Bj4Y3lUfvgQ== -bignumber.js@*, bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js#master", "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", bignumber.js@~8.0.2: +bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js#master", "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", bignumber.js@~9.0.2: version "9.0.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== @@ -8956,11 +8291,6 @@ bin-links@^3.0.0: rimraf "^3.0.0" write-file-atomic "^4.0.0" -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== - binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" @@ -9011,17 +8341,6 @@ bip32@3.1.0, bip32@^3.1.0: typeforce "^1.11.5" wif "^2.0.6" -bip39@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.5.0.tgz#51cbd5179460504a63ea3c000db3f787ca051235" - integrity sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA== - dependencies: - create-hash "^1.1.0" - pbkdf2 "^3.0.9" - randombytes "^2.0.1" - safe-buffer "^5.0.1" - unorm "^1.3.3" - bip39@^2.2.0, bip39@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.6.0.tgz#9e3a720b42ec8b3fbe4038f1e445317b6a99321c" @@ -9124,7 +8443,7 @@ bn.js@4.11.9: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0, bn.js@^4.8.0: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== @@ -9228,7 +8547,7 @@ braces@^1.8.0, braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" -braces@^2.3.1, braces@^2.3.2: +braces@^2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== @@ -9330,14 +8649,6 @@ browserify-sign@^4.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -browserslist@^3.2.6: - version "3.2.8" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" - integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ== - dependencies: - caniuse-lite "^1.0.30000844" - electron-to-chromium "^1.3.47" - browserslist@^4.20.2, browserslist@^4.21.3: version "4.21.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" @@ -9411,11 +8722,6 @@ buffer-equal-constant-time@1.0.1: resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA== -buffer-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== - buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" @@ -9590,21 +8896,6 @@ bytes@3.1.2: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -bytewise-core@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/bytewise-core/-/bytewise-core-1.2.3.tgz#3fb410c7e91558eb1ab22a82834577aa6bd61d42" - integrity sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA== - dependencies: - typewise-core "^1.2" - -bytewise@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/bytewise/-/bytewise-1.1.0.tgz#1d13cbff717ae7158094aa881b35d081b387253e" - integrity sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ== - dependencies: - bytewise-core "^1.2.2" - typewise "^1.0.3" - cacache@^15.2.0: version "15.3.0" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" @@ -9699,14 +8990,6 @@ cacheable-request@^7.0.2: normalize-url "^6.0.1" responselike "^2.0.0" -cachedown@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cachedown/-/cachedown-1.0.0.tgz#d43f036e4510696b31246d7db31ebf0f7ac32d15" - integrity sha512-t+yVk82vQWCJF3PsWHMld+jhhjkkWjcAzz8NbFx1iULOXWl8Tm/FdM4smZNVw3MRr0X+lVTx9PKzvEn4Ng19RQ== - dependencies: - abstract-leveldown "^2.4.1" - lru-cache "^3.2.0" - call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -9786,7 +9069,7 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001370: +caniuse-lite@^1.0.30001370: version "1.0.30001390" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz#158a43011e7068ef7fc73590e9fd91a7cece5e7f" integrity sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g== @@ -9849,13 +9132,18 @@ cbor@^5.2.0: bignumber.js "^9.0.1" nofilter "^1.0.4" -chai-as-promised@^7.1.1: +chai-as-promised@^7.1.0, chai-as-promised@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0" integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA== dependencies: check-error "^1.0.2" +chai-bignumber@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/chai-bignumber/-/chai-bignumber-3.1.0.tgz#e196456c760df21f0e124f6df922289ea15a7e4c" + integrity sha512-omxEc80jAU+pZwRmoWr3aEzeLad4JW3iBhLRQlgISvghBdIxrMT7mVAGsDz4WSyCkKowENshH2j9OABAhld7QQ== + chai-subset@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/chai-subset/-/chai-subset-1.6.0.tgz#a5d0ca14e329a79596ed70058b6646bd6988cfe9" @@ -10067,25 +9355,6 @@ chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.5.1: optionalDependencies: fsevents "~2.3.2" -chokidar@^2.0.0: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -10391,7 +9660,16 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" -clone-buffer@1.0.0, clone-buffer@^1.0.0: +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + +clone-buffer@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== @@ -10412,29 +9690,15 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== - -clone@2.1.2, clone@^2.0.0, clone@^2.1.1, clone@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== - clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== -cloneable-readable@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" - integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== - dependencies: - inherits "^2.0.1" - process-nextick-args "^2.0.0" - readable-stream "^2.3.5" +clone@^2.0.0, clone@^2.1.1, clone@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== cmd-shim@^5.0.0: version "5.0.0" @@ -10482,15 +9746,6 @@ collect-v8-coverage@^1.0.0: resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== -collection-map@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" - integrity sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA== - dependencies: - arr-map "^2.0.2" - for-own "^1.0.0" - make-iterator "^1.0.0" - collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -10721,7 +9976,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@^1.6.2: +concat-stream@^1.6.0, concat-stream@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -10915,7 +10170,7 @@ conventional-recommended-bump@^6.1.0: meow "^8.0.0" q "^1.5.1" -convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== @@ -10942,14 +10197,6 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -copy-props@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2" - integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw== - dependencies: - each-props "^1.3.2" - is-plain-object "^5.0.0" - core-js-compat@^3.21.0: version "3.25.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.1.tgz#6f13a90de52f89bbe6267e5620a412c7f7ff7e42" @@ -10967,7 +10214,7 @@ core-js@3.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== -core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: +core-js@^2.4.0, core-js@^2.4.1: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== @@ -11093,14 +10340,6 @@ cross-fetch@3.0.4: node-fetch "2.6.0" whatwg-fetch "3.0.0" -cross-fetch@^2.1.0, cross-fetch@^2.1.1: - version "2.2.6" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a" - integrity sha512-9JZz+vXCmfKUZ68zAptS7k4Nu8e2qcibe7WVZYps7sAgk5R8GYTc+T1WR0v1rlP9HxgARmOX1UTIJZFytajpNA== - dependencies: - node-fetch "^2.6.7" - whatwg-fetch "^2.0.4" - cross-fetch@^3.0.6, cross-fetch@^3.1.4, cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" @@ -11116,7 +10355,7 @@ cross-spawn@^4.0.2: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1, cross-spawn@^5.1.0: +cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A== @@ -11336,7 +10575,7 @@ debounce-fn@^4.0.0: dependencies: mimic-fn "^3.0.0" -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -11539,18 +10778,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - -default-resolution@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684" - integrity sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ== - defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -11706,18 +10933,6 @@ detect-file@^0.1.0: dependencies: fs-exists-sync "^0.1.0" -detect-file@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" - integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q== - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== - dependencies: - repeating "^2.0.0" - detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" @@ -11858,6 +11073,11 @@ dir-to-object@^2.0.0: resolved "https://registry.yarnpkg.com/dir-to-object/-/dir-to-object-2.0.0.tgz#29723e9bd1c3e58e4f307bd04ff634c0370c8f8a" integrity sha512-sXs0JKIhymON7T1UZuO2Ud6VTNAx/VTBXIl4+3mjb2RgfOpt+hectX0x04YqPOPdkeOAKoJuKqwqnXXURNPNEA== +dirty-chai@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/dirty-chai/-/dirty-chai-2.0.1.tgz#6b2162ef17f7943589da840abc96e75bda01aff3" + integrity sha512-ys79pWKvDMowIDEPC6Fig8d5THiC0DJ2gmTeGzVAoEH18J8OzLud0Jh7I9IWg3NSk8x2UocznUuFmfHCXYZx9w== + doctrine@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523" @@ -12043,14 +11263,6 @@ duplexify@^4.0.0, duplexify@^4.1.1: readable-stream "^3.1.1" stream-shift "^1.0.0" -each-props@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333" - integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA== - dependencies: - is-plain-object "^2.0.1" - object.defaults "^1.1.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -12079,7 +11291,7 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.202: +electron-to-chromium@^1.4.202: version "1.4.243" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz#9d5f1b10eafd6e434b687a88f1e7b0441dee168a" integrity sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw== @@ -12157,17 +11369,6 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -encoding-down@5.0.4, encoding-down@~5.0.0: - version "5.0.4" - resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-5.0.4.tgz#1e477da8e9e9d0f7c8293d320044f8b2cd8e9614" - integrity sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw== - dependencies: - abstract-leveldown "^5.0.0" - inherits "^2.0.3" - level-codec "^9.0.0" - level-errors "^2.0.0" - xtend "^4.0.1" - encoding-down@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-6.3.0.tgz#b1c4eb0e1728c146ecaef8e32963c549e76d082b" @@ -12178,6 +11379,17 @@ encoding-down@^6.3.0: level-codec "^9.0.0" level-errors "^2.0.0" +encoding-down@~5.0.0: + version "5.0.4" + resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-5.0.4.tgz#1e477da8e9e9d0f7c8293d320044f8b2cd8e9614" + integrity sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw== + dependencies: + abstract-leveldown "^5.0.0" + inherits "^2.0.3" + level-codec "^9.0.0" + level-errors "^2.0.0" + xtend "^4.0.1" + encoding@^0.1.11, encoding@^0.1.12, encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" @@ -12331,7 +11543,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@ es6-symbol "^3.1.3" next-tick "^1.1.0" -es6-iterator@^2.0.1, es6-iterator@^2.0.3: +es6-iterator@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g== @@ -12360,7 +11572,7 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3: d "^1.0.1" ext "^1.1.2" -es6-weak-map@^2.0.1, es6-weak-map@^2.0.3: +es6-weak-map@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53" integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA== @@ -12578,19 +11790,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -eth-block-tracker@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-3.0.1.tgz#95cd5e763c7293e0b1b2790a2a39ac2ac188a5e1" - integrity sha512-WUVxWLuhMmsfenfZvFO5sbl1qFY2IqUlw/FPVmjjdElpqLsZtSG+wPe9Dz7W/sB6e80HgFKknOmKk2eNlznHug== - dependencies: - eth-query "^2.1.0" - ethereumjs-tx "^1.3.3" - ethereumjs-util "^5.1.3" - ethjs-util "^0.1.3" - json-rpc-engine "^3.6.0" - pify "^2.3.0" - tape "^4.6.3" - eth-block-tracker@^4.4.2: version "4.4.3" resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-4.4.3.tgz#766a0a0eb4a52c867a28328e9ae21353812cf626" @@ -12603,6 +11802,15 @@ eth-block-tracker@^4.4.2: pify "^3.0.0" safe-event-emitter "^1.0.1" +eth-block-tracker@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-5.0.1.tgz#c5ad39902bd0454223b601ec0874f9fcc9f30eed" + integrity sha512-NVs+JDSux0FdmOrl3A2YDcQFkkYf9/qW9irvPmtC7bhMoPAe6oBlaqqe/m9Ixh5rkKqAox4mEyWGpsFmf/IsNw== + dependencies: + "@metamask/safe-event-emitter" "^2.0.0" + json-rpc-random-id "^1.0.1" + pify "^3.0.0" + eth-ens-namehash@2.0.8, eth-ens-namehash@^2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf" @@ -12632,21 +11840,7 @@ eth-gas-reporter@^0.2.16: sha1 "^1.1.1" sync-request "^6.0.0" -eth-json-rpc-errors@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/eth-json-rpc-errors/-/eth-json-rpc-errors-1.1.1.tgz#148377ef55155585981c21ff574a8937f9d6991f" - integrity sha512-WT5shJ5KfNqHi9jOZD+ID8I1kuYWNrigtZat7GOQkvwo99f8SzAVaEcWhJUv656WiZOAg3P1RiJQANtUmDmbIg== - dependencies: - fast-safe-stringify "^2.0.6" - -eth-json-rpc-errors@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/eth-json-rpc-errors/-/eth-json-rpc-errors-2.0.2.tgz#c1965de0301fe941c058e928bebaba2e1285e3c4" - integrity sha512-uBCRM2w2ewusRHGxN8JhcuOb2RN3ueAOYH/0BhqdFmQkZx5lj5+fLKTz0mIVOzd4FG5/kUksCzCD7eTEim6gaA== - dependencies: - fast-safe-stringify "^2.0.6" - -eth-json-rpc-filters@^4.1.1: +eth-json-rpc-filters@^4.2.1: version "4.2.2" resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz#eb35e1dfe9357ace8a8908e7daee80b2cd60a10d" integrity sha512-DGtqpLU7bBg63wPMWg1sCpkKCf57dJ+hj/k3zF26anXMzkmtSBDExL8IhUu7LUd34f0Zsce3PYNO2vV2GaTzaw== @@ -12658,65 +11852,16 @@ eth-json-rpc-filters@^4.1.1: json-rpc-engine "^6.1.0" pify "^5.0.0" -eth-json-rpc-infura@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz#26702a821067862b72d979c016fd611502c6057f" - integrity sha512-W7zR4DZvyTn23Bxc0EWsq4XGDdD63+XPUCEhV2zQvQGavDVC4ZpFDK4k99qN7bd7/fjj37+rxmuBOBeIqCA5Mw== - dependencies: - cross-fetch "^2.1.1" - eth-json-rpc-middleware "^1.5.0" - json-rpc-engine "^3.4.0" - json-rpc-error "^2.0.0" - -eth-json-rpc-infura@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-4.1.0.tgz#623478375ba65e4304dea529ed69e8bd7938270d" - integrity sha512-DFYitKovzVlCdUulEccdm4g6k/vnvyByuw7rd5OoWDBSIiaeinI8Z/SntLjSIs2c+YvE20DGwk/GLwZGCWDN1Q== +eth-json-rpc-infura@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-5.1.0.tgz#e6da7dc47402ce64c54e7018170d89433c4e8fb6" + integrity sha512-THzLye3PHUSGn1EXMhg6WTLW9uim7LQZKeKaeYsS9+wOBcamRiCQVGHa6D2/4P0oS0vSaxsBnU/J6qvn0MPdow== dependencies: - eth-json-rpc-middleware "^4.4.0" + eth-json-rpc-middleware "^6.0.0" eth-rpc-errors "^3.0.0" - json-rpc-engine "^5.1.3" + json-rpc-engine "^5.3.0" node-fetch "^2.6.0" -eth-json-rpc-middleware@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.6.0.tgz#5c9d4c28f745ccb01630f0300ba945f4bef9593f" - integrity sha512-tDVCTlrUvdqHKqivYMjtFZsdD7TtpNLBCfKAcOpaVs7orBMS/A8HWro6dIzNtTZIR05FAbJ3bioFOnZpuCew9Q== - dependencies: - async "^2.5.0" - eth-query "^2.1.2" - eth-tx-summary "^3.1.2" - ethereumjs-block "^1.6.0" - ethereumjs-tx "^1.3.3" - ethereumjs-util "^5.1.2" - ethereumjs-vm "^2.1.0" - fetch-ponyfill "^4.0.0" - json-rpc-engine "^3.6.0" - json-rpc-error "^2.0.0" - json-stable-stringify "^1.0.1" - promise-to-callback "^1.0.0" - tape "^4.6.3" - -eth-json-rpc-middleware@^4.1.5, eth-json-rpc-middleware@^4.4.0: - version "4.4.1" - resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-4.4.1.tgz#07d3dd0724c24a8d31e4a172ee96271da71b4228" - integrity sha512-yoSuRgEYYGFdVeZg3poWOwAlRI+MoBIltmOB86MtpoZjvLbou9EB/qWMOWSmH2ryCWLW97VYY6NWsmWm3OAA7A== - dependencies: - btoa "^1.2.1" - clone "^2.1.1" - eth-json-rpc-errors "^1.0.1" - eth-query "^2.1.2" - eth-sig-util "^1.4.2" - ethereumjs-block "^1.6.0" - ethereumjs-tx "^1.3.7" - ethereumjs-util "^5.1.2" - ethereumjs-vm "^2.6.0" - fetch-ponyfill "^4.0.0" - json-rpc-engine "^5.1.3" - json-stable-stringify "^1.0.1" - pify "^3.0.0" - safe-event-emitter "^1.0.1" - eth-json-rpc-middleware@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-6.0.0.tgz#4fe16928b34231a2537856f08a5ebbc3d0c31175" @@ -12764,7 +11909,7 @@ eth-lib@^0.1.26: ws "^3.0.0" xhr-request-promise "^0.1.2" -eth-query@^2.0.2, eth-query@^2.1.0, eth-query@^2.1.2: +eth-query@^2.1.0, eth-query@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.2.tgz#d6741d9000106b51510c72db92d6365456a6da5e" integrity sha512-srES0ZcvwkR/wd5OQBRA1bIJMww1skfGS0s8wlwK3/oNP4+wnds60krvu5R1QbpRQjMmpG5OMIWro5s7gvDPsA== @@ -12786,18 +11931,6 @@ eth-rpc-errors@^4.0.2: dependencies: fast-safe-stringify "^2.0.6" -eth-sig-util@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-2.3.0.tgz#c54a6ac8e8796f7e25f59cf436982a930e645231" - integrity sha512-ugD1AvaggvKaZDgnS19W5qOfepjGc7qHrt7TrAaL54gJw9SHvgIXJ3r2xOMW30RWJZNP+1GlTOy5oye7yXA4xA== - dependencies: - buffer "^5.2.1" - elliptic "^6.4.0" - ethereumjs-abi "0.6.5" - ethereumjs-util "^5.1.1" - tweetnacl "^1.0.0" - tweetnacl-util "^0.15.0" - eth-sig-util@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.2.tgz#8d958202c7edbaae839707fba6f09ff327606210" @@ -12806,22 +11939,6 @@ eth-sig-util@^1.4.2: ethereumjs-abi "git+https://github.com/ethereumjs/ethereumjs-abi.git" ethereumjs-util "^5.1.1" -eth-tx-summary@^3.1.2: - version "3.2.4" - resolved "https://registry.yarnpkg.com/eth-tx-summary/-/eth-tx-summary-3.2.4.tgz#e10eb95eb57cdfe549bf29f97f1e4f1db679035c" - integrity sha512-NtlDnaVZah146Rm8HMRUNMgIwG/ED4jiqk0TME9zFheMl1jOp6jL1m0NKGjJwehXQ6ZKCPr16MTr+qspKpEXNg== - dependencies: - async "^2.1.2" - clone "^2.0.0" - concat-stream "^1.5.1" - end-of-stream "^1.1.0" - eth-query "^2.0.2" - ethereumjs-block "^1.4.1" - ethereumjs-tx "^1.1.1" - ethereumjs-util "^5.0.1" - ethereumjs-vm "^2.6.0" - through2 "^2.0.3" - ethashjs@~0.0.7: version "0.0.8" resolved "https://registry.yarnpkg.com/ethashjs/-/ethashjs-0.0.8.tgz#227442f1bdee409a548fb04136e24c874f3aa6f9" @@ -12849,6 +11966,16 @@ ethereum-common@^0.0.18: resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f" integrity sha512-EoltVQTRNg2Uy4o84qpa2aXymXDJhxm7eos/ACOg0DG4baAbMjhbdAEsx9GeE8sC3XCxnYvrrzZDH8D8MtA2iQ== +ethereum-cryptography@1.2.0, ethereum-cryptography@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz#5ccfa183e85fdaf9f9b299a79430c044268c9b3a" + integrity sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw== + dependencies: + "@noble/hashes" "1.2.0" + "@noble/secp256k1" "1.7.1" + "@scure/bip32" "1.1.5" + "@scure/bip39" "1.1.1" + ethereum-cryptography@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz#8d6143cfc3d74bf79bbd8edecdf29e4ae20dd191" @@ -12880,39 +12007,13 @@ ethereum-cryptography@^1.0.3: "@scure/bip32" "1.1.0" "@scure/bip39" "1.1.0" -ethereum-cryptography@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz#5ccfa183e85fdaf9f9b299a79430c044268c9b3a" - integrity sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw== - dependencies: - "@noble/hashes" "1.2.0" - "@noble/secp256k1" "1.7.1" - "@scure/bip32" "1.1.5" - "@scure/bip39" "1.1.1" - -ethereum-types@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-2.1.6.tgz#57d9d515fad86ab987c0f6962c4203be37da8579" - integrity sha512-xaN5TxLvkdFCGjGfUQ5wV00GHzDHStozP1j+K/YdmUeQXVGiD15cogYPhBVWG3pQJM/aBjtYrpMrjywvKkNC4A== - dependencies: - "@types/node" "*" - bignumber.js "~8.0.2" - -ethereumjs-abi@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz#5a637ef16ab43473fa72a29ad90871405b3f5241" - integrity sha512-rCjJZ/AE96c/AAZc6O3kaog4FhOsAViaysBxqJNy2+LHP0ttH0zkZ7nXdVHOAyt6lFwLO0nlCwWszysG/ao1+g== - dependencies: - bn.js "^4.10.0" - ethereumjs-util "^4.3.0" - -ethereumjs-abi@0.6.7: - version "0.6.7" - resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.7.tgz#d1d1c5cdb8d910a7d97645ba9e93be5d153bba2e" - integrity sha512-EMLOA8ICO5yAaXDhjVEfYjsJIXYutY8ufTE93eEKwsVtp2usQreKwsDTJ9zvam3omYqNuffr8IONIqb2uUslGQ== +ethereum-types@^3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-3.7.1.tgz#8fa75e5d9f5da3c85535ea0d4bcd2614b1d650a8" + integrity sha512-EBQwTGnGZQ9oHK7Za3DFEOxiElksRCoZECkk418vHiE2d59lLSejDZ1hzRVphtFjAu5YqONz4/XuAYdMBg+gWA== dependencies: - bn.js "^4.11.8" - ethereumjs-util "^6.0.0" + "@types/node" "12.12.54" + bignumber.js "~9.0.2" ethereumjs-abi@^0.6.8, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": version "0.6.8" @@ -12921,15 +12022,6 @@ ethereumjs-abi@^0.6.8, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereu bn.js "^4.11.8" ethereumjs-util "^6.0.0" -ethereumjs-account@3.0.0, ethereumjs-account@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ethereumjs-account/-/ethereumjs-account-3.0.0.tgz#728f060c8e0c6e87f1e987f751d3da25422570a9" - integrity sha512-WP6BdscjiiPkQfF9PVfMcwx/rDvfZTjFKY0Uwc09zSQr9JfIVH87dYIJu0gNhBhpmovV4yq295fdllS925fnBA== - dependencies: - ethereumjs-util "^6.0.0" - rlp "^2.2.1" - safe-buffer "^5.1.1" - ethereumjs-account@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz#eeafc62de544cb07b0ee44b10f572c9c49e00a84" @@ -12939,18 +12031,16 @@ ethereumjs-account@^2.0.3: rlp "^2.0.0" safe-buffer "^5.1.1" -ethereumjs-block@2.2.2, ethereumjs-block@^2.2.2, ethereumjs-block@~2.2.0, ethereumjs-block@~2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz#c7654be7e22df489fda206139ecd63e2e9c04965" - integrity sha512-2p49ifhek3h2zeg/+da6XpdFR3GlqY3BIEiqxGF8j9aSRIgkb7M1Ky+yULBKJOu8PAZxfhsYA+HxUk2aCQp3vg== +ethereumjs-account@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ethereumjs-account/-/ethereumjs-account-3.0.0.tgz#728f060c8e0c6e87f1e987f751d3da25422570a9" + integrity sha512-WP6BdscjiiPkQfF9PVfMcwx/rDvfZTjFKY0Uwc09zSQr9JfIVH87dYIJu0gNhBhpmovV4yq295fdllS925fnBA== dependencies: - async "^2.0.1" - ethereumjs-common "^1.5.0" - ethereumjs-tx "^2.1.1" - ethereumjs-util "^5.0.0" - merkle-patricia-tree "^2.1.2" + ethereumjs-util "^6.0.0" + rlp "^2.2.1" + safe-buffer "^5.1.1" -ethereumjs-block@^1.2.2, ethereumjs-block@^1.4.1, ethereumjs-block@^1.6.0: +ethereumjs-block@^1.2.2: version "1.7.1" resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz#78b88e6cc56de29a6b4884ee75379b6860333c3f" integrity sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg== @@ -12961,6 +12051,17 @@ ethereumjs-block@^1.2.2, ethereumjs-block@^1.4.1, ethereumjs-block@^1.6.0: ethereumjs-util "^5.0.0" merkle-patricia-tree "^2.1.2" +ethereumjs-block@^2.2.2, ethereumjs-block@~2.2.0, ethereumjs-block@~2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz#c7654be7e22df489fda206139ecd63e2e9c04965" + integrity sha512-2p49ifhek3h2zeg/+da6XpdFR3GlqY3BIEiqxGF8j9aSRIgkb7M1Ky+yULBKJOu8PAZxfhsYA+HxUk2aCQp3vg== + dependencies: + async "^2.0.1" + ethereumjs-common "^1.5.0" + ethereumjs-tx "^2.1.1" + ethereumjs-util "^5.0.0" + merkle-patricia-tree "^2.1.2" + ethereumjs-blockchain@^4.0.3: version "4.0.4" resolved "https://registry.yarnpkg.com/ethereumjs-blockchain/-/ethereumjs-blockchain-4.0.4.tgz#30f2228dc35f6dcf94423692a6902604ae34960f" @@ -12977,25 +12078,12 @@ ethereumjs-blockchain@^4.0.3: rlp "^2.2.2" semaphore "^1.1.0" -ethereumjs-common@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.5.0.tgz#d3e82fc7c47c0cef95047f431a99485abc9bb1cd" - integrity sha512-SZOjgK1356hIY7MRj3/ma5qtfr/4B5BL+G4rP/XSMYr2z1H5el4RX5GReYCKmQmYI/nSBmRnwrZ17IfHuG0viQ== - ethereumjs-common@^1.1.0, ethereumjs-common@^1.3.2, ethereumjs-common@^1.5.0: version "1.5.2" resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz#2065dbe9214e850f2e955a80e650cb6999066979" integrity sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA== -ethereumjs-tx@2.1.2, ethereumjs-tx@^2.1.1, ethereumjs-tx@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz#5dfe7688bf177b45c9a23f86cf9104d47ea35fed" - integrity sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw== - dependencies: - ethereumjs-common "^1.5.0" - ethereumjs-util "^6.0.0" - -ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.3, ethereumjs-tx@^1.3.5, ethereumjs-tx@^1.3.7: +ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2: version "1.3.7" resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz#88323a2d875b10549b8347e09f4862b546f3d89a" integrity sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA== @@ -13003,18 +12091,13 @@ ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@ ethereum-common "^0.0.18" ethereumjs-util "^5.0.0" -ethereumjs-util@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.0.tgz#23ec79b2488a7d041242f01e25f24e5ad0357960" - integrity sha512-vb0XN9J2QGdZGIEKG2vXM+kUdEivUfU6Wmi5y0cg+LRhDYKnXIZ/Lz7XjFbHRR9VIKq2lVGLzGBkA++y2nOdOQ== +ethereumjs-tx@^2.1.1, ethereumjs-tx@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz#5dfe7688bf177b45c9a23f86cf9104d47ea35fed" + integrity sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw== dependencies: - "@types/bn.js" "^4.11.3" - bn.js "^4.11.0" - create-hash "^1.1.2" - ethjs-util "0.1.6" - keccak "^2.0.0" - rlp "^2.2.3" - secp256k1 "^3.0.1" + ethereumjs-common "^1.5.0" + ethereumjs-util "^6.0.0" ethereumjs-util@7.1.5, ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: version "7.1.5" @@ -13027,18 +12110,7 @@ ethereumjs-util@7.1.5, ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereum ethereum-cryptography "^0.1.3" rlp "^2.2.4" -ethereumjs-util@^4.3.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.1.tgz#f4bf9b3b515a484e3cc8781d61d9d980f7c83bd0" - integrity sha512-WrckOZ7uBnei4+AKimpuF1B3Fv25OmoRgmYCpGsP7u8PFxXAmAgiJSYT2kRWnt6fVIlKaQlZvuwXp7PIrmn3/w== - dependencies: - bn.js "^4.8.0" - create-hash "^1.1.2" - elliptic "^6.5.2" - ethereum-cryptography "^0.1.3" - rlp "^2.0.0" - -ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5, ethereumjs-util@^5.2.0: +ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.5, ethereumjs-util@^5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz#a833f0e5fca7e5b361384dc76301a721f537bf65" integrity sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ== @@ -13085,7 +12157,7 @@ ethereumjs-vm@4.1.3: safe-buffer "^5.1.1" util.promisify "^1.0.0" -ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4, ethereumjs-vm@^2.6.0: +ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.3.4: version "2.6.0" resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz#76243ed8de031b408793ac33907fb3407fe400c6" integrity sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw== @@ -13102,41 +12174,6 @@ ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4, ethereumjs-vm@ rustbn.js "~0.2.0" safe-buffer "^5.1.1" -"ethereumjs-vm@git+https://github.com/celo-org/celo-monorepo.git#ethereumjs-vm-v4.1.3-celo3-gitpkg": - version "4.1.3-celo3" - resolved "git+https://github.com/celo-org/celo-monorepo.git#886e684bcfd05c8299cfdba0c3f8411e1d5cf8c6" - dependencies: - async "^2.1.2" - async-eventemitter "^0.2.2" - core-js-pure "^3.0.1" - ethereumjs-account "^3.0.0" - ethereumjs-block "^2.2.2" - ethereumjs-blockchain "^4.0.3" - ethereumjs-common "^1.5.0" - ethereumjs-tx "^2.1.2" - ethereumjs-util "^6.2.0" - fake-merkle-patricia-tree "^1.0.1" - functional-red-black-tree "^1.0.1" - merkle-patricia-tree "^2.3.2" - rustbn.js "~0.2.0" - safe-buffer "^5.1.1" - util.promisify "^1.0.0" - -ethereumjs-wallet@0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.4.tgz#67dd013dd839e69a8eb9a8f78cacfc9bff307167" - integrity sha512-xAYLWVH/MA9Ds1+BiDTfdRrCBQIz7r70EJSjuBnvw/x40qJ1jBoBBAp8/l+I9VPGAsUXvHTfcnp2OZ9LbcTs/g== - dependencies: - aes-js "^3.1.1" - bs58check "^2.1.2" - ethereumjs-util "^6.0.0" - hdkey "^1.1.1" - randombytes "^2.0.6" - safe-buffer "^5.1.2" - scryptsy "^1.2.1" - utf8 "^3.0.0" - uuid "^3.3.2" - ethereumjs-wallet@^0.6.0, ethereumjs-wallet@^0.6.3: version "0.6.5" resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.5.tgz#685e9091645cee230ad125c007658833991ed474" @@ -13233,7 +12270,7 @@ ethers@^5.0.13: "@ethersproject/web" "5.7.0" "@ethersproject/wordlists" "5.7.0" -ethers@^5.7.1: +ethers@^5.2.0, ethers@^5.7.1: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -13379,19 +12416,6 @@ execa@^0.10.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw== - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -13797,11 +12821,6 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-sta resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9" - integrity sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw== - fast-levenshtein@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz#37b899ae47e1090e40e3fd2318e4d5f0142ca912" @@ -13949,13 +12968,6 @@ fetch-mock@^9.11.0: querystring "^0.2.0" whatwg-url "^6.5.0" -fetch-ponyfill@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz#ae3ce5f732c645eab87e4ae8793414709b239893" - integrity sha512-knK9sGskIg2T7OnYLdZ2hZXn0CtDrAIBxYQLpmEf0BqfdWnwmM1weccUl5+4EdA44tzNSFAuxITPbXtPehUB3g== - dependencies: - node-fetch "~1.7.1" - figures@3.2.0, figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -14146,37 +13158,6 @@ findup-sync@^1.0.0: micromatch "^2.3.7" resolve-dir "^0.1.0" -findup-sync@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" - integrity sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g== - dependencies: - detect-file "^1.0.0" - is-glob "^3.1.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" - -findup-sync@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" - integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" - -fined@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" - integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== - dependencies: - expand-tilde "^2.0.2" - is-plain-object "^2.0.3" - object.defaults "^1.1.0" - object.pick "^1.2.0" - parse-filepath "^1.0.1" - firebase-admin@^9.12.0: version "9.12.0" resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.12.0.tgz#d7e889e97c9c31610efbcd131bb6d06a783af757" @@ -14297,11 +13278,6 @@ firebase@^7.2.2: "@firebase/storage" "0.3.43" "@firebase/util" "0.3.2" -flagged-respawn@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" - integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== - flat-arguments@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/flat-arguments/-/flat-arguments-1.0.2.tgz#9baa780adf0501f282d726c9c6a038dba44ea76f" @@ -14343,14 +13319,6 @@ flow-stoplight@^1.0.0: resolved "https://registry.yarnpkg.com/flow-stoplight/-/flow-stoplight-1.0.0.tgz#4a292c5bcff8b39fa6cc0cb1a853d86f27eeff7b" integrity sha512-rDjbZUKpN8OYhB0IE/vY/I8UWO/602IIJEU/76Tv4LvYnwHCk0BCsvz4eRr9n+FQcri7L5cyaXOo0+/Kh4HisA== -flush-write-stream@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" - integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== - dependencies: - inherits "^2.0.3" - readable-stream "^2.3.6" - fn.name@1.x.x: version "1.1.0" resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" @@ -14397,13 +13365,6 @@ for-own@^0.1.3, for-own@^0.1.4: dependencies: for-in "^1.0.1" -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg== - dependencies: - for-in "^1.0.1" - foreach@^2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.6.tgz#87bcc8a1a0e74000ff2bf9802110708cfb02eb6e" @@ -14605,14 +13566,6 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0: dependencies: minipass "^3.0.0" -fs-mkdirp-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" - integrity sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ== - dependencies: - graceful-fs "^4.1.11" - through2 "^2.0.3" - fs-readdir-recursive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" @@ -14689,41 +13642,7 @@ funpermaproxy@^1.0.1: resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== -ganache-core@^2.6.0: - version "2.10.3" - resolved "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" - dependencies: - "@celo/utils" "1.5.1" - abstract-leveldown "3.0.0" - async "2.6.2" - bip39 "2.5.0" - cachedown "1.0.0" - clone "2.1.2" - debug "3.2.6" - encoding-down "5.0.4" - eth-sig-util "2.3.0" - ethereumjs-abi "0.6.7" - ethereumjs-account "3.0.0" - ethereumjs-block "2.2.2" - ethereumjs-common "1.5.0" - ethereumjs-tx "2.1.2" - ethereumjs-util "6.2.0" - ethereumjs-vm "git+https://github.com/celo-org/celo-monorepo.git#ethereumjs-vm-v4.1.3-celo3-gitpkg" - heap "0.2.6" - level-sublevel "6.6.4" - levelup "3.1.1" - lodash "4.17.14" - merkle-patricia-tree "2.3.2" - seedrandom "3.0.1" - source-map-support "0.5.12" - tmp "0.1.0" - web3-provider-engine "14.2.1" - websocket "1.0.29" - optionalDependencies: - ethereumjs-wallet "0.6.4" - web3 "1.2.4" - -ganache@7.7.3, "ganache@npm:@soloseng/ganache@7.7.5-beta.3": +ganache@7.7.3, ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.7.5-beta.3": version "7.7.5-beta.3" resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.7.5-beta.3.tgz#078e3c685c0b97a5b8d11c8c9892e082d2d76a9a" integrity sha512-IwopVN98CdRDRNPFTUe38DZgPWswfmdspNNh/ZmM9G1nSc+v50KUK5UFGIjPxZMCZs8mnHGL0kKK4JQq/Ivz/w== @@ -15169,22 +14088,6 @@ glob-slasher@^1.0.1: lodash.isobject "^2.4.1" toxic "^1.0.0" -glob-stream@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" - integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw== - dependencies: - extend "^3.0.0" - glob "^7.1.1" - glob-parent "^3.1.0" - is-negated-glob "^1.0.0" - ordered-read-streams "^1.0.0" - pumpify "^1.3.5" - readable-stream "^2.1.5" - remove-trailing-separator "^1.0.1" - to-absolute-glob "^2.0.0" - unique-stream "^2.0.2" - glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" @@ -15195,19 +14098,6 @@ glob-to-regexp@^0.4.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob-watcher@^5.0.3: - version "5.0.5" - resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc" - integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw== - dependencies: - anymatch "^2.0.0" - async-done "^1.2.0" - chokidar "^2.0.0" - is-negated-glob "^1.0.0" - just-debounce "^1.0.0" - normalize-path "^3.0.0" - object.defaults "^1.1.0" - glob@7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" @@ -15378,11 +14268,6 @@ globals@^11.1.0, globals@^11.7.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - globby@^10.0.1: version "10.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" @@ -15422,13 +14307,6 @@ globby@^8: pify "^3.0.0" slash "^1.0.0" -glogg@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" - integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA== - dependencies: - sparkles "^1.0.0" - google-auth-library@^3.0.0, google-auth-library@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-3.1.2.tgz#ff2f88cd5cd2118a57bd3d5ad3c093c8837fc350" @@ -15637,7 +14515,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -15716,47 +14594,6 @@ gtoken@^5.0.4: google-p12-pem "^3.1.3" jws "^4.0.0" -gulp-cli@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f" - integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A== - dependencies: - ansi-colors "^1.0.1" - archy "^1.0.0" - array-sort "^1.0.0" - color-support "^1.1.3" - concat-stream "^1.6.0" - copy-props "^2.0.1" - fancy-log "^1.3.2" - gulplog "^1.0.0" - interpret "^1.4.0" - isobject "^3.0.1" - liftoff "^3.1.0" - matchdep "^2.0.0" - mute-stdout "^1.0.0" - pretty-hrtime "^1.0.0" - replace-homedir "^1.0.0" - semver-greatest-satisfied-range "^1.1.0" - v8flags "^3.2.0" - yargs "^7.1.0" - -gulp@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa" - integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA== - dependencies: - glob-watcher "^5.0.3" - gulp-cli "^2.2.0" - undertaker "^1.2.1" - vinyl-fs "^3.0.0" - -gulplog@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" - integrity sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw== - dependencies: - glogg "^1.0.0" - handlebars@^4.0.1, handlebars@^4.7.6, handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" @@ -15936,15 +14773,6 @@ hdkey@^0.7.1: coinstring "^2.0.0" secp256k1 "^3.0.1" -hdkey@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-1.1.2.tgz#c60f9cf6f90fbf24a8a52ea06893f36a0108cd3e" - integrity sha512-PTQ4VKu0oRnCrYfLp04iQZ7T2Cxz0UsEXYauk2j8eh6PJXCpbXuCFhOmtIFtbET0i3PMWmHN9J11gU8LEgUljQ== - dependencies: - bs58check "^2.1.2" - safe-buffer "^5.1.1" - secp256k1 "^3.0.1" - he@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" @@ -15963,11 +14791,6 @@ header-case@^1.0.0: no-case "^2.2.0" upper-case "^1.1.3" -heap@0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.6.tgz#087e1f10b046932fc8594dd9e6d378afc9d1e5ac" - integrity sha512-MzzWcnfB1e4EG2vHi3dXHoBupmuXNZzx6pY6HldVS55JKKBoq3xOyzfSaZRkJp37HIhEYC78knabHff3zc4dQQ== - hermes-engine@~0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.5.1.tgz#601115e4b1e0a17d9aa91243b96277de4e926e09" @@ -16014,14 +14837,6 @@ home-dir@^1.0.0: resolved "https://registry.yarnpkg.com/home-dir/-/home-dir-1.0.0.tgz#2917eb44bdc9072ceda942579543847e3017fe4e" integrity sha512-PPAP0BMY72XQ0sYwFow8EgHwUYfptkZusnZEGHkBjdKRXIYcVFsbEViqU4k8VrJWf0m7wMr9gscQX9klJYh7zg== -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -16532,7 +15347,7 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" -interpret@^1.0.0, interpret@^1.4.0: +interpret@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== @@ -16542,7 +15357,7 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -invariant@^2.2.2, invariant@^2.2.4: +invariant@2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -16597,14 +15412,6 @@ is-absolute@^0.2.2: is-relative "^0.2.1" is-windows "^0.2.0" -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -16649,13 +15456,6 @@ is-bigint@^1.0.1: dependencies: has-bigints "^1.0.1" -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q== - dependencies: - binary-extensions "^1.0.0" - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -16790,11 +15590,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-finite@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" - integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== - is-fn@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fn/-/is-fn-1.0.0.tgz#9543d5de7bcf5b08a22ec8a20bae6e286d510d8c" @@ -16908,11 +15703,6 @@ is-natural-number@^4.0.1: resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ== -is-negated-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" - integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug== - is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" @@ -16989,7 +15779,7 @@ is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -17041,13 +15831,6 @@ is-relative@^0.2.1: dependencies: is-unc-path "^0.1.1" -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== - dependencies: - is-unc-path "^1.0.0" - is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" @@ -17141,13 +15924,6 @@ is-unc-path@^0.1.1: dependencies: unc-path-regex "^0.1.0" -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== - dependencies: - unc-path-regex "^0.1.2" - is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" @@ -17165,16 +15941,11 @@ is-url@^1.2.2, is-url@^1.2.4: resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== -is-utf8@^0.2.0, is-utf8@^0.2.1: +is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== -is-valid-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" - integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA== - is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -17260,13 +16031,21 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.0, isomorphic-fetch@^2.2.1: +isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.0, isomorphic-fetch@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" integrity sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA== dependencies: - node-fetch "^1.0.1" - whatwg-fetch ">=0.10.0" + node-fetch "^1.0.1" + whatwg-fetch ">=0.10.0" + +isomorphic-fetch@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4" + integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA== + dependencies: + node-fetch "^2.6.1" + whatwg-fetch "^3.4.1" isomorphic-ws@^4.0.1: version "4.0.1" @@ -18305,7 +17084,7 @@ jest-worker@^29.1.2: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@26.6.3, jest@^26.6.3: +jest@26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== @@ -18380,11 +17159,6 @@ js-sha3@^0.7.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== - js-yaml@3.13.1: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" @@ -18456,11 +17230,6 @@ jsdom@^16.4.0: ws "^7.4.6" xml-name-validator "^3.0.0" -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -18526,19 +17295,7 @@ json-ptr@^2.2.0: dependencies: tslib "^2.2.0" -json-rpc-engine@^3.4.0, json-rpc-engine@^3.6.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz#9d4ff447241792e1d0a232f6ef927302bb0c62a9" - integrity sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA== - dependencies: - async "^2.0.1" - babel-preset-env "^1.7.0" - babelify "^7.3.0" - json-rpc-error "^2.0.0" - promise-to-callback "^1.0.0" - safe-event-emitter "^1.0.1" - -json-rpc-engine@^5.1.3, json-rpc-engine@^5.3.0: +json-rpc-engine@^5.3.0: version "5.4.0" resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.4.0.tgz#75758609d849e1dba1e09021ae473f3ab63161e5" integrity sha512-rAffKbPoNDjuRnXkecTjnsE3xLLrb00rEkdgalINhaYVYIxDwWtvYBr9UFbhTvPB1B2qUOLoFd/cV6f4Q7mh7g== @@ -18554,7 +17311,7 @@ json-rpc-engine@^6.1.0: "@metamask/safe-event-emitter" "^2.0.0" eth-rpc-errors "^4.0.2" -json-rpc-error@2.0.0, json-rpc-error@^2.0.0: +json-rpc-error@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/json-rpc-error/-/json-rpc-error-2.0.0.tgz#a7af9c202838b5e905c7250e547f1aff77258a02" integrity sha512-EwUeWP+KgAZ/xqFpaP6YDAXMtCJi+o/QQpCQFIYyxr01AdADi2y413eM8hSqJcoQym9WMePAJWoaODEJufC4Ug== @@ -18623,11 +17380,6 @@ json-to-ast@^2.0.3: code-error-fragment "0.0.230" grapheme-splitter "^1.0.4" -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw== - json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -18683,11 +17435,6 @@ jsonpointer@^5.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== -jsonschema@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" - integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== - jsonwebtoken@^8.3.0, jsonwebtoken@^8.5.1: version "8.5.1" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" @@ -18714,11 +17461,6 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" -just-debounce@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf" - integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ== - just-diff-apply@^5.2.0: version "5.4.1" resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b" @@ -18811,16 +17553,6 @@ keccak@^1.0.2: nan "^2.2.1" safe-buffer "^5.1.0" -keccak@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-2.1.0.tgz#734ea53f2edcfd0f42cdb8d5f4c358fef052752b" - integrity sha512-m1wbJRTo+gWbctZWay9i26v5fFnYkOn7D5PCxJ3fZUGUEb49dE1Pm4BREUYCt/aoO6di7jeoGmhvqN9Nzylm3Q== - dependencies: - bindings "^1.5.0" - inherits "^2.0.4" - nan "^2.14.0" - safe-buffer "^5.2.0" - keytar@^7.3.0: version "7.9.0" resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" @@ -18869,7 +17601,7 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== @@ -18928,14 +17660,6 @@ kuler@^2.0.0: resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== -last-run@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b" - integrity sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ== - dependencies: - default-resolution "^2.0.0" - es6-weak-map "^2.0.1" - latest-version@^5.0.0, latest-version@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" @@ -18981,13 +17705,6 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" -lead@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" - integrity sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow== - dependencies: - flush-write-stream "^1.0.2" - lerna@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/lerna/-/lerna-5.5.0.tgz#94ebc67ebe67079e5ac74f6ba7c0b130c88f3e90" @@ -19059,15 +17776,6 @@ level-errors@~1.0.3: dependencies: errno "~0.1.1" -level-iterator-stream@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz#ccfff7c046dcf47955ae9a86f46dfa06a31688b4" - integrity sha512-I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig== - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.5" - xtend "^4.0.0" - level-iterator-stream@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz#e43b78b1a8143e6fa97a4f485eb8ea530352f2ed" @@ -19138,29 +17846,6 @@ level-packager@~4.0.0: encoding-down "~5.0.0" levelup "^3.0.0" -level-post@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/level-post/-/level-post-1.0.7.tgz#19ccca9441a7cc527879a0635000f06d5e8f27d0" - integrity sha512-PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew== - dependencies: - ltgt "^2.1.2" - -level-sublevel@6.6.4: - version "6.6.4" - resolved "https://registry.yarnpkg.com/level-sublevel/-/level-sublevel-6.6.4.tgz#f7844ae893919cd9d69ae19d7159499afd5352ba" - integrity sha512-pcCrTUOiO48+Kp6F1+UAzF/OtWqLcQVTVF39HLdZ3RO8XBoXt+XVPKZO1vVr1aUoxHZA9OtD2e1v7G+3S5KFDA== - dependencies: - bytewise "~1.1.0" - level-codec "^9.0.0" - level-errors "^2.0.0" - level-iterator-stream "^2.0.3" - ltgt "~2.1.1" - pull-defer "^0.2.2" - pull-level "^2.0.3" - pull-stream "^3.6.8" - typewiselite "~1.0.0" - xtend "~4.0.0" - level-supports@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-2.1.0.tgz#9af908d853597ecd592293b2fad124375be79c5f" @@ -19245,16 +17930,6 @@ leveldown@6.1.0: napi-macros "~2.0.0" node-gyp-build "^4.3.0" -levelup@3.1.1, levelup@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/levelup/-/levelup-3.1.1.tgz#c2c0b3be2b4dc316647c53b42e2f559e232d2189" - integrity sha512-9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg== - dependencies: - deferred-leveldown "~4.0.0" - level-errors "~2.0.0" - level-iterator-stream "~3.0.0" - xtend "~4.0.0" - levelup@4.4.0, levelup@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" @@ -19279,6 +17954,16 @@ levelup@^1.2.1: semver "~5.4.1" xtend "~4.0.0" +levelup@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/levelup/-/levelup-3.1.1.tgz#c2c0b3be2b4dc316647c53b42e2f559e232d2189" + integrity sha512-9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg== + dependencies: + deferred-leveldown "~4.0.0" + level-errors "~2.0.0" + level-iterator-stream "~3.0.0" + xtend "~4.0.0" + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -19313,20 +17998,6 @@ libnpmpublish@^6.0.4: semver "^7.3.7" ssri "^9.0.0" -liftoff@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3" - integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog== - dependencies: - extend "^3.0.0" - findup-sync "^3.0.0" - fined "^1.0.1" - flagged-respawn "^1.0.0" - is-plain-object "^2.0.4" - object.map "^1.0.0" - rechoir "^0.6.2" - resolve "^1.1.7" - limiter@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2" @@ -19629,12 +18300,7 @@ lodash.values@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q== -lodash@4.17.14: - version "4.17.14" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" - integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== - -lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -19701,16 +18367,6 @@ long@~3: resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== -looper@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/looper/-/looper-2.0.0.tgz#66cd0c774af3d4fedac53794f742db56da8f09ec" - integrity sha512-6DzMHJcjbQX/UPHc1rRCBfKlLwDkvuGZ715cIR36wSdYqWXFT35uLXq5P/2orl3tz+t+VOVPxw4yPinQlUDGDQ== - -looper@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/looper/-/looper-3.0.0.tgz#2efa54c3b1cbaba9b94aee2e5914b0be57fbb749" - integrity sha512-LJ9wplN/uSn72oJRsXTx+snxPet5c8XiZmOKCm906NVYu+ag6SB6vUcnJcWxgnl2NfbIyeobAn7Bwv6xRj2XJg== - loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -19752,13 +18408,6 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== -lru-cache@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee" - integrity sha512-91gyOKTc2k66UG6kHiH4h3S2eltcPwE1STVfMYC/NG+nZwf8IIuiamfmpGZjpbbxzSyEJaLC0tNSmhjlQUTJow== - dependencies: - pseudomap "^1.0.1" - lru-cache@^4.0.1, lru-cache@^4.1.3: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -19814,11 +18463,6 @@ ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0: resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA== -ltgt@~2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34" - integrity sha512-5VjHC5GsENtIi5rbJd+feEpDKhfr7j0odoUR2Uh978g+2p93nd5o34cTjQWohXsPsCZeqoDnIqEf88mPCe0Pfw== - lunr@^2.3.9: version "2.3.9" resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1" @@ -19895,13 +18539,6 @@ make-fetch-happen@^9.1.0: socks-proxy-agent "^6.0.0" ssri "^8.0.0" -make-iterator@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" - integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== - dependencies: - kind-of "^6.0.2" - makeerror@1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" @@ -19970,16 +18607,6 @@ marked@^1.1.1: resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.9.tgz#53786f8b05d4c01a2a5a76b7d1ec9943d29d72dc" integrity sha512-H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw== -matchdep@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e" - integrity sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA== - dependencies: - findup-sync "^2.0.0" - micromatch "^3.0.4" - resolve "^1.4.0" - stack-trace "0.0.10" - math-random@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" @@ -20018,13 +18645,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha512-nOBDrc/wgpkd3X/JOhMqYR+/eLqlfLP4oQfoBA6QExIxEl+GU01oyEkwWyueyO8110pUKijtiHGhEmYoOn88oQ== - dependencies: - mimic-fn "^1.0.0" - mem@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" @@ -20137,20 +18757,6 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -merkle-patricia-tree@2.3.2, merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz#982ca1b5a0fde00eed2f6aeed1f9152860b8208a" - integrity sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g== - dependencies: - async "^1.4.2" - ethereumjs-util "^5.0.0" - level-ws "0.0.0" - levelup "^1.2.1" - memdown "^1.0.0" - readable-stream "^2.0.0" - rlp "^2.0.0" - semaphore ">=1.0.1" - merkle-patricia-tree@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-4.0.0.tgz#b95500a2a188a813eae18b175b34d9f439b92a62" @@ -20164,6 +18770,20 @@ merkle-patricia-tree@4.0.0: rlp "^2.2.4" semaphore-async-await "^1.5.1" +merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz#982ca1b5a0fde00eed2f6aeed1f9152860b8208a" + integrity sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g== + dependencies: + async "^1.4.2" + ethereumjs-util "^5.0.0" + level-ws "0.0.0" + levelup "^1.2.1" + memdown "^1.0.0" + readable-stream "^2.0.0" + rlp "^2.0.0" + semaphore ">=1.0.1" + methods@^1.1.2, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -20406,7 +19026,7 @@ micromatch@^2.3.11, micromatch@^2.3.7: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -21065,11 +19685,6 @@ multimatch@^5.0.0: arrify "^2.0.1" minimatch "^3.0.4" -mute-stdout@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" - integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg== - mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -21128,7 +19743,7 @@ named-placeholders@^1.1.2: dependencies: lru-cache "^4.1.3" -nan@^2.11.0, nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.16.0, nan@^2.2.1: +nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.16.0, nan@^2.2.1: version "2.16.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== @@ -21249,7 +19864,7 @@ nocache@^2.1.0: resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f" integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q== -node-abi@^2.21.0, node-abi@^2.7.0: +node-abi@^2.21.0: version "2.30.1" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== @@ -21323,7 +19938,7 @@ node-fetch@2.6.7, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node- dependencies: whatwg-url "^5.0.0" -node-fetch@^1.0.1, node-fetch@~1.7.1: +node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ== @@ -21402,15 +20017,6 @@ node-hid@2.1.1: node-addon-api "^3.0.2" prebuild-install "^6.0.0" -node-hid@^0.7.9: - version "0.7.9" - resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-0.7.9.tgz#cc0cdf1418a286a7667f0b63642b5eeb544ccd05" - integrity sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA== - dependencies: - bindings "^1.5.0" - nan "^2.13.2" - prebuild-install "^5.3.0" - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -21460,11 +20066,6 @@ noncharacters@^1.1.0: resolved "https://registry.yarnpkg.com/noncharacters/-/noncharacters-1.1.0.tgz#af33df30fd50ed3c53cd202258f25ada90b540d2" integrity sha512-U69XzMNq7UQXR27xT17tkQsHPsLc+5W9yfXvYzVCwFxghVf+7VttxFnCKFMxM/cHD+/QIyU009263hxIIurj4g== -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ== - nopt@3.x: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -21531,13 +20132,6 @@ normalize-url@^6.0.1, normalize-url@^6.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -now-and-later@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c" - integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ== - dependencies: - once "^1.3.2" - npm-bundled@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" @@ -21763,7 +20357,7 @@ object-assign@^3.0.0: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" integrity sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ== -object-assign@^4, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -21834,7 +20428,7 @@ object.assign@4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.4: +object.assign@^4.1.0, object.assign@^4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -21844,16 +20438,6 @@ object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.defaults@^1.0.0, object.defaults@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" - integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA== - dependencies: - array-each "^1.0.1" - array-slice "^1.0.0" - for-own "^1.0.0" - isobject "^3.0.0" - object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.1: version "2.1.4" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37" @@ -21864,14 +20448,6 @@ object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.1 define-properties "^1.1.4" es-abstract "^1.20.1" -object.map@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" - integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w== - dependencies: - for-own "^1.0.0" - make-iterator "^1.0.0" - object.omit@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-1.1.0.tgz#9d17ea16778e5057deba7752c6f55f1496829e94" @@ -21888,21 +20464,13 @@ object.omit@^2.0.0: for-own "^0.1.4" is-extendable "^0.1.1" -object.pick@^1.2.0, object.pick@^1.3.0: +object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== dependencies: isobject "^3.0.1" -object.reduce@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad" - integrity sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw== - dependencies: - for-own "^1.0.0" - make-iterator "^1.0.0" - oboe@2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.4.tgz#20c88cdb0c15371bb04119257d4fdd34b0aa49f6" @@ -21963,7 +20531,7 @@ on-headers@^1.0.0, on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: +once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== @@ -22081,19 +20649,12 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ordered-read-streams@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" - integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw== - dependencies: - readable-stream "^2.0.1" - original-require@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" integrity sha512-5vdKMbE58WaE61uVD+PKyh8xdM398UnjPBLotW2sjG5MzHARwta/+NtMBCBA0t2WQblGYBvq5vsiZpWokwno+A== -os-homedir@^1.0.0, os-homedir@^1.0.1: +os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== @@ -22105,15 +20666,6 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-locale@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" @@ -22123,7 +20675,7 @@ os-locale@^3.1.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== @@ -22401,15 +20953,6 @@ parse-filepath@^0.6.1: is-absolute "^0.2.2" map-cache "^0.2.0" -parse-filepath@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" - integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q== - dependencies: - is-absolute "^1.0.0" - map-cache "^0.2.0" - path-root "^0.1.1" - parse-gitignore@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/parse-gitignore/-/parse-gitignore-0.2.0.tgz#98706d09f0f93ee86348b721ffee0606bc093d74" @@ -22580,7 +21123,7 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: +path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== @@ -22605,18 +21148,6 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ== - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg== - dependencies: - path-root-regex "^0.1.0" - path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -23117,27 +21648,6 @@ pouchdb@7.3.0: uuid "8.3.2" vuvuzela "1.0.3" -prebuild-install@^5.3.0: - version "5.3.6" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.6.tgz#7c225568d864c71d89d07f8796042733a3f54291" - integrity sha512-s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.7.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - which-pm-runs "^1.0.0" - prebuild-install@^6.0.0: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" @@ -23298,11 +21808,6 @@ pretty-format@^29.0.2: ansi-styles "^5.0.0" react-is "^18.0.0" -pretty-hrtime@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A== - pretty-quick@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.2.tgz#4e44d6489ed513ef111bee501f63688d854584e6" @@ -23315,26 +21820,21 @@ pretty-quick@^2.0.1: mri "^1.1.4" multimatch "^4.0.0" -private@^0.1.6, private@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== - proc-log@^2.0.0, proc-log@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685" integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw== -process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" integrity sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw== +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + process@^0.11.1, process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -23638,54 +22138,6 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -pull-cat@^1.1.9: - version "1.1.11" - resolved "https://registry.yarnpkg.com/pull-cat/-/pull-cat-1.1.11.tgz#b642dd1255da376a706b6db4fa962f5fdb74c31b" - integrity sha512-i3w+xZ3DCtTVz8S62hBOuNLRHqVDsHMNZmgrZsjPnsxXUgbWtXEee84lo1XswE7W2a3WHyqsNuDJTjVLAQR8xg== - -pull-defer@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/pull-defer/-/pull-defer-0.2.3.tgz#4ee09c6d9e227bede9938db80391c3dac489d113" - integrity sha512-/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA== - -pull-level@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pull-level/-/pull-level-2.0.4.tgz#4822e61757c10bdcc7cf4a03af04c92734c9afac" - integrity sha512-fW6pljDeUThpq5KXwKbRG3X7Ogk3vc75d5OQU/TvXXui65ykm+Bn+fiktg+MOx2jJ85cd+sheufPL+rw9QSVZg== - dependencies: - level-post "^1.0.7" - pull-cat "^1.1.9" - pull-live "^1.0.1" - pull-pushable "^2.0.0" - pull-stream "^3.4.0" - pull-window "^2.1.4" - stream-to-pull-stream "^1.7.1" - -pull-live@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pull-live/-/pull-live-1.0.1.tgz#a4ecee01e330155e9124bbbcf4761f21b38f51f5" - integrity sha512-tkNz1QT5gId8aPhV5+dmwoIiA1nmfDOzJDlOOUpU5DNusj6neNd3EePybJ5+sITr2FwyCs/FVpx74YMCfc8YeA== - dependencies: - pull-cat "^1.1.9" - pull-stream "^3.4.0" - -pull-pushable@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/pull-pushable/-/pull-pushable-2.2.0.tgz#5f2f3aed47ad86919f01b12a2e99d6f1bd776581" - integrity sha512-M7dp95enQ2kaHvfCt2+DJfyzgCSpWVR2h2kWYnVsW6ZpxQBx5wOu0QWOvQPVoPnBLUZYitYP2y7HyHkLQNeGXg== - -pull-stream@^3.2.3, pull-stream@^3.4.0, pull-stream@^3.6.8: - version "3.6.14" - resolved "https://registry.yarnpkg.com/pull-stream/-/pull-stream-3.6.14.tgz#529dbd5b86131f4a5ed636fdf7f6af00781357ee" - integrity sha512-KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew== - -pull-window@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/pull-window/-/pull-window-2.1.4.tgz#fc3b86feebd1920c7ae297691e23f705f88552f0" - integrity sha512-cbDzN76BMlcGG46OImrgpkMf/VkCnupj8JhsrpBw3aWBM9ye345aYnqitmZCgauBkc0HbbRRn9hCnsa3k2FNUg== - dependencies: - looper "^2.0.0" - pump@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" @@ -23710,7 +22162,7 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -pumpify@^1.3.5, pumpify@^1.5.1: +pumpify@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== @@ -24099,7 +22551,7 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -24156,15 +22608,6 @@ readdir-scoped-modules@^1.1.0: graceful-fs "^4.1.2" once "^1.3.0" -readdirp@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - readdirp@~3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839" @@ -24246,7 +22689,7 @@ regenerate-unicode-properties@^10.0.1: dependencies: regenerate "^1.4.2" -regenerate@^1.2.1, regenerate@^1.4.2: +regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== @@ -24261,15 +22704,6 @@ regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q== - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - regenerator-transform@^0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" @@ -24311,15 +22745,6 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - integrity sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ== - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - regexpu-core@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d" @@ -24346,23 +22771,11 @@ registry-url@^5.0.0: dependencies: rc "^1.2.8" -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - integrity sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g== - regjsgen@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw== - dependencies: - jsesc "~0.5.0" - regjsparser@^0.8.2: version "0.8.4" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" @@ -24392,24 +22805,7 @@ remix-lib@>=0.4.1: solc "^0.6.0" web3 "^1.2.4" -remove-bom-buffer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" - integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ== - dependencies: - is-buffer "^1.1.5" - is-utf8 "^0.2.1" - -remove-bom-stream@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" - integrity sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA== - dependencies: - remove-bom-buffer "^3.0.0" - safe-buffer "^5.1.0" - through2 "^2.0.3" - -remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0: +remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== @@ -24424,27 +22820,6 @@ repeat-string@^1.5.2, repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== - dependencies: - is-finite "^1.0.0" - -replace-ext@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" - integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== - -replace-homedir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c" - integrity sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg== - dependencies: - homedir-polyfill "^1.0.1" - is-absolute "^1.0.0" - remove-trailing-separator "^1.1.0" - req-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/req-cwd/-/req-cwd-2.0.0.tgz#d4082b4d44598036640fb73ddea01ed53db49ebc" @@ -24575,7 +22950,7 @@ resolve-dir@^0.1.0: expand-tilde "^1.2.2" global-modules "^0.2.3" -resolve-dir@^1.0.0, resolve-dir@^1.0.1: +resolve-dir@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg== @@ -24598,13 +22973,6 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve-options@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" - integrity sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A== - dependencies: - value-or-function "^3.0.0" - resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -24620,7 +22988,7 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@~1.22.1: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@~1.22.1: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -24823,7 +23191,7 @@ rx-lite@*, rx-lite@^4.0.8: resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" integrity sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA== -rxjs@6, rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.6.0: +rxjs@6, rxjs@^6.4.0, rxjs@^6.6.0: version "6.6.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== @@ -25000,11 +23368,6 @@ seed-random@2.2.0: resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" integrity sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ== -seedrandom@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.1.tgz#eb3dde015bcf55df05a233514e5df44ef9dce083" - integrity sha512-1/02Y/rUeU1CJBAGLebiC5Lbo5FnB22gQbIFFYTLkwvp1xdABZJH1sn4ZT1MzXmPpzv+Rf/Lu2NcsLJiK4rcDg== - seedrandom@3.0.5: version "3.0.5" resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" @@ -25039,13 +23402,6 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver-greatest-satisfied-range@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b" - integrity sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ== - dependencies: - sver-compat "^1.5.0" - "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -25516,7 +23872,7 @@ solc@^0.4.2, solc@^0.4.20: semver "^5.3.0" yargs "^4.7.1" -solc@^0.5.5, solc@^0.5.8: +solc@^0.5.8: version "0.5.17" resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.17.tgz#8a76c50e98d49ca7610cca2fdc78ff3016540c67" integrity sha512-qpX+PGaU0Q3c6lh2vDzMoIbhv6bIrecI4bYsx+xUs01xsGFnY6Nr0L8y/QMyutTnrHN6Lb/Yl672ZVRqxka96w== @@ -25544,6 +23900,19 @@ solc@^0.6.0: semver "^5.5.0" tmp "0.0.33" +solc@^0.8: + version "0.8.19" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.19.tgz#cac6541106ae3cff101c740042c7742aa56a2ed3" + integrity sha512-yqurS3wzC4LdEvmMobODXqprV4MYJcVtinuxgrp61ac8K2zz40vXA0eSAskSHPgv8dQo7Nux39i3QBsHx4pqyA== + dependencies: + command-exists "^1.2.8" + commander "^8.1.0" + follow-redirects "^1.12.1" + js-sha3 "0.8.0" + memorystream "^0.3.1" + semver "^5.5.0" + tmp "0.0.33" + solhint@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/solhint/-/solhint-2.3.1.tgz#6fee8fc2635112bf5812f7cba8359c14e9d9a491" @@ -25604,15 +23973,7 @@ source-map-resolve@^0.5.0: decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@0.5.12: - version "0.5.12" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" + urix "^0.1.0" source-map-support@0.5.13: version "0.5.13" @@ -25622,13 +23983,6 @@ source-map-support@0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -25642,7 +23996,7 @@ source-map-url@^0.4.0: resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== -source-map@^0.5.6, source-map@^0.5.7: +source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== @@ -25669,11 +24023,6 @@ spark-md5@3.0.2: resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== -sparkles@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" - integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw== - spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" @@ -25797,7 +24146,7 @@ ssri@^9.0.0, ssri@^9.0.1: dependencies: minipass "^3.1.1" -stack-trace@0.0.10, stack-trace@0.0.x: +stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== @@ -25881,24 +24230,11 @@ stream-events@^1.0.1, stream-events@^1.0.4, stream-events@^1.0.5: dependencies: stubs "^3.0.0" -stream-exhaust@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" - integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw== - stream-shift@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -stream-to-pull-stream@^1.7.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz#4161aa2d2eb9964de60bfa1af7feaf917e874ece" - integrity sha512-6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg== - dependencies: - looper "^3.0.0" - pull-stream "^3.2.3" - streamsearch@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" @@ -25929,7 +24265,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-width@^1.0.1, string-width@^1.0.2: +string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== @@ -26055,6 +24391,11 @@ strip-bom@^4.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== +strip-comments@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" + integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== + strip-dirs@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" @@ -26274,14 +24615,6 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -sver-compat@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8" - integrity sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg== - dependencies: - es6-iterator "^2.0.1" - es6-symbol "^3.1.1" - swap-case@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3" @@ -26366,7 +24699,7 @@ tail@^2.0.0: resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.4.tgz#90dd4c5a174a3fa39dcb65a1df1950a4a0093a41" integrity sha512-PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ== -tape@^4.4.0, tape@^4.6.3: +tape@^4.4.0: version "4.16.0" resolved "https://registry.yarnpkg.com/tape/-/tape-4.16.0.tgz#18310f57b71c0ac21b3ef94fe5c16033b3d6362b" integrity sha512-mBlqYFr2mHysgCFXAuSarIQ+ffhielpb7a5/IbeOhMaLnQYhkJLUm6CwO1RszWeHRxnIpMessZ3xL2Cfo94BWw== @@ -26667,14 +25000,6 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -through2-filter@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" - integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - through2@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9" @@ -26691,7 +25016,7 @@ through2@3.0.2, through2@^3.0.0, through2@^3.0.1: inherits "^2.0.4" readable-stream "2 || 3" -through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0: +through2@^2.0.0, through2@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -26784,7 +25109,7 @@ tmp@0.0.33, tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@0.1.0, tmp@^0.1.0: +tmp@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw== @@ -26803,24 +25128,11 @@ tmpl@1.0.5: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== -to-absolute-glob@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" - integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA== - dependencies: - is-absolute "^1.0.0" - is-negated-glob "^1.0.0" - to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -26863,13 +25175,6 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -to-through@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" - integrity sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q== - dependencies: - through2 "^2.0.3" - toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -26948,11 +25253,6 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== - triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" @@ -27249,17 +25549,12 @@ tunnel@0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -tweetnacl-util@^0.15.0: - version "0.15.1" - resolved "https://registry.yarnpkg.com/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz#b80fcdb5c97bcc508be18c44a4be50f022eea00b" - integrity sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw== - tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== -tweetnacl@^1.0.0, tweetnacl@^1.0.1: +tweetnacl@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== @@ -27491,33 +25786,11 @@ typescript@^3.6.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== -typewise-core@^1.2, typewise-core@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195" - integrity sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg== - -typewise@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/typewise/-/typewise-1.0.3.tgz#1067936540af97937cc5dcf9922486e9fa284651" - integrity sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ== - dependencies: - typewise-core "^1.2.0" - -typewiselite@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typewiselite/-/typewiselite-1.0.0.tgz#c8882fa1bb1092c06005a97f34ef5c8508e3664e" - integrity sha512-J9alhjVHupW3Wfz6qFRGgQw0N3gr8hOkw6zm7FZ6UR1Cse/oD9/JVok7DNE9TT9IbciDHX2Ex9+ksE6cRmtymw== - typical@^2.6.0, typical@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" integrity sha512-ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg== -u2f-api@0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-0.2.7.tgz#17bf196b242f6bf72353d9858e6a7566cc192720" - integrity sha512-fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg== - ua-parser-js@^0.7.18: version "0.7.31" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6" @@ -27569,7 +25842,7 @@ unbzip2-stream@^1.0.9: buffer "^5.2.1" through "^2.3.8" -unc-path-regex@^0.1.0, unc-path-regex@^0.1.2: +unc-path-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== @@ -27589,27 +25862,6 @@ underscore@>1.4.4, "underscore@>= 1.3.1": resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee" integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ== -undertaker-registry@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50" - integrity sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw== - -undertaker@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18" - integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg== - dependencies: - arr-flatten "^1.0.1" - arr-map "^2.0.0" - bach "^1.0.0" - collection-map "^1.0.0" - es6-weak-map "^2.0.1" - fast-levenshtein "^1.0.0" - last-run "^1.1.0" - object.defaults "^1.0.0" - object.reduce "^1.0.0" - undertaker-registry "^1.0.0" - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -27671,14 +25923,6 @@ unique-slug@^3.0.0: dependencies: imurmurhash "^0.1.4" -unique-stream@^2.0.2: - version "2.3.1" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" - integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== - dependencies: - json-stable-stringify-without-jsonify "^1.0.1" - through2-filter "^3.0.0" - unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" @@ -27756,11 +26000,6 @@ unzipper@^0.10.10: readable-stream "~2.3.6" setimmediate "~1.0.4" -upath@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== - upath@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" @@ -27902,7 +26141,7 @@ urlgrey@1.0.0: dependencies: fast-url-parser "^1.1.3" -usb@^1.6.0, usb@^1.7.0: +usb@^1.7.0: version "1.9.2" resolved "https://registry.yarnpkg.com/usb/-/usb-1.9.2.tgz#fb6b36f744ecc707a196c45a6ec72442cb6f2b73" integrity sha512-dryNz030LWBPAf6gj8vyq0Iev3vPbCLHCT8dBw3gQRXRzVNsIdeuU+VjPp3ksmSPkeMAl1k+kQ14Ij0QHyeiAg== @@ -28075,13 +26314,6 @@ v8-to-istanbul@^9.0.1: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" -v8flags@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" - integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== - dependencies: - homedir-polyfill "^1.0.1" - valid-url@^1, valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" @@ -28109,11 +26341,6 @@ validate-npm-package-name@^4.0.0: dependencies: builtins "^5.0.0" -value-or-function@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" - integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg== - value-or-promise@1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" @@ -28138,54 +26365,6 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vinyl-fs@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" - integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng== - dependencies: - fs-mkdirp-stream "^1.0.0" - glob-stream "^6.1.0" - graceful-fs "^4.0.0" - is-valid-glob "^1.0.0" - lazystream "^1.0.0" - lead "^1.0.0" - object.assign "^4.0.4" - pumpify "^1.3.5" - readable-stream "^2.3.3" - remove-bom-buffer "^3.0.0" - remove-bom-stream "^1.2.0" - resolve-options "^1.1.0" - through2 "^2.0.0" - to-through "^2.0.0" - value-or-function "^3.0.0" - vinyl "^2.0.0" - vinyl-sourcemap "^1.1.0" - -vinyl-sourcemap@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" - integrity sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA== - dependencies: - append-buffer "^1.0.2" - convert-source-map "^1.5.0" - graceful-fs "^4.1.6" - normalize-path "^2.1.1" - now-and-later "^2.0.0" - remove-bom-buffer "^3.0.0" - vinyl "^2.0.0" - -vinyl@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" - integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - vlq@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468" @@ -28288,16 +26467,6 @@ web3-bzz@1.2.2: swarm-js "0.1.39" underscore "1.9.1" -web3-bzz@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.4.tgz#a4adb7a8cba3d260de649bdb1f14ed359bfb3821" - integrity sha512-MqhAo/+0iQSMBtt3/QI1rU83uvF08sYq8r25+OUZ+4VtihnYsmkkca+rdU0QbRyrXY2/yGIpI46PFdh0khD53A== - dependencies: - "@types/node" "^10.12.18" - got "9.6.0" - swarm-js "0.1.39" - underscore "1.9.1" - web3-bzz@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.6.tgz#95f370aecc3ff6ad07f057e6c0c916ef09b04dde" @@ -28364,15 +26533,6 @@ web3-core-helpers@1.2.2: web3-eth-iban "1.2.2" web3-utils "1.2.2" -web3-core-helpers@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.4.tgz#ffd425861f4d66b3f38df032afdb39ea0971fc0f" - integrity sha512-U7wbsK8IbZvF3B7S+QMSNP0tni/6VipnJkB0tZVEpHEIV2WWeBHYmZDnULWcsS/x/jn9yKhJlXIxWGsEAMkjiw== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.2.4" - web3-utils "1.2.4" - web3-core-helpers@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.6.tgz#c478246a9abe4e5456acf42657dac2f7c330be74" @@ -28439,17 +26599,6 @@ web3-core-method@1.2.2: web3-core-subscriptions "1.2.2" web3-utils "1.2.2" -web3-core-method@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.4.tgz#a0fbc50b8ff5fd214021435cc2c6d1e115807aed" - integrity sha512-8p9kpL7di2qOVPWgcM08kb+yKom0rxRCMv6m/K+H+yLSxev9TgMbCgMSbPWAHlyiF3SJHw7APFKahK5Z+8XT5A== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.4" - web3-core-promievent "1.2.4" - web3-core-subscriptions "1.2.4" - web3-utils "1.2.4" - web3-core-method@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.6.tgz#4b0334edd94b03dfec729d113c69a4eb6ebc68ae" @@ -28514,14 +26663,6 @@ web3-core-promievent@1.2.2: any-promise "1.3.0" eventemitter3 "3.1.2" -web3-core-promievent@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.4.tgz#75e5c0f2940028722cdd21ba503ebd65272df6cb" - integrity sha512-gEUlm27DewUsfUgC3T8AxkKi8Ecx+e+ZCaunB7X4Qk3i9F4C+5PSMGguolrShZ7Zb6717k79Y86f3A00O0VAZw== - dependencies: - any-promise "1.3.0" - eventemitter3 "3.1.2" - web3-core-promievent@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.6.tgz#6c27dc79de8f71b74f5d17acaf9aaf593d3cb0c9" @@ -28568,17 +26709,6 @@ web3-core-requestmanager@1.2.2: web3-providers-ipc "1.2.2" web3-providers-ws "1.2.2" -web3-core-requestmanager@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.4.tgz#0a7020a23fb91c6913c611dfd3d8c398d1e4b4a8" - integrity sha512-eZJDjyNTDtmSmzd3S488nR/SMJtNnn/GuwxnMh3AzYCqG3ZMfOylqTad2eYJPvc2PM5/Gj1wAMQcRpwOjjLuPg== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.4" - web3-providers-http "1.2.4" - web3-providers-ipc "1.2.4" - web3-providers-ws "1.2.4" - web3-core-requestmanager@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.6.tgz#4fea269fe913fd4fca464b4f7c65cb94857b5b2a" @@ -28653,15 +26783,6 @@ web3-core-subscriptions@1.2.2: underscore "1.9.1" web3-core-helpers "1.2.2" -web3-core-subscriptions@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.4.tgz#0dc095b5cfd82baa527a39796e3515a846b21b99" - integrity sha512-3D607J2M8ymY9V+/WZq4MLlBulwCkwEjjC2U+cXqgVO1rCyVqbxZNCmHyNYHjDDCxSEbks9Ju5xqJxDSxnyXEw== - dependencies: - eventemitter3 "3.1.2" - underscore "1.9.1" - web3-core-helpers "1.2.4" - web3-core-subscriptions@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.6.tgz#ee24e7974d1d72ff6c992c599deba4ef9b308415" @@ -28728,19 +26849,6 @@ web3-core@1.2.2: web3-core-requestmanager "1.2.2" web3-utils "1.2.2" -web3-core@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.4.tgz#2df13b978dcfc59c2abaa887d27f88f21ad9a9d6" - integrity sha512-CHc27sMuET2cs1IKrkz7xzmTdMfZpYswe7f0HcuyneTwS1yTlTnHyqjAaTy0ZygAb/x4iaVox+Gvr4oSAqSI+A== - dependencies: - "@types/bignumber.js" "^5.0.0" - "@types/bn.js" "^4.11.4" - "@types/node" "^12.6.1" - web3-core-helpers "1.2.4" - web3-core-method "1.2.4" - web3-core-requestmanager "1.2.4" - web3-utils "1.2.4" - web3-core@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.6.tgz#a6a761d1ff2f3ee462b8dab679229d2f8e267504" @@ -28815,15 +26923,6 @@ web3-eth-abi@1.2.2: underscore "1.9.1" web3-utils "1.2.2" -web3-eth-abi@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.4.tgz#5b73e5ef70b03999227066d5d1310b168845e2b8" - integrity sha512-8eLIY4xZKoU3DSVu1pORluAw9Ru0/v4CGdw5so31nn+7fR8zgHMgwbFe0aOqWQ5VU42PzMMXeIJwt4AEi2buFg== - dependencies: - ethers "4.0.0-beta.3" - underscore "1.9.1" - web3-utils "1.2.4" - web3-eth-abi@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.6.tgz#4272ca48d817aa651bbf97b269f5ff10abc2b8a9" @@ -28883,24 +26982,6 @@ web3-eth-accounts@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" -web3-eth-accounts@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.4.tgz#ada6edc49542354328a85cafab067acd7f88c288" - integrity sha512-04LzT/UtWmRFmi4hHRewP5Zz43fWhuHiK5XimP86sUQodk/ByOkXQ3RoXyGXFMNoRxdcAeRNxSfA2DpIBc9xUw== - dependencies: - "@web3-js/scrypt-shim" "^0.1.0" - any-promise "1.3.0" - crypto-browserify "3.12.0" - eth-lib "0.2.7" - ethereumjs-common "^1.3.2" - ethereumjs-tx "^2.1.1" - underscore "1.9.1" - uuid "3.3.2" - web3-core "1.2.4" - web3-core-helpers "1.2.4" - web3-core-method "1.2.4" - web3-utils "1.2.4" - web3-eth-accounts@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.6.tgz#f9fcb50b28ee58090ab292a10d996155caa2b474" @@ -29013,21 +27094,6 @@ web3-eth-contract@1.2.2: web3-eth-abi "1.2.2" web3-utils "1.2.2" -web3-eth-contract@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.4.tgz#68ef7cc633232779b0a2c506a810fbe903575886" - integrity sha512-b/9zC0qjVetEYnzRA1oZ8gF1OSSUkwSYi5LGr4GeckLkzXP7osEnp9lkO/AQcE4GpG+l+STnKPnASXJGZPgBRQ== - dependencies: - "@types/bn.js" "^4.11.4" - underscore "1.9.1" - web3-core "1.2.4" - web3-core-helpers "1.2.4" - web3-core-method "1.2.4" - web3-core-promievent "1.2.4" - web3-core-subscriptions "1.2.4" - web3-eth-abi "1.2.4" - web3-utils "1.2.4" - web3-eth-contract@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.6.tgz#cccf4d32dc56917fb6923e778498a9ba2a5ba866" @@ -29113,20 +27179,6 @@ web3-eth-ens@1.2.2: web3-eth-contract "1.2.2" web3-utils "1.2.2" -web3-eth-ens@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.4.tgz#b95b3aa99fb1e35c802b9e02a44c3046a3fa065e" - integrity sha512-g8+JxnZlhdsCzCS38Zm6R/ngXhXzvc3h7bXlxgKU4coTzLLoMpgOAEz71GxyIJinWTFbLXk/WjNY0dazi9NwVw== - dependencies: - eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.2.4" - web3-core-helpers "1.2.4" - web3-core-promievent "1.2.4" - web3-eth-abi "1.2.4" - web3-eth-contract "1.2.4" - web3-utils "1.2.4" - web3-eth-ens@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.6.tgz#0d28c5d4ea7b4462ef6c077545a77956a6cdf175" @@ -29215,14 +27267,6 @@ web3-eth-iban@1.2.2: bn.js "4.11.8" web3-utils "1.2.2" -web3-eth-iban@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.4.tgz#8e0550fd3fd8e47a39357d87fe27dee9483ee476" - integrity sha512-D9HIyctru/FLRpXakRwmwdjb5bWU2O6UE/3AXvRm6DCOf2e+7Ve11qQrPtaubHfpdW3KWjDKvlxV9iaFv/oTMQ== - dependencies: - bn.js "4.11.8" - web3-utils "1.2.4" - web3-eth-iban@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.6.tgz#0d6ba21fe78f190af8919e9cd5453882457209e0" @@ -29275,18 +27319,6 @@ web3-eth-personal@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" -web3-eth-personal@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.4.tgz#3224cca6851c96347d9799b12c1b67b2a6eb232b" - integrity sha512-5Russ7ZECwHaZXcN3DLuLS7390Vzgrzepl4D87SD6Sn1DHsCZtvfdPIYwoTmKNp69LG3mORl7U23Ga5YxqkICw== - dependencies: - "@types/node" "^12.6.1" - web3-core "1.2.4" - web3-core-helpers "1.2.4" - web3-core-method "1.2.4" - web3-net "1.2.4" - web3-utils "1.2.4" - web3-eth-personal@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.6.tgz#226137916754c498f0284f22c55924c87a2efcf0" @@ -29366,25 +27398,6 @@ web3-eth@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" -web3-eth@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.4.tgz#24c3b1f1ac79351bbfb808b2ab5c585fa57cdd00" - integrity sha512-+j+kbfmZsbc3+KJpvHM16j1xRFHe2jBAniMo1BHKc3lho6A8Sn9Buyut6odubguX2AxoRArCdIDCkT9hjUERpA== - dependencies: - underscore "1.9.1" - web3-core "1.2.4" - web3-core-helpers "1.2.4" - web3-core-method "1.2.4" - web3-core-subscriptions "1.2.4" - web3-eth-abi "1.2.4" - web3-eth-accounts "1.2.4" - web3-eth-contract "1.2.4" - web3-eth-ens "1.2.4" - web3-eth-iban "1.2.4" - web3-eth-personal "1.2.4" - web3-net "1.2.4" - web3-utils "1.2.4" - web3-eth@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.6.tgz#2c650893d540a7a0eb1365dd5b2dca24ac919b7c" @@ -29498,15 +27511,6 @@ web3-net@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" -web3-net@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.4.tgz#1d246406d3aaffbf39c030e4e98bce0ca5f25458" - integrity sha512-wKOsqhyXWPSYTGbp7ofVvni17yfRptpqoUdp3SC8RAhDmGkX6irsiT9pON79m6b3HUHfLoBilFQyt/fTUZOf7A== - dependencies: - web3-core "1.2.4" - web3-core-method "1.2.4" - web3-utils "1.2.4" - web3-net@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.6.tgz#a56492e2227475e38db29394f8bac305a2446e41" @@ -29552,50 +27556,24 @@ web3-net@1.8.2: web3-core-method "1.8.2" web3-utils "1.8.2" -web3-provider-engine@14.0.6: - version "14.0.6" - resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz#cbdd66fe20c0136a3a495cbe40d18b6c4160d5f0" - integrity sha512-tr5cGSyxfSC/JqiUpBlJtfZpwQf1yAA8L/zy1C6fDFm0ntR974pobJ4v4676atpZne4Ze5VFy3kPPahHe9gQiQ== - dependencies: - async "^2.5.0" - backoff "^2.5.0" - clone "^2.0.0" - cross-fetch "^2.1.0" - eth-block-tracker "^3.0.0" - eth-json-rpc-infura "^3.1.0" - eth-sig-util "^1.4.2" - ethereumjs-block "^1.2.2" - ethereumjs-tx "^1.2.0" - ethereumjs-util "^5.1.5" - ethereumjs-vm "^2.3.4" - json-rpc-error "^2.0.0" - json-stable-stringify "^1.0.1" - promise-to-callback "^1.0.0" - readable-stream "^2.2.9" - request "^2.67.0" - semaphore "^1.0.3" - tape "^4.4.0" - ws "^5.1.1" - xhr "^2.2.0" - xtend "^4.0.1" - -web3-provider-engine@14.2.1: - version "14.2.1" - resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-14.2.1.tgz#ef351578797bf170e08d529cb5b02f8751329b95" - integrity sha512-iSv31h2qXkr9vrL6UZDm4leZMc32SjWJFGOp/D92JXfcEboCqraZyuExDkpxKw8ziTufXieNM7LSXNHzszYdJw== +web3-provider-engine@16.0.4: + version "16.0.4" + resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-16.0.4.tgz#a6565d85f3cfdc2da68f141af8728f90ad198f3f" + integrity sha512-f5WxJ9+LTF+4aJo4tCOXtQ6SDytBtLkhvV+qh/9gImHAuG9sMr6utY0mn/pro1Rx7O3hbztBxvQKjGMdOo8muw== dependencies: + "@ethereumjs/tx" "^3.3.0" async "^2.5.0" backoff "^2.5.0" clone "^2.0.0" - cross-fetch "^2.1.0" - eth-block-tracker "^3.0.0" - eth-json-rpc-infura "^3.1.0" + eth-block-tracker "^4.4.2" + eth-json-rpc-filters "^4.2.1" + eth-json-rpc-infura "^5.1.0" + eth-json-rpc-middleware "^6.0.0" + eth-rpc-errors "^3.0.0" eth-sig-util "^1.4.2" ethereumjs-block "^1.2.2" - ethereumjs-tx "^1.2.0" ethereumjs-util "^5.1.5" ethereumjs-vm "^2.3.4" - json-rpc-error "^2.0.0" json-stable-stringify "^1.0.1" promise-to-callback "^1.0.0" readable-stream "^2.2.9" @@ -29605,23 +27583,22 @@ web3-provider-engine@14.2.1: xhr "^2.2.0" xtend "^4.0.1" -web3-provider-engine@^15.0.0: - version "15.0.12" - resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-15.0.12.tgz#24d7f2f6fb6de856824c7306291018c4fc543ac3" - integrity sha512-/OfhQalKPND1iB5ggvGuYF0+SIb2Qj5OFTrT2VrZWP79UhMTdP7T+L2FtblmRdCeOetoAzZHdBaIwLOZsmIX+w== +web3-provider-engine@^16.0.5: + version "16.0.5" + resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-16.0.5.tgz#28a0eaf6c33bc60b3cb7de1b961bea6b5cf06b78" + integrity sha512-fvoMm8Tehf3efaqv9pSd2VKLjgzcYNsJaiby87nPrktlnIc9S3G/9udnuJQn32FAt19yzOvNk3B513jhBKOgEg== dependencies: + "@ethereumjs/tx" "^3.3.0" async "^2.5.0" backoff "^2.5.0" clone "^2.0.0" - cross-fetch "^2.1.0" - eth-block-tracker "^4.4.2" - eth-json-rpc-errors "^2.0.2" - eth-json-rpc-filters "^4.1.1" - eth-json-rpc-infura "^4.0.1" - eth-json-rpc-middleware "^4.1.5" + eth-block-tracker "^5.0.1" + eth-json-rpc-filters "^4.2.1" + eth-json-rpc-infura "^5.1.0" + eth-json-rpc-middleware "^6.0.0" + eth-rpc-errors "^3.0.0" eth-sig-util "^1.4.2" ethereumjs-block "^1.2.2" - ethereumjs-tx "^1.2.0" ethereumjs-util "^5.1.5" ethereumjs-vm "^2.3.4" json-stable-stringify "^1.0.1" @@ -29661,14 +27638,6 @@ web3-providers-http@1.2.2: web3-core-helpers "1.2.2" xhr2-cookies "1.1.0" -web3-providers-http@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.4.tgz#514fcad71ae77832c2c15574296282fbbc5f4a67" - integrity sha512-dzVCkRrR/cqlIrcrWNiPt9gyt0AZTE0J+MfAu9rR6CyIgtnm1wFUVVGaxYRxuTGQRO4Dlo49gtoGwaGcyxqiTw== - dependencies: - web3-core-helpers "1.2.4" - xhr2-cookies "1.1.0" - web3-providers-http@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.6.tgz#36e8724a7424d52827819d53fd75dbf31f5422c2" @@ -29724,15 +27693,6 @@ web3-providers-ipc@1.2.2: underscore "1.9.1" web3-core-helpers "1.2.2" -web3-providers-ipc@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.4.tgz#9d6659f8d44943fb369b739f48df09092be459bd" - integrity sha512-8J3Dguffin51gckTaNrO3oMBo7g+j0UNk6hXmdmQMMNEtrYqw4ctT6t06YOf9GgtOMjSAc1YEh3LPrvgIsR7og== - dependencies: - oboe "2.1.4" - underscore "1.9.1" - web3-core-helpers "1.2.4" - web3-providers-ipc@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.6.tgz#cef8d12c1ebb47adce5ebf597f553c623362cb4a" @@ -29783,15 +27743,6 @@ web3-providers-ws@1.2.2: web3-core-helpers "1.2.2" websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" -web3-providers-ws@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.4.tgz#099ee271ee03f6ea4f5df9cfe969e83f4ce0e36f" - integrity sha512-F/vQpDzeK+++oeeNROl1IVTufFCwCR2hpWe5yRXN0ApLwHqXrMI7UwQNdJ9iyibcWjJf/ECbauEEQ8CHgE+MYQ== - dependencies: - "@web3-js/websocket" "^1.0.29" - underscore "1.9.1" - web3-core-helpers "1.2.4" - web3-providers-ws@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.6.tgz#e1df617bc89d66165abdf2191da0014c505bfaac" @@ -29865,16 +27816,6 @@ web3-shh@1.2.2: web3-core-subscriptions "1.2.2" web3-net "1.2.2" -web3-shh@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.4.tgz#5c8ff5ab624a3b14f08af0d24d2b16c10e9f70dd" - integrity sha512-z+9SCw0dE+69Z/Hv8809XDbLj7lTfEv9Sgu8eKEIdGntZf4v7ewj5rzN5bZZSz8aCvfK7Y6ovz1PBAu4QzS4IQ== - dependencies: - web3-core "1.2.4" - web3-core-method "1.2.4" - web3-core-subscriptions "1.2.4" - web3-net "1.2.4" - web3-shh@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.6.tgz#4e3486c7eca5cbdb87f88910948223a5b7ea6c20" @@ -29968,20 +27909,6 @@ web3-utils@1.2.2: underscore "1.9.1" utf8 "3.0.0" -web3-utils@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.4.tgz#96832a39a66b05bf8862a5b0bdad2799d709d951" - integrity sha512-+S86Ip+jqfIPQWvw2N/xBQq5JNqCO0dyvukGdJm8fEWHZbckT4WxSpHbx+9KLEWY4H4x9pUwnoRkK87pYyHfgQ== - dependencies: - bn.js "4.11.8" - eth-lib "0.2.7" - ethereum-bloom-filters "^1.0.6" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - underscore "1.9.1" - utf8 "3.0.0" - web3-utils@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.6.tgz#390bc9fa3a7179746963cfaca55bb80ac4d8dc10" @@ -30075,20 +28002,6 @@ web3@1.2.2: web3-shh "1.2.2" web3-utils "1.2.2" -web3@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.4.tgz#6e7ab799eefc9b4648c2dab63003f704a1d5e7d9" - integrity sha512-xPXGe+w0x0t88Wj+s/dmAdASr3O9wmA9mpZRtixGZxmBexAF0MjfqYM+MS4tVl5s11hMTN3AZb8cDD4VLfC57A== - dependencies: - "@types/node" "^12.6.1" - web3-bzz "1.2.4" - web3-core "1.2.4" - web3-eth "1.2.4" - web3-eth-personal "1.2.4" - web3-net "1.2.4" - web3-shh "1.2.4" - web3-utils "1.2.4" - web3@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.6.tgz#599425461c3f9a8cbbefa70616438995f4a064cc" @@ -30196,17 +28109,6 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== -websocket@1.0.29: - version "1.0.29" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.29.tgz#3f83e49d3279657c58b02a22d90749c806101b98" - integrity sha512-WhU8jKXC8sTh6ocLSqpZRlOKMNYGwUvjA5+XcIgIk/G3JCaDfkZUr0zA19sVSxJ0TEvm0i5IBzr54RZC4vzW7g== - dependencies: - debug "^2.2.0" - gulp "^4.0.2" - nan "^2.11.0" - typedarray-to-buffer "^3.1.5" - yaeti "^0.0.6" - websocket@^1.0.28, websocket@^1.0.32: version "1.0.34" resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111" @@ -30236,7 +28138,7 @@ whatwg-encoding@^1.0.5: dependencies: iconv-lite "0.4.24" -whatwg-fetch@2.0.4, whatwg-fetch@^2.0.4: +whatwg-fetch@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== @@ -30246,7 +28148,7 @@ whatwg-fetch@3.0.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== -whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0: +whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0, whatwg-fetch@^3.4.1: version "3.6.2" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== @@ -30308,11 +28210,6 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== -which-pm-runs@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35" - integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA== - which-typed-array@^1.1.2: version "1.1.8" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" @@ -30843,26 +28740,11 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^21.0.0, yargs-parser@^21.0.1: +yargs-parser@^21.0.0, yargs-parser@^21.0.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs-parser@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394" - integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA== - dependencies: - camelcase "^3.0.0" - object.assign "^4.1.0" - -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ== - dependencies: - camelcase "^4.1.0" - yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" @@ -30935,24 +28817,6 @@ yargs@16.2.0, yargs@^16.0.3, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" - integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig== - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^8.1.0" - yargs@^11.0.0: version "11.1.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766" @@ -31018,6 +28882,19 @@ yargs@^17.3.1, yargs@^17.4.0: y18n "^5.0.5" yargs-parser "^21.0.0" +yargs@^17.5.1: + version "17.7.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" + 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@^3.10.0: version "3.32.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" @@ -31051,25 +28928,6 @@ yargs@^4.7.1: y18n "^3.2.1" yargs-parser "^2.4.1" -yargs@^7.1.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db" - integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA== - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^5.0.1" - yarn@^1.21.1: version "1.22.19" resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" From 861d5c3c42f8ec6b903161b615b9694a6d5f6a9c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 30 Mar 2023 10:32:04 -0400 Subject: [PATCH 016/184] ++ ethereum-cryptography dependency --- packages/protocol/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 0cbd240f17a..bf74720f7b8 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -71,6 +71,7 @@ "elliptic": "^6.5.4", "ethereumjs-abi": "^0.6.8", "ethereumjs-wallet": "^0.6.3", + "ethereum-cryptography": "1.2.0", "fs-extra": "^5.0.0", "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", "glob-fs": "^0.1.7", From ff4e7e85e5ef635d4f3769f518c0a6f73d031ccb Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 1 Apr 2023 17:28:57 -0400 Subject: [PATCH 017/184] Merge branch 'soloseng/fixing-gas-price' --- packages/protocol/runTests.js | 1 + packages/protocol/test/common/goldtoken.ts | 4 +--- packages/protocol/test/common/integration.ts | 1 - packages/protocol/test/governance/network/governance.ts | 1 - packages/protocol/test/governance/voting/release_gold.ts | 3 +-- packages/protocol/truffle-config.js | 2 +- packages/sdk/base/src/signatureUtils.ts | 2 +- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index 07acffeca3a..28ab1156487 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -23,6 +23,7 @@ async function startGanache() { networkId: network.network_id, chainId: 1, allowUnlimitedContractSize: true, + hardfork: 'istanbul', }, }) diff --git a/packages/protocol/test/common/goldtoken.ts b/packages/protocol/test/common/goldtoken.ts index b04e3c92e81..185db5e0f4b 100644 --- a/packages/protocol/test/common/goldtoken.ts +++ b/packages/protocol/test/common/goldtoken.ts @@ -1,4 +1,3 @@ -// TODO (soloseng) gas price issue import { NULL_ADDRESS } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { @@ -161,8 +160,7 @@ contract('GoldToken', (accounts: string[]) => { it('should transfer balance from one user to another', async () => { const startBalanceFrom = await goldToken.balanceOf(sender) const startBalanceTo = await goldToken.balanceOf(receiver) - const resp = await goldToken.transfer(receiver, ONE_GOLDTOKEN) - console.log('TX receipt:', resp.receipt) + await goldToken.transfer(receiver, ONE_GOLDTOKEN) await assertBalance(sender, startBalanceFrom.minus(ONE_GOLDTOKEN)) await assertBalance(receiver, startBalanceTo.plus(ONE_GOLDTOKEN)) }) diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index 7cd795bf43a..13e4bca7c82 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -1,4 +1,3 @@ -// TODO (soloseng) gas price issue import { ensureLeading0x, NULL_ADDRESS } from '@celo/base/lib/address' import { constitution } from '@celo/protocol/governanceConstitution' import { diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index 9812055b5c3..cd1688cc829 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -1,4 +1,3 @@ -// TODO: (soloseng) gas price; import { NULL_ADDRESS, trimLeading0x } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils' diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index 96dac682d9f..1175502d0ff 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -1,4 +1,3 @@ -// TODO: (soloseng) error caused by non-zero gasprice import { NULL_ADDRESS } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils' @@ -10,7 +9,7 @@ import { assertSameAddress, timeTravel, } from '@celo/protocol/lib/test-utils' -import { addressToPublicKey, Signature } from '@celo/utils/lib/signatureUtils' +import { Signature, addressToPublicKey } from '@celo/utils/lib/signatureUtils' import { BigNumber } from 'bignumber.js' import _ from 'lodash' import { diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index 4bae58fd989..4c9534f7381 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -70,7 +70,7 @@ const networks = { defaultGasPrice: 0, blockGasLimit: gasLimit, defaultBalance: 200000000, - maxFeePerGas: 875000000, + // maxFeePerGas: 875000000, mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic', }, rc0: { diff --git a/packages/sdk/base/src/signatureUtils.ts b/packages/sdk/base/src/signatureUtils.ts index 0e52c689264..fac9f529d56 100644 --- a/packages/sdk/base/src/signatureUtils.ts +++ b/packages/sdk/base/src/signatureUtils.ts @@ -17,7 +17,7 @@ export function NativeSigner( } export interface Signature { - //TODO: soloseng: should this be converted to Bigint? + //TODO: (soloseng) should this be converted to Bigint? v: number r: string s: string From 8de0e9d4859679b9fe4c6666aa9a6c89b88217df Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 5 Apr 2023 12:13:54 -0400 Subject: [PATCH 018/184] timeout fix --- packages/protocol/lib/test-utils.ts | 2 +- packages/protocol/test/common/accounts.ts | 20 ++++-- .../test/governance/network/governance.ts | 14 ++++- .../protocol/test/identity/attestations.ts | 62 ++++++++++++------- 4 files changed, 67 insertions(+), 31 deletions(-) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index ba58459f0b0..92e9c1ed7de 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -8,7 +8,7 @@ import assert from 'assert'; import BigNumber from 'bignumber.js'; import chai from 'chai'; import chaiSubset from 'chai-subset'; -import { spawn, SpawnOptions } from 'child_process'; +import { SpawnOptions, spawn } from 'child_process'; import { keccak256 } from 'ethereum-cryptography/keccak'; import { GovernanceApproverMultiSigInstance, diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index 8aad558f342..cfaaadceb45 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -362,17 +362,25 @@ contract('Accounts', (accounts: string[]) => { describe('#batchGetMetadataURL', () => { it('returns multiple metadata URLs', async () => { const randomStrings = accounts.map((_) => web3.utils.randomHex(20).slice(2)) - await Promise.all( - accounts.map(async (mappedAccount, i) => { - await accountsInstance.createAccount({ from: mappedAccount }) - await accountsInstance.setMetadataURL(randomStrings[i], { from: mappedAccount }) - }) - ) + // await Promise.all( + // accounts.map(async (mappedAccount, i) => { + // await accountsInstance.createAccount({ from: mappedAccount }) + // await accountsInstance.setMetadataURL(randomStrings[i], { from: mappedAccount }) + // }) + // ) + + for (let i = 0; i < accounts.length; i++) { + await accountsInstance.createAccount({ from: accounts[i] }) + await accountsInstance.setMetadataURL(randomStrings[i], { from: accounts[i] }) + } + const [stringLengths, data] = await accountsInstance.batchGetMetadataURL(accounts) + const strings = parseSolidityStringArray( stringLengths.map((x) => x.toNumber()), data as unknown as string ) + for (let i = 0; i < accounts.length; i++) { assert.equal(strings[i], randomStrings[i]) } diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index cd1688cc829..ebef47959dc 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -3164,7 +3164,17 @@ contract('Governance', (accounts: string[]) => { ) beforeEach(async () => { - await concurrentMap(5, validators, async (validator) => { + // await concurrentMap(5, validators, async (validator) => { + // await accountsInstance.createAccount({ from: validator.account }) + // const sig = await getParsedSignatureOfAddress(web3, validator.account, validator.signer) + // await accountsInstance.authorizeValidatorSigner(validator.signer, sig.v, sig.r, sig.s, { + // from: validator.account, + // }) + // // add signers for mock precompile + // await governance.addValidator(validator.signer) + // }) + + for (let validator of validators) { await accountsInstance.createAccount({ from: validator.account }) const sig = await getParsedSignatureOfAddress(web3, validator.account, validator.signer) await accountsInstance.authorizeValidatorSigner(validator.signer, sig.v, sig.r, sig.s, { @@ -3172,7 +3182,7 @@ contract('Governance', (accounts: string[]) => { }) // add signers for mock precompile await governance.addValidator(validator.signer) - }) + } }) const whitelistFrom = (t: keyof typeof validators[0]) => diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index 16f2137c3a1..19880b3a62b 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -32,7 +32,6 @@ import { } from 'types' import Web3 from 'web3' import { soliditySha3 } from 'web3-utils' -import { beforeEachWithRetries } from '../customHooks' const Accounts: AccountsContract = artifacts.require('Accounts') /* We use a contract that behaves like the actual Attestations contract, but @@ -82,7 +81,8 @@ contract('Attestations', (accounts: string[]) => { return accounts[nonIssuerIndex] } - beforeEachWithRetries('Attestations setup', 3, 3000, async () => { + beforeEach('Attestations setup', async () => { + // beforeEachWithRetries('Attestations setup', 3, 3000, async () => { accountsInstance = await Accounts.new(true) mockERC20Token = await MockERC20Token.new() otherMockERC20Token = await MockERC20Token.new() @@ -95,27 +95,45 @@ contract('Attestations', (accounts: string[]) => { registry = await Registry.new(true) await accountsInstance.initialize(registry.address) await registry.setAddressFor(CeloContractName.Validators, mockValidators.address) - const tokenBalance = web3.utils.toWei('10', 'ether').toString() - await Promise.all( - accounts.map(async (account) => { - await mockERC20Token.mint(account, tokenBalance) - await otherMockERC20Token.mint(account, tokenBalance) - await accountsInstance.createAccount({ from: account }) - await unlockAndAuthorizeKey( - KeyOffsets.VALIDATING_KEY_OFFSET, - accountsInstance.authorizeValidatorSigner, - account, - accounts - ) - await unlockAndAuthorizeKey( - KeyOffsets.ATTESTING_KEY_OFFSET, - accountsInstance.authorizeAttestationSigner, - account, - accounts - ) - }) - ) + // await Promise.all( + // accounts.map(async (account) => { + // console.log('account:', account) + // await mockERC20Token.mint(account, tokenBalance) + // await otherMockERC20Token.mint(account, tokenBalance) + // await accountsInstance.createAccount({ from: account }) + // await unlockAndAuthorizeKey( + // KeyOffsets.VALIDATING_KEY_OFFSET, + // accountsInstance.authorizeValidatorSigner, + // account, + // accounts + // ) + // // await unlockAndAuthorizeKey( + // // KeyOffsets.ATTESTING_KEY_OFFSET, + // // accountsInstance.authorizeAttestationSigner, + // // account, + // // accounts + // // ) + // }) + // ) + + for (let account of accounts) { + await mockERC20Token.mint(account, tokenBalance) + await otherMockERC20Token.mint(account, tokenBalance) + await accountsInstance.createAccount({ from: account }) + await unlockAndAuthorizeKey( + KeyOffsets.VALIDATING_KEY_OFFSET, + accountsInstance.authorizeValidatorSigner, + account, + accounts + ) + await unlockAndAuthorizeKey( + KeyOffsets.ATTESTING_KEY_OFFSET, + accountsInstance.authorizeAttestationSigner, + account, + accounts + ) + } mockElection = await MockElection.new() await mockElection.setElectedValidators( From 4be4285f87201d1f3c3643a1f9ac5204bd770939 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 5 Apr 2023 14:16:49 -0400 Subject: [PATCH 019/184] -- comments --- packages/protocol/test/common/accounts.ts | 8 ------- .../test/governance/network/governance.ts | 12 +---------- .../protocol/test/identity/attestations.ts | 21 ------------------- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index cfaaadceb45..e184dd52cf6 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -362,12 +362,6 @@ contract('Accounts', (accounts: string[]) => { describe('#batchGetMetadataURL', () => { it('returns multiple metadata URLs', async () => { const randomStrings = accounts.map((_) => web3.utils.randomHex(20).slice(2)) - // await Promise.all( - // accounts.map(async (mappedAccount, i) => { - // await accountsInstance.createAccount({ from: mappedAccount }) - // await accountsInstance.setMetadataURL(randomStrings[i], { from: mappedAccount }) - // }) - // ) for (let i = 0; i < accounts.length; i++) { await accountsInstance.createAccount({ from: accounts[i] }) @@ -375,12 +369,10 @@ contract('Accounts', (accounts: string[]) => { } const [stringLengths, data] = await accountsInstance.batchGetMetadataURL(accounts) - const strings = parseSolidityStringArray( stringLengths.map((x) => x.toNumber()), data as unknown as string ) - for (let i = 0; i < accounts.length; i++) { assert.equal(strings[i], randomStrings[i]) } diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index ebef47959dc..a86144375b2 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -3164,16 +3164,6 @@ contract('Governance', (accounts: string[]) => { ) beforeEach(async () => { - // await concurrentMap(5, validators, async (validator) => { - // await accountsInstance.createAccount({ from: validator.account }) - // const sig = await getParsedSignatureOfAddress(web3, validator.account, validator.signer) - // await accountsInstance.authorizeValidatorSigner(validator.signer, sig.v, sig.r, sig.s, { - // from: validator.account, - // }) - // // add signers for mock precompile - // await governance.addValidator(validator.signer) - // }) - for (let validator of validators) { await accountsInstance.createAccount({ from: validator.account }) const sig = await getParsedSignatureOfAddress(web3, validator.account, validator.signer) @@ -3304,7 +3294,7 @@ contract('Governance', (accounts: string[]) => { [transactionSuccess1.value], [transactionSuccess1.destination], // @ts-ignore bytes type - transactionSuccess1.data, //submitting TX + transactionSuccess1.data, [transactionSuccess1.data.length], salt, { gas: 2000000 } diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index 19880b3a62b..aab4ea41dcd 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -96,27 +96,6 @@ contract('Attestations', (accounts: string[]) => { await accountsInstance.initialize(registry.address) await registry.setAddressFor(CeloContractName.Validators, mockValidators.address) const tokenBalance = web3.utils.toWei('10', 'ether').toString() - // await Promise.all( - // accounts.map(async (account) => { - // console.log('account:', account) - // await mockERC20Token.mint(account, tokenBalance) - // await otherMockERC20Token.mint(account, tokenBalance) - // await accountsInstance.createAccount({ from: account }) - // await unlockAndAuthorizeKey( - // KeyOffsets.VALIDATING_KEY_OFFSET, - // accountsInstance.authorizeValidatorSigner, - // account, - // accounts - // ) - // // await unlockAndAuthorizeKey( - // // KeyOffsets.ATTESTING_KEY_OFFSET, - // // accountsInstance.authorizeAttestationSigner, - // // account, - // // accounts - // // ) - // }) - // ) - for (let account of accounts) { await mockERC20Token.mint(account, tokenBalance) await otherMockERC20Token.mint(account, tokenBalance) From 686659aad40caa585a51c33070163649ba2986d5 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 5 Apr 2023 14:18:15 -0400 Subject: [PATCH 020/184] Fixed overflow test --- packages/protocol/test/governance/voting/release_gold.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index 1175502d0ff..bb549746224 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -7,6 +7,7 @@ import { assertLogMatches, assertRevert, assertSameAddress, + assertTXRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { Signature, addressToPublicKey } from '@celo/utils/lib/signatureUtils' @@ -456,7 +457,10 @@ contract('ReleaseGold', (accounts: string[]) => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.numReleasePeriods = Number.MAX_SAFE_INTEGER releaseGoldSchedule.amountReleasedPerPeriod = new BigNumber(2).pow(300) - await assertRevert(createNewReleaseGoldInstance(releaseGoldSchedule, web3)) + await assertTXRevertWithReason( + createNewReleaseGoldInstance(releaseGoldSchedule, web3), + 'value out-of-bounds' + ) }) }) }) From a8c32886d69301d98179bfa180369cda963de7ff Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:55:07 -0400 Subject: [PATCH 021/184] Merge branch 'soloseng/ast-version_fix' --- package.json | 5 +- .../protocol/lib/compatibility/ast-version.ts | 13 +- .../test/compatibility/ast-version.ts | 39 +++--- yarn.lock | 127 ++---------------- 4 files changed, 43 insertions(+), 141 deletions(-) diff --git a/package.json b/package.json index aad53b4b959..9650b549913 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,9 @@ "resolutions": { "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", "@types/bn.js": "4.11.6", - "bignumber.js": "9.0.0" + "bignumber.js": "9.0.0", + "@ethereumjs/block": "4.0.1", + "@ethereumjs/blockchain": "6.0.2", + "@ethereumjs/ethash": "2.0.1" } } diff --git a/packages/protocol/lib/compatibility/ast-version.ts b/packages/protocol/lib/compatibility/ast-version.ts index 524049203cb..f77785054a2 100644 --- a/packages/protocol/lib/compatibility/ast-version.ts +++ b/packages/protocol/lib/compatibility/ast-version.ts @@ -1,9 +1,10 @@ // tslint:disable: max-classes-per-file import { Artifact } from '@celo/protocol/lib/compatibility/internal'; import { ContractVersion, ContractVersionChecker, ContractVersionCheckerIndex, ContractVersionDelta, ContractVersionDeltaIndex, ContractVersionIndex, DEFAULT_VERSION_STRING } from '@celo/protocol/lib/compatibility/version'; +import { Address as EJSAddress } from "@ethereumjs/util"; +import { VM } from "@ethereumjs/vm"; import { BuildArtifacts } from '@openzeppelin/upgrades'; import { isLibrary } from './report'; -const VM = require('@ethereumjs/vm').default const abi = require('ethereumjs-abi') /** @@ -29,17 +30,17 @@ export class ASTContractVersions { * If the contract version cannot be retrieved, returns version 1.1.0.0 by default. */ export async function getContractVersion(artifact: Artifact): Promise { - const vm = new VM() + const vm = await VM.create(); const bytecode = artifact.deployedBytecode const data = '0x' + abi.methodID('getVersionNumber', []).toString('hex') const nullAddress = '0000000000000000000000000000000000000000' // Artificially link all libraries to the null address. const linkedBytecode = bytecode.split(/[_]+[A-Za-z0-9]+[_]+/).join(nullAddress) - const result = await vm.runCall({ - to: Buffer.from(nullAddress, 'hex'), - caller: Buffer.from(nullAddress, 'hex'), + const result = await vm.evm.runCall({ + to:new EJSAddress(Buffer.from(nullAddress, 'hex')) , + caller: new EJSAddress(Buffer.from(nullAddress, 'hex')), code: Buffer.from(linkedBytecode.slice(2), 'hex'), - static: true, + isStatic: true, data: Buffer.from(data.slice(2), 'hex') }) if (result.execResult.exceptionError === undefined) { diff --git a/packages/protocol/test/compatibility/ast-version.ts b/packages/protocol/test/compatibility/ast-version.ts index bd826c1b086..98de2807288 100644 --- a/packages/protocol/test/compatibility/ast-version.ts +++ b/packages/protocol/test/compatibility/ast-version.ts @@ -1,30 +1,27 @@ -// TODO: (soloseng): find source of error: \ -// issue may be comming from @ethereumjs/vm package runCall +import { getContractVersion } from '@celo/protocol/lib/compatibility/ast-version' +import { DEFAULT_VERSION_STRING } from '@celo/protocol/lib/compatibility/version' +import { getTestArtifacts } from '@celo/protocol/test/compatibility/common' +import { assert } from 'chai' -// import { getContractVersion } from '@celo/protocol/lib/compatibility/ast-version' -// import { DEFAULT_VERSION_STRING } from '@celo/protocol/lib/compatibility/version' -// import { getTestArtifacts } from '@celo/protocol/test/compatibility/common' -// import { assert } from 'chai' - -// const testCases = { -// original: getTestArtifacts('original'), -// versioned: getTestArtifacts('versioned'), -// } +const testCases = { + original: getTestArtifacts('original'), + versioned: getTestArtifacts('versioned'), +} describe('#getContractVersion()', () => { describe('when the contract implements getVersionNumber()', () => { - // xit('returns the correct version number', async () => { - // const version = await getContractVersion( - // testCases.versioned.getArtifactByName('TestContract') - // ) - // assert.equal(version.toString(), '1.2.3.4') - // }) + it('returns the correct version number', async () => { + const version = await getContractVersion( + testCases.versioned.getArtifactByName('TestContract') + ) + assert.equal(version.toString(), '1.2.3.4') + }) }) describe('when the contract does not implement getVersionNumber()', () => { - // xit('returns the default version number', async () => { - // const version = await getContractVersion(testCases.original.getArtifactByName('TestContract')) - // assert.equal(version.toString(), DEFAULT_VERSION_STRING) - // }) + it('returns the default version number', async () => { + const version = await getContractVersion(testCases.original.getArtifactByName('TestContract')) + assert.equal(version.toString(), DEFAULT_VERSION_STRING) + }) }) }) diff --git a/yarn.lock b/yarn.lock index fb58584481c..3d21e4b7711 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1409,42 +1409,6 @@ eth-lib "^0.2.8" ethereumjs-util "^5.2.0" -"@chainsafe/as-sha256@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.3.1.tgz#3639df0e1435cab03f4d9870cc3ac079e57a6fc9" - integrity sha512-hldFFYuf49ed7DAakWVXSJODuq3pzJEguD8tQ7h+sGkM18vja+OFoJI9krnGmgzyuZC2ETX0NOIcCTy31v2Mtg== - -"@chainsafe/persistent-merkle-tree@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.4.2.tgz#4c9ee80cc57cd3be7208d98c40014ad38f36f7ff" - integrity sha512-lLO3ihKPngXLTus/L7WHKaw9PnNJWizlOF1H9NNzHP6Xvh82vzg9F2bzkXhYIFshMZ2gTCEz8tq6STe7r5NDfQ== - dependencies: - "@chainsafe/as-sha256" "^0.3.1" - -"@chainsafe/persistent-merkle-tree@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.5.0.tgz#2b4a62c9489a5739dedd197250d8d2f5427e9f63" - integrity sha512-l0V1b5clxA3iwQLXP40zYjyZYospQLZXzBVIhhr9kDg/1qHZfzzHw0jj4VPBijfYCArZDlPkRi1wZaV2POKeuw== - dependencies: - "@chainsafe/as-sha256" "^0.3.1" - -"@chainsafe/ssz@^0.10.0": - version "0.10.1" - resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.10.1.tgz#c05ec168a3c7de1e6b72eac170afbe497ffca329" - integrity sha512-IdDOblRmH/aYqSJknAjTuT2Y2FEctofyXvmFzbJZkQ/XgYWyFELI3IFR3P2T2VNxeAgl6QOqcVbe+cGRL7Mxpw== - dependencies: - "@chainsafe/as-sha256" "^0.3.1" - "@chainsafe/persistent-merkle-tree" "^0.5.0" - -"@chainsafe/ssz@^0.9.2": - version "0.9.4" - resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.9.4.tgz#696a8db46d6975b600f8309ad3a12f7c0e310497" - integrity sha512-77Qtg2N1ayqs4Bg/wvnWfg5Bta7iy7IRh8XqXh7oNMeP2HBbBwx8m6yTpA8p0EHItWPEBkgZd5S5/LSlp3GXuQ== - dependencies: - "@chainsafe/as-sha256" "^0.3.1" - "@chainsafe/persistent-merkle-tree" "^0.4.2" - case "^1.6.3" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1517,7 +1481,7 @@ resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA== -"@ethereumjs/block@4.0.1": +"@ethereumjs/block@4.0.1", "@ethereumjs/block@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-4.0.1.tgz#bc865daa901c3165c43b1bad2c6db544d4e9b3dd" integrity sha512-cYkJaogUL5V3iZOSm7WgSP8Fvm9R/jN/dotRQZpj5SJ3fP6GF00xtmYpQGE10SnK/Lo+iyXwZ2K7M1zn/0wnXw== @@ -1530,19 +1494,6 @@ ethereum-cryptography "^1.1.2" ethers "^5.7.1" -"@ethereumjs/block@^4.0.1", "@ethereumjs/block@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-4.2.0.tgz#08c0f98b30b13069291749414bf47172f2eaa121" - integrity sha512-IBGJaJN8wt1LGBXFouF6TGLz7Q5QTJR3dudP+Mf2LMNxpH1I6A/N5dSzMIRtULke5UI5V/dnWlobF9XFVx37Pw== - dependencies: - "@ethereumjs/common" "^3.1.0" - "@ethereumjs/rlp" "^4.0.1" - "@ethereumjs/trie" "^5.0.3" - "@ethereumjs/tx" "^4.1.0" - "@ethereumjs/util" "^8.0.4" - ethereum-cryptography "^1.1.2" - ethers "^5.7.1" - "@ethereumjs/blockchain@6.0.2": version "6.0.2" resolved "https://registry.yarnpkg.com/@ethereumjs/blockchain/-/blockchain-6.0.2.tgz#51f7b573dccc976077a699f08882276e54ab1fd8" @@ -1569,7 +1520,7 @@ crc-32 "^1.2.0" ethereumjs-util "^7.1.1" -"@ethereumjs/common@3.0.1": +"@ethereumjs/common@3.0.1", "@ethereumjs/common@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.0.1.tgz#c2dbd444d96e4014c7f7befd0529b5c1a02f590b" integrity sha512-AHsJB7ydfb7TFCT7ORGY0tRiKkAylWZd/Qt6Lmc3Oycs66bMeE1JuYHbc0U6qsAZKZMFsUmL/UJDT/w7Z0cytw== @@ -1585,22 +1536,14 @@ crc-32 "^1.2.0" ethereumjs-util "^7.1.5" -"@ethereumjs/common@^3.0.1", "@ethereumjs/common@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.1.0.tgz#33eca566d19a7555d905edeeef36a2cc55afc355" - integrity sha512-LyfDb6i4AJ9sSuFY+sz1HQwjSZkIrEuYjrqUO2d3ESzvc8pQwKkrqk19dlNxIMNP3Q5SJ+fqeLOun7R4HJYKdQ== - dependencies: - "@ethereumjs/util" "^8.0.4" - crc-32 "^1.2.0" - -"@ethereumjs/ethash@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-2.0.3.tgz#a903b422f0c41105cb47e9630d1234a9c934b669" - integrity sha512-CPNP7gD6XAmBRlh70iBVOmfiP7CZcb4q1z5r9pzFWW0dzoXRUJKV7WqlCJXF9mNvpuQEAPJzYjBEE8NqOg/Spg== +"@ethereumjs/ethash@2.0.1", "@ethereumjs/ethash@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-2.0.1.tgz#eb79d642ee5bd9200ed68080aa28753753c1271e" + integrity sha512-3+Z7ot2j3MKD9+bzoqfAVoN+T89d+g7KKX2hwQ8s2wNvuZoki1uhg/hRy5XmHbOtFhQ0pjUqC1kk3U+CsN4+rQ== dependencies: - "@ethereumjs/block" "^4.2.0" - "@ethereumjs/rlp" "^4.0.1" - "@ethereumjs/util" "^8.0.4" + "@ethereumjs/block" "^4.0.1" + "@ethereumjs/rlp" "^4.0.0" + "@ethereumjs/util" "^8.0.0" abstract-level "^1.0.3" bigint-crypto-utils "^3.0.23" ethereum-cryptography "^1.1.2" @@ -1618,16 +1561,11 @@ mcl-wasm "^0.7.1" rustbn.js "~0.2.0" -"@ethereumjs/rlp@4.0.0": +"@ethereumjs/rlp@4.0.0", "@ethereumjs/rlp@^4.0.0", "@ethereumjs/rlp@^4.0.0-beta.2": version "4.0.0" resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.0.tgz#66719891bd727251a7f233f9ca80212d1994f8c8" integrity sha512-LM4jS5n33bJN60fM5EC8VeyhUgga6/DjCPBV2vWjnfVtobqtOiNC4SQ1MRFqyBSmJGGdB533JZWewyvlcdJtkQ== -"@ethereumjs/rlp@^4.0.0", "@ethereumjs/rlp@^4.0.0-beta.2", "@ethereumjs/rlp@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.1.tgz#626fabfd9081baab3d0a3074b0c7ecaf674aaa41" - integrity sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw== - "@ethereumjs/statemanager@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/statemanager/-/statemanager-1.0.1.tgz#1ded98f3c139af1f9b4b3feb8ea7272aaeb7348f" @@ -1640,7 +1578,7 @@ ethers "^5.7.1" js-sdsl "^4.1.4" -"@ethereumjs/trie@5.0.1": +"@ethereumjs/trie@5.0.1", "@ethereumjs/trie@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.1.tgz#3cb5730450839c8a540ec48e16a7825a1d0897e5" integrity sha512-MA8uXR2pa+r8+wBvlyeZoUewwbUZe4Iy4zKi38THP6/flYvIIY+bTVjf/EA3jMhH68j6nJH5SFu5wi5SBdS/2A== @@ -1651,17 +1589,6 @@ ethereum-cryptography "^1.1.2" readable-stream "^3.6.0" -"@ethereumjs/trie@^5.0.1", "@ethereumjs/trie@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.3.tgz#050c844c80cf0669506de747ec3907b082d01c83" - integrity sha512-E32kjPP1+Li151VaPWzkZJColdR/bO8V/D4JoX8RqPN5rDvZEtbjDi69UUGyJqIIsa9ZxwGeeqcDCNJmxiMTCQ== - dependencies: - "@ethereumjs/rlp" "^4.0.1" - "@ethereumjs/util" "^8.0.4" - "@types/readable-stream" "^2.3.13" - ethereum-cryptography "^1.1.2" - readable-stream "^3.6.0" - "@ethereumjs/tx@3.3.2": version "3.3.2" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.2.tgz#348d4624bf248aaab6c44fec2ae67265efe3db00" @@ -1670,7 +1597,7 @@ "@ethereumjs/common" "^2.5.0" ethereumjs-util "^7.1.2" -"@ethereumjs/tx@4.0.1": +"@ethereumjs/tx@4.0.1", "@ethereumjs/tx@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.0.1.tgz#bb8333e883952b61c40dbc7a3335d99cc5f1c2e4" integrity sha512-JFq66cjjwnWOdKuDNNq0Hr1j04A546ymUo/8xnPa7wAm3s+RyGVt8VbaNF71/GJqN4tuY62gxvTfZ+B62foyPw== @@ -1689,19 +1616,7 @@ "@ethereumjs/common" "^2.6.4" ethereumjs-util "^7.1.5" -"@ethereumjs/tx@^4.0.1", "@ethereumjs/tx@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.1.0.tgz#02357c4f307b988abe7870126241c140c7ecc375" - integrity sha512-3/PawJxcmI0LR8SCqN/3OTz76Q4Mhto8TCvcTpIAPx/l9V68C/NBjYdJOn2WshzxRvvm6jBTphUaZc2B70W5Jw== - dependencies: - "@chainsafe/ssz" "^0.9.2" - "@ethereumjs/common" "^3.1.0" - "@ethereumjs/rlp" "^4.0.1" - "@ethereumjs/util" "^8.0.4" - "@ethersproject/providers" "^5.7.2" - ethereum-cryptography "^1.1.2" - -"@ethereumjs/util@8.0.2": +"@ethereumjs/util@8.0.2", "@ethereumjs/util@^8.0.0", "@ethereumjs/util@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.0.2.tgz#b7348fc7253649b0f00685a94546c6eee1fad819" integrity sha512-b1Fcxmq+ckCdoLPhVIBkTcH8szigMapPuEmD8EDakvtI5Na5rzmX1sBW73YQqaPc7iUxGCAzZP1LrFQ7aEMugA== @@ -1710,15 +1625,6 @@ async "^3.2.4" ethereum-cryptography "^1.1.2" -"@ethereumjs/util@^8.0.0", "@ethereumjs/util@^8.0.2", "@ethereumjs/util@^8.0.4": - version "8.0.4" - resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.0.4.tgz#a5bdf0009e2e23f2c821369f718f8a404f59def4" - integrity sha512-tX2k9fG6eWBq5qby3VT1KgQT8iqnmwMYeDPJ/oyVdOcYKTiCBdkSBNtCWLh0vp3bIWUOjNRyPdwsYu73CyFCNA== - dependencies: - "@chainsafe/ssz" "^0.10.0" - "@ethereumjs/rlp" "^4.0.1" - ethereum-cryptography "^1.1.2" - "@ethereumjs/vm@npm:@soloseng/ethereumjs-vm@6.2.3": version "6.2.3" resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-vm/-/ethereumjs-vm-6.2.3.tgz#1f1dbd055698c35b2d993aab8a907ff7d3390167" @@ -1977,7 +1883,7 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2": +"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1": version "5.7.2" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg== @@ -9089,11 +8995,6 @@ cardinal@^2.1.1: ansicolors "~0.3.2" redeyed "~2.1.0" -case@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" - integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== - caseless@^0.12.0, caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" From e50fe29b7738573bf82138feef2800e549c2a740 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 18 Apr 2023 14:08:39 -0400 Subject: [PATCH 022/184] using istanbul hardfork --- packages/dev-utils/src/ganache-setup.ts | 2 +- packages/protocol/scripts/devchain.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dev-utils/src/ganache-setup.ts b/packages/dev-utils/src/ganache-setup.ts index 8e5a6900857..7b40e82c2b0 100644 --- a/packages/dev-utils/src/ganache-setup.ts +++ b/packages/dev-utils/src/ganache-setup.ts @@ -71,7 +71,7 @@ async function launchServer(opts: { verbose?: boolean; from_targz?: boolean }, c logging: { logger: { log: logFn } }, database: { dbPath: chain }, miner: { blockGasLimit: 20000000 }, - chain: { networkId: 1101, allowUnlimitedContractSize: true }, + chain: { networkId: 1101, allowUnlimitedContractSize: true, hardfork: 'istanbul' }, }) server.listen(8545, async (err: any) => { diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 8eb6090f688..3dc809df74b 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -123,7 +123,7 @@ async function startGanache(datadir: string, opts: { verbose?: boolean }) { database: { dbPath: datadir }, wallet: { mnemonic: MNEMONIC, defaultBalance: 200000000 }, miner: { blockGasLimit: gasLimit }, - chain: { networkId: 1101, allowUnlimitedContractSize: true }, + chain: { networkId: 1101, allowUnlimitedContractSize: true, hardfork: 'istanbul' }, }) server.listen(8545, async (err) => { From 45817fa15684af9c1818340dab5026ddbf0873f9 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:59:16 -0400 Subject: [PATCH 023/184] ++ yarn.lock --- yarn.lock | 6629 +++++++++++++++++++++-------------------------------- 1 file changed, 2550 insertions(+), 4079 deletions(-) diff --git a/yarn.lock b/yarn.lock index f0e0b32b191..4ba0b58b24b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -553,10 +553,17 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.0.tgz#2a592fd89bacb1fcde68de31bee4f2f2dacb0e86" - integrity sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw== +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" + integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== + dependencies: + "@babel/highlight" "^7.18.6" + +"@babel/compat-data@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" + integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4": version "7.19.0" @@ -579,7 +586,17 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.19.0", "@babel/generator@^7.5.0", "@babel/generator@^7.7.2": +"@babel/generator@^7.12.5", "@babel/generator@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" + integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== + dependencies: + "@babel/types" "^7.21.4" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + +"@babel/generator@^7.19.0", "@babel/generator@^7.7.2": version "7.19.0" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a" integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg== @@ -588,111 +605,45 @@ "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" -"@babel/generator@^7.13.0", "@babel/generator@^7.5.0": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39" - integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw== +"@babel/helper-compilation-targets@^7.19.0": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" + integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== dependencies: - "@babel/types" "^7.18.6" + "@babel/compat-data" "^7.21.4" + "@babel/helper-validator-option" "^7.21.0" + browserslist "^4.21.3" + lru-cache "^5.1.1" + semver "^6.3.0" -"@babel/helper-annotate-as-pure@^7.10.1", "@babel/helper-annotate-as-pure@^7.10.4": +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-function-name@^7.10.4": version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" - integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA== + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" + integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== dependencies: + "@babel/helper-get-function-arity" "^7.10.4" + "@babel/template" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz#4e9012d6701bef0030348d7f9c808209bd3e8687" - integrity sha512-lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.10.3" - "@babel/types" "^7.10.3" - -"@babel/helper-builder-react-jsx-experimental@^7.10.1": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz#9a7d58ad184d3ac3bafb1a452cec2bad7e4a0bc8" - integrity sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ== +"@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" + integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/helper-module-imports" "^7.10.1" - "@babel/types" "^7.10.1" + "@babel/template" "^7.20.7" + "@babel/types" "^7.21.0" -"@babel/helper-builder-react-jsx@^7.10.3": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.3.tgz#62c4b7bb381153a0a5f8d83189b94b9fb5384fc5" - integrity sha512-vkxmuFvmovtqTZknyMGj9+uQAZzz5Z9mrbnkJnPkaYGfKTaSsYcjQdXP0lgrWLVh8wU6bCjOmXOpx+kqUi+S5Q== +"@babel/helper-get-function-arity@^7.10.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/types" "^7.10.3" - -"@babel/helper-compilation-targets@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz#02bdb22783439afb11b2f009814bdd88384bd468" - integrity sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A== - dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" - semver "^6.3.0" - -"@babel/helper-create-class-features-plugin@^7.10.1": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.3.tgz#2783daa6866822e3d5ed119163b50f0fc3ae4b35" - integrity sha512-iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ== - dependencies: - "@babel/helper-function-name" "^7.10.3" - "@babel/helper-member-expression-to-functions" "^7.10.3" - "@babel/helper-optimise-call-expression" "^7.10.3" - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/helper-replace-supers" "^7.10.1" - "@babel/helper-split-export-declaration" "^7.10.1" - -"@babel/helper-create-class-features-plugin@^7.13.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz#0367bd0a7505156ce018ca464f7ac91ba58c1a04" - integrity sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" - -"@babel/helper-create-regexp-features-plugin@^7.10.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8" - integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-regex" "^7.10.4" - regexpu-core "^4.7.1" - -"@babel/helper-define-map@^7.10.3": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz#d27120a5e57c84727b30944549b2dfeca62401a8" - integrity sha512-bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ== - dependencies: - "@babel/helper-function-name" "^7.10.3" - "@babel/types" "^7.10.3" - lodash "^4.17.13" - -"@babel/helper-explode-assignable-expression@^7.10.3": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz#9dc14f0cfa2833ea830a9c8a1c742b6e7461b05e" - integrity sha512-0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw== - dependencies: - "@babel/traverse" "^7.10.3" - "@babel/types" "^7.10.3" - -"@babel/helper-function-name@^7.10.1", "@babel/helper-function-name@^7.10.3", "@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" + "@babel/types" "^7.16.7" "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" @@ -701,13 +652,6 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-get-function-arity@^7.10.1", "@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== - dependencies: - "@babel/types" "^7.18.9" - "@babel/helper-module-imports@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" @@ -715,248 +659,110 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.10.3", "@babel/helper-member-expression-to-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c" - integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.18.6" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" - -"@babel/helper-optimise-call-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" - integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-imports@^7.10.1", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.8.3": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" - integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== +"@babel/helper-module-imports@^7.8.3": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" + integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== dependencies: - "@babel/types" "^7.12.5" + "@babel/types" "^7.21.4" -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" - integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ== +"@babel/helper-module-transforms@^7.19.0": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" + integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-module-transforms@^7.10.1", "@babel/helper-module-transforms@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" - integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" - integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw== - dependencies: - "@babel/types" "^7.18.9" - -"@babel/helper-optimise-call-expression@^7.10.3", "@babel/helper-optimise-call-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" - integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-string-parser@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" - integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.2" + "@babel/types" "^7.21.2" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.10.3", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== -"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" - integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== - -"@babel/helper-regex@^7.10.1", "@babel/helper-regex@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0" - integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg== - dependencies: - lodash "^4.17.19" - -"@babel/helper-replace-supers@^7.10.1", "@babel/helper-replace-supers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9" - integrity sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24" - integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helper-simple-access@^7.10.1", "@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" - integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== - dependencies: - "@babel/types" "^7.12.1" +"@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.3": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.20.2" -"@babel/helper-split-export-declaration@^7.10.1", "@babel/helper-split-export-declaration@^7.11.0": +"@babel/helper-split-export-declaration@^7.11.0": version "7.11.0" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== dependencies: "@babel/types" "^7.11.0" -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== "@babel/helper-validator-identifier@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== -"@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== +"@babel/helper-validator-option@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" + integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== -"@babel/helpers@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" - integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== +"@babel/helpers@^7.19.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" + integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" - -"@babel/helpers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0" - integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.0" + "@babel/types" "^7.21.0" -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.18.6" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" - integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== - -"@babel/parser@^7.0.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.4": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.9.tgz#ca34cb95e1c2dd126863a84465ae8ef66114be99" - integrity sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw== - "@babel/parser@^7.1.0", "@babel/parser@^7.12.7": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== -"@babel/plugin-external-helpers@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.12.13.tgz#65ef9f4576297250dc601d2aa334769790d9966d" - integrity sha512-ClvAsk4RqpE6iacYUjdU9PtvIwC9yAefZENsPfGeG5FckX3jFZLDlWPuyv5gi9/9C2VgwX6H8q1ukBifC0ha+Q== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-proposal-class-properties@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01" - integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-proposal-export-default-from@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.0.0.tgz#a057bbfd4649facfe39f33a537e18554bdd2b5da" - integrity sha512-cWhkx6SyjZ4caFOanoPmDNgQCuYYTmou4QXy886JsyLTw/vhWQbop2gLKsWyyswrJkKTB7fSNxVYbP/oEsoySA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-export-default-from" "^7.0.0" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78" - integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" - -"@babel/plugin-proposal-object-rest-spread@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz#b8d0d22f70afa34ad84b7a200ff772f9b9fce474" - integrity sha512-ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ== - dependencies: - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.10.1" - -"@babel/plugin-proposal-optional-catch-binding@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2" - integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" +"@babel/parser@^7.14.7", "@babel/parser@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" + integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== -"@babel/plugin-proposal-optional-chaining@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz#9a726f94622b653c0a3a7a59cdce94730f526f7c" - integrity sha512-yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng== - dependencies: - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" +"@babel/parser@^7.20.7", "@babel/parser@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" + integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -972,13 +778,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-class-properties@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c" @@ -986,27 +785,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-dynamic-import@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-default-from@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.0.0.tgz#084b639bce3d42f3c5bf3f68ccb42220bb2d729d" - integrity sha512-HNnjg/fFFbnuLAqr/Ocp1Y3GB4AjmXcu1xxn3ql3bS2kGrB/qi+Povshb8i3hOkE5jNozzh8r/0/lq1w8oOWbQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c" - integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" @@ -1021,19 +799,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" - integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-jsx@^7.10.1": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz#0ae371134a42b91d5418feb3c8c8d43e1565d2da" - integrity sha512-+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ== +"@babel/plugin-syntax-jsx@^7.7.2": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" + integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -1042,7 +813,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== @@ -1056,7 +827,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": +"@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== @@ -1070,7 +841,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": +"@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== @@ -1084,256 +855,22 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" - integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== +"@babel/plugin-syntax-typescript@^7.7.2": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz#2751948e9b7c6d771a8efa59340c15d4a2891ff8" + integrity sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-arrow-functions@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b" - integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-block-scoped-functions@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" - integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-block-scoping@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e" - integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - lodash "^4.17.13" - -"@babel/plugin-transform-classes@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz#8d9a656bc3d01f3ff69e1fccb354b0f9d72ac544" - integrity sha512-irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/helper-define-map" "^7.10.3" - "@babel/helper-function-name" "^7.10.3" - "@babel/helper-optimise-call-expression" "^7.10.3" - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/helper-replace-supers" "^7.10.1" - "@babel/helper-split-export-declaration" "^7.10.1" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz#d3aa6eef67cb967150f76faff20f0abbf553757b" - integrity sha512-GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.3" - -"@babel/plugin-transform-destructuring@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907" - integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-exponentiation-operator@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3" - integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-flow-strip-types@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01" - integrity sha512-WhXUNb4It5a19RsgKKbQPrjmy4yWOY1KynpEbNw7bnd1QTcrT/EIl3MJvnGgpgvrKyKbqX7nUNOJfkpLOnoDKA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.0.0" - -"@babel/plugin-transform-for-of@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5" - integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-function-name@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d" - integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw== - dependencies: - "@babel/helper-function-name" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-literals@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a" - integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-member-expression-literals@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" - integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-modules-commonjs@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301" - integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg== - dependencies: - "@babel/helper-module-transforms" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/helper-simple-access" "^7.10.1" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-object-assign@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.0.0.tgz#fca6d7500d9675c42868b8f3882979201b9a5ad8" - integrity sha512-Dag8mxx7/03oj8F8PkNso8GEMhwGfeT0TL6KfMsa9Brjx4IpwZVl3WBvEmYks8BMhPmrvM5NQ/tjaMbwEj5ijA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-object-super@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" - integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - -"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.10.1": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd" - integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg== - dependencies: - "@babel/helper-get-function-arity" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-property-literals@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" - integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-react-display-name@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.3.tgz#e3c246e1b4f3e52cc7633e237ad9194c0ec482e7" - integrity sha512-dOV44bnSW5KZ6kYF6xSHBth7TFiHHZReYXH/JH3XnFNV+soEL1F5d8JT7AJ3ZBncd19Qul7SN4YpBnyWOnQ8KA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.3" - -"@babel/plugin-transform-react-jsx-self@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz#422d99d122d592acab9c35ea22a6cfd9bf189f60" - integrity sha512-FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-react-jsx-source@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz#30db3d4ee3cdebbb26a82a9703673714777a4273" - integrity sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/plugin-syntax-jsx" "^7.10.1" - -"@babel/plugin-transform-react-jsx@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.3.tgz#c07ad86b7c159287c89b643f201f59536231048e" - integrity sha512-Y21E3rZmWICRJnvbGVmDLDZ8HfNDIwjGF3DXYHx1le0v0mIHCs0Gv5SavyW5Z/jgAHLaAoJPiwt+Dr7/zZKcOQ== - dependencies: - "@babel/helper-builder-react-jsx" "^7.10.3" - "@babel/helper-builder-react-jsx-experimental" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.3" - "@babel/plugin-syntax-jsx" "^7.10.1" - -"@babel/plugin-transform-regenerator@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz#6ec680f140a5ceefd291c221cb7131f6d7e8cb6d" - integrity sha512-H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw== - dependencies: - regenerator-transform "^0.14.2" - -"@babel/plugin-transform-runtime@^7.0.0", "@babel/plugin-transform-runtime@^7.5.5": +"@babel/plugin-transform-runtime@^7.5.5": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd" integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w== dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.9" - babel-plugin-polyfill-corejs2 "^0.3.2" - babel-plugin-polyfill-corejs3 "^0.5.3" - babel-plugin-polyfill-regenerator "^0.4.0" - semver "^6.3.0" - -"@babel/plugin-transform-shorthand-properties@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3" - integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-spread@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8" - integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/plugin-transform-sticky-regex@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00" - integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.1" - "@babel/helper-regex" "^7.10.1" - -"@babel/plugin-transform-template-literals@^7.0.0": - version "7.10.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz#69d39b3d44b31e7b4864173322565894ce939b25" - integrity sha512-yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.3" - -"@babel/plugin-transform-typescript@^7.5.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853" - integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-typescript" "^7.12.13" - -"@babel/plugin-transform-unicode-regex@^7.0.0": - version "7.10.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f" - integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.10.1" - "@babel/helper-plugin-utils" "^7.10.1" - -"@babel/register@^7.0.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.13.8.tgz#d9051dc6820cb4e86375cc0e2d55a4862b31184f" - integrity sha512-yCVtABcmvQjRsX2elcZFUV5Q5kDDpHdtXKKku22hNDma60lYuhKmtp1ykZ/okRCPLT2bR5S+cA1kvtBdAFlDTQ== - dependencies: - find-cache-dir "^2.0.0" - lodash "^4.17.19" - make-dir "^2.1.0" - pirates "^4.0.0" - source-map-support "^0.5.16" + "@babel/helper-module-imports" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + resolve "^1.8.1" + semver "^5.5.1" "@babel/runtime@^7.0.0": version "7.13.9" @@ -1349,40 +886,32 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.0.0", "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== +"@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" + integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" + regenerator-runtime "^0.13.11" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0", "@babel/traverse@^7.7.2": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.0.tgz#eb9c561c7360005c592cc645abafe0c3c4548eed" - integrity sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA== +"@babel/template@^7.10.4", "@babel/template@^7.18.10", "@babel/template@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc" - integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ== +"@babel/template@^7.3.3": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" + integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.0" - "@babel/types" "^7.13.0" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.19" + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.3", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9": +"@babel/traverse@^7.1.0": version "7.12.9" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== @@ -1397,7 +926,39 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.1", "@babel/types@^7.10.3", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": +"@babel/traverse@^7.19.0", "@babel/traverse@^7.7.2": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.0.tgz#eb9c561c7360005c592cc645abafe0c3c4548eed" + integrity sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.19.0" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.19.0" + "@babel/types" "^7.19.0" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" + integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== + dependencies: + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.4" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.21.4" + "@babel/types" "^7.21.4" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.11.0", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== @@ -1406,6 +967,15 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" +"@babel/types@^7.10.4", "@babel/types@^7.16.7", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" + integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== + dependencies: + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -1416,11 +986,6 @@ resolved "https://registry.yarnpkg.com/@celo/base/-/base-1.5.2.tgz#168ab5e4e30b374079d8d139fafc52ca6bfd4100" integrity sha512-KGf6Dl9E6D01vAfkgkjL2sG+zqAjspAogILIpWstljWdG5ifyA75jihrnDEHaMCoQS0KxHvTdP1XYS/GS6BEyQ== -"@celo/base@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/base/-/base-2.2.0.tgz#cb769b0644408327cbe631400a8455d195a657ab" - integrity sha512-+jo52+er1TV9Qe6nCmzQ2dLt6M8J9STEJDaU+uiPyMVhMBcnYBpWzu9FJJPERmttejOC7hFuudrJI83vJulc4Q== - "@celo/bls12377js@0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@celo/bls12377js/-/bls12377js-0.1.1.tgz#ba3574f41697cdba96c10ae96bb1aac057285798" @@ -1441,16 +1006,15 @@ debug "^4.1.1" utf8 "3.0.0" -"@celo/contractkit@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/contractkit/-/contractkit-2.2.0.tgz#5cfcfdb4e5ec22f8ca071405c0d552b632137912" - integrity sha512-nIgCGDnOtCG5QtPJFzaDOOk12O6A8Bjk+tey46okeasvcT1uw2mQpLoelQ/PloTSbLQty3/IATNSPrQWqXShFA== +"@celo/contractkit@1.5.2", "@celo/contractkit@^1.2.0": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/contractkit/-/contractkit-1.5.2.tgz#be15d570f3044a190dabb6bbe53d5081c78ea605" + integrity sha512-b0r5TlfYDEscxze1Ai2jyJayiVElA9jvEehMD6aOSNtVhfP8oirjFIIffRe0Wzw1MSDGkw+q1c4m0Yw5sEOlvA== dependencies: - "@celo/base" "2.2.0" - "@celo/connect" "2.2.0" - "@celo/utils" "2.2.0" - "@celo/wallet-local" "2.2.0" - "@types/bn.js" "^5.1.0" + "@celo/base" "1.5.2" + "@celo/connect" "1.5.2" + "@celo/utils" "1.5.2" + "@celo/wallet-local" "1.5.2" "@types/debug" "^4.1.5" bignumber.js "^9.0.0" cross-fetch "^3.0.6" @@ -1465,61 +1029,9 @@ resolved "https://registry.yarnpkg.com/@celo/identity/-/identity-1.2.0.tgz#822ce8f2237a8498fad6910a2d2707f6b67a6999" integrity sha512-vpipC8qyEueIKKY0skPXaNwUDIhodGPv9wfFZ5mywzTIz46dbT0VmNSYkvOnoXlqvAjrwdzgvETbVMmpHpj3Xw== dependencies: - ethereumjs-util "6.1.0" - source-map-support "0.5.12" - yargs "13.2.4" - -"@celo/ganache-cli@git+https://github.com/celo-org/ganache-cli.git#e933297": - version "6.6.1" - resolved "git+https://github.com/celo-org/ganache-cli.git#e93329707efbe899ac2f32a30ccf2badbbec8bdf" - dependencies: - ethereumjs-util "6.1.0" - source-map-support "0.5.12" - yargs "13.2.4" - -"@celo/ganache-core@git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b", ganache-core@^2.6.0, "ganache-core@git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b": - version "2.10.3" - resolved "git+https://github.com/celo-org/ganache-core.git#e7099c4713c415ab24b8056fbf6e1034fa913a8b" - dependencies: - "@celo/utils" "1.5.1" - abstract-leveldown "3.0.0" - async "2.6.2" - bip39 "2.5.0" - cachedown "1.0.0" - clone "2.1.2" - debug "3.2.6" - encoding-down "5.0.4" - eth-sig-util "2.3.0" - ethereumjs-abi "0.6.7" - ethereumjs-account "3.0.0" - ethereumjs-block "2.2.2" - ethereumjs-common "1.5.0" - ethereumjs-tx "2.1.2" - ethereumjs-util "6.2.0" - ethereumjs-vm "git+https://github.com/celo-org/celo-monorepo.git#ethereumjs-vm-v4.1.3-celo3-gitpkg" - heap "0.2.6" - level-sublevel "6.6.4" - levelup "3.1.1" - lodash "4.17.14" - merkle-patricia-tree "2.3.2" - seedrandom "3.0.1" - source-map-support "0.5.12" - tmp "0.1.0" - web3-provider-engine "14.2.1" - websocket "1.0.29" - optionalDependencies: - ethereumjs-wallet "0.6.4" - web3 "1.2.4" - -"@celo/identity@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/identity/-/identity-2.2.0.tgz#a218faa2d53d5e4941c4da24a0ec2c65dd8eadc8" - integrity sha512-8VrbtC51+7Hw2oiuRzVhNU/HvK8dapUuzl1yN9lWlETgfHsiiJMk8ucw4oqJc137siBRxUdHIxuHgsDXzUzsdQ== - dependencies: - "@celo/base" "2.2.0" - "@celo/contractkit" "2.2.0" - "@celo/phone-number-privacy-common" "1.0.39" - "@celo/utils" "2.2.0" + "@celo/base" "^1.2.0" + "@celo/contractkit" "^1.2.0" + "@celo/utils" "^1.2.0" "@types/debug" "^4.1.5" bignumber.js "^9.0.0" blind-threshold-bls "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a" @@ -1529,10 +1041,28 @@ fp-ts "2.1.1" io-ts "2.0.1" -"@celo/poprf@^0.1.6": - version "0.1.6" - resolved "https://registry.yarnpkg.com/@celo/poprf/-/poprf-0.1.6.tgz#f8960a454b027910741595ecd3fcc067838c16e1" - integrity sha512-zWcChteh5tcNr2s85gDNnz6hGvVF3NK1c5qlMPrMn70KWiy7d0YzXzkNYCjL99OQn1SUx+SD9RtZ2l48ByAtKw== +"@celo/phone-number-privacy-common@1.0.39": + version "1.0.39" + resolved "https://registry.yarnpkg.com/@celo/phone-number-privacy-common/-/phone-number-privacy-common-1.0.39.tgz#3c9568f70378d24d11afcc4306024c5cf4f8efe9" + integrity sha512-0sbeuoYCN2ZQYO1CryR0Hf9HhOQKuIDZraWFMpUlwrUKk5qKmSMlV16xobG4VL5qUpXHgIRjKPfmcaf0rkrn8A== + dependencies: + "@celo/base" "1.5.2" + "@celo/contractkit" "1.5.2" + "@celo/utils" "1.5.2" + bignumber.js "^9.0.0" + blind-threshold-bls "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a" + btoa "1.2.1" + bunyan "1.8.12" + bunyan-debug-stream "2.0.0" + bunyan-gke-stackdriver "0.1.2" + dotenv "^8.2.0" + elliptic "^6.5.4" + is-base64 "^1.1.0" + +"@celo/poprf@^0.1.9": + version "0.1.9" + resolved "https://registry.yarnpkg.com/@celo/poprf/-/poprf-0.1.9.tgz#38c514ce0f572b80edeb9dc280b6cf5e9d7c2a75" + integrity sha512-+993EA/W+TBCZyY5G0B2EVdXnPX6t2AldgRAIMaT9WIqTwZKi/TcdJDUQl8mj7HEHMPHlpgCBOVgaHkUcwo/5A== "@celo/typechain-target-web3-v1-celo@0.2.0": version "0.2.0" @@ -1575,31 +1105,14 @@ web3-eth-abi "1.3.6" web3-utils "1.3.6" -"@celo/utils@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/utils/-/utils-2.2.0.tgz#a852435391b1abc492aa9436837e49beb906cf70" - integrity sha512-oCDZt44Ch30/4m+G+7gcuiKmo/WgptMpmxxSLH+h3Wmc6LUWS/F/9SFcdlTbJF0sH3LOXchczO+HUlATJ+vQNQ== - dependencies: - "@celo/base" "2.2.0" - "@types/bn.js" "^5.1.0" - "@types/elliptic" "^6.4.9" - "@types/ethereumjs-util" "^5.2.0" - "@types/node" "^10.12.18" - bignumber.js "^9.0.0" - elliptic "^6.5.4" - ethereumjs-util "^5.2.0" - io-ts "2.0.1" - web3-eth-abi "1.3.6" - web3-utils "1.3.6" - -"@celo/wallet-base@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/wallet-base/-/wallet-base-2.2.0.tgz#423a6af2a49d6c93aa786a99799a3ecc022a3160" - integrity sha512-zL05/tJzPWWvGGaQKEkcEYCLJRJwl7PLskJNWCiloGLfmPd7L1g96ulU1ZGffeO+kVIcUvwtQ9AS7ky4CbHybQ== +"@celo/wallet-base@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@celo/wallet-base/-/wallet-base-1.5.2.tgz#ae8df425bf3c702277bb1b63a761a2ec8429e7aa" + integrity sha512-NYJu7OtSRFpGcvSMl2Wc8zN32S6oTkAzKqhH7rXisQ0I2q4yNwCzoquzPVYB0G2UVUFKuuxgsA5V+Zda/LQCyw== dependencies: - "@celo/base" "2.2.0" - "@celo/connect" "2.2.0" - "@celo/utils" "2.2.0" + "@celo/base" "1.5.2" + "@celo/connect" "1.5.2" + "@celo/utils" "1.5.2" "@types/debug" "^4.1.5" "@types/ethereumjs-util" "^5.2.0" bignumber.js "^9.0.0" @@ -1607,20 +1120,6 @@ eth-lib "^0.2.8" ethereumjs-util "^5.2.0" -"@celo/wallet-local@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@celo/wallet-local/-/wallet-local-2.2.0.tgz#a4ad9a010265edf81cf41d6a3f3b35047181ddf2" - integrity sha512-l+RJkieGlnUT+q39/aGrRnFlhbwQsiPGsLoDebW7OuYncExRGf0Pid48ke+yrl7/0nBxNXDSRuNMW9qI0AlHSw== - dependencies: - "@celo/connect" "2.2.0" - "@celo/utils" "2.2.0" - "@celo/wallet-base" "2.2.0" - "@types/ethereumjs-util" "^5.2.0" - bignumber.js "^9.0.0" - debug "^4.1.1" - eth-lib "^0.2.8" - ethereumjs-util "^5.2.0" - "@celo/wallet-local@1.5.2": version "1.5.2" resolved "https://registry.yarnpkg.com/@celo/wallet-local/-/wallet-local-1.5.2.tgz#66ea5fb763e19724309e3d56f312f1a342e12b91" @@ -1633,18 +1132,6 @@ eth-lib "^0.2.8" ethereumjs-util "^5.2.0" -"@celo/wallet-local@3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@celo/wallet-local/-/wallet-local-3.2.0.tgz#905dd18a3285852a8341e5683beda94512c0f4f8" - integrity sha512-hR70gzNCDHgf/GskaaLtB7Jz4AqJEW0b+1jG1rsuAyaXLJomSRADGBwUUgMy1dKU87fcQ9h7Uh+AuRAP4/5COQ== - dependencies: - "@celo/connect" "3.2.0" - "@celo/utils" "3.2.0" - "@celo/wallet-base" "3.2.0" - "@types/ethereumjs-util" "^5.2.0" - eth-lib "^0.2.8" - ethereumjs-util "^5.2.0" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1653,10 +1140,15 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@ethersproject/abi@5.0.0-beta.142": - version "5.0.0-beta.142" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.142.tgz#cde0ced7daa2fbc98e35a2c31203331907e84a39" - integrity sha512-vJ2V9fPNzi+8iutY4sjy6mgogkJtiGsd9hmpa1bjnGW6qnHOEkAV1fzVpvT002LlnjFgqgtzuLBDZob6oU7i8w== +"@colors/colors@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== + +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== dependencies: "@jridgewell/trace-mapping" "0.3.9" @@ -1890,18 +1382,20 @@ "@ethersproject/properties" "^5.0.3" "@ethersproject/strings" "^5.0.4" -"@ethersproject/abstract-provider@^5.0.8": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.10.tgz#a533aed39a5f27312745c8c4c40fa25fc884831c" - integrity sha512-OSReY5iz94iIaPlRvLiJP8YVIvQLx4aUvMMnHWSaA/vTU8QHZmgNlt4OBdYV1+aFY8Xl+VRYiWBHq72ZDKXXCQ== +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.0-beta.146", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" + integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== dependencies: - "@ethersproject/bignumber" "^5.0.13" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/networks" "^5.0.7" - "@ethersproject/properties" "^5.0.7" - "@ethersproject/transactions" "^5.0.9" - "@ethersproject/web" "^5.0.12" + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" "@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.7.0": version "5.7.0" @@ -1916,17 +1410,16 @@ "@ethersproject/transactions" "^5.7.0" "@ethersproject/web" "^5.7.0" -"@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.4.tgz#8669bcbd02f4b64f4cede0a10e84df6d964ec9d3" - integrity sha512-CIjAeG6zNehbpJTi0sgwUvaH2ZICiAV9XkCBaFy5tjuEVFpQNeqd6f+B7RowcNO7Eut+QbhcQ5CVLkmP5zhL9A== +"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2" + integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ== dependencies: - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/rlp" "^5.0.3" - bn.js "^4.4.0" + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" "@ethersproject/address@5.7.0", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.7.0": version "5.7.0" @@ -1939,12 +1432,12 @@ "@ethersproject/logger" "^5.7.0" "@ethersproject/rlp" "^5.7.0" -"@ethersproject/base64@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.9.tgz#bb1f35d3dba92082a574d5e2418f9202a0a1a7e6" - integrity sha512-37RBz5LEZ9SlTNGiWCYFttnIN9J7qVs9Xo2EbqGqDH5LfW9EIji66S+YDMpXVo1zWDax1FkEldAoatxHK2gfgA== +"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c" + integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ== dependencies: - "@ethersproject/bytes" "^5.0.9" + "@ethersproject/bytes" "^5.7.0" "@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.7.0": version "5.7.0" @@ -1963,24 +1456,38 @@ "@ethersproject/logger" "^5.7.0" bn.js "^5.2.1" -"@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" + integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== + dependencies: + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/bytes@^5.0.4": version "5.0.4" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.4.tgz#328d9d929a3e970964ecf5d62e12568a187189f1" integrity sha512-9R6A6l9JN8x1U4s1dJCR+9h3MZTT3xQofr/Xx8wbDvj6NnY4CbBB0o8ZgHXvR74yV90pY2EzCekpkMBJnRzkSw== dependencies: - "@ethersproject/logger" "^5.7.0" + "@ethersproject/logger" "^5.0.5" -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== dependencies: "@ethersproject/bignumber" "^5.7.0" -"@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4": +"@ethersproject/constants@^5.0.4": version "5.0.4" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.4.tgz#9ddaa5f3c738a94e5adc4b3f71b36206fa5cdf88" integrity sha512-Df32lcXDHPgZRPgp1dgmByNbNe4Ki1QoXR+wU61on5nggQGTqWR1Bb7pp9VtI5Go9kyE/JflFc4Te6o9MvYt8A== + dependencies: + "@ethersproject/bignumber" "^5.0.7" + +"@ethersproject/contracts@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.7.0.tgz#c305e775abd07e48aa590e1a877ed5c316f8bd1e" + integrity sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg== dependencies: "@ethersproject/abi" "^5.7.0" "@ethersproject/abstract-provider" "^5.7.0" @@ -2008,10 +1515,10 @@ "@ethersproject/properties" "^5.7.0" "@ethersproject/strings" "^5.7.0" -"@ethersproject/hash@>=5.0.0-beta.128": - version "5.0.0-beta.133" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.0-beta.133.tgz#bda0c74454a82359642033f27c5157963495fcdf" - integrity sha512-tfF11QxFlJCy92rMtUZ0kImchWhlYXkN5Gj5cYfTcCdWEUKwNq1LljDnlrjV2JabO6s5enb8uiUj4RBTo2+Rgw== +"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.7.0.tgz#e627ddc6b466bc77aebf1a6b9e47405ca5aef9cf" + integrity sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg== dependencies: "@ethersproject/abstract-signer" "^5.7.0" "@ethersproject/basex" "^5.7.0" @@ -2053,11 +1560,16 @@ "@ethersproject/bytes" "^5.7.0" js-sha3 "0.8.0" -"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.7.0": +"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.7.0.tgz#6ce9ae168e74fecf287be17062b590852c311892" integrity sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig== +"@ethersproject/logger@^5.0.5": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.5.tgz#e3ba3d0bcf9f5be4da5f043b1e328eb98b80002f" + integrity sha512-gJj72WGzQhUtCk6kfvI8elTaPOQyMvrMghp/nbz0ivTo39fZ7IjypFh/ySDeUSdBNplAwhzWKKejQhdpyefg/w== + "@ethersproject/networks@5.7.0", "@ethersproject/networks@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.0.tgz#df72a392f1a63a57f87210515695a31a245845ad" @@ -2065,10 +1577,12 @@ dependencies: "@ethersproject/logger" "^5.7.0" -"@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.5.tgz#e3ba3d0bcf9f5be4da5f043b1e328eb98b80002f" - integrity sha512-gJj72WGzQhUtCk6kfvI8elTaPOQyMvrMghp/nbz0ivTo39fZ7IjypFh/ySDeUSdBNplAwhzWKKejQhdpyefg/w== +"@ethersproject/networks@5.7.1": + version "5.7.1" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" + integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== + dependencies: + "@ethersproject/logger" "^5.7.0" "@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": version "5.7.0" @@ -2078,12 +1592,12 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/sha2" "^5.7.0" -"@ethersproject/networks@^5.0.7": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.9.tgz#ec5da11e4d4bfd69bec4eaebc9ace33eb9569279" - integrity sha512-L8+VCQwArBLGkxZb/5Ns/OH/OxP38AcaveXIxhUTq+VWpXYjrObG3E7RDQIKkUx1S1IcQl/UWTz5w4DK0UitJg== +"@ethersproject/properties@5.7.0", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.7.0.tgz#a6e12cb0439b878aaf470f1902a176033067ed30" + integrity sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw== dependencies: - "@ethersproject/logger" "^5.0.8" + "@ethersproject/logger" "^5.7.0" "@ethersproject/providers@5.7.0": version "5.7.0" @@ -2137,15 +1651,15 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/rlp@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.3.tgz#841a5edfdf725f92155fe74424f5510c9043c13a" - integrity sha512-Hz4yyA/ilGafASAqtTlLWkA/YqwhQmhbDAq2LSIp1AJNx+wtbKWFAKSckpeZ+WG/xZmT+fw5OFKK7a5IZ4DR5g== +"@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" + integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ== dependencies: "@ethersproject/bytes" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.0.3", "@ethersproject/rlp@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== @@ -2153,23 +1667,24 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/signing-key@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.4.tgz#a5334ce8a52d4e9736dc8fb6ecc384704ecf8783" - integrity sha512-I6pJoga1IvhtjYK5yXzCjs4ZpxrVbt9ZRAlpEw0SW9UuV020YfJH5EIVEGR2evdRceS3nAQIggqbsXSkP8Y1Dg== +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" + integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== dependencies: "@ethersproject/bytes" "^5.7.0" "@ethersproject/logger" "^5.7.0" hash.js "1.1.7" -"@ethersproject/signing-key@^5.0.8": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.11.tgz#19fc5c4597e18ad0a5efc6417ba5b74069fdd2af" - integrity sha512-Jfcru/BGwdkXhLxT+8WCZtFy7LL0TPFZw05FAb5asxB/MyVsEfNdNxGDtjVE9zXfmRSPe/EusXYY4K7wcygOyQ== +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.0.4", "@ethersproject/signing-key@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" + integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== dependencies: - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + bn.js "^5.2.1" elliptic "6.5.4" hash.js "1.1.7" @@ -2194,46 +1709,65 @@ "@ethersproject/constants" "^5.7.0" "@ethersproject/logger" "^5.7.0" +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" + integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== + dependencies: + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + "@ethersproject/signing-key" "^5.7.0" + "@ethersproject/transactions@^5.0.0-beta.135": version "5.0.5" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.5.tgz#9a966f9ef4817b1752265d4efee0f1e9fd6aeaad" integrity sha512-1Ga/QmbcB74DItggP8/DK1tggu4ErEvwTkIwIlUXUcvIAuRNXXE7kgQhlp+w1xA/SAQFhv56SqCoyqPiiLCvVA== dependencies: + "@ethersproject/address" "^5.0.4" + "@ethersproject/bignumber" "^5.0.7" + "@ethersproject/bytes" "^5.0.4" + "@ethersproject/constants" "^5.0.4" + "@ethersproject/keccak256" "^5.0.3" + "@ethersproject/logger" "^5.0.5" + "@ethersproject/properties" "^5.0.3" + "@ethersproject/rlp" "^5.0.3" + "@ethersproject/signing-key" "^5.0.4" + +"@ethersproject/units@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.7.0.tgz#637b563d7e14f42deeee39245275d477aae1d8b1" + integrity sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + +"@ethersproject/wallet@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.7.0.tgz#4e5d0790d96fe21d61d38fb40324e6c7ef350b2d" + integrity sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" "@ethersproject/address" "^5.7.0" "@ethersproject/bignumber" "^5.7.0" "@ethersproject/bytes" "^5.7.0" - "@ethersproject/constants" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/hdnode" "^5.7.0" + "@ethersproject/json-wallets" "^5.7.0" "@ethersproject/keccak256" "^5.7.0" "@ethersproject/logger" "^5.7.0" "@ethersproject/properties" "^5.7.0" - "@ethersproject/rlp" "^5.7.0" + "@ethersproject/random" "^5.7.0" "@ethersproject/signing-key" "^5.7.0" - -"@ethersproject/transactions@^5.0.9": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.11.tgz#b31df5292f47937136a45885d6ee6112477c13df" - integrity sha512-ftsRvR9+gQp7L63F6+XmstvsZ4w8GtWvQB08e/zB+oB86Fnhq8+i/tkgpJplSHC8I/qgiCisva+M3u2GVhDFPA== - dependencies: - "@ethersproject/address" "^5.0.9" - "@ethersproject/bignumber" "^5.0.13" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/constants" "^5.0.8" - "@ethersproject/keccak256" "^5.0.7" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" - "@ethersproject/rlp" "^5.0.7" - "@ethersproject/signing-key" "^5.0.8" - -"@ethersproject/web@^5.0.12": - version "5.0.14" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.14.tgz#6e7bebdd9fb967cb25ee60f44d9218dc0803bac4" - integrity sha512-QpTgplslwZ0Sp9oKNLoRuS6TKxnkwfaEk3gr7zd7XLF8XBsYejsrQO/03fNfnMx/TAT/RR6WEw/mbOwpRSeVRA== - dependencies: - "@ethersproject/base64" "^5.0.7" - "@ethersproject/bytes" "^5.0.9" - "@ethersproject/logger" "^5.0.8" - "@ethersproject/properties" "^5.0.7" - "@ethersproject/strings" "^5.0.8" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/wordlists" "^5.7.0" "@ethersproject/web@5.7.0", "@ethersproject/web@^5.7.0": version "5.7.0" @@ -2397,10 +1931,10 @@ faye-websocket "0.11.4" tslib "^2.1.0" -"@firebase/database@0.5.20", "@firebase/database@^0.5.17": - version "0.5.20" - resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.5.20.tgz#f157e04409a94dda90ebb5493cc639310242cdea" - integrity sha512-31dNLqMW4nGrGzIDS5hh+1LFzkr/m1Kb+EcftQGC3NaGC3zHwGyG7ijn+Xo7gIWtXukvJvm1cFC7R+eOCPEejw== +"@firebase/database@0.6.13": + version "0.6.13" + resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.6.13.tgz#b96fe0c53757dd6404ee085fdcb45c0f9f525c17" + integrity sha512-NommVkAPzU7CKd1gyehmi3lz0K78q0KOfiex7Nfy7MBMwknLm7oNqKovXSgQV1PCLvKXvvAplDSFhDhzIf9obA== dependencies: "@firebase/auth-interop-types" "0.1.5" "@firebase/component" "0.1.19" @@ -2576,46 +2110,46 @@ "@ganache/utils" "0.3.0" ethereumjs-util "7.1.5" -"@google-cloud/common@^2.1.1": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-2.3.0.tgz#492ddd3a163c9c335ce596d70f8821fa83603a64" - integrity sha512-nmIyi3q/FL2j6ZJ61xK/863DoJEZayI2/W/iCgwrCYUYsem277XO45MBTAimjgiKBCA0c9InmQyfT48h/IK4jg== +"@ganache/console.log@0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@ganache/console.log/-/console.log-0.3.0.tgz#be7bb0875e883d7c219c3543cc7e854203c5233d" + integrity sha512-cRkjY3gn1zxPxy+PKK/xl12p3KbGwXeS7oGTkXFeey4bhQgd5QBa/+HNMVPflT2BcWLZ91Ir+CRRiRekeyHUWQ== + dependencies: + "@ethereumjs/util" "8.0.2" + "@ganache/utils" "0.3.0" + +"@ganache/utils@0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@ganache/utils/-/utils-0.3.0.tgz#f95d7a4746d4e062febf3ce59f65f6ca1336be8a" + integrity sha512-cxoG8KQxkYPl71BPdKZihjVKqN2AE7WLXjU65BVOQ5jEYrUH3CWSxA9v7CCUJj4e0HoXFpVFIZ+1HRkiBKKiKg== dependencies: - "@google-cloud/projectify" "^1.0.0" - "@google-cloud/promisify" "^1.0.0" + emittery "0.10.0" + keccak "3.0.1" + seedrandom "3.0.5" + optionalDependencies: + "@trufflesuite/bigint-buffer" "1.1.9" + +"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== + +"@google-cloud/common@^0.32.0": + version "0.32.1" + resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-0.32.1.tgz#6a32c340172cea3db6674d0e0e34e78740a0073f" + integrity sha512-bLdPzFvvBMtVkwsoBtygE9oUm3yrNmPa71gvOgucYI/GqvNP2tb6RYsDHPq98kvignhcgHGDI5wyNgxaCo8bKQ== + dependencies: + "@google-cloud/projectify" "^0.3.3" + "@google-cloud/promisify" "^0.4.0" + "@types/request" "^2.48.1" arrify "^2.0.0" duplexify "^3.6.0" ent "^2.2.0" extend "^3.0.2" - google-auth-library "^5.5.0" + google-auth-library "^3.1.1" + pify "^4.0.1" retry-request "^4.0.0" - teeny-request "^6.0.0" - -"@google-cloud/common@^3.7.4": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-3.7.4.tgz#71acac3dfe19bbed42e4763c5d85b35acea7e368" - integrity sha512-JO4a8l/N6fkHZ+vWgNYgcNoZh1/m6kqv8F7+NpBkGqs7NzUtkmE9WdvHaNUwAOm1mIqbuX2wXKNfAZfqZr+vMg== - dependencies: - "@google-cloud/projectify" "^2.0.0" - "@google-cloud/promisify" "^2.0.0" - arrify "^2.0.1" - duplexify "^4.1.1" - ent "^2.2.0" - extend "^3.0.2" - google-auth-library "^7.9.2" - retry-request "^4.2.2" - teeny-request "^7.0.0" - -"@google-cloud/firestore@^3.0.0": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-3.4.1.tgz#10bb1deaf518f622bd96cacd476d436816e16c09" - integrity sha512-k3PPcLvP9wr4yyA0djzfPdj2ZewburifhpcFACa0wiXvjXj3Ob68MORcPC3a3wyonX73TY72RsEGPk4Ult0Dyw== - dependencies: - deep-equal "^2.0.0" - functional-red-black-tree "^1.0.1" - google-gax "^1.13.0" - readable-stream "^3.4.0" - through2 "^3.0.0" + teeny-request "^3.11.3" "@google-cloud/firestore@^4.5.0": version "4.15.1" @@ -2652,18 +2186,10 @@ split-array-stream "^2.0.0" stream-events "^1.0.4" -"@google-cloud/paginator@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-2.0.1.tgz#89ca97933eecfdd7eaa07bd79ed01c9869c9531b" - integrity sha512-HZ6UTGY/gHGNriD7OCikYWL/Eu0sTEur2qqse2w6OVsz+57se3nTkqH14JIPxtf0vlEJ8IJN5w3BdZ22pjCB8g== - dependencies: - arrify "^2.0.0" - extend "^3.0.2" - -"@google-cloud/paginator@^3.0.0": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.6.tgz#02a59dccd348d515069779a4f77a4a4fd15594da" - integrity sha512-XCTm/GfQIlc1ZxpNtTSs/mnZxC2cePNhxU3X8EzHXKIJ2JFncmJj2Fcd2IP+gbmZaSZnY0juFxbUCkIeuu/2eQ== +"@google-cloud/paginator@^3.0.6", "@google-cloud/paginator@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b" + integrity sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ== dependencies: arrify "^2.0.0" extend "^3.0.2" @@ -2806,10 +2332,10 @@ uuid "^8.0.0" xdg-basedir "^4.0.0" -"@grpc/grpc-js@^0.3.0", "@grpc/grpc-js@^1.1.8", "@grpc/grpc-js@~1.0.0", "@grpc/grpc-js@~1.0.3", "@grpc/grpc-js@~1.4.0": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.4.tgz#dd0237ad7df80a7a24766fe516d7e4a22cb4855e" - integrity sha512-+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw== +"@graphql-tools/batch-execute@8.5.1": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.1.tgz#fa3321d58c64041650be44250b1ebc3aab0ba7a9" + integrity sha512-hRVDduX0UDEneVyEWtc2nu5H2PxpfSfM/riUlgZvo/a/nG475uyehxR5cFGvTEPEQUKY3vGIlqvtRigzqTfCew== dependencies: "@graphql-tools/utils" "8.9.0" dataloader "2.1.0" @@ -2903,6 +2429,21 @@ "@grpc/proto-loader" "^0.7.0" "@types/node" ">=12.12.47" +"@grpc/grpc-js@~1.0.0": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.5.tgz#09948c0810e62828fdd61455b2eb13d7879888b0" + integrity sha512-Hm+xOiqAhcpT9RYM8lc15dbQD7aQurM7ZU8ulmulepiPlN7iwBXXwP3vSBUimoFoApRqz7pSIisXU8pZaCB4og== + dependencies: + semver "^6.2.0" + +"@grpc/grpc-js@~1.4.0": + version "1.4.6" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.4.6.tgz#8108d7ab7c0c21b38c538c1a48583edbbf2c2412" + integrity sha512-Byau4xiXfIixb1PnW30V/P9mkrZ05lknyNqiK+cVY9J5hj3gecxd/anwaUbAM8j834zg1x78NvAbwGnMfWEu7A== + dependencies: + "@grpc/proto-loader" "^0.6.4" + "@types/node" ">=12.12.47" + "@grpc/proto-loader@0.6.9": version "0.6.9" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz#4014eef366da733f8e04a9ddd7376fe8a58547b7" @@ -2922,7 +2463,7 @@ lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.5.0": +"@grpc/proto-loader@^0.5.0", "@grpc/proto-loader@^0.5.1": version "0.5.6" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== @@ -2930,7 +2471,7 @@ lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.6.12": +"@grpc/proto-loader@^0.6.1", "@grpc/proto-loader@^0.6.4": version "0.6.13" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc" integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g== @@ -2952,54 +2493,15 @@ protobufjs "^7.0.0" yargs "^16.2.0" -"@gulp-sourcemaps/map-sources@1.X": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda" - integrity sha1-iQrnxdjId/bThIYCFazp1+yUW9o= - dependencies: - normalize-path "^2.0.1" - through2 "^2.0.3" - -"@hapi/address@2.x.x": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" - integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ== - -"@hapi/bourne@1.x.x": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a" - integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA== - -"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0": - version "8.5.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06" - integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow== - -"@hapi/joi@^15.0.3": - version "15.1.1" - resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7" - integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ== - dependencies: - "@hapi/address" "2.x.x" - "@hapi/bourne" "1.x.x" - "@hapi/hoek" "8.x.x" - "@hapi/topo" "3.x.x" - -"@hapi/topo@3.x.x": - version "3.1.6" - resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29" - integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ== - dependencies: - "@hapi/hoek" "^8.3.0" +"@hutson/parse-repository-url@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" + integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q== -"@iarna/cli@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@iarna/cli/-/cli-1.2.0.tgz#0f7af5e851afe895104583c4ca07377a8094d641" - integrity sha512-ukITQAqVs2n9HGmn3car/Ir7d3ta650iXhrG7pjr3EWdFmJuuOVWgYsu7ftsSe5VifEFFhjxVuX9+8F7L8hwcA== - dependencies: - signal-exit "^3.0.2" - update-notifier "^2.2.0" - yargs "^8.0.2" +"@isaacs/string-locale-compare@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" + integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ== "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" @@ -3041,6 +2543,18 @@ jest-util "^29.0.2" slash "^3.0.0" +"@jest/console@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.5.0.tgz#593a6c5c0d3f75689835f1b3b4688c4f8544cb57" + integrity sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ== + dependencies: + "@jest/types" "^29.5.0" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^29.5.0" + jest-util "^29.5.0" + slash "^3.0.0" + "@jest/core@^26.6.3": version "26.6.3" resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" @@ -3075,37 +2589,37 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/core@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.0.2.tgz#7bf47ff6cd882678c47fbdea562bdf1ff03b6d33" - integrity sha512-imP5M6cdpHEOkmcuFYZuM5cTG1DAF7ZlVNCq1+F7kbqme2Jcl+Kh4M78hihM76DJHNkurbv4UVOnejGxBKEmww== +"@jest/core@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03" + integrity sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ== dependencies: - "@jest/console" "^29.0.2" - "@jest/reporters" "^29.0.2" - "@jest/test-result" "^29.0.2" - "@jest/transform" "^29.0.2" - "@jest/types" "^29.0.2" + "@jest/console" "^29.5.0" + "@jest/reporters" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" ci-info "^3.2.0" exit "^0.1.2" graceful-fs "^4.2.9" - jest-changed-files "^29.0.0" - jest-config "^29.0.2" - jest-haste-map "^29.0.2" - jest-message-util "^29.0.2" - jest-regex-util "^29.0.0" - jest-resolve "^29.0.2" - jest-resolve-dependencies "^29.0.2" - jest-runner "^29.0.2" - jest-runtime "^29.0.2" - jest-snapshot "^29.0.2" - jest-util "^29.0.2" - jest-validate "^29.0.2" - jest-watcher "^29.0.2" + jest-changed-files "^29.5.0" + jest-config "^29.5.0" + jest-haste-map "^29.5.0" + jest-message-util "^29.5.0" + jest-regex-util "^29.4.3" + jest-resolve "^29.5.0" + jest-resolve-dependencies "^29.5.0" + jest-runner "^29.5.0" + jest-runtime "^29.5.0" + jest-snapshot "^29.5.0" + jest-util "^29.5.0" + jest-validate "^29.5.0" + jest-watcher "^29.5.0" micromatch "^4.0.4" - pretty-format "^29.0.2" + pretty-format "^29.5.0" slash "^3.0.0" strip-ansi "^6.0.0" @@ -3119,14 +2633,30 @@ "@types/node" "*" jest-mock "^26.6.2" -"@jest/fake-timers@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93" - integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A== +"@jest/environment@^29.0.2", "@jest/environment@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65" + integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ== + dependencies: + "@jest/fake-timers" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/node" "*" + jest-mock "^29.5.0" + +"@jest/expect-utils@^29.1.2", "@jest/expect-utils@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036" + integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg== + dependencies: + jest-get-type "^29.4.3" + +"@jest/expect@^29.0.2", "@jest/expect@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba" + integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g== dependencies: - "@jest/types" "^24.9.0" - jest-message-util "^24.9.0" - jest-mock "^24.9.0" + expect "^29.5.0" + jest-snapshot "^29.5.0" "@jest/fake-timers@^26.6.2": version "26.6.2" @@ -3140,17 +2670,17 @@ jest-mock "^26.6.2" jest-util "^26.6.2" -"@jest/fake-timers@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.0.2.tgz#6f15f4d8eb1089d445e3f73473ddc434faa2f798" - integrity sha512-2JhQeWU28fvmM5r33lxg6BxxkTKaVXs6KMaJ6eXSM8ml/MaWkt2BvbIO8G9KWAJFMdBXWbn+2h9OK1/s5urKZA== +"@jest/fake-timers@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.5.0.tgz#d4d09ec3286b3d90c60bdcd66ed28d35f1b4dc2c" + integrity sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg== dependencies: - "@jest/types" "^29.0.2" - "@sinonjs/fake-timers" "^9.1.2" + "@jest/types" "^29.5.0" + "@sinonjs/fake-timers" "^10.0.2" "@types/node" "*" - jest-message-util "^29.0.2" - jest-mock "^29.0.2" - jest-util "^29.0.2" + jest-message-util "^29.5.0" + jest-mock "^29.5.0" + jest-util "^29.5.0" "@jest/globals@^26.6.2": version "26.6.2" @@ -3161,15 +2691,15 @@ "@jest/types" "^26.6.2" expect "^26.6.2" -"@jest/globals@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.0.2.tgz#605d3389ad0c6bfe17ad3e1359b5bc39aefd8b65" - integrity sha512-4hcooSNJCVXuTu07/VJwCWW6HTnjLtQdqlcGisK6JST7z2ixa8emw4SkYsOk7j36WRc2ZUEydlUePnOIOTCNXg== +"@jest/globals@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.5.0.tgz#6166c0bfc374c58268677539d0c181f9c1833298" + integrity sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ== dependencies: - "@jest/environment" "^29.0.2" - "@jest/expect" "^29.0.2" - "@jest/types" "^29.0.2" - jest-mock "^29.0.2" + "@jest/environment" "^29.5.0" + "@jest/expect" "^29.5.0" + "@jest/types" "^29.5.0" + jest-mock "^29.5.0" "@jest/reporters@^26.6.2": version "26.6.2" @@ -3203,14 +2733,42 @@ optionalDependencies: node-notifier "^8.0.0" -"@jest/source-map@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" - integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== +"@jest/reporters@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.5.0.tgz#985dfd91290cd78ddae4914ba7921bcbabe8ac9b" + integrity sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA== dependencies: - callsites "^3.0.0" - graceful-fs "^4.1.15" - source-map "^0.6.0" + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" + "@jridgewell/trace-mapping" "^0.3.15" + "@types/node" "*" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.2.9" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^5.1.0" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.1.3" + jest-message-util "^29.5.0" + jest-util "^29.5.0" + jest-worker "^29.5.0" + slash "^3.0.0" + string-length "^4.0.1" + strip-ansi "^6.0.0" + v8-to-istanbul "^9.0.1" + +"@jest/schemas@^29.0.0", "@jest/schemas@^29.4.3": + version "29.4.3" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" + integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg== + dependencies: + "@sinclair/typebox" "^0.25.16" "@jest/source-map@^26.6.2": version "26.6.2" @@ -3221,14 +2779,14 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" - integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA== +"@jest/source-map@^29.4.3": + version "29.4.3" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.3.tgz#ff8d05cbfff875d4a791ab679b4333df47951d20" + integrity sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w== dependencies: - "@jest/console" "^24.9.0" - "@jest/types" "^24.9.0" - "@types/istanbul-lib-coverage" "^2.0.0" + "@jridgewell/trace-mapping" "^0.3.15" + callsites "^3.0.0" + graceful-fs "^4.2.9" "@jest/test-result@^26.6.2": version "26.6.2" @@ -3250,6 +2808,16 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" +"@jest/test-result@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408" + integrity sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ== + dependencies: + "@jest/console" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + "@jest/test-sequencer@^26.6.3": version "26.6.3" resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" @@ -3261,14 +2829,14 @@ jest-runner "^26.6.3" jest-runtime "^26.6.3" -"@jest/test-sequencer@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.0.2.tgz#ae9b2d2c1694c7aa1a407713100e14dbfa79293e" - integrity sha512-fsyZqHBlXNMv5ZqjQwCuYa2pskXCO0DVxh5aaVCuAtwzHuYEGrhordyEncBLQNuCGQSYgElrEEmS+7wwFnnMKw== +"@jest/test-sequencer@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz#34d7d82d3081abd523dbddc038a3ddcb9f6d3cc4" + integrity sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ== dependencies: - "@jest/test-result" "^29.0.2" + "@jest/test-result" "^29.5.0" graceful-fs "^4.2.9" - jest-haste-map "^29.0.2" + jest-haste-map "^29.5.0" slash "^3.0.0" "@jest/transform@^26.6.2": @@ -3292,56 +2860,47 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/transform@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.0.2.tgz#eef90ebd939b68bf2c2508d9e914377871869146" - integrity sha512-lajVQx2AnsR+Pa17q2zR7eikz2PkPs1+g/qPbZkqQATeS/s6eT55H+yHcsLfuI/0YQ/4VSBepSu3bOX+44q0aA== +"@jest/transform@^29.1.2": + version "29.1.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.1.2.tgz#20f814696e04f090421f6d505c14bbfe0157062a" + integrity sha512-2uaUuVHTitmkx1tHF+eBjb4p7UuzBG7SXIaA/hNIkaMP6K+gXYGxP38ZcrofzqN0HeZ7A90oqsOa97WU7WZkSw== dependencies: "@babel/core" "^7.11.6" - "@jest/types" "^29.0.2" + "@jest/types" "^29.1.2" "@jridgewell/trace-mapping" "^0.3.15" babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.1.0" graceful-fs "^4.2.9" - jest-haste-map "^29.0.2" + jest-haste-map "^29.1.2" jest-regex-util "^29.0.0" - jest-util "^29.0.2" + jest-util "^29.1.2" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" write-file-atomic "^4.0.1" -"@jest/transform@^29.1.2": - version "29.1.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.1.2.tgz#20f814696e04f090421f6d505c14bbfe0157062a" - integrity sha512-2uaUuVHTitmkx1tHF+eBjb4p7UuzBG7SXIaA/hNIkaMP6K+gXYGxP38ZcrofzqN0HeZ7A90oqsOa97WU7WZkSw== +"@jest/transform@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9" + integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw== dependencies: "@babel/core" "^7.11.6" - "@jest/types" "^29.1.2" + "@jest/types" "^29.5.0" "@jridgewell/trace-mapping" "^0.3.15" babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" - convert-source-map "^1.4.0" + convert-source-map "^2.0.0" fast-json-stable-stringify "^2.1.0" graceful-fs "^4.2.9" - jest-haste-map "^29.1.2" - jest-regex-util "^29.0.0" - jest-util "^29.1.2" + jest-haste-map "^29.5.0" + jest-regex-util "^29.4.3" + jest-util "^29.5.0" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" - write-file-atomic "^4.0.1" - -"@jest/types@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" - integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^13.0.0" + write-file-atomic "^4.0.2" "@jest/types@^26.6.2": version "26.6.2" @@ -3390,6 +2949,18 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" +"@jest/types@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" + integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog== + dependencies: + "@jest/schemas" "^29.4.3" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + "@josephg/resolvable@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb" @@ -3412,7 +2983,7 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== @@ -3422,7 +2993,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -3443,6 +3014,14 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/trace-mapping@^0.3.17": + version "0.3.18" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" + integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + "@jsdevtools/ono@^7.1.3": version "7.1.3" resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796" @@ -3465,20 +3044,40 @@ rxjs "6" semver "^7.3.5" -"@ledgerhq/errors@^4.64.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.64.0.tgz#fb9c74edb0ea434e659711d88ffcef315a44aeee" - integrity sha512-Wwu6mFvPsFJ4Dhix3G1SPjt2LzSe5iGWhSt8KftzWD9t05UNdJB9BimQnMcTn6/Cgpj/y1RdIgo/nd7hIsjvJg== +"@ledgerhq/devices@^7.0.1": + version "7.0.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-7.0.7.tgz#3499304a1c9d3aa7399de2ad390719bef5d1e89c" + integrity sha512-PZ9TtaTGBYUm/g0qNKPbECZt7DDNvqM3ILS5wAtOMna2cBR+mrywUGXrkjuOWlHpuqZ8wenaAKveQBbzF2ba8w== + dependencies: + "@ledgerhq/errors" "^6.12.3" + "@ledgerhq/logs" "^6.10.1" + rxjs "6" + semver "^7.3.5" + +"@ledgerhq/devices@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.1.tgz#4c475f6ae249daf00ef08f5098924206233f3179" + integrity sha512-8uuyR8DGowYBLatur+MyJtRJ8RYDWSFFqGnNmgBBdlRG6VPf9vjhrFZlmYqukWesPwkZNZstP475W4TS+j6EFw== + dependencies: + "@ledgerhq/errors" "^6.12.4" + "@ledgerhq/logs" "^6.10.1" + rxjs "6" + semver "^7.3.5" "@ledgerhq/errors@^5.11.0", "@ledgerhq/errors@^5.50.0": version "5.50.0" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.50.0.tgz#e3a6834cb8c19346efca214c1af84ed28e69dad9" integrity sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow== -"@ledgerhq/hw-app-eth@^4.3.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.64.0.tgz#7d41ea7e72ce0033ad50f9adb98a3e3a78e7123a" - integrity sha512-yPNbSE2Lwxo6GQYSXQeGvpdz19cQV4HXpTU1VsAWj7sQgim6Ghz9NZGom3Q4G1KqfH31XjIUDiE6KjwGM8vnaQ== +"@ledgerhq/errors@^6.10.2", "@ledgerhq/errors@^6.12.3", "@ledgerhq/errors@^6.12.4": + version "6.12.4" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.4.tgz#1c2f75dc3dee91b069f3446be484fa28676d1b45" + integrity sha512-qi5poMrcIuFuivdzRjjQsNp7rRwUA5v3eo6D4yEy+l+w8wT4d4JtQ5u1TbrlGfFHfgLq7Lv6dsvh2ooLyWTyfg== + +"@ledgerhq/hw-app-eth@^5.53.0": + version "5.53.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-5.53.0.tgz#5df2d7427db9f387099d0cc437e9730101d7c404" + integrity sha512-LKi/lDA9tW0GdoYP1ng0VY/PXNYjSrwZ1cj0R0MQ9z+knmFlPcVkGK2MEqE8W8cXrC0tjsUXITMcngvpk5yfKA== dependencies: "@ledgerhq/cryptoassets" "^5.53.0" "@ledgerhq/errors" "^5.50.0" @@ -3506,16 +3105,16 @@ "@ledgerhq/logs" "^5.50.0" node-hid "2.1.1" -"@ledgerhq/hw-transport-node-hid-noevents@^5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-5.11.0.tgz#6d400414dfc54defce4c765ea52481dcbb4505c9" - integrity sha512-egE2qaZEHkL89qjbWAnTEV3bYe5ALQRCCL8oTc8JVAu4JaxqCoro4DntXrBjjye7gT6gnUHgok1H5f/DVqX4aw== +"@ledgerhq/hw-transport-node-hid-noevents@^6.27.4": + version "6.27.13" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.13.tgz#96f3667a18ea3602160af5d08db677ae0b8e3bb7" + integrity sha512-Lq85zoc95eb5npudlgTARVrB57jbk8oZ8KuyVOovNm1AjR0OrYfl0iCqw49h+SL/UFWWVyBisLg6IOYCpj1SNQ== dependencies: - "@ledgerhq/devices" "^5.11.0" - "@ledgerhq/errors" "^5.11.0" - "@ledgerhq/hw-transport" "^5.11.0" - "@ledgerhq/logs" "^5.11.0" - node-hid "^1.2.0" + "@ledgerhq/devices" "^8.0.1" + "@ledgerhq/errors" "^6.12.4" + "@ledgerhq/hw-transport" "^6.28.2" + "@ledgerhq/logs" "^6.10.1" + node-hid "^2.1.2" "@ledgerhq/hw-transport-node-hid@^5.51.1": version "5.51.1" @@ -3573,6 +3172,15 @@ "@ledgerhq/errors" "^6.10.2" events "^3.3.0" +"@ledgerhq/hw-transport@^6.28.2": + version "6.28.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.2.tgz#483f9a39403ee63b03d452e30bfe8189dcca5785" + integrity sha512-2LxQdZnhSzu394brKuUZIWfuT2YAyNI3glRMf8+yHx3wUFqi10v8NzII99SHDyT8tN3Ovzmq+hbGHvrR2PqYRA== + dependencies: + "@ledgerhq/devices" "^8.0.1" + "@ledgerhq/errors" "^6.12.4" + events "^3.3.0" + "@ledgerhq/hw-transport@~5.11.0": version "5.11.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.11.0.tgz#f5c45a34d9b68d81fd2f6641b49815527720364b" @@ -3582,20 +3190,25 @@ "@ledgerhq/errors" "^5.11.0" events "^3.1.0" -"@ledgerhq/logs@^4.64.0": - version "4.64.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-4.64.0.tgz#19a335e3f2d9188188437f8dabb06e0fd45b0052" - integrity sha512-NwgA7q1CXWMkqxoHVaSTk0gJUGbiBbWTM7Uod/Zz8EWNa1Ns0yHthCcSS279htP6oQplEaSppzsie5bcbwNApg== +"@ledgerhq/logs@^5.50.0": + version "5.50.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186" + integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA== "@ledgerhq/logs@^6.10.0": version "6.10.0" resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.0.tgz#c012c1ecc1a0e53d50e6af381618dca5268461c1" integrity sha512-lLseUPEhSFUXYTKj6q7s2O3s2vW2ebgA11vMAlKodXGf5AFw4zUoEbTz9CoFOC9jS6xY4Qr8BmRnxP/odT4Uuw== -"@lerna/add@3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.16.0.tgz#f871eda820fe43b868c3a6154906799485c33342" - integrity sha512-yJ4EdmMudSVaBHE4hbCI1WchPf47HwDiVnu3Qb56fsR7DBvPrCoki/QXub8nXWd6ByfjU0T4mfDmGBKt/+hkWg== +"@ledgerhq/logs@^6.10.1": + version "6.10.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.1.tgz#5bd16082261d7364eabb511c788f00937dac588d" + integrity sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w== + +"@lerna/add@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.5.0.tgz#33c671dc01153f1bda8929de8ed7267d16858ce6" + integrity sha512-RdJ8yyE8BizzrYRjZuqeXtgkHBE/KzcS7tmBG+UKCQ5QFLnkdORzaVECNy2sfZl0vTtrxj4cv+kuwxIeg/4XVQ== dependencies: "@lerna/bootstrap" "5.5.0" "@lerna/command" "5.5.0" @@ -4275,10 +3888,10 @@ npmlog "^6.0.2" write-file-atomic "^4.0.1" -"@mapbox/node-pre-gyp@^1.0.0", "@mapbox/node-pre-gyp@^1.0.4": - version "1.0.10" - resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c" - integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA== +"@mapbox/node-pre-gyp@^1.0.0": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc" + integrity sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw== dependencies: detect-libc "^2.0.0" https-proxy-agent "^5.0.0" @@ -4290,15 +3903,10 @@ semver "^7.3.5" tar "^6.1.11" -"@metamask/safe-event-emitter@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c" - integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q== - -"@mapbox/node-pre-gyp@^1.0.0": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc" - integrity sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw== +"@mapbox/node-pre-gyp@^1.0.4": + version "1.0.10" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c" + integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA== dependencies: detect-libc "^2.0.0" https-proxy-agent "^5.0.0" @@ -4310,6 +3918,11 @@ semver "^7.3.5" tar "^6.1.11" +"@metamask/safe-event-emitter@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c" + integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q== + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -5082,125 +4695,49 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== -"@react-native-community/cli-debugger-ui@^4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.13.1.tgz#07de6d4dab80ec49231de1f1fbf658b4ad39b32c" - integrity sha512-UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg== - dependencies: - serve-static "^1.13.1" - -"@react-native-community/cli-hermes@^4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-4.13.0.tgz#6243ed9c709dad5e523f1ccd7d21066b32f2899d" - integrity sha512-oG+w0Uby6rSGsUkJGLvMQctZ5eVRLLfhf84lLyz942OEDxFRa9U19YJxOe9FmgCKtotbYiM3P/XhK+SVCuerPQ== - dependencies: - "@react-native-community/cli-platform-android" "^4.13.0" - "@react-native-community/cli-tools" "^4.13.0" - chalk "^3.0.0" - hermes-profile-transformer "^0.0.6" - ip "^1.1.5" +"@redux-saga/core@^1.0.0": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.2.3.tgz#882ed9ac58b5f42c6abb23349542315b871de305" + integrity sha512-U1JO6ncFBAklFTwoQ3mjAeQZ6QGutsJzwNBjgVLSWDpZTRhobUzuVDS1qH3SKGJD8fvqoaYOjp6XJ3gCmeZWgA== + dependencies: + "@babel/runtime" "^7.6.3" + "@redux-saga/deferred" "^1.2.1" + "@redux-saga/delay-p" "^1.2.1" + "@redux-saga/is" "^1.1.3" + "@redux-saga/symbols" "^1.1.3" + "@redux-saga/types" "^1.2.1" + redux "^4.0.4" + typescript-tuple "^2.2.1" + +"@redux-saga/deferred@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.2.1.tgz#aca373a08ccafd6f3481037f2f7ee97f2c87c3ec" + integrity sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g== -"@react-native-community/cli-platform-android@^4.10.0", "@react-native-community/cli-platform-android@^4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.13.0.tgz#922681ec82ee1aadd993598b814df1152118be02" - integrity sha512-3i8sX8GklEytUZwPnojuoFbCjIRzMugCdzDIdZ9UNmi/OhD4/8mLGO0dgXfT4sMWjZwu3qjy45sFfk2zOAgHbA== +"@redux-saga/delay-p@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.2.1.tgz#e72ac4731c5080a21f75b61bedc31cb639d9e446" + integrity sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w== dependencies: - "@react-native-community/cli-tools" "^4.13.0" - chalk "^3.0.0" - execa "^1.0.0" - fs-extra "^8.1.0" - glob "^7.1.3" - jetifier "^1.6.2" - lodash "^4.17.15" - logkitty "^0.7.1" - slash "^3.0.0" - xmldoc "^1.1.2" + "@redux-saga/symbols" "^1.1.3" -"@react-native-community/cli-platform-ios@^4.10.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.13.0.tgz#a738915c68cac86df54e578b59a1311ea62b1aef" - integrity sha512-6THlTu8zp62efkzimfGr3VIuQJ2514o+vScZERJCV1xgEi8XtV7mb/ZKt9o6Y9WGxKKkc0E0b/aVAtgy+L27CA== - dependencies: - "@react-native-community/cli-tools" "^4.13.0" - chalk "^3.0.0" - glob "^7.1.3" - js-yaml "^3.13.1" - lodash "^4.17.15" - plist "^3.0.1" - xcode "^2.0.0" - -"@react-native-community/cli-server-api@^4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.13.1.tgz#bee7ee9702afce848e9d6ca3dcd5669b99b125bd" - integrity sha512-vQzsFKD9CjHthA2ehTQX8c7uIzlI9A7ejaIow1I9RlEnLraPH2QqVDmzIdbdh5Od47UPbRzamCgAP8Bnqv3qwQ== - dependencies: - "@react-native-community/cli-debugger-ui" "^4.13.1" - "@react-native-community/cli-tools" "^4.13.0" - compression "^1.7.1" - connect "^3.6.5" - errorhandler "^1.5.0" - nocache "^2.1.0" - pretty-format "^25.1.0" - serve-static "^1.13.1" - ws "^1.1.0" - -"@react-native-community/cli-tools@^4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.13.0.tgz#b406463d33af16cedc4305a9a9257ed32845cf1b" - integrity sha512-s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg== +"@redux-saga/is@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.3.tgz#b333f31967e87e32b4e6b02c75b78d609dd4ad73" + integrity sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q== dependencies: - chalk "^3.0.0" - lodash "^4.17.15" - mime "^2.4.1" - node-fetch "^2.6.0" - open "^6.2.0" - shell-quote "1.6.1" + "@redux-saga/symbols" "^1.1.3" + "@redux-saga/types" "^1.2.1" -"@react-native-community/cli-types@^4.10.1": - version "4.10.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-4.10.1.tgz#d68a2dcd1649d3b3774823c64e5e9ce55bfbe1c9" - integrity sha512-ael2f1onoPF3vF7YqHGWy7NnafzGu+yp88BbFbP0ydoCP2xGSUzmZVw0zakPTC040Id+JQ9WeFczujMkDy6jYQ== +"@redux-saga/symbols@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.3.tgz#b731d56201719e96dc887dc3ae9016e761654367" + integrity sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg== -"@react-native-community/cli@^4.10.0": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.14.0.tgz#bb106a98341bfa2db36060091ff90bfe82ea4f55" - integrity sha512-EYJKBuxFxAu/iwNUfwDq41FjORpvSh1wvQ3qsHjzcR5uaGlWEOJrd3uNJDuKBAS0TVvbEesLF9NEXipjyRVr4Q== - dependencies: - "@hapi/joi" "^15.0.3" - "@react-native-community/cli-debugger-ui" "^4.13.1" - "@react-native-community/cli-hermes" "^4.13.0" - "@react-native-community/cli-server-api" "^4.13.1" - "@react-native-community/cli-tools" "^4.13.0" - "@react-native-community/cli-types" "^4.10.1" - chalk "^3.0.0" - command-exists "^1.2.8" - commander "^2.19.0" - cosmiconfig "^5.1.0" - deepmerge "^3.2.0" - envinfo "^7.7.2" - execa "^1.0.0" - find-up "^4.1.0" - fs-extra "^8.1.0" - glob "^7.1.3" - graceful-fs "^4.1.3" - inquirer "^3.0.6" - leven "^3.1.0" - lodash "^4.17.15" - metro "^0.59.0" - metro-config "^0.59.0" - metro-core "^0.59.0" - metro-react-native-babel-transformer "^0.59.0" - metro-resolver "^0.59.0" - minimist "^1.2.0" - mkdirp "^0.5.1" - node-stream-zip "^1.9.1" - ora "^3.4.0" - pretty-format "^25.2.0" - semver "^6.3.0" - serve-static "^1.13.1" - strip-ansi "^5.2.0" - sudo-prompt "^9.0.0" - wcwidth "^1.0.1" +"@redux-saga/types@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8" + integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA== "@resolver-engine/core@^0.2.1": version "0.2.1" @@ -5275,10 +4812,10 @@ "@noble/hashes" "~1.2.0" "@scure/base" "~1.1.0" -"@sinclair/typebox@^0.24.1": - version "0.24.38" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.38.tgz#7f68d9c5775c4c2cec0524b3b990263dd009c968" - integrity sha512-IbYB6vdhLFmzGEyXXEdFAJKyq7S4/RsivkgxNzs/LzwYuUJHmeNQ0cHkjG/Yqm6VgUzzZDLMZAf0XgeeaZAocA== +"@sinclair/typebox@^0.25.16": + version "0.25.24" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" + integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== "@sindresorhus/is@^0.14.0": version "0.14.0" @@ -5302,6 +4839,20 @@ dependencies: type-detect "4.0.8" +"@sinonjs/commons@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3" + integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^10.0.2": + version "10.0.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c" + integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw== + dependencies: + "@sinonjs/commons" "^2.0.0" + "@sinonjs/fake-timers@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" @@ -5309,13 +4860,6 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@sinonjs/fake-timers@^9.1.2": - version "9.1.2" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" - integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== - dependencies: - "@sinonjs/commons" "^1.7.0" - "@solidity-parser/parser@^0.14.0", "@solidity-parser/parser@^0.14.1", "@solidity-parser/parser@^0.14.3": version "0.14.3" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.3.tgz#0d627427b35a40d8521aaa933cc3df7d07bfa36f" @@ -6130,17 +5674,17 @@ "@types/connect" "*" "@types/node" "*" -"@types/btoa@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/btoa/-/btoa-1.2.3.tgz#2c8e7093f902bf8f0e10992a731a4996aa1a5732" - integrity sha512-ANNCZICS/ofxhzUl8V1DniBJs+sFQ+Yg5am1ZwVEf/sxoKY/J2+h5Fuw3xUErlZ7eJLdgzukBjZwnsV6+/2Rmg== +"@types/bunyan@1.8.8", "@types/bunyan@^1.8.8": + version "1.8.8" + resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.8.tgz#8d6d33f090f37c07e2a80af30ae728450a101008" + integrity sha512-Cblq+Yydg3u+sGiz2mjHjC5MPmdjY+No4qvHrF+BUhblsmSfMvsHLbOG62tPbonsqBj6sbWv1LHcsoe5Jw+/Ow== dependencies: "@types/node" "*" -"@types/bunyan@1.8.4": - version "1.8.4" - resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.4.tgz#69c11adc7b50538d45fb68d9ae39d062b9432f38" - integrity sha512-bxOF3fsm69ezKxdcJ7Oo/PsZMOJ+JIV/QJO2IADfScmR3sLulR88dpSnz6+q+9JJ1kD7dXFFgUrGRSKHLkOX7w== +"@types/bytebuffer@^5.0.40": + version "5.0.44" + resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.44.tgz#553015fb34db1fc3eb3f7b232bff91c006c251a1" + integrity sha512-k1qonHga/SfQT02NF633i+7tIfKd+cfC/8pjnedcfuXJNMWooss/FkCgRMSnLf2WorLjbuH4bfgAZEbtyHBDoQ== dependencies: "@types/long" "^3.0.0" "@types/node" "*" @@ -6261,32 +5805,18 @@ "@types/bn.js" "*" "@types/node" "*" -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.30" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04" - integrity sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ== - dependencies: - "@types/express" "*" - "@types/express-unless" "*" - -"@types/express-rate-limit@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@types/express-rate-limit/-/express-rate-limit-5.0.0.tgz#46b0dbae748a53347a5e1c3bdbb5a54e3f5c34f9" - integrity sha512-tVRtvshGIYTNiUET3XJaONn1Li0V9mhi9Tb23Kf3rJ19hsgbCywkZBOf5Xhd9OXBO0Ssw7B+qAHL77xe/TiqUw== - dependencies: - "@types/express" "*" - -"@types/express-request-id@1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@types/express-request-id/-/express-request-id-1.4.3.tgz#8e0f5c091314eaf9009d2d5d9d6c431907f0676c" - integrity sha512-vOQzyPe5Y5LNefpEiBwD8RpXu2ZD2Vy5pTMEzVrOLRKYk5iSE1kMC+4FIQD5xtMEwmrYuVhEpC/xLD479XK8Xg== - dependencies: - "@types/express-serve-static-core" "*" - "@types/express-serve-static-core@*": version "4.17.5" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c" integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw== + dependencies: + "@types/node" "*" + "@types/range-parser" "*" + +"@types/express-serve-static-core@4.17.31": + version "4.17.31" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" + integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== dependencies: "@types/node" "*" "@types/qs" "*" @@ -6301,17 +5831,19 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express-unless@*": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@types/express-unless/-/express-unless-0.5.2.tgz#07e29883d280778588644b03563d8796f870f20e" - integrity sha512-Q74UyYRX/zIgl1HSp9tUX2PlG8glkVm+59r7aK4KGKzC5jqKIOX6rrVLRQrzpZUQ84VukHtRoeAuon2nIssHPQ== +"@types/express-serve-static-core@^4.17.33": + version "4.17.33" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" + integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== dependencies: - "@types/express" "*" + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" -"@types/express@*", "@types/express@^4.17.3", "@types/express@^4.17.6": - version "4.17.8" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a" - integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ== +"@types/express@4.17.14": + version "4.17.14" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" + integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.18" @@ -6327,13 +5859,23 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" -"@types/express@^4.17.12": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== +"@types/express@^4.17.13": + version "4.17.17" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" + integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" + "@types/express-serve-static-core" "^4.17.33" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/express@^4.17.6": + version "4.17.8" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a" + integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "*" "@types/qs" "*" "@types/serve-static" "*" @@ -6349,7 +5891,7 @@ dependencies: "@types/node" "*" -"@types/fs-extra@^8.0.0", "@types/fs-extra@^8.0.1", "@types/fs-extra@^8.1.0": +"@types/fs-extra@^8.0.0", "@types/fs-extra@^8.1.0": version "8.1.0" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d" integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg== @@ -6431,14 +5973,6 @@ dependencies: "@types/istanbul-lib-coverage" "*" -"@types/istanbul-reports@^1.1.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" - integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - "@types/istanbul-reports@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" @@ -6566,15 +6100,12 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce" integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w== -"@types/node-fetch@2.5.12": - version "2.5.12" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66" - integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw== - dependencies: - "@types/node" "*" - form-data "^3.0.0" +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@^2.5.0", "@types/node-fetch@^2.5.7": +"@types/node-fetch@^2.5.7": version "2.5.7" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c" integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw== @@ -6619,6 +6150,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== +"@types/node@^13.7.0": + version "13.13.52" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.52.tgz#03c13be70b9031baaed79481c0c0cfb0045e53f7" + integrity sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ== + "@types/node@^18.7.16": version "18.7.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154" @@ -6629,7 +6165,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== -"@types/node@^8.0.0", "@types/node@^8.0.47", "@types/node@^8.10.59": +"@types/node@^8.0.0": version "8.10.59" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04" integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ== @@ -6943,7 +6479,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.8.tgz#b730ecb2bde209d12194cdf8bf9f12c4bd21965a" integrity sha512-49Pmk3GBUOrs/ZKJodGMJeEeiulv2VdfAYpGgkTCSXpNWx7KCX36+PbrkItwzrjTDHO2QoEZDpbhFoMN1lxe9A== -"@types/yargs@^13.0.0", "@types/yargs@^13.0.2": +"@types/yargs@^13.0.2": version "13.0.12" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.12.tgz#d895a88c703b78af0465a9de88aa92c61430b092" integrity sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ== @@ -6987,7 +6523,7 @@ abab@^2.0.3, abab@^2.0.5: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== -abbrev@1: +abbrev@1, abbrev@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -7032,15 +6568,10 @@ abortcontroller-polyfill@^1.1.9, abortcontroller-polyfill@^1.7.3: resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5" integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q== -absolute-path@^0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" - integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c= - -abstract-leveldown@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz#5cb89f958a44f526779d740d1440e743e0c30a57" - integrity sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ== +abstract-level@1.0.3, abstract-level@^1.0.0, abstract-level@^1.0.2, abstract-level@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/abstract-level/-/abstract-level-1.0.3.tgz#78a67d3d84da55ee15201486ab44c09560070741" + integrity sha512-t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA== dependencies: buffer "^6.0.3" catering "^2.1.0" @@ -7105,7 +6636,7 @@ abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3: level-supports "~1.0.0" xtend "~4.0.0" -accepts@^1.3.5, accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8: +accepts@^1.3.5, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -7137,11 +6668,6 @@ acorn-walk@^8.1.1, acorn-walk@^8.2.0: integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^6.0.7: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== - -acorn@^6.0.7, acorn@^6.2.1: version "6.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== @@ -7208,20 +6734,18 @@ agentkeepalive@^4.1.3, agentkeepalive@^4.2.1: depd "^1.1.2" humanize-ms "^1.2.1" -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== - -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" - integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.6.1, ajv@^6.9.1: - version "6.12.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" - integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== dependencies: ajv "^8.0.0" @@ -7257,18 +6781,6 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg== -anser@^1.4.9: - version "1.4.10" - resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b" - integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww== - -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= - dependencies: - string-width "^2.0.0" - ansi-align@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" @@ -7286,21 +6798,12 @@ ansi-colors@4.1.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== -ansi-colors@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9" - integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA== - dependencies: - ansi-wrap "^0.1.0" - -ansi-cyan@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" - integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM= - dependencies: - ansi-wrap "0.1.0" +ansi-colors@^4.1.1: + version "4.1.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== -ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: +ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== @@ -7312,29 +6815,6 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: dependencies: type-fest "^0.21.3" -ansi-fragments@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ansi-fragments/-/ansi-fragments-0.2.1.tgz#24409c56c4cc37817c3d7caa99d8969e2de5a05e" - integrity sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w== - dependencies: - colorette "^1.0.7" - slice-ansi "^2.0.0" - strip-ansi "^5.0.0" - -ansi-gray@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" - integrity sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw== - dependencies: - ansi-wrap "0.1.0" - -ansi-red@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" - integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw= - dependencies: - ansi-wrap "0.1.0" - ansi-regex@^2.0.0, ansi-regex@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -7345,7 +6825,7 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1" integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== -ansi-regex@^4.0.0, ansi-regex@^4.1.0: +ansi-regex@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== @@ -7379,7 +6859,7 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -ansi-wrap@0.1.0, ansi-wrap@^0.1.0: +ansi-wrap@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw== @@ -7401,7 +6881,12 @@ antlr4@4.7.1: resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773" integrity sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ== -any-promise@1.3.0, any-promise@^1.0.0, any-promise@^1.3.0: +antlr4ts@^0.5.0-alpha.4: + version "0.5.0-alpha.4" + resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a" + integrity sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ== + +any-promise@1.3.0, any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== @@ -7532,7 +7017,7 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -"aproba@^1.1.2 || 2", aproba@^2.0.0: +"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== @@ -7582,14 +7067,6 @@ are-we-there-yet@^3.0.0: delegates "^1.0.0" readable-stream "^3.6.0" -are-we-there-yet@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" - integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - are-we-there-yet@~1.1.2: version "1.1.7" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" @@ -7661,18 +7138,6 @@ arr-flatten@^1.0.1, arr-flatten@^1.1.0: resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== -arr-map@^2.0.0, arr-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4" - integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ= - dependencies: - make-iterator "^1.0.0" - -arr-union@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" - integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0= - arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" @@ -7692,31 +7157,19 @@ array-back@^2.0.0: dependencies: typical "^2.6.1" +array-buffer-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" + integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== + dependencies: + call-bind "^1.0.2" + is-array-buffer "^3.0.1" + array-differ@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg== -array-each@^1.0.0, array-each@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" - integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= - -array-filter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= - -array-filter@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" - integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw= - -array-find-index@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= - array-flatten@1.1.1, array-flatten@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -7732,31 +7185,6 @@ array-ify@^1.0.0: resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== -array-initial@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795" - integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U= - dependencies: - array-slice "^1.0.0" - is-number "^4.0.0" - -array-last@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336" - integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg== - dependencies: - is-number "^4.0.0" - -array-map@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" - integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI= - -array-reduce@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b" - integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys= - array-slice@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" @@ -7789,7 +7217,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.map@^1.0.1, array.prototype.map@^1.0.4: +array.prototype.map@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.4.tgz#0d97b640cfdd036c1b41cfe706a5e699aa0711f2" integrity sha512-Qds9QnX7A0qISY7JT5WuJO0NJPE9CMlC6JzHQfhpqAAQQzufVRoeH7EzUY5GcPTx72voG8LV/5eo+b8Qi8hmhA== @@ -7800,6 +7228,17 @@ array.prototype.map@^1.0.1, array.prototype.map@^1.0.4: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" +array.prototype.map@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.5.tgz#6e43c2fee6c0fb5e4806da2dc92eb00970809e55" + integrity sha512-gfaKntvwqYIuC7mLLyv2wzZIJqrRhn5PZ9EfFejSx6a78sV7iDsGpG9P+3oUPtm1Rerqm6nrKS4FYuTIvWfo3g== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-array-method-boxes-properly "^1.0.0" + is-string "^1.0.7" + array.prototype.reduce@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f" @@ -7877,21 +7316,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== -assert@^1.1.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" - integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE= - dependencies: - util "0.10.3" - -assert@^1.4.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - assertion-error@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" @@ -7977,7 +7401,7 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -atob@^2.1.2: +atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== @@ -8065,13 +7489,6 @@ axios@^0.25.0: dependencies: follow-redirects "^1.14.7" -axios@^0.26.1: - version "0.26.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" - integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== - dependencies: - follow-redirects "^1.14.8" - babel-jest@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" @@ -8079,24 +7496,11 @@ babel-jest@^26.6.3: dependencies: "@jest/transform" "^26.6.2" "@jest/types" "^26.6.2" - "@types/babel__core" "^7.1.7" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.6.2" - chalk "^4.0.0" - graceful-fs "^4.2.4" - slash "^3.0.0" - -babel-jest@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.0.2.tgz#7efde496c07607949e9be499bf277aa1543ded95" - integrity sha512-yTu4/WSi/HzarjQtrJSwV+/0maoNt+iP0DmpvFJdv9yY+5BuNle8TbheHzzcSWj5gIHfuhpbLYHWRDYhWKyeKQ== - dependencies: - "@jest/transform" "^29.0.2" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^29.0.2" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^26.6.2" chalk "^4.0.0" - graceful-fs "^4.2.9" + graceful-fs "^4.2.4" slash "^3.0.0" babel-jest@^29.1.2: @@ -8112,17 +7516,34 @@ babel-jest@^29.1.2: graceful-fs "^4.2.9" slash "^3.0.0" -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== +babel-jest@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5" + integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q== dependencies: - object.assign "^4.1.0" + "@jest/transform" "^29.5.0" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^29.5.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + slash "^3.0.0" babel-plugin-istanbul@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^4.0.0" + test-exclude "^6.0.0" + +babel-plugin-istanbul@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@istanbuljs/load-nyc-config" "^1.0.0" @@ -8140,65 +7561,16 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4= - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM= - -babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" - integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ== - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= +babel-plugin-jest-hoist@^29.0.2, babel-plugin-jest-hoist@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a" + integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" -babel-plugin-polyfill-corejs2@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d" - integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.2" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7" - integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" - core-js-compat "^3.21.0" - -babel-plugin-polyfill-regenerator@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe" - integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" - -babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" - integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ== - babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" @@ -8217,75 +7589,6 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-env@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" - integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg== - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^3.2.6" - invariant "^2.2.2" - semver "^5.3.0" - -babel-preset-fbjs@^3.2.0, babel-preset-fbjs@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541" - integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw== - dependencies: - "@babel/plugin-proposal-class-properties" "^7.0.0" - "@babel/plugin-proposal-object-rest-spread" "^7.0.0" - "@babel/plugin-syntax-class-properties" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.0.0" - "@babel/plugin-syntax-jsx" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - "@babel/plugin-transform-arrow-functions" "^7.0.0" - "@babel/plugin-transform-block-scoped-functions" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.0.0" - "@babel/plugin-transform-classes" "^7.0.0" - "@babel/plugin-transform-computed-properties" "^7.0.0" - "@babel/plugin-transform-destructuring" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.0.0" - "@babel/plugin-transform-for-of" "^7.0.0" - "@babel/plugin-transform-function-name" "^7.0.0" - "@babel/plugin-transform-literals" "^7.0.0" - "@babel/plugin-transform-member-expression-literals" "^7.0.0" - "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/plugin-transform-object-super" "^7.0.0" - "@babel/plugin-transform-parameters" "^7.0.0" - "@babel/plugin-transform-property-literals" "^7.0.0" - "@babel/plugin-transform-react-display-name" "^7.0.0" - "@babel/plugin-transform-react-jsx" "^7.0.0" - "@babel/plugin-transform-shorthand-properties" "^7.0.0" - "@babel/plugin-transform-spread" "^7.0.0" - "@babel/plugin-transform-template-literals" "^7.0.0" - babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0" - babel-preset-jest@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" @@ -8302,7 +7605,15 @@ babel-preset-jest@^29.0.2: babel-plugin-jest-hoist "^29.0.2" babel-preset-current-node-syntax "^1.0.0" -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0: +babel-preset-jest@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2" + integrity sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg== + dependencies: + babel-plugin-jest-hoist "^29.5.0" + babel-preset-current-node-syntax "^1.0.0" + +babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== @@ -8329,17 +7640,12 @@ base-x@^3.0.2, base-x@^3.0.8: dependencies: safe-buffer "^5.0.1" -base64-js@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978" - integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg= - base64-js@^1.0.2, base64-js@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== -base64-js@^1.1.2, base64-js@^1.3.1, base64-js@^1.5.1: +base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -8381,22 +7687,40 @@ bech32@1.1.4, bech32@^1.1.3: resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9" integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ== -big-integer@1.6.x: - version "1.6.51" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" - integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== +before-after-hook@^2.2.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c" + integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ== + +better-ajv-errors@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/better-ajv-errors/-/better-ajv-errors-0.8.2.tgz#9abf27e19d2cee60f400753510f7a3a96d655adf" + integrity sha512-FnODTBJSQSHmJXDLPiC7ca0dC4S1HSTPv1+Hg2sm/C71i3Dj0l1jcUEaq/3OQ6MmnUveshTsUvUj65pDSr3Qow== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/runtime" "^7.0.0" + chalk "^2.4.1" + core-js "^3.2.1" + json-to-ast "^2.0.3" + jsonpointer "^5.0.0" + leven "^3.1.0" + +big-integer@1.6.36: + version "1.6.36" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36" + integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg== big-integer@^1.6.15, big-integer@^1.6.17, big-integer@^1.6.44: version "1.6.48" resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +big.js@^6.0.3: + version "6.2.1" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f" + integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ== -bigi@^1.1.0: +bigi@^1.1.0, bigi@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825" integrity sha512-ddkU+dFIuEIW8lE7ZwdIAf2UPoM90eaprg5m3YXAVVTmKlqV/9BX4A2M8BOK2yOq6/VgZFVhK6QAxJebhlbhzw== @@ -8774,7 +8098,7 @@ browserify-sign@^4.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -browserslist@^4.20.2, browserslist@^4.21.3: +browserslist@^4.21.3: version "4.21.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== @@ -8882,7 +8206,14 @@ buffer-xor@^1.0.3: resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== -buffer@4.9.2, buffer@^4.3.0, buffer@^4.9.1: +buffer-xor@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-2.0.2.tgz#34f7c64f04c777a1f8aac5e661273bb9dd320289" + integrity sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ== + dependencies: + safe-buffer "^5.1.1" + +buffer@4.9.2: version "4.9.2" resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== @@ -9038,10 +8369,10 @@ cacache@^15.2.0: tar "^6.0.2" unique-filename "^1.1.1" -cacache@^12.0.0, cacache@^12.0.2: - version "12.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" - integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== +cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0: + version "16.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" + integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== dependencies: "@npmcli/fs" "^2.1.0" "@npmcli/move-file" "^2.0.0" @@ -9108,7 +8439,7 @@ cacheable-request@^7.0.2: normalize-url "^6.0.1" responselike "^2.0.0" -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2: +call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -9301,7 +8632,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -9355,11 +8686,6 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chardet@^0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" - integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= - chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -9438,29 +8764,10 @@ chokidar@3.3.0: optionalDependencies: fsevents "~2.1.1" -chokidar@^2.0.0, chokidar@^2.1.5, chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - -chokidar@^3.0.2, chokidar@^3.4.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d" - integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A== +chokidar@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450" + integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -9487,7 +8794,7 @@ chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.5.1: optionalDependencies: fsevents "~2.3.2" -chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: +chownr@^1.0.1, chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -9497,18 +8804,6 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" - -ci-info@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" - integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== - ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -9851,30 +9146,6 @@ cmd-shim@^5.0.0: dependencies: mkdirp-infer-owner "^2.0.0" -cls-bluebird@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee" - integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4= - dependencies: - is-bluebird "^1.0.2" - shimmer "^1.1.0" - -cmd-shim@^2.0.2, cmd-shim@~2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb" - integrity sha1-b8vamUg6j9FdfTChlspp1oii79s= - dependencies: - graceful-fs "^4.1.2" - mkdirp "~0.5.0" - -cmd-shim@^3.0.0, cmd-shim@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz#2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb" - integrity sha512-DtGg+0xiFhQIntSBRzL2fRQBnmtAVwXIDo4Qq46HPpObYquxMaZS4sb82U9nH91qJrlosC1wa9gwr0QyL/HypA== - dependencies: - graceful-fs "^4.1.2" - mkdirp "~0.5.0" - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -9967,15 +9238,10 @@ color@^3.1.3: color-convert "^1.9.3" color-string "^1.6.0" -colorette@1.1.0, colorette@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.1.0.tgz#1f943e5a357fac10b4e0f5aaef3b14cdc1af6ec7" - integrity sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg== - -colorette@^1.0.7: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" - integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== +colorette@2.0.19: + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== colors@1.0.3, colors@1.0.x: version "1.0.3" @@ -10044,7 +9310,7 @@ commander@3.0.2, commander@^3.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.12.1, commander@^2.19.0, commander@^2.20.0: +commander@^2.12.1, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -10054,20 +9320,20 @@ commander@^4.0.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +commander@^8.1.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== -commander@~2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" - integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA== +commander@^9.1.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== -commander@~2.17.1: - version "2.17.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" - integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== +common-ancestor-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7" + integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w== commondir@^1.0.1: version "1.0.1" @@ -10104,11 +9370,6 @@ component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@^1.3.0: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -component-emitter@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - compress-commons@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" @@ -10164,10 +9425,10 @@ concat-stream@^2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -config-chain@^1.1.11, config-chain@^1.1.12: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== +conf@^10.1.2: + version "10.2.0" + resolved "https://registry.yarnpkg.com/conf/-/conf-10.2.0.tgz#838e757be963f1a2386dfe048a98f8f69f7b55d6" + integrity sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg== dependencies: ajv "^8.6.3" ajv-formats "^2.1.1" @@ -10222,23 +9483,6 @@ connect@^3.6.2: parseurl "~1.3.2" utils-merge "1.0.1" -connect@^3.6.5: - version "3.7.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" - integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== - dependencies: - debug "2.6.9" - finalhandler "1.1.2" - parseurl "~1.3.3" - utils-merge "1.0.1" - -console-browserify@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" - integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= - dependencies: - date-now "^0.1.4" - console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -10362,6 +9606,11 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -10372,35 +9621,21 @@ cookie@0.5.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== -cookiejar@^2.1.0, cookiejar@^2.1.1: +cookiejar@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" +cookiejar@^2.1.3: + version "2.1.4" + resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b" + integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw== copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -core-js-compat@^3.21.0: - version "3.25.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.1.tgz#6f13a90de52f89bbe6267e5620a412c7f7ff7e42" - integrity sha512-pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw== - dependencies: - browserslist "^4.21.3" - core-js-pure@^3.0.1: version "3.25.1" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.1.tgz#79546518ae87cc362c991d9c2d211f45107991ee" @@ -10411,21 +9646,11 @@ core-js@3.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== -core-js@3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.2.tgz#2799ea1a59050f0acf50dfe89b916d6503b16caa" - integrity sha512-hIE5dXkRzRvnZ5vhkRfQxUvDxQZmD9oueA08jDYRBKJHx+VIl/Pne/e0A4x9LObEEthC/TqiZybUoNM4tRgnKg== - -core-js@^2.4.0, core-js@^2.5.0: +core-js@^2.4.0: version "2.6.11" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== -core-js@^2.4.1: - version "2.6.12" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" - integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== - core-js@^3.0.0: version "3.25.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.1.tgz#5818e09de0db8956e16bf10e2a7141e931b7c69c" @@ -10454,7 +9679,7 @@ cors@^2.8.1, cors@^2.8.5: object-assign "^4" vary "^1" -cosmiconfig@^5.0.7, cosmiconfig@^5.1.0, cosmiconfig@^5.2.1: +cosmiconfig@^5.0.7, cosmiconfig@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== @@ -10539,7 +9764,15 @@ cross-env@^5.1.3, cross-env@^5.1.6: dependencies: cross-spawn "^6.0.5" -cross-fetch@3.0.4, cross-fetch@^2.1.0, cross-fetch@^2.1.1, cross-fetch@^3.0.2, cross-fetch@^3.0.6: +cross-fetch@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.4.tgz#7bef7020207e684a7638ef5f2f698e24d9eb283c" + integrity sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw== + dependencies: + node-fetch "2.6.0" + whatwg-fetch "3.0.0" + +cross-fetch@^3.0.6, cross-fetch@^3.1.4, cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== @@ -10554,16 +9787,18 @@ cross-spawn@^4.0.2: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1, cross-spawn@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A== +cross-spawn@^6.0.0, cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== dependencies: - lru-cache "^4.0.1" + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.1: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -10731,15 +9966,15 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-and-time@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.12.0.tgz#6d30c91c47fa72edadd628b71ec2ac46909b9267" - integrity sha512-n2RJIAp93AucgF/U/Rz5WRS2Hjg5Z+QxscaaMCi6pVZT1JpJKRH+C08vyH/lRR1kxNXnPxgo3lWfd+jCb/UcuQ== +dataloader@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" + integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ== -date-and-time@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-2.0.1.tgz#bc8b72704980e8a0979bb186118d30d02059ef04" - integrity sha512-O7Xe5dLaqvY/aF/MFWArsAM1J4j7w1CSZlPCX9uHgmb+6SbkPd8Q4YOvfvH/cZGvFlJFfHOZKxQtmMUOoZhc/w== +date-and-time@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.6.3.tgz#2daee52df67c28bd93bce862756ac86b68cf4237" + integrity sha512-lcWy3AXDRJOD7MplwZMmNSRM//kZtJaLz4n6D1P5z9wEmZGBKhJRBIr1Xs9KNQJmdXPblvgffynYji4iylUTcA== date-utils@*: version "1.2.21" @@ -10751,20 +9986,10 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -dayjs@^1.8.15, dayjs@^1.8.29: - version "1.11.5" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.5.tgz#00e8cc627f231f9499c19b38af49f56dc0ac5e93" - integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA== - -dayjs@^1.8.29: - version "1.9.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.9.6.tgz#6f0c77d76ac1ff63720dd1197e5cb87b67943d70" - integrity sha512-HngNLtPEBWRo8EFVmHFmSXAjtCX8rGNqeXQI0Gh7wCTSqwaKgPIDqu9m07wABVopNwzvOeCb+2711vQhDlcIXw== - -debug-fabulous@0.0.X: - version "0.0.4" - resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.0.4.tgz#fa071c5d87484685424807421ca4b16b0b1a0763" - integrity sha1-+gccXYdIRoVCSAdCHKSxawsaB2M= +debounce-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" + integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== dependencies: mimic-fn "^3.0.0" @@ -10789,28 +10014,14 @@ debug@3.2.6: dependencies: ms "^2.1.1" -debug@4: +debug@4, debug@4.3.4, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87" - integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg== - dependencies: - ms "^2.1.1" - -debug@4.1.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -debug@^4.3.1: +debug@4.3.1, debug@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -10824,6 +10035,13 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -10948,28 +10166,15 @@ deep-eql@^3.0.1: dependencies: type-detect "^4.0.0" -deep-equal@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.1.tgz#fc12bbd6850e93212f21344748682ccc5a8813cf" - integrity sha512-7Et6r6XfNW61CPPCIYfm1YPGSmh6+CliYeL4km7GWJcpX5LTAflGF8drLLR+MZX+2P3NZfAfSduutBbSWqER4g== - dependencies: - es-abstract "^1.16.3" - es-get-iterator "^1.0.1" - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - isarray "^2.0.5" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - side-channel "^1.0.1" - which-boxed-primitive "^1.0.1" - which-collection "^1.0.0" - deep-equal@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= + integrity sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw== + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-freeze@0.0.1: version "0.0.1" @@ -10981,16 +10186,6 @@ deep-is@^0.1.3, deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deepmerge@^2.0.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" - integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA== - -deepmerge@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.3.0.tgz#d3c47fd6f3a93d517b14426b0628a17b0125f5f7" - integrity sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA== - deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" @@ -11106,15 +10301,10 @@ delimit-stream@0.1.0: resolved "https://registry.yarnpkg.com/delimit-stream/-/delimit-stream-0.1.0.tgz#9b8319477c0e5f8aeb3ce357ae305fc25ea1cd2b" integrity sha512-a02fiQ7poS5CnjiJBAsjGLPp5EwVoGHNeu9sziBd9huppRfsAFIpv5zNLv0V1gbop53ilngAf5Kf331AwcoRBQ== -denodeify@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631" - integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE= - -denque@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" - integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== +denque@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" + integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== depd@2.0.0, depd@^2.0.0, depd@~2.0.0: version "2.0.0" @@ -11173,10 +10363,10 @@ detect-libc@^1.0.3: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== -detect-newline@2.X, detect-newline@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" - integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== detect-newline@^3.0.0: version "3.1.0" @@ -11217,7 +10407,7 @@ detox@^17.13.2: yargs "^16.0.3" yargs-unparser "^2.0.0" -dezalgo@^1.0.0, dezalgo@~1.0.3: +dezalgo@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY= @@ -11225,6 +10415,14 @@ dezalgo@^1.0.0, dezalgo@~1.0.3: asap "^2.0.0" wrappy "1" +dezalgo@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" + integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig== + dependencies: + asap "^2.0.0" + wrappy "1" + dicer@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.1.tgz#abf28921e3475bc5e801e74e0159fd94f927ba97" @@ -11237,10 +10435,10 @@ diff-sequences@^26.6.2: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== -diff-sequences@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.0.0.tgz#bae49972ef3933556bcb0800b72e8579d19d9e4f" - integrity sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA== +diff-sequences@^29.4.3: + version "29.4.3" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2" + integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA== diff@3.5.0: version "3.5.0" @@ -11406,10 +10604,20 @@ dotenv@^6.1.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== -dottie@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.1.tgz#697ad9d72004db7574d21f892466a3c285893659" - integrity sha512-ch5OQgvGDK2u8pSZeSYAQaV/lczImd7pMJ7BcEPXmnFVjy4yJIzP6CsODJUTH8mg1tyH1Z2abOiuJO3DjZ/GBw== +dotenv@^8.2.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== + +dotenv@~10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" + integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== + +double-ended-queue@2.1.0-0: + version "2.1.0-0" + resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" + integrity sha512-+BNfZ+deCo8hMNpDqDnvT+c0XpJ5cUa6mqYq89bho2Ifze4URTqRkcwR399hWoTrTkbZ/XJYDgP6rc7pRgffEQ== drbg.js@^1.0.1: version "1.0.1" @@ -11487,21 +10695,6 @@ ecurve@^1.0.6: bigi "^1.1.0" safe-buffer "^5.0.1" -editor@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742" - integrity sha1-YMf4e9YrzGqJT6jM1q+3gjok90I= - -editorconfig@^0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" - integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g== - dependencies: - commander "^2.19.0" - lru-cache "^4.1.5" - semver "^5.6.0" - sigmund "^1.0.1" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -11540,10 +10733,10 @@ emittery@0.10.0: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.0.tgz#bb373c660a9d421bb44706ec4967ed50c02a8026" integrity sha512-AGvFfs+d0JKCJQ4o01ASQLGPmSCxgfU9RFXvzPvZdjKK8oscynksuJhWrSTSw7j7Ep/sZct5b5ZhYCi8S/t0HQ== -emittery@^0.10.2: - version "0.10.2" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933" - integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw== +emittery@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" + integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== emittery@^0.4.1: version "0.4.1" @@ -11570,19 +10763,17 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== -enabled@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= - dependencies: - env-variable "0.0.x" +encode-utf8@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda" + integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw== -encodeurl@~1.0.2: +encodeurl@~1.0.1, encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== @@ -11634,50 +10825,39 @@ ends-with@^0.2.0: resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a" integrity sha512-lRppY4dK3VkqBdR242sKcAJeYc8Gf/DhoX9AWvWI2RzccmLnqBQfwm2k4oSDv5MPDjUqawCauXhZkyWxkVhRsg== -enhanced-resolve@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f" - integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.4.0" - tapable "^1.0.0" - -enhanced-resolve@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" - integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== +enquirer@~2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.5.0" - tapable "^1.0.0" + ansi-colors "^4.1.1" ent@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== -env-paths@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" - integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA= +entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== env-paths@^2.2.0, env-paths@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -envinfo@^7.7.2: - version "7.7.4" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320" - integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ== +envinfo@^7.7.4: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== -err-code@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" - integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: +errno@~0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== @@ -11691,69 +10871,91 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-stack-parser@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" - integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== - dependencies: - stackframe "^1.1.1" - -errorhandler@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91" - integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A== - dependencies: - accepts "~1.3.7" - escape-html "~1.0.3" - -es-abstract@^1.16.3, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.5.0: +es-abstract@^1.17.0-next.1: version "1.17.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== dependencies: - call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.5" + is-regex "^1.0.5" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" + +es-abstract@^1.19.0, es-abstract@^1.19.2, es-abstract@^1.20.0, es-abstract@^1.20.1, es-abstract@^1.20.4, es-abstract@^1.5.0: + version "1.21.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" + integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== + dependencies: + array-buffer-byte-length "^1.0.0" + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + es-set-tostringtag "^2.0.1" + es-to-primitive "^1.2.1" function.prototype.name "^1.1.5" - get-intrinsic "^1.1.2" + get-intrinsic "^1.2.0" get-symbol-description "^1.0.0" + globalthis "^1.0.3" + gopd "^1.0.1" has "^1.0.3" has-property-descriptors "^1.0.0" + has-proto "^1.0.1" has-symbols "^1.0.3" - internal-slot "^1.0.3" - is-callable "^1.2.4" + internal-slot "^1.0.5" + is-array-buffer "^3.0.2" + is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" + is-typed-array "^1.1.10" is-weakref "^1.0.2" - object-inspect "^1.12.2" + object-inspect "^1.12.3" object-keys "^1.1.1" object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" + safe-regex-test "^1.0.0" + string.prototype.trim "^1.2.7" + string.prototype.trimend "^1.0.6" + string.prototype.trimstart "^1.0.6" + typed-array-length "^1.0.4" unbox-primitive "^1.0.2" + which-typed-array "^1.1.9" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== -es-get-iterator@^1.0.1, es-get-iterator@^1.0.2: +es-get-iterator@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9" integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.0" + call-bind "^1.0.0" + get-intrinsic "^1.0.1" has-symbols "^1.0.1" - is-arguments "^1.1.0" - is-map "^2.0.2" - is-set "^2.0.2" + is-arguments "^1.0.4" + is-map "^2.0.1" + is-set "^2.0.1" is-string "^1.0.5" isarray "^2.0.5" +es-set-tostringtag@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" + integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== + dependencies: + get-intrinsic "^1.1.3" + has "^1.0.3" + has-tostringtag "^1.0.0" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -12612,11 +11814,6 @@ events@^3.0.0, events@^3.1.0, events@^3.3.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -events@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" @@ -12816,16 +12013,16 @@ expect@^29.0.0: jest-message-util "^29.1.2" jest-util "^29.1.2" -expect@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.0.2.tgz#22c7132400f60444b427211f1d6bb604a9ab2420" - integrity sha512-JeJlAiLKn4aApT4pzUXBVxl3NaZidWIOdg//smaIlP9ZMBDkHZGFd9ubphUZP9pUyDEo7bC6M0IIZR51o75qQw== +expect@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7" + integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg== dependencies: - "@jest/expect-utils" "^29.0.2" - jest-get-type "^29.0.0" - jest-matcher-utils "^29.0.2" - jest-message-util "^29.0.2" - jest-util "^29.0.2" + "@jest/expect-utils" "^29.5.0" + jest-get-type "^29.4.3" + jest-matcher-utils "^29.5.0" + jest-message-util "^29.5.0" + jest-util "^29.5.0" export-files@^2.0.1: version "2.1.1" @@ -12878,13 +12075,6 @@ ext@^1.1.2: dependencies: type "^2.7.2" -extend-shallow@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071" - integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE= - dependencies: - kind-of "^1.1.0" - extend-shallow@^2.0.0, extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -12980,16 +12170,6 @@ faker@5.5.3: resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e" integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g== -fancy-log@^1.3.2: - version "1.3.3" - resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" - integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== - dependencies: - ansi-gray "^0.1.1" - color-support "^1.1.3" - parse-node-version "^1.0.0" - time-stamp "^1.0.0" - fast-check@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-3.1.1.tgz#72c5ae7022a4e86504762e773adfb8a5b0b01252" @@ -13068,6 +12248,11 @@ fast-text-encoding@^1.0.0: resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz#3e5ce8293409cfaa7177a71b9ca84e1b1e6f25ef" integrity sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ== +fast-text-encoding@^1.0.3: + version "1.0.6" + resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" + integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== + fast-url-parser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" @@ -13103,50 +12288,15 @@ faye-websocket@0.11.4: fb-watchman@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== - dependencies: - bser "2.1.1" - -fbjs-css-vars@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" - integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== - -fbjs-scripts@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-1.2.0.tgz#069a0c0634242d10031c6460ef1fccefcdae8b27" - integrity sha512-5krZ8T0Bf8uky0abPoCLrfa7Orxd8UH4Qq8hRUF2RZYNMu+FmEOrBc7Ib3YVONmxTXTlLAvyrrdrVmksDb2OqQ== - dependencies: - "@babel/core" "^7.0.0" - ansi-colors "^1.0.1" - babel-preset-fbjs "^3.2.0" - core-js "^2.4.1" - cross-spawn "^5.1.0" - fancy-log "^1.3.2" - object-assign "^4.0.1" - plugin-error "^0.1.2" - semver "^5.1.0" - through2 "^2.0.0" - -fbjs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a" - integrity sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA== + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== dependencies: - core-js "^2.4.1" - fbjs-css-vars "^1.0.0" - isomorphic-fetch "^2.1.1" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.18" + bser "2.1.1" -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== dependencies: pend "~1.2.0" @@ -13177,10 +12327,10 @@ fetch-mock@9.10.4: querystring "^0.2.0" whatwg-url "^6.5.0" -fetch-ponyfill@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz#ae3ce5f732c645eab87e4ae8793414709b239893" - integrity sha1-rjzl9zLGReq4fkroeTQUcJsjmJM= +fetch-mock@^9.11.0: + version "9.11.0" + resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-9.11.0.tgz#371c6fb7d45584d2ae4a18ee6824e7ad4b637a3f" + integrity sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q== dependencies: "@babel/core" "^7.0.0" "@babel/runtime" "^7.0.0" @@ -13285,23 +12435,23 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" + integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw== dependencies: debug "2.6.9" - encodeurl "~1.0.2" + encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" + parseurl "~1.3.2" + statuses "~1.3.1" unpipe "~1.0.0" -finalhandler@1.1.2, finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" @@ -13383,41 +12533,6 @@ findup-sync@^1.0.0: micromatch "^2.3.7" resolve-dir "^0.1.0" -findup-sync@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" - integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= - dependencies: - detect-file "^1.0.0" - is-glob "^3.1.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" - -fined@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" - integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== - dependencies: - expand-tilde "^2.0.2" - is-plain-object "^2.0.3" - object.defaults "^1.1.0" - object.pick "^1.2.0" - parse-filepath "^1.0.1" - -firebase-admin@^8.10.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-8.10.0.tgz#4a838aec52df49845eba07ad59a40b4df996e815" - integrity sha512-QzJZ1sBh9xzKjb44aP6m1duy0Xe1ixexwh0eaOt1CkJYCOq2b6bievK4GNWMl5yGQ7FFBEbZO6hyDi+5wrctcg== - dependencies: - "@firebase/database" "^0.5.17" - "@types/node" "^8.10.59" - dicer "^0.3.0" - jsonwebtoken "8.1.0" - node-forge "0.7.4" - optionalDependencies: - "@google-cloud/firestore" "^3.0.0" - "@google-cloud/storage" "^4.1.2" - firebase-admin@^9.12.0: version "9.12.0" resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.12.0.tgz#d7e889e97c9c31610efbcd131bb6d06a783af757" @@ -13596,7 +12711,7 @@ follow-redirects@^1.12.1, follow-redirects@^1.15.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== -follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.14.8, follow-redirects@^1.14.9: +follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9: version "1.15.1" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== @@ -13635,7 +12750,12 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== -form-data@^2.2.0, form-data@^2.3.1, form-data@^2.3.2: +form-data-encoder@1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.1.tgz#ac80660e4f87ee0d3d3c3638b7da8278ddb8ec96" + integrity sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg== + +form-data@^2.2.0, form-data@^2.5.0: version "2.5.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== @@ -13671,10 +12791,15 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formidable@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659" - integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg== +formidable@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.1.tgz#81269cbea1a613240049f5f61a9d97731517414f" + integrity sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ== + dependencies: + dezalgo "^1.0.4" + hexoid "^1.0.0" + once "^1.4.0" + qs "^6.11.0" forwarded@0.2.0: version "0.2.0" @@ -13729,16 +12854,16 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= +fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" -fs-extra@^4.0.2, fs-extra@^4.0.3: +fs-extra@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== @@ -13793,7 +12918,7 @@ fs-extra@^9.0, fs-extra@^9.0.1, fs-extra@^9.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^1.2.7: +fs-minipass@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -13817,14 +12942,6 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^1.2.7: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" @@ -13853,7 +12970,7 @@ ftp@^0.3.10: readable-stream "1.1.x" xregexp "2.0.0" -function-bind@^1.1.1: +function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== @@ -13932,21 +13049,6 @@ gauge@^4.0.3: strip-ansi "^6.0.1" wide-align "^1.1.5" -gauge@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" - integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.2" - console-control-strings "^1.0.0" - has-unicode "^2.0.1" - object-assign "^4.1.1" - signal-exit "^3.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.2" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -13971,17 +13073,6 @@ gaxios@^1.0.2, gaxios@^1.0.4, gaxios@^1.2.1, gaxios@^1.2.2, gaxios@^1.5.0: https-proxy-agent "^2.2.1" node-fetch "^2.3.0" -gaxios@^2.0.0, gaxios@^2.0.1, gaxios@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-2.3.0.tgz#442eb57c6f00811795946a89a13dfe47bdb9ba40" - integrity sha512-VgC4JKJQAAAGK5rFZbPcS5mXsdIYVMIUJOxMjSOkYdfhB74R0L6y8PFQDdS0r1ObG6hdP11e71EjHh3xbI+6fQ== - dependencies: - abort-controller "^3.0.0" - extend "^3.0.2" - https-proxy-agent "^4.0.0" - is-stream "^2.0.0" - node-fetch "^2.3.0" - gaxios@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.0.3.tgz#497730758f5b0d43a32ebdbebe5f1bd9f7db7aed" @@ -14012,14 +13103,6 @@ gcp-metadata@^1.0.0: gaxios "^1.0.2" json-bigint "^0.3.0" -gcp-metadata@^3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-3.3.1.tgz#1c5c05591e7a9c1613463b05dab9642319f08f1f" - integrity sha512-RrASg1HaVAxoB9Q/8sYfJ++v9PMiiqIgOrOxZeagMgS4osZtICT1lKBx2uvzYgwetxj8i6K99Z0iuKMg7WraTg== - dependencies: - gaxios "^2.1.0" - json-bigint "^0.3.0" - gcp-metadata@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.1.0.tgz#8b9b5903882076948554af471c838e7ea2f564b4" @@ -14048,36 +13131,6 @@ gcs-resumable-upload@^1.0.0: pumpify "^1.5.1" stream-events "^1.0.4" -gcs-resumable-upload@^2.2.4: - version "2.2.5" - resolved "https://registry.yarnpkg.com/gcs-resumable-upload/-/gcs-resumable-upload-2.2.5.tgz#13e832130eb8c12be6d80f4bdc6fc0c410f73ad1" - integrity sha512-r98Hnxza8oYT21MzpziAB2thz3AURGz54+osWtczxGNxH7Fodb0HVUEtfqTwBS5vcf9RnKwR7c0EMaI8R39feg== - dependencies: - abort-controller "^3.0.0" - configstore "^5.0.0" - gaxios "^2.0.0" - google-auth-library "^5.0.0" - pumpify "^2.0.0" - stream-events "^1.0.4" - -gcs-resumable-upload@^3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/gcs-resumable-upload/-/gcs-resumable-upload-3.3.1.tgz#bb3b0d776ce64b7c40d81fffadac7d54d878a9f3" - integrity sha512-WyC0i4VkslIdrdmeM5PNuGzANALLXTG5RoHb08OE30gYT+FEvCDPiA8KOjV2s1wOu9ngEW4+IuzBjtP/ni7UdQ== - dependencies: - abort-controller "^3.0.0" - configstore "^5.0.0" - extend "^3.0.2" - gaxios "^4.0.0" - google-auth-library "^7.0.0" - pumpify "^2.0.0" - stream-events "^1.0.4" - -generate-function@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-1.1.0.tgz#54c21b080192b16d9877779c5bb81666e772365f" - integrity sha1-VMIbCAGSsW2Yd3ecW7gWZudyNl8= - generate-function@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" @@ -14124,7 +13177,16 @@ get-installed-path@^4.0.8: dependencies: global-modules "1.0.0" -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2: +get-intrinsic@^1.0.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.3" + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== @@ -14138,10 +13200,10 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-pkg-repo@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d" - integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0= +get-pkg-repo@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385" + integrity sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA== dependencies: "@hutson/parse-repository-url" "^3.0.0" hosted-git-info "^4.0.0" @@ -14470,7 +13532,7 @@ glob@7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.3: +glob@7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -14478,7 +13540,7 @@ glob@^7.0.3: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.1.1" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" @@ -14504,7 +13566,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.2.3: +glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -14527,6 +13589,18 @@ glob@^8.0.1: minimatch "^5.0.1" once "^1.3.0" +glob@~7.1.4: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + 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" + global-dirs@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" @@ -14579,19 +13653,10 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== - dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" - -global@~4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" - integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8= +global@~4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" + integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== dependencies: min-document "^2.19.0" process "^0.11.10" @@ -14601,6 +13666,13 @@ globals@^11.1.0, globals@^11.7.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== +globalthis@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + dependencies: + define-properties "^1.1.3" + globby@^10.0.1: version "10.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" @@ -14655,20 +13727,6 @@ google-auth-library@^3.0.0, google-auth-library@^3.1.1: lru-cache "^5.0.0" semver "^5.5.0" -google-auth-library@^5.0.0, google-auth-library@^5.5.0: - version "5.9.2" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-5.9.2.tgz#e528f4f1cd10657073d7ae2b9a9ce17ac97c3538" - integrity sha512-rBE1YTOZ3/Hu6Mojkr+UUmbdc/F28hyMGYEGxjyfVA9ZFmq12oqS3AeftX4h9XpdVIcxPooSo8hECYGT6B9XqQ== - dependencies: - arrify "^2.0.0" - base64-js "^1.3.0" - fast-text-encoding "^1.0.0" - gaxios "^2.1.0" - gcp-metadata "^3.3.0" - gtoken "^4.1.0" - jws "^4.0.0" - lru-cache "^5.0.0" - google-auth-library@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.0.1.tgz#b5bbff2583f024188a37920cb509e194f2cc4dd2" @@ -14699,7 +13757,7 @@ google-auth-library@^6.1.3: jws "^4.0.0" lru-cache "^6.0.0" -google-auth-library@^7.0.0, google-auth-library@^7.14.0, google-auth-library@^7.14.1: +google-auth-library@^7.0.0, google-auth-library@^7.14.0, google-auth-library@^7.14.1, google-auth-library@^7.6.1: version "7.14.1" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.1.tgz#e3483034162f24cc71b95c8a55a210008826213c" integrity sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA== @@ -14753,27 +13811,6 @@ google-gax@^0.25.0: semver "^6.0.0" walkdir "^0.3.2" -google-gax@^1.13.0: - version "1.15.3" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-1.15.3.tgz#e88cdcbbd19c7d88cc5fd7d7b932c4d1979a5aca" - integrity sha512-3JKJCRumNm3x2EksUTw4P1Rad43FTpqrtW9jzpf3xSMYXx+ogaqTM1vGo7VixHB4xkAyATXVIa3OcNSh8H9zsQ== - dependencies: - "@grpc/grpc-js" "~1.0.3" - "@grpc/proto-loader" "^0.5.1" - "@types/fs-extra" "^8.0.1" - "@types/long" "^4.0.0" - abort-controller "^3.0.0" - duplexify "^3.6.0" - google-auth-library "^5.0.0" - is-stream-ended "^0.1.4" - lodash.at "^4.6.0" - lodash.has "^4.5.2" - node-fetch "^2.6.0" - protobufjs "^6.8.9" - retry-request "^4.0.0" - semver "^6.0.0" - walkdir "^0.4.0" - google-gax@^2.0.1: version "2.6.1" resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.6.1.tgz#ab09c4f94ccdd0a81a0f743f49fec83108587fbf" @@ -14805,12 +13842,12 @@ google-gax@^2.24.1: abort-controller "^3.0.0" duplexify "^4.0.0" fast-text-encoding "^1.0.3" - google-auth-library "^7.14.0" + google-auth-library "^7.6.1" is-stream-ended "^0.1.4" node-fetch "^2.6.1" - object-hash "^3.0.0" - proto3-json-serializer "^0.1.8" - protobufjs "6.11.3" + object-hash "^2.1.1" + proto3-json-serializer "^0.1.1" + protobufjs "6.11.2" retry-request "^4.0.0" google-libphonenumber@^3.2.15, google-libphonenumber@^3.2.27: @@ -14826,13 +13863,6 @@ google-p12-pem@^1.0.0: node-forge "^0.10.0" pify "^4.0.0" -google-p12-pem@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-2.0.2.tgz#39cae8f6fcbe66a01f00be4ddf2d56b95926fa7b" - integrity sha512-UfnEARfJKI6pbmC1hfFFm+UAcZxeIwTiEcHfqKe/drMsXD/ilnVjF7zgOGpHXyhuvX6jNJK3S8A0hOQjwtFxEw== - dependencies: - node-forge "^0.9.0" - google-p12-pem@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.0.1.tgz#a220c05a8d7ee9751dd133ee72ecfc855820d5ab" @@ -14840,12 +13870,12 @@ google-p12-pem@^3.0.0: dependencies: node-forge "^0.9.0" -google-p12-pem@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz#c3d61c2da8e10843ff830fdb0d2059046238c1d4" - integrity sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A== +google-p12-pem@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b" + integrity sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg== dependencies: - node-forge "^0.10.0" + node-forge "^1.3.1" google-proto-files@^0.20.0: version "0.20.0" @@ -14876,6 +13906,13 @@ googleapis@^39.2.0: google-auth-library "^3.0.0" googleapis-common "^0.7.0" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + got@12.1.0: version "12.1.0" resolved "https://registry.yarnpkg.com/got/-/got-12.1.0.tgz#099f3815305c682be4fd6b0ee0726d8e4c6b0af4" @@ -14932,20 +13969,22 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@^4.1.3: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== -graceful-fs@~4.1.11: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== +graphql-tag@^2.11.0, graphql-tag@^2.12.6: + version "2.12.6" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" + integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== + dependencies: + tslib "^2.1.0" graphql@^14.1.1: version "14.7.0" @@ -15000,16 +14039,6 @@ gtoken@^2.3.2: mime "^2.2.0" pify "^4.0.0" -gtoken@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-4.1.0.tgz#0b315dd1a925e3ad3c82db1eb5b9e89bae875ba8" - integrity sha512-wqyn2gf5buzEZN4QNmmiiW2i2JkEdZnL7Z/9p44RtZqgt4077m4khRgAYNuu8cBwHWCc6MsP6eDUn/KkF6jFIw== - dependencies: - gaxios "^2.0.0" - google-p12-pem "^2.0.0" - jws "^3.1.5" - mime "^2.2.0" - gtoken@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.0.1.tgz#b93f309d89adfe230bb0f24269b978284ba89e0f" @@ -15098,6 +14127,11 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + has-symbol-support-x@^1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" @@ -15226,23 +14260,26 @@ header-case@^1.0.0: no-case "^2.2.0" upper-case "^1.1.3" -hexoid@1.0.0: +hexoid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== -hermes-profile-transformer@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz#bd0f5ecceda80dd0ddaae443469ab26fb38fc27b" - integrity sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ== - dependencies: - source-map "^0.7.3" - highlight.js@^10.2.0: version "10.3.2" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.3.2.tgz#135fd3619a00c3cbb8b4cd6dbc78d56bfcbc46f1" integrity sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw== +highlight.js@^10.4.1: + version "10.7.3" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" + integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== + +highlightjs-solidity@^2.0.5, highlightjs-solidity@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/highlightjs-solidity/-/highlightjs-solidity-2.0.6.tgz#e7a702a2b05e0a97f185e6ba39fd4846ad23a990" + integrity sha512-DySXWfQghjm2l6a/flF+cteroJqD4gI8GSdL4PtvxZSsAHie8m3yVe2JFoRg03ROKT6hp2Lc/BxXkqerNmtQYg== + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -15473,7 +14510,7 @@ hyperlinker@^1.0.0: resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ== -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -15516,20 +14553,10 @@ ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -iferr@^0.1.5, iferr@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= - -ignore-by-default@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= - -ignore-walk@3.0.3, ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== +ignore-walk@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== dependencies: minimatch "^3.0.4" @@ -15555,10 +14582,10 @@ ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== -image-size@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" - integrity sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA== +immediate@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" + integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== immediate@^3.2.3, immediate@~3.2.3: version "3.2.3" @@ -15586,14 +14613,6 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== -import-local@2.0.0, import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== - dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" - import-local@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" @@ -15622,12 +14641,7 @@ infer-owner@^1.0.4: resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== -inflection@1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" - integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY= - -inflight@^1.0.4, inflight@~1.0.6: +inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== @@ -15673,27 +14687,7 @@ init-package-json@^3.0.2: validate-npm-package-license "^3.0.4" validate-npm-package-name "^4.0.0" -inquirer@^3.0.6: - version "3.3.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" - integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ== - dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^2.0.4" - figures "^2.0.0" - lodash "^4.3.0" - mute-stream "0.0.7" - run-async "^2.2.0" - rx-lite "^4.0.8" - rx-lite-aggregates "^4.0.8" - string-width "^2.1.0" - strip-ansi "^4.0.0" - through "^2.3.6" - -inquirer@^6.2.0, inquirer@^6.2.2: +inquirer@^6.2.2: version "6.5.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42" integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA== @@ -15776,17 +14770,26 @@ install-artifact-from-github@^1.3.1: resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.1.tgz#eefaad9af35d632e5d912ad1569c1de38c3c2462" integrity sha512-3l3Bymg2eKDsN5wQuMfgGEj2x6l5MCAv0zPL6rxHESufFVlEAKW/6oY9F1aGgvY/EgWm5+eWGRjINveL4X7Hgg== -interpret@1.2.0, interpret@^1.0.0, interpret@^1.1.0: +internal-slot@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" + integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== + dependencies: + get-intrinsic "^1.2.0" + has "^1.0.3" + side-channel "^1.0.4" + +interpret@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -interpret@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.0.0.tgz#b783ffac0b8371503e9ab39561df223286aa5433" - integrity sha512-e0/LknJ8wpMMhTiWcjivB+ESwIuvHnBSlBbmP/pSb8CQJldoj1p2qv7xGZ/+BtbTziYRFSz8OsvdbiX45LtYQA== +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -invariant@^2.2.2, invariant@^2.2.4: +invariant@2: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -15855,7 +14858,7 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-arguments@^1.0.4, is-arguments@^1.1.0: +is-arguments@^1.0.4: version "1.1.1" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== @@ -15863,6 +14866,15 @@ is-arguments@^1.0.4, is-arguments@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" +is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" + integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + is-typed-array "^1.1.10" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -15892,15 +14904,13 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-bluebird@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2" - integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI= - -is-boolean-object@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" - integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M= +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.0.2, is-buffer@^1.1.5: version "1.1.6" @@ -15912,11 +14922,16 @@ is-buffer@^2.0.2, is-buffer@^2.0.5, is-buffer@~2.0.3: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4: +is-callable@^1.1.3, is-callable@^1.1.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== +is-callable@^1.1.5, is-callable@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -15924,7 +14939,14 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0: +is-core-module@^2.0.0, is-core-module@^2.11.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" + integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== + dependencies: + has "^1.0.3" + +is-core-module@^2.5.0: version "2.10.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== @@ -16131,7 +15153,7 @@ is-lower-case@^1.1.0: dependencies: lower-case "^1.1.0" -is-map@^2.0.2: +is-map@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== @@ -16254,15 +15276,10 @@ is-property@^1.0.2: resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g== -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= - -is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== +is-regex@^1.0.5, is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" has-tostringtag "^1.0.0" @@ -16284,7 +15301,7 @@ is-retry-allowed@^2.2.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== -is-set@^2.0.2: +is-set@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== @@ -16344,6 +15361,17 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" +is-typed-array@^1.1.10: + version "1.1.10" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" + integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-typed-array@^1.1.3, is-typed-array@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67" @@ -16396,21 +15424,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-valid-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" - integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= - -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - -is-weakset@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" - integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== - is-windows@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.1.1.tgz#be310715431cfabccc54ab3951210fa0b6d01abe" @@ -16489,12 +15502,7 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -isobject@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" - integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== - -isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.0, isomorphic-fetch@^2.2.1: +isomorphic-fetch@^2.2.0, isomorphic-fetch@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" integrity sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA== @@ -16525,7 +15533,7 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== -istanbul-lib-instrument@^4.0.3: +istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== @@ -16662,10 +15670,10 @@ jest-changed-files@^26.6.2: execa "^4.0.0" throat "^5.0.0" -jest-changed-files@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.0.0.tgz#aa238eae42d9372a413dd9a8dadc91ca1806dce0" - integrity sha512-28/iDMDrUpGoCitTURuDqUzWQoWmOmOKOFST1mi2lwh62X4BFf6khgH3uSuo1e49X/UDjuApAj3w0wLOex4VPQ== +jest-changed-files@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e" + integrity sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag== dependencies: execa "^5.0.0" p-limit "^3.1.0" @@ -16684,14 +15692,40 @@ jest-circus@^29.0.2: co "^4.6.0" dedent "^0.7.0" is-generator-fn "^2.0.0" - jest-each "^29.0.2" - jest-matcher-utils "^29.0.2" - jest-message-util "^29.0.2" - jest-runtime "^29.0.2" - jest-snapshot "^29.0.2" - jest-util "^29.0.2" + jest-each "^29.0.2" + jest-matcher-utils "^29.0.2" + jest-message-util "^29.0.2" + jest-runtime "^29.0.2" + jest-snapshot "^29.0.2" + jest-util "^29.0.2" + p-limit "^3.1.0" + pretty-format "^29.0.2" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-circus@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317" + integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA== + dependencies: + "@jest/environment" "^29.5.0" + "@jest/expect" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + dedent "^0.7.0" + is-generator-fn "^2.0.0" + jest-each "^29.5.0" + jest-matcher-utils "^29.5.0" + jest-message-util "^29.5.0" + jest-runtime "^29.5.0" + jest-snapshot "^29.5.0" + jest-util "^29.5.0" p-limit "^3.1.0" - pretty-format "^29.0.2" + pretty-format "^29.5.0" + pure-rand "^6.0.0" slash "^3.0.0" stack-utils "^2.0.3" @@ -16714,21 +15748,21 @@ jest-cli@^26.6.3: prompts "^2.0.1" yargs "^15.4.1" -jest-cli@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.0.2.tgz#adf341ee3a4fd6ad1f23e3c0eb4e466847407021" - integrity sha512-tlf8b+4KcUbBGr25cywIi3+rbZ4+G+SiG8SvY552m9sRZbXPafdmQRyeVE/C/R8K+TiBAMrTIUmV2SlStRJ40g== +jest-cli@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67" + integrity sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw== dependencies: - "@jest/core" "^29.0.2" - "@jest/test-result" "^29.0.2" - "@jest/types" "^29.0.2" + "@jest/core" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/types" "^29.5.0" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^29.0.2" - jest-util "^29.0.2" - jest-validate "^29.0.2" + jest-config "^29.5.0" + jest-util "^29.5.0" + jest-validate "^29.5.0" prompts "^2.0.1" yargs "^17.3.1" @@ -16756,31 +15790,31 @@ jest-config@^26.6.3: micromatch "^4.0.2" pretty-format "^26.6.2" -jest-config@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.0.2.tgz#0ce168e1f74ca46c27285a7182ecb06c2d8ce7d9" - integrity sha512-RU4gzeUNZAFktYVzDGimDxeYoaiTnH100jkYYZgldqFamaZukF0IqmFx8+QrzVeEWccYg10EEJT3ox1Dq5b74w== +jest-config@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.5.0.tgz#3cc972faec8c8aaea9ae158c694541b79f3748da" + integrity sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA== dependencies: "@babel/core" "^7.11.6" - "@jest/test-sequencer" "^29.0.2" - "@jest/types" "^29.0.2" - babel-jest "^29.0.2" + "@jest/test-sequencer" "^29.5.0" + "@jest/types" "^29.5.0" + babel-jest "^29.5.0" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.3" graceful-fs "^4.2.9" - jest-circus "^29.0.2" - jest-environment-node "^29.0.2" - jest-get-type "^29.0.0" - jest-regex-util "^29.0.0" - jest-resolve "^29.0.2" - jest-runner "^29.0.2" - jest-util "^29.0.2" - jest-validate "^29.0.2" + jest-circus "^29.5.0" + jest-environment-node "^29.5.0" + jest-get-type "^29.4.3" + jest-regex-util "^29.4.3" + jest-resolve "^29.5.0" + jest-runner "^29.5.0" + jest-util "^29.5.0" + jest-validate "^29.5.0" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^29.0.2" + pretty-format "^29.5.0" slash "^3.0.0" strip-json-comments "^3.1.1" @@ -16794,25 +15828,15 @@ jest-diff@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-diff@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.0.2.tgz#1a99419efda66f9ee72f91e580e774df95de5ddc" - integrity sha512-b9l9970sa1rMXH1owp2Woprmy42qIwwll/htsw4Gf7+WuSp5bZxNhkKHDuCGKL+HoHn1KhcC+tNEeAPYBkD2Jg== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.0.0" - jest-get-type "^29.0.0" - pretty-format "^29.0.2" - -jest-diff@^29.1.2: - version "29.1.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.1.2.tgz#bb7aaf5353227d6f4f96c5e7e8713ce576a607dc" - integrity sha512-4GQts0aUopVvecIT4IwD/7xsBaMhKTYoM4/njE/aVw9wpw+pIUVp8Vab/KnSzSilr84GnLBkaP3JLDnQYCKqVQ== +jest-diff@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" + integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw== dependencies: chalk "^4.0.0" - diff-sequences "^29.0.0" - jest-get-type "^29.0.0" - pretty-format "^29.1.2" + diff-sequences "^29.4.3" + jest-get-type "^29.4.3" + pretty-format "^29.5.0" jest-docblock@^26.0.0: version "26.0.0" @@ -16821,10 +15845,10 @@ jest-docblock@^26.0.0: dependencies: detect-newline "^3.0.0" -jest-docblock@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.0.0.tgz#3151bcc45ed7f5a8af4884dcc049aee699b4ceae" - integrity sha512-s5Kpra/kLzbqu9dEjov30kj1n4tfu3e7Pl8v+f8jOkeWNqM6Ds8jRaJfZow3ducoQUrf2Z4rs2N5S3zXnb83gw== +jest-docblock@^29.4.3: + version "29.4.3" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.3.tgz#90505aa89514a1c7dceeac1123df79e414636ea8" + integrity sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg== dependencies: detect-newline "^3.0.0" @@ -16850,6 +15874,17 @@ jest-each@^29.0.2: jest-util "^29.0.2" pretty-format "^29.0.2" +jest-each@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06" + integrity sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA== + dependencies: + "@jest/types" "^29.5.0" + chalk "^4.0.0" + jest-get-type "^29.4.3" + jest-util "^29.5.0" + pretty-format "^29.5.0" + jest-environment-jsdom@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" @@ -16875,46 +15910,27 @@ jest-environment-node@^26.6.2: jest-mock "^26.6.2" jest-util "^26.6.2" -jest-environment-node@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.0.2.tgz#8196268c9f740f1d2e7ecccf212b4c1c5b0167e4" - integrity sha512-4Fv8GXVCToRlMzDO94gvA8iOzKxQ7rhAbs8L+j8GPyTxGuUiYkV+63LecGeVdVhsL2KXih1sKnoqmH6tp89J7Q== +jest-environment-node@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.5.0.tgz#f17219d0f0cc0e68e0727c58b792c040e332c967" + integrity sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw== dependencies: - "@jest/environment" "^29.0.2" - "@jest/fake-timers" "^29.0.2" - "@jest/types" "^29.0.2" + "@jest/environment" "^29.5.0" + "@jest/fake-timers" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" - jest-mock "^29.0.2" - jest-util "^29.0.2" - -jest-get-type@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" - integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== + jest-mock "^29.5.0" + jest-util "^29.5.0" jest-get-type@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-haste-map@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d" - integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ== - dependencies: - "@jest/types" "^24.9.0" - anymatch "^2.0.0" - fb-watchman "^2.0.0" - graceful-fs "^4.1.15" - invariant "^2.2.4" - jest-serializer "^24.9.0" - jest-util "^24.9.0" - jest-worker "^24.9.0" - micromatch "^3.1.10" - sane "^4.0.3" - walker "^1.0.7" - optionalDependencies: - fsevents "^1.2.7" +jest-get-type@^29.0.0, jest-get-type@^29.4.3: + version "29.4.3" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" + integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg== jest-haste-map@^26.6.2: version "26.6.2" @@ -16937,39 +15953,39 @@ jest-haste-map@^26.6.2: optionalDependencies: fsevents "^2.1.2" -jest-haste-map@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.0.2.tgz#cac403a595e6e43982c9776b5c4dae63e38b22c5" - integrity sha512-SOorh2ysQ0fe8gsF4gaUDhoMIWAvi2hXOkwThEO48qT3JqA8GLAUieQcIvdSEd6M0scRDe1PVmKc5tXR3Z0U0A== +jest-haste-map@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.1.2.tgz#93f3634aa921b6b654e7c94137b24e02e7ca6ac9" + integrity sha512-xSjbY8/BF11Jh3hGSPfYTa/qBFrm3TPM7WU8pU93m2gqzORVLkHFWvuZmFsTEBPRKndfewXhMOuzJNHyJIZGsw== dependencies: - "@jest/types" "^29.0.2" + "@jest/types" "^29.1.2" "@types/graceful-fs" "^4.1.3" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" jest-regex-util "^29.0.0" - jest-util "^29.0.2" - jest-worker "^29.0.2" + jest-util "^29.1.2" + jest-worker "^29.1.2" micromatch "^4.0.4" walker "^1.0.8" optionalDependencies: fsevents "^2.3.2" -jest-haste-map@^29.1.2: - version "29.1.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.1.2.tgz#93f3634aa921b6b654e7c94137b24e02e7ca6ac9" - integrity sha512-xSjbY8/BF11Jh3hGSPfYTa/qBFrm3TPM7WU8pU93m2gqzORVLkHFWvuZmFsTEBPRKndfewXhMOuzJNHyJIZGsw== +jest-haste-map@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de" + integrity sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA== dependencies: - "@jest/types" "^29.1.2" + "@jest/types" "^29.5.0" "@types/graceful-fs" "^4.1.3" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" - jest-regex-util "^29.0.0" - jest-util "^29.1.2" - jest-worker "^29.1.2" + jest-regex-util "^29.4.3" + jest-util "^29.5.0" + jest-worker "^29.5.0" micromatch "^4.0.4" walker "^1.0.8" optionalDependencies: @@ -17017,13 +16033,13 @@ jest-leak-detector@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-leak-detector@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.0.2.tgz#f88fd08e352b5fad3d33e48ecab39e97077ed8a8" - integrity sha512-5f0493qDeAxjUldkBSQg5D1cLadRgZVyWpTQvfJeQwQUpHQInE21AyVHVv64M7P2Ue8Z5EZ4BAcoDS/dSPPgMw== +jest-leak-detector@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz#cf4bdea9615c72bac4a3a7ba7e7930f9c0610c8c" + integrity sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow== dependencies: - jest-get-type "^29.0.0" - pretty-format "^29.0.2" + jest-get-type "^29.4.3" + pretty-format "^29.5.0" jest-matcher-utils@^26.6.2: version "26.6.2" @@ -17035,19 +16051,15 @@ jest-matcher-utils@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-message-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" - integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw== +jest-matcher-utils@^29.0.2, jest-matcher-utils@^29.1.2, jest-matcher-utils@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5" + integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw== dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" - "@types/stack-utils" "^1.0.1" - chalk "^2.0.1" - micromatch "^3.1.10" - slash "^2.0.0" - stack-utils "^1.0.1" + chalk "^4.0.0" + jest-diff "^29.5.0" + jest-get-type "^29.4.3" + pretty-format "^29.5.0" jest-message-util@^26.6.2: version "26.6.2" @@ -17064,12 +16076,20 @@ jest-message-util@^26.6.2: slash "^3.0.0" stack-utils "^2.0.2" -jest-mock@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6" - integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w== +jest-message-util@^29.0.2, jest-message-util@^29.1.2, jest-message-util@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e" + integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA== dependencies: - "@jest/types" "^24.9.0" + "@babel/code-frame" "^7.12.13" + "@jest/types" "^29.5.0" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^29.5.0" + slash "^3.0.0" + stack-utils "^2.0.3" jest-mock@^26.6.2: version "26.6.2" @@ -17079,13 +16099,14 @@ jest-mock@^26.6.2: "@jest/types" "^26.6.2" "@types/node" "*" -jest-mock@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.0.2.tgz#d7810966a6338aca6a440c3cd9f19276477840ad" - integrity sha512-giWXOIT23UCxHCN2VUfUJ0Q7SmiqQwfSFXlCaIhW5anITpNQ+3vuLPQdKt5wkuwM37GrbFyHIClce8AAK9ft9g== +jest-mock@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.5.0.tgz#26e2172bcc71d8b0195081ff1f146ac7e1518aed" + integrity sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw== dependencies: - "@jest/types" "^29.0.2" + "@jest/types" "^29.5.0" "@types/node" "*" + jest-util "^29.5.0" jest-pnp-resolver@^1.2.2: version "1.2.2" @@ -17102,6 +16123,11 @@ jest-regex-util@^29.0.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.0.0.tgz#b442987f688289df8eb6c16fa8df488b4cd007de" integrity sha512-BV7VW7Sy0fInHWN93MMPtlClweYv2qrSCwfeFWmpribGZtQPWNvRSq9XOVgOEjU1iBGRKXUZil0o2AH7Iy9Lug== +jest-regex-util@^29.4.3: + version "29.4.3" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8" + integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg== + jest-resolve-dependencies@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" @@ -17111,13 +16137,13 @@ jest-resolve-dependencies@^26.6.3: jest-regex-util "^26.0.0" jest-snapshot "^26.6.2" -jest-resolve-dependencies@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.0.2.tgz#2d30199ed0059ff97712f4fa6320c590bfcd2061" - integrity sha512-fSAu6eIG7wtGdnPJUkVVdILGzYAP9Dj/4+zvC8BrGe8msaUMJ9JeygU0Hf9+Uor6/icbuuzQn5See1uajLnAqg== +jest-resolve-dependencies@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz#f0ea29955996f49788bf70996052aa98e7befee4" + integrity sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg== dependencies: - jest-regex-util "^29.0.0" - jest-snapshot "^29.0.2" + jest-regex-util "^29.4.3" + jest-snapshot "^29.5.0" jest-resolve@^26.6.2: version "26.6.2" @@ -17133,19 +16159,19 @@ jest-resolve@^26.6.2: resolve "^1.18.1" slash "^3.0.0" -jest-resolve@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.0.2.tgz#dd097e1c8020fbed4a8c1e1889ccb56022288697" - integrity sha512-V3uLjSA+EHxLtjIDKTBXnY71hyx+8lusCqPXvqzkFO1uCGvVpjBfuOyp+KOLBNSuY61kM2jhepiMwt4eiJS+Vw== +jest-resolve@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.5.0.tgz#b053cc95ad1d5f6327f0ac8aae9f98795475ecdc" + integrity sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w== dependencies: chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^29.0.2" + jest-haste-map "^29.5.0" jest-pnp-resolver "^1.2.2" - jest-util "^29.0.2" - jest-validate "^29.0.2" + jest-util "^29.5.0" + jest-validate "^29.5.0" resolve "^1.20.0" - resolve.exports "^1.1.0" + resolve.exports "^2.0.0" slash "^3.0.0" jest-runner@^26.6.3: @@ -17174,30 +16200,30 @@ jest-runner@^26.6.3: source-map-support "^0.5.6" throat "^5.0.0" -jest-runner@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.0.2.tgz#64e4e6c88f74387307687b73a4688f93369d8d99" - integrity sha512-+D82iPZejI8t+SfduOO1deahC/QgLFf8aJBO++Znz3l2ETtOMdM7K4ATsGWzCFnTGio5yHaRifg1Su5Ybza5Nw== +jest-runner@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.5.0.tgz#6a57c282eb0ef749778d444c1d758c6a7693b6f8" + integrity sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ== dependencies: - "@jest/console" "^29.0.2" - "@jest/environment" "^29.0.2" - "@jest/test-result" "^29.0.2" - "@jest/transform" "^29.0.2" - "@jest/types" "^29.0.2" + "@jest/console" "^29.5.0" + "@jest/environment" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" chalk "^4.0.0" - emittery "^0.10.2" + emittery "^0.13.1" graceful-fs "^4.2.9" - jest-docblock "^29.0.0" - jest-environment-node "^29.0.2" - jest-haste-map "^29.0.2" - jest-leak-detector "^29.0.2" - jest-message-util "^29.0.2" - jest-resolve "^29.0.2" - jest-runtime "^29.0.2" - jest-util "^29.0.2" - jest-watcher "^29.0.2" - jest-worker "^29.0.2" + jest-docblock "^29.4.3" + jest-environment-node "^29.5.0" + jest-haste-map "^29.5.0" + jest-leak-detector "^29.5.0" + jest-message-util "^29.5.0" + jest-resolve "^29.5.0" + jest-runtime "^29.5.0" + jest-util "^29.5.0" + jest-watcher "^29.5.0" + jest-worker "^29.5.0" p-limit "^3.1.0" source-map-support "0.5.13" @@ -17234,10 +16260,33 @@ jest-runtime@^26.6.3: strip-bom "^4.0.0" yargs "^15.4.1" -jest-serializer@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" - integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== +jest-runtime@^29.0.2, jest-runtime@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420" + integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw== + dependencies: + "@jest/environment" "^29.5.0" + "@jest/fake-timers" "^29.5.0" + "@jest/globals" "^29.5.0" + "@jest/source-map" "^29.4.3" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/node" "*" + chalk "^4.0.0" + cjs-module-lexer "^1.0.0" + collect-v8-coverage "^1.0.0" + glob "^7.1.3" + graceful-fs "^4.2.9" + jest-haste-map "^29.5.0" + jest-message-util "^29.5.0" + jest-mock "^29.5.0" + jest-regex-util "^29.4.3" + jest-resolve "^29.5.0" + jest-snapshot "^29.5.0" + jest-util "^29.5.0" + slash "^3.0.0" + strip-bom "^4.0.0" jest-serializer@^26.6.2: version "26.6.2" @@ -17269,25 +16318,36 @@ jest-snapshot@^26.6.2: pretty-format "^26.6.2" semver "^7.3.2" -jest-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162" - integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg== +jest-snapshot@^29.0.2, jest-snapshot@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce" + integrity sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g== dependencies: - "@jest/console" "^24.9.0" - "@jest/fake-timers" "^24.9.0" - "@jest/source-map" "^24.9.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" - callsites "^3.0.0" - chalk "^2.0.1" - graceful-fs "^4.1.15" - is-ci "^2.0.0" - mkdirp "^0.5.1" - slash "^2.0.0" - source-map "^0.6.0" + "@babel/core" "^7.11.6" + "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-jsx" "^7.7.2" + "@babel/plugin-syntax-typescript" "^7.7.2" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/babel__traverse" "^7.0.6" + "@types/prettier" "^2.1.5" + babel-preset-current-node-syntax "^1.0.0" + chalk "^4.0.0" + expect "^29.5.0" + graceful-fs "^4.2.9" + jest-diff "^29.5.0" + jest-get-type "^29.4.3" + jest-matcher-utils "^29.5.0" + jest-message-util "^29.5.0" + jest-util "^29.5.0" + natural-compare "^1.4.0" + pretty-format "^29.5.0" + semver "^7.3.5" -jest-util@^26.1.0, jest-util@^26.6.2: +jest-util@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== @@ -17335,17 +16395,17 @@ jest-util@^29.1.2: graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab" - integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ== +jest-util@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" + integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== dependencies: - "@jest/types" "^24.9.0" - camelcase "^5.3.1" - chalk "^2.0.1" - jest-get-type "^24.9.0" - leven "^3.1.0" - pretty-format "^24.9.0" + "@jest/types" "^29.5.0" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" jest-validate@^26.6.2: version "26.6.2" @@ -17359,17 +16419,17 @@ jest-validate@^26.6.2: leven "^3.1.0" pretty-format "^26.6.2" -jest-validate@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.0.2.tgz#ad86e157cc1735a3a3ea88995a611ebf8544bd67" - integrity sha512-AeRKm7cEucSy7tr54r3LhiGIXYvOILUwBM1S7jQkKs6YelwAlWKsmZGVrQR7uwsd31rBTnR5NQkODi1Z+6TKIQ== +jest-validate@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.5.0.tgz#8e5a8f36178d40e47138dc00866a5f3bd9916ffc" + integrity sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ== dependencies: - "@jest/types" "^29.0.2" + "@jest/types" "^29.5.0" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^29.0.0" + jest-get-type "^29.4.3" leven "^3.1.0" - pretty-format "^29.0.2" + pretty-format "^29.5.0" jest-watcher@^26.6.2: version "26.6.2" @@ -17384,13 +16444,19 @@ jest-watcher@^26.6.2: jest-util "^26.6.2" string-length "^4.0.1" -jest-worker@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" - integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw== +jest-watcher@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.5.0.tgz#cf7f0f949828ba65ddbbb45c743a382a4d911363" + integrity sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA== dependencies: - merge-stream "^2.0.0" - supports-color "^6.1.0" + "@jest/test-result" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + emittery "^0.13.1" + jest-util "^29.5.0" + string-length "^4.0.1" jest-worker@^26.6.2: version "26.6.2" @@ -17401,15 +16467,6 @@ jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.0.2.tgz#46c9f2cb9a19663d22babbacf998e4b5d7c46574" - integrity sha512-EyvBlYcvd2pg28yg5A3OODQnqK9LI1kitnGUZUG5/NYIeaRgewtYBKB5wlr7oXj8zPCkzev7EmnTCsrXK7V+Xw== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - jest-worker@^29.1.2: version "29.1.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.1.2.tgz#a68302af61bce82b42a9a57285ca7499d29b2afc" @@ -17420,6 +16477,16 @@ jest-worker@^29.1.2: merge-stream "^2.0.0" supports-color "^8.0.0" +jest-worker@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" + integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA== + dependencies: + "@types/node" "*" + jest-util "^29.5.0" + merge-stream "^2.0.0" + supports-color "^8.0.0" + jest@26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" @@ -17429,10 +16496,15 @@ jest@26.6.3: import-local "^3.0.2" jest-cli "^26.6.3" -jetifier@^1.6.2: - version "1.6.6" - resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.6.tgz#fec8bff76121444c12dc38d2dad6767c421dab68" - integrity sha512-JNAkmPeB/GS2tCRqUzRPsTOHpGDah7xP18vGJfIjZC+W2sxEHbxgJxetIjIqhjQ3yYbYNEELkM/spKLtwoOSUQ== +jest@^29.0.2: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e" + integrity sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ== + dependencies: + "@jest/core" "^29.5.0" + "@jest/types" "^29.5.0" + import-local "^3.0.2" + jest-cli "^29.5.0" jju@^1.1.0: version "1.4.0" @@ -17460,16 +16532,10 @@ jose@^2.0.5: dependencies: "@panva/asn1.js" "^1.0.0" -js-beautify@^1.8.8: - version "1.10.2" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.2.tgz#88c9099cd6559402b124cfab18754936f8a7b178" - integrity sha512-ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ== - dependencies: - config-chain "^1.1.12" - editorconfig "^0.15.3" - glob "^7.1.3" - mkdirp "~0.5.1" - nopt "~4.0.1" +js-sdsl@^4.1.4: + version "4.4.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430" + integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg== js-sha3@0.5.7, js-sha3@^0.5.7: version "0.5.7" @@ -17562,11 +16628,6 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== - json-bigint@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-0.3.1.tgz#0c1729d679f580d550899d6a2226c228564afe60" @@ -17962,14 +17023,15 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -knex@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/knex/-/knex-0.21.1.tgz#4fba7e6c58c9f459846c3090be157a732fc75e41" - integrity sha512-uWszXC2DPaLn/YznGT9wFTWUG9+kqbL4DMz+hCH789GLcLuYzq8werHPDKBJxtKvxrW/S1XIXgrTWdMypiVvsw== +knex@^2.1.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/knex/-/knex-2.4.2.tgz#a34a289d38406dc19a0447a78eeaf2d16ebedd61" + integrity sha512-tMI1M7a+xwHhPxjbl/H9K1kHX+VncEYcvCx5K00M16bWvpYPKAZd6QrCu68PtHAdIZNQPWZn0GVhqVBEthGWCg== dependencies: - colorette "1.1.0" - commander "^5.1.0" - debug "4.1.1" + colorette "2.0.19" + commander "^9.1.0" + debug "4.3.4" + escalade "^3.1.1" esm "^3.2.25" get-package-type "^0.1.0" getopts "2.3.0" @@ -18324,20 +17386,6 @@ libnpmpublish@^6.0.4: semver "^7.3.7" ssri "^9.0.0" -liftoff@3.1.0, liftoff@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3" - integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog== - dependencies: - extend "^3.0.0" - findup-sync "^3.0.0" - fined "^1.0.1" - flagged-respawn "^1.0.0" - is-plain-object "^2.0.4" - object.map "^1.0.0" - rechoir "^0.6.2" - resolve "^1.1.7" - limiter@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2" @@ -18385,19 +17433,15 @@ load-json-file@^5.3.0: strip-bom "^3.0.0" type-fest "^0.3.0" -loader-runner@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" - integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== - -loader-utils@1.2.3, loader-utils@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== +load-json-file@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1" + integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ== dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" + graceful-fs "^4.1.15" + parse-json "^5.0.0" + strip-bom "^4.0.0" + type-fest "^0.6.0" locate-path@^2.0.0: version "2.0.0" @@ -18481,11 +17525,6 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== - lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -18622,22 +17661,7 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash.throttle@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" - integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= - -lodash.toarray@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" - integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= - -lodash.tostring@^4.0.0: - version "4.1.4" - resolved "https://registry.yarnpkg.com/lodash.tostring/-/lodash.tostring-4.1.4.tgz#560c27d1f8eadde03c2cce198fef5c031d8298fb" - integrity sha1-Vgwn0fjq3eA8LM4Zj+9cAx2CmPs= - -lodash.union@^4.6.0, lodash.union@~4.6.0: +lodash.union@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw== @@ -18654,12 +17678,7 @@ lodash.values@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q== -lodash.without@~4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" - integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw= - -lodash@4.17.14, lodash@4.17.15, lodash@4.x, lodash@^2.4.1, lodash@^3.10.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -18697,15 +17716,6 @@ logform@^2.3.2, logform@^2.4.0: safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" -logkitty@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/logkitty/-/logkitty-0.7.1.tgz#8e8d62f4085a826e8d38987722570234e33c6aa7" - integrity sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ== - dependencies: - ansi-fragments "^0.2.1" - dayjs "^1.8.15" - yargs "^15.1.0" - loglevel@^1.6.1, loglevel@^1.6.8: version "1.8.0" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114" @@ -18726,17 +17736,7 @@ long@~3: resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== -looper@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/looper/-/looper-2.0.0.tgz#66cd0c774af3d4fedac53794f742db56da8f09ec" - integrity sha1-Zs0Md0rz1P7axTeU90LbVtqPCew= - -looper@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/looper/-/looper-3.0.0.tgz#2efa54c3b1cbaba9b94aee2e5914b0be57fbb749" - integrity sha1-LvpUw7HLq6m5Su4uWRSwvlf7t0k= - -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: +loose-envify@^1.0.0, loose-envify@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -18777,7 +17777,7 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5: +lru-cache@^4.0.1, lru-cache@^4.1.3: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -18859,13 +17859,6 @@ make-dir@^3.0.0, make-dir@^3.1.0: dependencies: semver "^6.0.0" -make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - make-error@1.x, make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -18922,42 +17915,6 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" -make-fetch-happen@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz#a8e3fe41d3415dd656fe7b8e8172e1fb4458b38d" - integrity sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA== - dependencies: - agentkeepalive "^3.4.1" - cacache "^12.0.0" - http-cache-semantics "^3.8.1" - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.1" - lru-cache "^5.1.1" - mississippi "^3.0.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^4.0.0" - ssri "^6.0.0" - -make-iterator@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" - integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== - dependencies: - kind-of "^6.0.2" - -makeerror@1.0.x: - version "1.0.11" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= - dependencies: - tmpl "1.0.x" - -mamacro@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" - integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== - map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -19116,21 +18073,14 @@ memoizee@^0.4.14: next-tick "^1.1.0" timers-ext "^0.1.7" -memory-fs@^0.4.0, memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -memory-fs@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" - integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== +memory-level@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/memory-level/-/memory-level-1.0.0.tgz#7323c3fd368f9af2f71c3cd76ba403a17ac41692" + integrity sha512-UXzwewuWeHBz5krr7EvehKcmLFNoXxGcvuYhC41tRnkrTbJohtS7kVn9akmgirtRygg+f7Yjsfi8Uu5SGSQ4Og== dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" + abstract-level "^1.0.0" + functional-red-black-tree "^1.0.1" + module-error "^1.0.1" memorystream@^0.3.1: version "0.3.1" @@ -19159,13 +18109,6 @@ merge-descriptors@1.0.1, merge-descriptors@~1.0.0: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== -merge-stream@^1.0.0, merge-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - integrity sha512-e6RM36aegd4f+r8BZCcYXlO2P3H6xbUM6ktL2Xmf45GAOit9bI4z6/3VU7JwllVO1L7u0UDSg/EhzQ5lmMLolA== - dependencies: - readable-stream "^2.0.1" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -19189,15 +18132,21 @@ merkle-patricia-tree@4.0.0: rlp "^2.2.4" semaphore-async-await "^1.5.1" -messagebird@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/messagebird/-/messagebird-3.5.0.tgz#d4daf7a4f602698600603e53b500bb01c2ae8fe6" - integrity sha512-LNzMPr6PuZBHFjDdrAQR5aRad2QHv4C4BcumySyE3DKvsd0k2p8oYX2mFHzk8uMO5KstDJVe6Yz2/bNDADo4SQ== +merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz#982ca1b5a0fde00eed2f6aeed1f9152860b8208a" + integrity sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g== dependencies: - safe-buffer "^5.1.2" - scmp "^2.0.0" + async "^1.4.2" + ethereumjs-util "^5.0.0" + level-ws "0.0.0" + levelup "^1.2.1" + memdown "^1.0.0" + readable-stream "^2.0.0" + rlp "^2.0.0" + semaphore ">=1.0.1" -methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: +methods@^1.1.2, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== @@ -19272,23 +18221,16 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" +mime-db@1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-db@~1.23.0: - version "1.23.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659" - integrity sha1-oxtAcK2uon1zLqMzdApk0OyaZlk= - -mime-types@2.1.11: - version "2.1.11" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c" - integrity sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw= - dependencies: - mime-db "~1.23.0" - mime-types@^2.0.8, mime-types@^2.1.16, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.27" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" @@ -19296,7 +18238,7 @@ mime-types@^2.0.8, mime-types@^2.1.16, mime-types@~2.1.19, mime-types@~2.1.24: dependencies: mime-db "1.44.0" -mime-types@^2.1.12: +mime-types@^2.1.12, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -19308,16 +18250,26 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + mime@^2.2.0: version "2.4.4" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== -mime@^2.4.1, mime@^2.5.2: +mime@^2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== +mime@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" + integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A== + mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -19389,25 +18341,51 @@ minimatch@3.0.4: dependencies: brace-expansion "^1.1.7" -minimist-options@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" - integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ== +minimatch@3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== + dependencies: + brace-expansion "^1.1.7" + +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== + dependencies: + brace-expansion "^2.0.1" + +minimatch@^5.0.1, minimatch@^5.1.0: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + +minimist-options@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" + integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== dependencies: arrify "^1.0.1" is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@0.0.5, minimist@0.0.8, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q== -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.6: +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minimist@~1.2.0: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -19466,7 +18444,7 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.9.0: +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -19493,7 +18471,7 @@ minipass@^4.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06" integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ== -minizlib@^1.3.3: +minizlib@^1.2.1: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -19524,6 +18502,20 @@ mixin-object@^2.0.0: for-in "^0.1.3" is-extendable "^0.1.1" +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +mkdirp-infer-owner@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316" + integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw== + dependencies: + chownr "^2.0.0" + infer-owner "^1.0.4" + mkdirp "^1.0.3" + mkdirp-promise@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1" @@ -19557,7 +18549,7 @@ mkdirp@0.5.5: dependencies: minimist "^1.2.5" -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.6, mkdirp@~0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -19726,35 +18718,7 @@ module-not-found-error@^1.0.1: resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0" integrity sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g== -module@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/module/-/module-1.2.5.tgz#b503eb06cdc13473f56818426974cde7ec59bf15" - integrity sha1-tQPrBs3BNHP1aBhCaXTN5+xZvxU= - dependencies: - chalk "1.1.3" - concat-stream "1.5.1" - lodash.template "4.2.4" - map-stream "0.0.6" - tildify "1.2.0" - vinyl-fs "2.4.3" - yargs "4.6.0" - -mold-source-map@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/mold-source-map/-/mold-source-map-0.4.0.tgz#cf67e0b31c47ab9badb5c9c25651862127bb8317" - integrity sha1-z2fgsxxHq5uttcnCVlGGISe7gxc= - dependencies: - convert-source-map "^1.1.0" - through "~2.2.7" - -moment-timezone@^0.5.21: - version "0.5.37" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz#adf97f719c4e458fdb12e2b4e87b8bec9f4eef1e" - integrity sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0", moment@^2.10.6, moment@^2.22.1, moment@^2.24.0, moment@^2.29.0: +moment@^2.10.6, moment@^2.19.3, moment@^2.22.1, moment@^2.29.0: version "2.29.4" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -19869,15 +18833,16 @@ multimatch@^4.0.0: arrify "^2.0.1" minimatch "^3.0.4" -mustache@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31" - integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA== - -mute-stdout@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" - integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg== +multimatch@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6" + integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA== + dependencies: + "@types/minimatch" "^3.0.3" + array-differ "^3.0.0" + array-union "^2.1.0" + arrify "^2.0.1" + minimatch "^3.0.4" mute-stream@0.0.7: version "0.0.7" @@ -19937,7 +18902,7 @@ named-placeholders@^1.1.2: dependencies: lru-cache "^4.1.3" -nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.16.0, nan@^2.2.1: +nan@^2.13.2, nan@^2.14.0, nan@^2.16.0, nan@^2.2.1: version "2.16.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== @@ -20020,9 +18985,9 @@ negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3: integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== neodoc@^2.0.2: version "2.0.2" @@ -20031,31 +18996,12 @@ neodoc@^2.0.2: dependencies: ansi-regex "^2.0.0" -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== - -netmask@^2.0.1: +netmask@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== -nexmo@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/nexmo/-/nexmo-2.4.2.tgz#12187611c85e490b22ac8d7c639a1bf49b0f561c" - integrity sha512-9DYMSyKgVunboK8hDb6wuFawXfNPGxfooQs7mv4m5DWxVywtAx03PNYB7GUqZWwevmH9iGwijlQBVPgachmitw== - dependencies: - jsonwebtoken "^8.4.0" - request "^2.88.0" - uuid "^2.0.2" - -next-tick@1: +next-tick@1, next-tick@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== @@ -20065,10 +19011,12 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -nocache@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f" - integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q== +no-case@^2.2.0, no-case@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== + dependencies: + lower-case "^1.1.1" node-abi@^2.21.0: version "2.30.1" @@ -20094,6 +19042,16 @@ node-addon-api@^2.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== +node-addon-api@^3.0.2, node-addon-api@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + +node-addon-api@^4.2.0, node-addon-api@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + node-emoji@^1.4.1: version "1.11.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" @@ -20122,6 +19080,11 @@ node-fetch@2.6.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== +node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + node-fetch@2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" @@ -20137,16 +19100,23 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0, node-fetch@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-fetch@^2.6.7: + version "2.6.9" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" + integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== + dependencies: + whatwg-url "^5.0.0" -node-forge@0.7.4, node-forge@^0.10.0, node-forge@^0.7.4, node-forge@^0.9.0: +node-forge@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-forge@^0.9.0: + version "0.9.2" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.2.tgz#b35a44c28889b2ea55cabf8c79e3563f9676190a" + integrity sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw== + node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -20157,10 +19127,25 @@ node-gyp-build@4.3.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== -node-gyp@5.0.1, node-gyp@^3.6.2, node-gyp@^4.0.0, node-gyp@^5.0.2, node-gyp@^8.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.1.tgz#db211e9c5d7f611e79d1dcbdc53bca646b99ae4c" - integrity sha512-D68549U6EDVJLrAkSOZCWX/nmlYo0eCX2dYZoTOOZJ7bEIFrSE/MQgsgMFBKjByJ323hNzkifw2OuT3A5bR5mA== +node-gyp-build@4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4" + integrity sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ== + +node-gyp-build@^4.2.0, node-gyp-build@^4.3.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" + integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== + +node-gyp-build@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb" + integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ== + +node-gyp@8.x: + version "8.4.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" + integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== dependencies: env-paths "^2.2.0" glob "^7.1.4" @@ -20173,100 +19158,58 @@ node-gyp@5.0.1, node-gyp@^3.6.2, node-gyp@^4.0.0, node-gyp@^5.0.2, node-gyp@^8.0 tar "^6.1.2" which "^2.0.2" -node-hid@^0.7.9: - version "0.7.9" - resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-0.7.9.tgz#cc0cdf1418a286a7667f0b63642b5eeb544ccd05" - integrity sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA== +node-gyp@^9.0.0: + version "9.3.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4" + integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg== dependencies: env-paths "^2.2.0" glob "^7.1.4" graceful-fs "^4.2.6" make-fetch-happen "^10.0.3" - nopt "^5.0.0" + nopt "^6.0.0" npmlog "^6.0.0" rimraf "^3.0.2" semver "^7.3.5" tar "^6.1.2" which "^2.0.2" -node-hid@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-1.2.0.tgz#d084a9750832b28fd6de6fe2ccd8063fe8e3e7c0" - integrity sha512-ap06Wo1E0aGrZf0t1zvjWSk+IzI6yvKpTDYQRIrdxLHEelifnGDx6XOb2VVlrQhxzM4etma8jH/i0M1LUB55dA== +node-hid@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-2.1.1.tgz#f83c8aa0bb4e6758b5f7383542477da93f67359d" + integrity sha512-Skzhqow7hyLZU93eIPthM9yjot9lszg9xrKxESleEs05V2NcbUptZc5HFqzjOkSmL0sFlZFr3kmvaYebx06wrw== dependencies: bindings "^1.5.0" - nan "^2.14.0" - prebuild-install "^5.3.3" + node-addon-api "^3.0.2" + prebuild-install "^6.0.0" + +node-hid@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/node-hid/-/node-hid-2.1.2.tgz#3145fa86ed4336a402a71e9f372c54213b88797c" + integrity sha512-qhCyQqrPpP93F/6Wc/xUR7L8mAJW0Z6R7HMQV8jCHHksAxNDe/4z4Un/H9CpLOT+5K39OPyt9tIQlavxWES3lg== + dependencies: + bindings "^1.5.0" + node-addon-api "^3.0.2" + prebuild-install "^7.1.1" node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - -node-libs-react-native@1.0.3, node-libs-react-native@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/node-libs-react-native/-/node-libs-react-native-1.2.1.tgz#c9fd1d1b2cd2573d3e75633cea8bccd53b334f24" - integrity sha512-2LkPntNVa5MInMxtP7fW9F/uGo7KZCURI5/YoNn9/qOGIQpxEqnsndQWAPipsw8+ZVrIxPGkKEgJ2sSdvz0NKQ== +node-interval-tree@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/node-interval-tree/-/node-interval-tree-1.3.3.tgz#15ffb904cde08270214acace8dc7653e89ae32b7" + integrity sha512-K9vk96HdTK5fEipJwxSvIIqwTqr4e3HRJeJrNxBSeVMNSC/JWARRaX7etOLOuTmrRMeOI/K5TCJu3aWIwZiNTw== dependencies: - assert "^1.4.1" - base-64 "^0.1.0" - browserify-zlib "^0.2.0" - buffer "^6.0.3" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.0" - process "^0.11.0" - punycode "^2.1.0" - querystring-es3 "^0.2.0" - react-native-crypto "^2.0.1" - react-native-randombytes "^3.5.1" - readable-stream "^2.2.9" - stream-http "^2.3.1" - string_decoder "^1.0.3" - timers-browserify "^2.0.2" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" + shallowequal "^1.0.2" node-modules-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^8.0.0, node-notifier@^8.0.2: +node-notifier@^8.0.0: version "8.0.2" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== @@ -20278,110 +19221,26 @@ node-notifier@^8.0.0, node-notifier@^8.0.2: uuid "^8.3.0" which "^2.0.2" -node-pre-gyp@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" - integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -node-pre-gyp@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" - integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -node-pre-gyp@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - -node-releases@^1.1.70: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== - -node-stream-zip@^1.9.1: - version "1.13.2" - resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.13.2.tgz#2fce9d001fa7fda943a906eff239eb83fda124ba" - integrity sha512-159NUO3quDIRVSVOQiQ/0VG8NFrGvVyUa+MUUleiOys3NLtrGtNkodqYYTRHU/kiXu/ygHZcNy/tZ4NUCcDUmQ== +node-releases@^2.0.6: + version "2.0.10" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" + integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== node-version@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d" integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ== -nodemon@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.1.tgz#576f0aad0f863aabf8c48517f6192ff987cd5071" - integrity sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg== - dependencies: - chokidar "^2.1.5" - debug "^3.1.0" - ignore-by-default "^1.0.1" - minimatch "^3.0.4" - pstree.remy "^1.1.6" - semver "^5.5.0" - supports-color "^5.2.0" - touch "^3.1.0" - undefsafe "^2.0.2" - update-notifier "^2.5.0" - -nodent-compiler@^3.2.10: - version "3.2.11" - resolved "https://registry.yarnpkg.com/nodent-compiler/-/nodent-compiler-3.2.11.tgz#8f4bc703d7d8d0e563f5e09ea22efdce04dbaf9b" - integrity sha512-rfDrGWdgIJYomPUzR8nXiWNuIhJ7cVodPeZP3Ho65LEycuaX2uVNZ0ytpcfrmUKzdFeLRtye9+pHe8OynPZuPQ== - dependencies: - acorn ">= 2.5.2 <= 5.7.3" - acorn-es7-plugin "^1.1.7" - nodent-transform "^3.2.9" - source-map "^0.5.7" - -nodent-runtime@>=3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e" - integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA== - -nodent-transform@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/nodent-transform/-/nodent-transform-3.2.9.tgz#ec11a6116b5476e60bc212371cf6b8e4c74f40b6" - integrity sha512-4a5FH4WLi+daH/CGD5o/JWRR8W5tlCkd3nrDSkxbOzscJTyTUITltvOJeQjg3HJ1YgEuNyiPhQbvbtRjkQBByQ== - nofilter@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.3.tgz#34e54b4cc9757de0cad38cc0d19462489b1b7f5d" integrity sha512-FlUlqwRK6reQCaFLAhMcF+6VkVG2caYjKQY3YsRDTl4/SEch595Qb3oLjJRDr8dkHAAOVj2pOx3VknfnSgkE5g== +nofilter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e" + integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA== + noncharacters@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/noncharacters/-/noncharacters-1.1.0.tgz#af33df30fd50ed3c53cd202258f25ada90b540d2" @@ -20401,14 +19260,14 @@ nopt@^5.0.0: dependencies: abbrev "1" -nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= +nopt@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" + integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== dependencies: - abbrev "1" + abbrev "^1.0.0" -normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0, "normalize-package-data@~1.0.1 || ^2.0.0": +normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -20574,10 +19433,32 @@ npmlog@^4.0.1: gauge "~2.7.3" set-blocking "~2.0.0" -nullthrows@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" - integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" + +npmlog@^6.0.0, npmlog@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + +nth-check@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== + dependencies: + boolbase "^1.0.0" number-is-nan@^1.0.0: version "1.0.1" @@ -20648,16 +19529,6 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -ob1@0.59.0: - version "0.59.0" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.59.0.tgz#ee103619ef5cb697f2866e3577da6f0ecd565a36" - integrity sha512-opXMTxyWJ9m68ZglCxwo0OPRESIC/iGmKFPXEXzMZqsVIrgoRXOHmoMDkQzz4y3irVjbyPJRAh5pI9fd0MJTFQ== - -object-assign@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" - integrity sha1-ejs9DpgGPUP0wD8uiubNUahog6A= - object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" @@ -20677,12 +19548,22 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-hash@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" + integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== + object-hash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== -object-inspect@^1.12.2, object-inspect@^1.9.0, object-inspect@~1.12.2: +object-inspect@^1.12.3, object-inspect@^1.7.0: + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== + +object-inspect@^1.9.0: version "1.12.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== @@ -20692,12 +19573,7 @@ object-inspect@~1.6.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ== -object-is@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" - integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY= - -object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.0.11, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -20811,24 +19687,6 @@ oboe@2.1.5: fp-ts "2.1.1" io-ts "2.0.1" -"old-identity-sdk@npm:@celo/identity@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@celo/identity/-/identity-1.5.2.tgz#6401aeefbf7893374f6f940c9e0918d0a75d0411" - integrity sha512-/9JTL5P4xTY37hgu6qh5tU1d2GS3duBjP3QL600Zz1KAQrUVgb8g8JPpiRY21oEK6L7ZoNTukQJIuM3sbi//vg== - dependencies: - "@celo/base" "1.5.2" - "@celo/contractkit" "1.5.2" - "@celo/phone-number-privacy-common" "1.0.39" - "@celo/utils" "1.5.2" - "@types/debug" "^4.1.5" - bignumber.js "^9.0.0" - blind-threshold-bls "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a" - cross-fetch "3.0.4" - debug "^4.1.1" - elliptic "^6.5.4" - fp-ts "2.1.1" - io-ts "2.0.1" - omni-fetch@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/omni-fetch/-/omni-fetch-0.2.3.tgz#56a6f46ad170b6d978982cca5bd1c6b70597a58d" @@ -20857,7 +19715,7 @@ on-headers@^1.0.0, on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0, once@~1.4.0: +once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== @@ -20938,11 +19796,6 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" word-wrap "~1.2.3" -options@>=0.0.5: - version "0.0.6" - resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" - integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= - optjs@~3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee" @@ -21001,7 +19854,7 @@ os-locale@^3.1.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: +os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== @@ -21328,11 +20181,6 @@ parse-json@^5.0.0, parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-node-version@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -21375,7 +20223,7 @@ parse5@^7.0.0: dependencies: entities "^4.4.0" -parseurl@^1.3.3, parseurl@~1.3.3: +parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== @@ -21469,23 +20317,11 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.7: +path-parse@^1.0.6, path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= - dependencies: - path-root-regex "^0.1.0" - path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -21570,22 +20406,10 @@ pg-connection-string@0.1.3: resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" integrity sha512-i0NV/CrSkFTaiOQs9AGy3tq0dkSjtTd4d7DfsjeDVZAA4aIHInwfFEmriNYGGJUfZ5x6IAC/QddoUpUJjQAi0w== -pg-connection-string@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.2.0.tgz#caab4d38a9de4fdc29c9317acceed752897de41c" - integrity sha512-xB/+wxcpFipUZOQcSzcgkjcNOosGhEoPSjz06jC89lv1dj7mc9bZv6wLVy8M2fVjP0a/xN0N988YDq1L0FhK3A== - -pg-connection-string@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.2.3.tgz#48e1158ec37eaa82e98dbcb7307103ec303fe0e7" - integrity sha512-I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ== - -pg-hstore@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.3.tgz#d1978c12a85359830b1388d3b0ff233b88928e96" - integrity sha512-qpeTpdkguFgfdoidtfeTho1Q1zPVPbtMHgs8eQ+Aan05iLmIs3Z3oo5DOZRclPGoQ4i68I1kCtQSJSa7i0ZVYg== - dependencies: - underscore "^1.7.0" +pg-connection-string@2.5.0, pg-connection-string@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" + integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== pg-int8@1.0.1: version "1.0.1" @@ -21699,13 +20523,18 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== -pirates@^4.0.0, pirates@^4.0.1: +pirates@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== dependencies: node-modules-regexp "^1.0.0" +pirates@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -21734,25 +20563,6 @@ please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" -plist@^3.0.1, plist@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" - integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA== - dependencies: - base64-js "^1.5.1" - xmlbuilder "^9.0.7" - -plugin-error@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" - integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4= - dependencies: - ansi-cyan "^0.1.1" - ansi-red "^0.1.1" - arr-diff "^1.0.1" - arr-union "^2.0.1" - extend-shallow "^1.1.2" - pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" @@ -21768,11 +20578,6 @@ pngjs@^5.0.0: resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb" integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw== -pop-iterate@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz#ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3" - integrity sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M= - popper.js@1.14.3: version "1.14.3" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095" @@ -21814,10 +20619,196 @@ postgres-interval@^1.1.0: dependencies: xtend "^4.0.0" -prebuild-install@5.3.3, prebuild-install@^5.2.4, prebuild-install@^5.3.0, prebuild-install@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e" - integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g== +pouchdb-abstract-mapreduce@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.1.tgz#96ff4a0f41cbe273f3f52fde003b719005a2093c" + integrity sha512-0zKXVFBvrfc1KnN0ggrB762JDmZnUpePHywo9Bq3Jy+L1FnoG7fXM5luFfvv5/T0gEw+ZTIwoocZECMnESBI9w== + dependencies: + pouchdb-binary-utils "7.3.1" + pouchdb-collate "7.3.1" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-fetch "7.3.1" + pouchdb-mapreduce-utils "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-adapter-leveldb-core@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.3.1.tgz#3c71dce7ff06c2e483d873d7aabc1fded56372ca" + integrity sha512-mxShHlqLMPz2gChrgtA9okV1ogFmQrRAoM/O4EN0CrQWPLXqYtpL1f7sI2asIvFe7SmpnvbLx7kkZyFmLTfwjA== + dependencies: + argsarray "0.0.1" + buffer-from "1.1.2" + double-ended-queue "2.1.0-0" + levelup "4.4.0" + pouchdb-adapter-utils "7.3.1" + pouchdb-binary-utils "7.3.1" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-json "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-merge "7.3.1" + pouchdb-utils "7.3.1" + sublevel-pouchdb "7.3.1" + through2 "3.0.2" + +pouchdb-adapter-memory@^7.1.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-memory/-/pouchdb-adapter-memory-7.3.1.tgz#7be4b0601326cb93eb1141ed910fdfdf40c36616" + integrity sha512-iHdWGJAHONqQv0we3Oi1MYen69ZS8McLW9wUyaAYcWTJnAIIAr2ZM0/TeTDVSHfMUwYqEYk7X8jRtJZEMwLnwg== + dependencies: + memdown "1.4.1" + pouchdb-adapter-leveldb-core "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-adapter-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.3.1.tgz#7237cb597f8d337057df15d4859bfe3c881d8832" + integrity sha512-uKLG6dClwTs/sLIJ4WkLAi9wlnDBpOnfyhpeAgOjlOGN/XLz5nKHrA4UJRnURDyc+uv79S9r/Unc4hVpmbSPUw== + dependencies: + pouchdb-binary-utils "7.3.1" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-merge "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-binary-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.1.tgz#eea22d9a5f880fcd95062476f4f5484cdf61496f" + integrity sha512-crZJNfAEOnUoRk977Qtmk4cxEv6sNKllQ6vDDKgQrQLFjMUXma35EHzNyIJr1s76J77Q4sqKQAmxz9Y40yHGtw== + dependencies: + buffer-from "1.1.2" + +pouchdb-collate@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.3.1.tgz#19d7b87dd173d1c765da8cc9987c5aa9eb24f11f" + integrity sha512-o4gyGqDMLMSNzf6EDTr3eHaH/JRMoqRhdc+eV+oA8u00nTBtr9wD+jypVe2LbgKLJ4NWqx2qVkXiTiQdUFtsLQ== + +pouchdb-collections@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.3.1.tgz#4f1819cf4dd6936a422c29f7fa26a9b5dca428f5" + integrity sha512-yUyDqR+OJmtwgExOSJegpBJXDLAEC84TWnbAYycyh+DZoA51Yw0+XVQF5Vh8Ii90/Ut2xo88fmrmp0t6kqom8w== + +pouchdb-debug@^7.1.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/pouchdb-debug/-/pouchdb-debug-7.2.1.tgz#f5f869f6113c12ccb97cddf5b0a32b6e0e67e961" + integrity sha512-eP3ht/AKavLF2RjTzBM6S9gaI2/apcW6xvaKRQhEdOfiANqerFuksFqHCal3aikVQuDO+cB/cw+a4RyJn/glBw== + dependencies: + debug "3.1.0" + +pouchdb-errors@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.3.1.tgz#78be36721e2edc446fac158a236a9218c7bcdb14" + integrity sha512-Zktz4gnXEUcZcty8FmyvtYUYsHskoST05m6H5/E2gg/0mCfEXq/XeyyLkZHaZmqD0ZPS9yNmASB1VaFWEKEaDw== + dependencies: + inherits "2.0.4" + +pouchdb-fetch@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.3.1.tgz#d54b1807be0f0a5d4b6d06e416c7d54952bbc348" + integrity sha512-205xAtvdHRPQ4fp1h9+RmT9oQabo9gafuPmWsS9aEl3ER54WbY8Vaj1JHZGbU4KtMTYvW7H5088zLS7Nrusuag== + dependencies: + abort-controller "3.0.0" + fetch-cookie "0.11.0" + node-fetch "2.6.7" + +pouchdb-find@^7.0.0: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.3.1.tgz#07a633d5ee2bd731dae9f991281cd25212088d29" + integrity sha512-AeqUfAVY1c7IFaY36BRT0vIz9r4VTKq/YOWTmiqndOZUQ/pDGxyO2fNFal6NN3PyYww0JijlD377cPvhnrhJVA== + dependencies: + pouchdb-abstract-mapreduce "7.3.1" + pouchdb-collate "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-fetch "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-selector-core "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-json@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.3.1.tgz#a80a3060aa2914959e4dca7a4e2022ab20c7119a" + integrity sha512-AyOKsmc85/GtHjMZyEacqzja8qLVfycS1hh1oskR+Bm5PIITX52Fb8zyi0hEetV6VC0yuGbn0RqiLjJxQePeqQ== + dependencies: + vuvuzela "1.0.3" + +pouchdb-mapreduce-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.1.tgz#f0ac2c8400fbedb705e9226082453ac7d3f2a066" + integrity sha512-oUMcq82+4pTGQ6dtrhgORHOVHZSr6w/5tFIUGlv7RABIDvJarL4snMawADjlpiEwPdiQ/ESG8Fqt8cxqvqsIgg== + dependencies: + argsarray "0.0.1" + inherits "2.0.4" + pouchdb-collections "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-md5@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.3.1.tgz#70fae44f9d27eb4c6a8e7106156b4593d31c1762" + integrity sha512-aDV8ui/mprnL3xmt0gT/81DFtTtJiKyn+OxIAbwKPMfz/rDFdPYvF0BmDC9QxMMzGfkV+JJUjU6at0PPs2mRLg== + dependencies: + pouchdb-binary-utils "7.3.1" + spark-md5 "3.0.2" + +pouchdb-merge@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.3.1.tgz#97aae682d7d8499b62b6ce234dcb9527c7bf6f02" + integrity sha512-FeK3r35mKimokf2PQ2tUI523QWyZ4lYZ0Yd75FfSch/SPY6wIokz5XBZZ6PHdu5aOJsEKzoLUxr8CpSg9DhcAw== + +pouchdb-selector-core@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.3.1.tgz#08245662de3d61f16ab8dae2b56ef622935b3fb3" + integrity sha512-HBX+nNGXcaL9z0uNpwSMRq2GNZd3EZXW+fe9rJHS0hvJohjZL7aRJLoaXfEdHPRTNW+CpjM3Rny60eGekQdI/w== + dependencies: + pouchdb-collate "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.3.1.tgz#d25f0a034427f388ba5ae37d9ae3fbed210e8720" + integrity sha512-R3hHBo1zTdTu/NFs3iqkcaQAPwhIH0gMIdfVKd5lbDYlmP26rCG5pdS+v7NuoSSFLJ4xxnaGV+Gjf4duYsJ8wQ== + dependencies: + argsarray "0.0.1" + clone-buffer "1.0.0" + immediate "3.3.0" + inherits "2.0.4" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-md5 "7.3.1" + uuid "8.3.2" + +pouchdb@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.3.0.tgz#440fbef12dfd8f9002320802528665e883a3b7f8" + integrity sha512-OwsIQGXsfx3TrU1pLruj6PGSwFH+h5k4hGNxFkZ76Um7/ZI8F5TzUHFrpldVVIhfXYi2vP31q0q7ot1FSLFYOw== + dependencies: + abort-controller "3.0.0" + argsarray "0.0.1" + buffer-from "1.1.2" + clone-buffer "1.0.0" + double-ended-queue "2.1.0-0" + fetch-cookie "0.11.0" + immediate "3.3.0" + inherits "2.0.4" + level "6.0.1" + level-codec "9.0.2" + level-write-stream "1.0.0" + leveldown "5.6.0" + levelup "4.4.0" + ltgt "2.2.1" + node-fetch "2.6.7" + readable-stream "1.1.14" + spark-md5 "3.0.2" + through2 "3.0.2" + uuid "8.3.2" + vuvuzela "1.0.3" + +prebuild-install@^6.0.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -21833,40 +20824,21 @@ prebuild-install@5.3.3, prebuild-install@^5.2.4, prebuild-install@^5.3.0, prebui tar-fs "^2.0.0" tunnel-agent "^0.6.0" -prebuild-install@^7.0.1: +prebuild-install@^7.0.1, prebuild-install@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== dependencies: - detect-libc "^2.0.0" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prebuild-install@^6.0.0: - version "6.1.4" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" - integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== - dependencies: - detect-libc "^1.0.3" + detect-libc "^2.0.0" expand-template "^2.0.3" github-from-package "0.0.0" minimist "^1.2.3" mkdirp-classic "^0.5.3" napi-build-utils "^1.0.1" - node-abi "^2.21.0" - npmlog "^4.0.1" + node-abi "^3.3.0" pump "^3.0.0" rc "^1.2.7" - simple-get "^3.0.3" + simple-get "^4.0.0" tar-fs "^2.0.0" tunnel-agent "^0.6.0" @@ -21945,27 +20917,7 @@ prettier@^2.7.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== -pretty-format@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" - integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== - dependencies: - "@jest/types" "^24.9.0" - ansi-regex "^4.0.0" - ansi-styles "^3.2.0" - react-is "^16.8.4" - -pretty-format@^25.1.0, pretty-format@^25.2.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" - integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== - dependencies: - "@jest/types" "^25.5.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - -pretty-format@^26.0.0, pretty-format@^26.6.2: +pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== @@ -21975,7 +20927,7 @@ pretty-format@^26.0.0, pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" -pretty-format@^29.0.0, pretty-format@^29.1.2: +pretty-format@^29.0.0: version "29.1.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.1.2.tgz#b1f6b75be7d699be1a051f5da36e8ae9e76a8e6a" integrity sha512-CGJ6VVGXVRP2o2Dorl4mAwwvDWT25luIsYhkyVQW32E4nL+TgW939J7LlKT/npq5Cpq6j3s+sy+13yk7xYpBmg== @@ -21993,6 +20945,15 @@ pretty-format@^29.0.2: ansi-styles "^5.0.0" react-is "^18.0.0" +pretty-format@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a" + integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw== + dependencies: + "@jest/schemas" "^29.4.3" + ansi-styles "^5.0.0" + react-is "^18.0.0" + pretty-quick@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.2.tgz#4e44d6489ed513ef111bee501f63688d854584e6" @@ -22099,12 +21060,17 @@ promise.allsettled@1.0.2: function-bind "^1.1.1" iterate-value "^1.0.0" -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== +promise.allsettled@^1.0.2: + version "1.0.6" + resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.6.tgz#8dc8ba8edf429feb60f8e81335b920e109c94b6e" + integrity sha512-22wJUOD3zswWFqgwjNHa1965LvqTX87WPu/lreY2KSd7SVcERfuZ4GfUaOnJNnvtoIv2yXT/W00YIGMetXtFXg== dependencies: - asap "~2.0.3" + array.prototype.map "^1.0.5" + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + get-intrinsic "^1.1.3" + iterate-value "^1.0.2" promise@^8.0.0: version "8.0.1" @@ -22113,13 +21079,6 @@ promise@^8.0.0: dependencies: asap "~2.0.3" -promise@^8.0.3: - version "8.1.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" - integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== - dependencies: - asap "~2.0.6" - prompt@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/prompt/-/prompt-1.2.0.tgz#5d8f1d9011766bac07abde510dbf4338d87b4f02" @@ -22154,15 +21113,6 @@ promzard@^0.3.0: dependencies: read "1" -prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - proper-lockfile@^3.0.2: version "3.2.0" resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-3.2.0.tgz#89ca420eea1d55d38ca552578851460067bcda66" @@ -22177,7 +21127,7 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -proto3-json-serializer@^0.1.8: +proto3-json-serializer@^0.1.1, proto3-json-serializer@^0.1.8: version "0.1.9" resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.9.tgz#705ddb41b009dd3e6fcd8123edd72926abf65a34" integrity sha512-A60IisqvnuI45qNRygJjrnNjX2TMdQGMY+57tR3nul3ZgO2zXkR9OGR8AXxJhkqx84g0FTnrfi3D5fWMSdANdQ== @@ -22203,7 +21153,17 @@ protobufjs@6.11.2: "@types/node" ">=13.7.0" long "^4.0.0" -protobufjs@6.11.3, protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8: +protobufjs@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" + integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== + dependencies: + ascli "~1" + bytebuffer "~5" + glob "^7.0.5" + yargs "^3.10.0" + +protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3: version "6.11.3" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== @@ -22222,20 +21182,29 @@ protobufjs@6.11.3, protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3, p "@types/node" ">=13.7.0" long "^4.0.0" -protobufjs@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" - integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== - dependencies: - ascli "~1" - bytebuffer "~5" - glob "^7.0.5" - yargs "^3.10.0" - -protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8, protobufjs@^6.8.9, protobufjs@^6.9.0: +protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8, protobufjs@^6.9.0: version "6.9.0" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.9.0.tgz#c08b2bf636682598e6fabbf0edb0b1256ff090bd" integrity sha512-LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.1" + "@types/node" "^13.7.0" + long "^4.0.0" + +protobufjs@^7.0.0: + version "7.2.3" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2" + integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -22392,20 +21361,16 @@ pure-rand@^5.0.1: resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-5.0.1.tgz#97a287b4b4960b2a3448c0932bf28f2405cac51d" integrity sha512-ksWccjmXOHU2gJBnH0cK1lSYdvSZ0zLoCMSz/nTGh6hDvCSgcRxDyIcOBD6KNxFz3xhMPm/T267Tbe2JRymKEQ== +pure-rand@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.1.tgz#31207dddd15d43f299fdcdb2f572df65030c19af" + integrity sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg== + pvutils@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3" integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ== -q@2.0.x: - version "2.0.3" - resolved "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz#75b8db0255a1a5af82f58c3f3aaa1efec7d0d134" - integrity sha1-dbjbAlWhpa+C9Yw/Oqoe/sfQ0TQ= - dependencies: - asap "^2.0.0" - pop-iterate "^1.0.1" - weak-map "^1.0.5" - q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -22447,7 +21412,14 @@ qs@6.10.3: dependencies: side-channel "^1.0.4" -qs@^6.4.0, qs@^6.5.1, qs@^6.5.2, qs@^6.7.0, qs@^6.9.4: +qs@^6.10.3, qs@^6.11.0: + version "6.11.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f" + integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ== + dependencies: + side-channel "^1.0.4" + +qs@^6.4.0, qs@^6.5.2, qs@^6.7.0: version "6.9.4" resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== @@ -22566,19 +21538,6 @@ re2@^1.15.8: nan "^2.16.0" node-gyp "^9.0.0" -react-devtools-core@^4.6.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.10.1.tgz#6d57db291aeac9cc45ef9fb4636dd2ab97490daf" - integrity sha512-sXbBjGAWcf9HAblTP/zMtFhGHqxAfIR+GPxONZsSGN9FHnF4635dx1s2LdQWG9rJ+Ehr3nWg+BUAB6P78my5PA== - dependencies: - shell-quote "^1.6.1" - ws "^7" - -react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - react-is@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" @@ -22589,70 +21548,10 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -react-native-flipper@^0.70.0: - version "0.70.0" - resolved "https://registry.yarnpkg.com/react-native-flipper/-/react-native-flipper-0.70.0.tgz#670ab2781d1f14141eaa12c3cd06f43ba2912425" - integrity sha512-/msQuZLXfe5OrfHFBJMN73RoiVRBvT4/oqfa7P641pqcLGMXl1cE2QxCY1qoBqk7d3erD+ufaGFYmT8G4OeRaw== - -react-native-ntp-client@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/react-native-ntp-client/-/react-native-ntp-client-1.0.3.tgz#822fbe44d5bfcca2e236f877832f98123aef448e" - integrity sha512-y6UlSKNZh0Qlga2OnTCMm0OMnbxoCzEEzHpHEKZGjZC7VOowu43dFQWyDY0zEUnXgcuBE7JLEmMxekrdVDv5rw== - dependencies: - node-libs-react-native "1.0.3" - -react-native-randombytes@^3.5.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/react-native-randombytes/-/react-native-randombytes-3.6.1.tgz#cac578093b5ca38e3e085becffdc6cbcf6f0d654" - integrity sha512-qxkwMbOZ0Hff1V7VqpaWrR6ItkA+oF6bnI79Qp9F3Tk8WBsdKDi6m1mi3dEdFWePoRLrhJ2L03rU0yabst1tVw== - dependencies: - buffer "^4.9.1" - sjcl "^1.0.3" - -react-native@^0.63.4: - version "0.63.4" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.63.4.tgz#2210fdd404c94a5fa6b423c6de86f8e48810ec36" - integrity sha512-I4kM8kYO2mWEYUFITMcpRulcy4/jd+j9T6PbIzR0FuMcz/xwd+JwHoLPa1HmCesvR1RDOw9o4D+OFLwuXXfmGw== - dependencies: - "@babel/runtime" "^7.0.0" - "@react-native-community/cli" "^4.10.0" - "@react-native-community/cli-platform-android" "^4.10.0" - "@react-native-community/cli-platform-ios" "^4.10.0" - abort-controller "^3.0.0" - anser "^1.4.9" - base64-js "^1.1.2" - event-target-shim "^5.0.1" - fbjs "^1.0.0" - fbjs-scripts "^1.1.0" - hermes-engine "~0.5.0" - invariant "^2.2.4" - jsc-android "^245459.0.0" - metro-babel-register "0.59.0" - metro-react-native-babel-transformer "0.59.0" - metro-source-map "0.59.0" - nullthrows "^1.1.1" - pretty-format "^24.9.0" - promise "^8.0.3" - prop-types "^15.7.2" - react-devtools-core "^4.6.0" - react-refresh "^0.4.0" - regenerator-runtime "^0.13.2" - scheduler "0.19.1" - stacktrace-parser "^0.1.3" - use-subscription "^1.0.0" - whatwg-fetch "^3.0.0" - -react-refresh@^0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.2.tgz#54a277a6caaac2803d88f1d6f13c1dcfbd81e334" - integrity sha512-kv5QlFFSZWo7OlJFNYbxRtY66JImuP2LcrFgyJfQaf85gSP+byzG21UbDQEYjU7f//ny8rwiEkO6py2Y+fEgAQ== - -read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16" - integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA== - dependencies: - graceful-fs "^4.1.2" +read-cmd-shim@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087" + integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g== read-last-lines@^1.7.2: version "1.8.0" @@ -22758,7 +21657,7 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -22843,10 +21742,10 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -redent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" - integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== dependencies: resolve "^1.20.0" @@ -22865,50 +21764,45 @@ redeyed@~2.1.0: dependencies: esprima "~4.0.0" -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== +redux-saga@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.0.0.tgz#acb8b3ed9180fecbe75f342011d75af3ac11045b" + integrity sha512-GvJWs/SzMvEQgeaw6sRMXnS2FghlvEGsHiEtTLpJqc/FHF3I5EE/B+Hq5lyHZ8LSoT2r/X/46uWvkdCnK9WgHA== dependencies: - regenerate "^1.4.0" + "@redux-saga/core" "^1.0.0" -regenerate@^1.2.1, regenerate@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" - integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== +redux@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" + integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== + dependencies: + lodash "^4.2.1" + lodash-es "^4.2.1" + loose-envify "^1.1.0" + symbol-observable "^1.0.3" + +redux@^4.0.4: + version "4.2.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" + integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== + dependencies: + "@babel/runtime" "^7.9.2" regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.2: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== regenerator-runtime@^0.13.4: version "0.13.5" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q== - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regenerator-transform@^0.14.2: - version "0.14.4" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7" - integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw== - dependencies: - "@babel/runtime" "^7.8.4" - private "^0.1.8" - regex-cache@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" @@ -22929,51 +21823,20 @@ regexp-to-ast@0.4.0: resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.4.0.tgz#f3dbcb42726cd71902ba50193f63eab5325cd7cb" integrity sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw== -regexp.prototype.flags@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== +regexp.prototype.flags@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" + integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + functions-have-names "^1.2.2" regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpu-core@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d" - integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA== - dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^10.0.1" - regjsgen "^0.6.0" - regjsparser "^0.8.2" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" - -regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" - -registry-auth-token@^3.0.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" - integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ== - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - registry-auth-token@^4.0.0: version "4.2.2" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" @@ -22988,23 +21851,6 @@ registry-url@^5.0.0: dependencies: rc "^1.2.8" -regjsgen@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" - integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== - -regjsgen@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" - integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= - dependencies: - jsesc "~0.5.0" - relative@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" @@ -23200,22 +22046,30 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== -resolve.exports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" - integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== +resolve.exports@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" + integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1: version "1.18.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== dependencies: - is-core-module "^2.9.0" + is-core-module "^2.0.0" + path-parse "^1.0.6" + +resolve@^1.11.1, resolve@^1.20.0: + version "1.22.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" + integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== + dependencies: + is-core-module "^2.11.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -23223,6 +22077,13 @@ resolve@~1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw== + dependencies: + path-parse "^1.0.6" + +responselike@*: + version "3.0.0" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-3.0.0.tgz#20decb6c298aff0dbee1c355ca95461d42823626" + integrity sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg== dependencies: lowercase-keys "^3.0.0" @@ -23268,13 +22129,6 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -retry-as-promised@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543" - integrity sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg== - dependencies: - any-promise "^1.3.0" - retry-request@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.0.0.tgz#5c366166279b3e10e9d7aa13274467a05cb69290" @@ -23310,7 +22164,7 @@ revalidator@0.1.x: resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b" integrity sha512-xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg== -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -23331,11 +22185,6 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@~2.2.6: - version "2.2.8" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" - integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI= - rimraf@~2.4.0: version "2.4.5" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" @@ -23363,11 +22212,6 @@ rlp@^2.0.0, rlp@^2.2.1, rlp@^2.2.2, rlp@^2.2.3, rlp@^2.2.4: dependencies: bn.js "^5.2.0" -rootpath@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/rootpath/-/rootpath-0.1.2.tgz#5b379a87dca906e9b91d690a599439bef267ea6b" - integrity sha1-Wzeah9ypBum5HWkKWZQ5vvJn6ms= - router@^1.3.1: version "1.3.7" resolved "https://registry.yarnpkg.com/router/-/router-1.3.7.tgz#7d68cef5558febfd3438a23de07a0f8b92b873f1" @@ -23415,19 +22259,14 @@ rustbn.js@~0.2.0: resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca" integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA== -rx-lite-aggregates@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" - integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74= +rxjs@6: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" -rx-lite@*, rx-lite@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" - integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ= - -rxjs@^6.4.0, rxjs@^6.5.2, rxjs@^6.5.4, rxjs@^6.6.0: +rxjs@^6.4.0, rxjs@^6.6.0: version "6.6.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== @@ -23441,7 +22280,7 @@ rxjs@^7.5.5: dependencies: tslib "^2.1.0" -safe-buffer@*, safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: +safe-buffer@*, safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -23463,6 +22302,15 @@ safe-json-stringify@~1: resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== +safe-regex-test@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" + integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + is-regex "^1.1.4" + safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -23517,7 +22365,7 @@ sax@1.2.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA== -sax@>=0.6.0, sax@^1.2.4: +sax@>=0.6.0: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -23529,28 +22377,6 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -scheduler@0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - -scmp@^2.0.0, scmp@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a" - integrity sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q== - scrypt-js@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" @@ -23647,7 +22473,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -23683,16 +22509,11 @@ semver@7.3.7, semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7 dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - semver@~5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" @@ -23730,62 +22551,22 @@ seq-queue@^0.0.5: resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q== -sequelize-cli@^5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.1.tgz#0b9c2fc04d082cc8ae0a8fe270b96bb606152bab" - integrity sha512-ZM4kUZvY3y14y+Rq3cYxGH7YDJz11jWHcN2p2x7rhAIemouu4CEXr5ebw30lzTBtyXV4j2kTO+nUjZOqzG7k+Q== - dependencies: - bluebird "^3.5.3" - cli-color "^1.4.0" - fs-extra "^7.0.1" - js-beautify "^1.8.8" - lodash "^4.17.5" - resolve "^1.5.0" - umzug "^2.1.0" - yargs "^13.1.0" - -sequelize-pool@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d" - integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA== - -sequelize@5.21.5: - version "5.21.5" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.5.tgz#44056f3ab8862ccbfeebd5e03ce041c570477ea2" - integrity sha512-n9hR5K4uQGmBGK/Y/iqewCeSFmKVsd0TRnh0tfoLoAkmXbKC4tpeK96RhKs7d+TTMtrJlgt2TNLVBaAxEwC4iw== - dependencies: - bluebird "^3.5.0" - cls-bluebird "^2.1.0" - debug "^4.1.1" - dottie "^2.0.0" - inflection "1.12.0" - lodash "^4.17.15" - moment "^2.24.0" - moment-timezone "^0.5.21" - retry-as-promised "^3.2.0" - semver "^6.3.0" - sequelize-pool "^2.3.0" - toposort-class "^1.0.1" - uuid "^3.3.3" - validator "^10.11.0" - wkx "^0.4.8" - -serialize-error@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a" - integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go= +serialize-javascript@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e" + integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw== -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== +serialize-javascript@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== dependencies: randombytes "^2.1.0" -serve-static@1.14.1, serve-static@^1.13.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" @@ -23862,10 +22643,10 @@ sha1@^1.1.1: charenc ">= 0.0.1" crypt ">= 0.0.1" -sha3@1.2.3, sha3@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/sha3/-/sha3-1.2.3.tgz#ed5958fa8331df1b1b8529ca9fdf225a340c5418" - integrity sha512-sOWDZi8cDBRkLfWOw18wvJyNblXDHzwMGnRWut8zNNeIeLnmMRO17bjpLc7OzMuj1ASUgx2IyohzUCAl+Kx5vA== +sha3@^2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/sha3/-/sha3-2.1.4.tgz#000fac0fe7c2feac1f48a25e7a31b52a6492cc8f" + integrity sha512-S8cNxbyb0UGUM2VhRD4Poe5N58gJnJsLJ5vC7FYWGUmGhcsj4++WaIOBFVDxlG0W3To6xBuiRh+i0Qp2oNCOtg== dependencies: buffer "6.0.3" @@ -23905,17 +22686,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767" - integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c= - dependencies: - array-filter "~0.0.0" - array-map "~0.0.0" - array-reduce "~0.0.0" - jsonify "~0.0.0" - -shell-quote@^1.6.1, shell-quote@^1.7.2: +shell-quote@^1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== @@ -23943,16 +22714,16 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -sigmund@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= - signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +signal-exit@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + simple-concat@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" @@ -23976,14 +22747,14 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" -simple-plist@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.3.1.tgz#16e1d8f62c6c9b691b8383127663d834112fb017" - integrity sha512-iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw== +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== dependencies: - bplist-creator "0.1.0" - bplist-parser "0.3.1" - plist "^3.0.5" + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" simple-swizzle@^0.2.2: version "0.2.2" @@ -24024,7 +22795,7 @@ sleep@6.1.0: dependencies: nan "^2.13.2" -slice-ansi@^2.0.0, slice-ansi@^2.1.0: +slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== @@ -24245,17 +23016,12 @@ sort-keys@^4.0.0: dependencies: is-plain-obj "^2.0.0" -source-list-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" - integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A== - -source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: +source-map-resolve@^0.5.0: version "0.5.2" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== dependencies: - atob "^2.1.2" + atob "^2.1.1" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -24269,14 +23035,7 @@ source-map-support@0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - source-map "^0.5.6" - -source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12: +source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.6: version "0.5.16" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== @@ -24284,6 +23043,14 @@ source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.6 buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@^0.5.17, source-map-support@^0.5.19: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" @@ -24444,11 +23211,6 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== -stack-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" - integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== - stack-utils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" @@ -24456,17 +23218,12 @@ stack-utils@^2.0.2: dependencies: escape-string-regexp "^2.0.0" -stackframe@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" - integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== - -stacktrace-parser@^0.1.3: - version "0.1.10" - resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a" - integrity sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg== +stack-utils@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== dependencies: - type-fest "^0.7.1" + escape-string-regexp "^2.0.0" starts-with@^1.0.0, starts-with@^1.0.2: version "1.0.2" @@ -24486,28 +23243,25 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: +"statuses@>= 1.5.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== +statuses@~1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" + integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg== + stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" integrity sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g== -stream-browserify@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" - integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds= - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-buffers@2.2.x: - version "2.2.0" - resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4" - integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg== +stoppable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b" + integrity sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw== stream-combiner@^0.2.2: version "0.2.2" @@ -24524,41 +23278,6 @@ stream-events@^1.0.1, stream-events@^1.0.4, stream-events@^1.0.5: dependencies: stubs "^3.0.0" -stream-exhaust@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" - integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw== - -stream-http@^2.3.1: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -stream-http@^2.7.2: - version "2.8.1" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4" - integrity sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.3" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -stream-iterate@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stream-iterate/-/stream-iterate-1.2.0.tgz#2bd7c77296c1702a46488b8ad41f79865eecd4e1" - integrity sha1-K9fHcpbBcCpGSIuK1B95hl7s1OE= - dependencies: - readable-stream "^2.1.5" - stream-shift "^1.0.0" - stream-shift@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" @@ -24611,6 +23330,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -24627,54 +23355,63 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string-width@^4.2.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" + strip-ansi "^6.0.0" + +string.prototype.trim@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" + integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" string.prototype.trim@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea" - integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= + integrity sha512-IlEfUereZQqIcv/LJFNPUygFkq0HJCQMnaDr5i+zyRXpeYvF4F8J8u4UFxXICLMY+O3SEfJeaye5AO5miS6a9g== dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" + define-properties "^1.1.2" + es-abstract "^1.5.0" + function-bind "^1.0.2" -string.prototype.trim@~1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.6.tgz#824960787db37a9e24711802ed0c1d1c0254f83e" - integrity sha512-8lMR2m+U0VJTPp6JjvJTtGyc4FIGq9CdRt7O9p6T0e6K4vjU+OP+SQJpbe/SBmRcCUIvNUnjsbmY6lnMp8MhsQ== +string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" + integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.19.5" + es-abstract "^1.20.4" -string.prototype.trimend@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" - integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== +string.prototype.trimleft@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.3.tgz#dee305118117d0a1843c1fc0d38d5d0754d83c60" + integrity sha512-699Ibssmj/awVzvdNk4g83/Iu8U9vDohzmA/ly2BrQWGhamuY4Tlvs5XKmKliDt3ky6SKbE1bzPhASKCFlx9Sg== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" + call-bind "^1.0.0" + define-properties "^1.1.3" + string.prototype.trimstart "^1.0.3" -string.prototype.trimstart@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" - integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== +string.prototype.trimright@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.3.tgz#dc16a21d7456cbc8b2c54d47fe01f06d9efe94eb" + integrity sha512-hoOq56oRFnnfDuXNy2lGHiwT77MehHv9d0zGfRZ8QdC+4zjrkFB9vd5i/zYTd/ymFBd4YxtbdgHt3U6ksGeuBw== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + string.prototype.trimend "^1.0.3" + +string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" + integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.19.5" + es-abstract "^1.20.4" -string_decoder@^1.0.0, string_decoder@^1.0.3, string_decoder@^1.1.1: +string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== @@ -24808,25 +23545,20 @@ stubs@^3.0.0: resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== -sublevel-pouchdb@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.3.0.tgz#d27138c34d98c3d5c8c3ee85c1662add3ad04525" - integrity sha512-zp7u4jmv2N/s+dXZkWTtL4BjREs3SZ1nGBNNJ8RWX4yqN59oHgKmti4CfVOqfsAW9RMasmTqQAEPxL9hX8+CIA== +sublevel-pouchdb@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.3.1.tgz#c1cc03af45081345c7c82821d6dcaa74564ae2ef" + integrity sha512-n+4fK72F/ORdqPwoGgMGYeOrW2HaPpW9o9k80bT1B3Cim5BSvkKkr9WbWOWynni/GHkbCEdvLVFJL1ktosAdhQ== dependencies: inherits "2.0.4" level-codec "9.0.2" ltgt "2.2.1" readable-stream "1.1.14" -sudo-prompt@^9.0.0: - version "9.2.1" - resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz#77efb84309c9ca489527a4e749f287e6bdd52afd" - integrity sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw== - -superagent@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" - integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA== +superagent@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6" + integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g== dependencies: component-emitter "^1.3.0" cookiejar "^2.1.3" @@ -24894,12 +23626,19 @@ supports-color@6.0.0: dependencies: has-flag "^3.0.0" -supports-color@6.1.0, supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== +supports-color@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== dependencies: - has-flag "^3.0.0" + has-flag "^4.0.0" + +supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" supports-color@^2.0.0: version "2.0.0" @@ -24920,13 +23659,6 @@ supports-color@^5.0.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-co dependencies: has-flag "^3.0.0" -supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -24950,10 +23682,15 @@ supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.1.0: has-flag "^4.0.0" supports-color "^7.0.0" -sver-compat@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8" - integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg= +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +swap-case@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3" + integrity sha512-BAmWG6/bx8syfc6qXPprof3Mn5vQgf5dwdUNJhsNqU9WdPt5P+ES/wQ5bxfijy8zwZgZZHslC3iAsxsuQMCzJQ== dependencies: lower-case "^1.1.1" upper-case "^1.1.1" @@ -25034,30 +23771,23 @@ tail@^2.0.0: resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.4.tgz#90dd4c5a174a3fa39dcb65a1df1950a4a0093a41" integrity sha512-PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ== -tapable@^1.0.0, tapable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== - -tape@^4.4.0, tape@^4.6.3, tape@^4.8.0: +tape@^4.4.0: version "4.11.0" resolved "https://registry.yarnpkg.com/tape/-/tape-4.11.0.tgz#63d41accd95e45a23a874473051c57fdbc58edc1" integrity sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA== dependencies: - call-bind "~1.0.2" - deep-equal "~1.1.1" + deep-equal "~1.0.1" defined "~1.0.0" - dotignore "~0.1.2" for-each "~0.3.3" - glob "~7.2.3" + function-bind "~1.1.1" + glob "~7.1.4" has "~1.0.3" inherits "~2.0.4" - is-regex "~1.1.4" - minimist "~1.2.6" - object-inspect "~1.12.2" - resolve "~1.22.1" + minimist "~1.2.0" + object-inspect "~1.6.0" + resolve "~1.11.1" resumer "~0.0.0" - string.prototype.trim "~1.2.6" + string.prototype.trim "~1.1.2" through "~2.3.8" tar-fs@^1.8.1: @@ -25104,18 +23834,18 @@ tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@4.4.15, tar@^4, tar@^4.0.2, tar@^4.3.0, tar@^4.4.0, tar@^4.4.10, tar@^4.4.2, tar@^4.4.3, tar@^4.4.8: +tar@^4.0.2, tar@^4.3.0: version "4.4.15" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8" integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA== dependencies: - chownr "^1.1.4" - fs-minipass "^1.2.7" - minipass "^2.9.0" - minizlib "^1.3.3" - mkdirp "^0.5.5" - safe-buffer "^5.2.1" - yallist "^3.1.1" + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" tar@^6.0.2: version "6.1.13" @@ -25190,10 +23920,10 @@ tedious@^6.7.1: readable-stream "^3.4.0" sprintf-js "^1.1.2" -teeny-request@6.0.1, teeny-request@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.1.tgz#9b1f512cef152945827ba7e34f62523a4ce2c5b0" - integrity sha512-TAK0c9a00ELOqLrZ49cFxvPVogMUFaWY8dUsQc/0CuQPGF+BOxOQzXfE413BAk2kLomwNplvdtMpeaeGWmoc2g== +teeny-request@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-7.1.1.tgz#2b0d156f4a8ad81de44303302ba8d7f1f05e20e6" + integrity sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg== dependencies: http-proxy-agent "^4.0.0" https-proxy-agent "^5.0.0" @@ -25233,26 +23963,6 @@ temp-dir@^1.0.0: resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" integrity sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ== -temp-write@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492" - integrity sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI= - dependencies: - graceful-fs "^4.1.2" - is-stream "^1.1.0" - make-dir "^1.0.0" - pify "^3.0.0" - temp-dir "^1.0.0" - uuid "^3.0.1" - -temp@0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" - integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k= - dependencies: - os-tmpdir "^1.0.0" - rimraf "~2.2.6" - tempfile@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" @@ -25342,11 +24052,6 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -throat@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" - integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= - throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" @@ -25360,7 +24065,15 @@ through2@2.0.1: readable-stream "~2.0.0" xtend "~4.0.0" -through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0: +through2@3.0.2, through2@^3.0.0, through2@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" + integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== + dependencies: + inherits "^2.0.4" + readable-stream "2 || 3" + +through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -25385,31 +24098,12 @@ tildify@2.0.0: resolved "https://registry.yarnpkg.com/tildify/-/tildify-2.0.0.tgz#f205f3674d677ce698b7067a99e949ce03b4754a" integrity sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw== -time-stamp@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" - integrity sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw== - timed-out@^4.0.0, timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== -timers-browserify@^2.0.2: - version "2.0.12" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" - integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== - dependencies: - setimmediate "^1.0.4" - -timers-browserify@^2.0.4: - version "2.0.10" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae" - integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg== - dependencies: - setimmediate "^1.0.4" - -timers-ext@^0.1.5: +timers-ext@^0.1.5, timers-ext@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6" integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ== @@ -25533,31 +24227,12 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -to-through@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" - integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY= - dependencies: - through2 "^2.0.3" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -toposort-class@^1.0.1: +toidentifier@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" - integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg= - -touch@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" - integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== - dependencies: - nopt "~1.0.10" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== -tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0: +tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -25944,23 +24619,6 @@ tweetsodium@0.0.5: blakejs "^1.1.0" tweetnacl "^1.0.1" -twilio@^3.57.0: - version "3.57.0" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.57.0.tgz#626d212fb86c5d73abf23e7d39cb83f25d477a49" - integrity sha512-gt1NtEM647c/+KGcPiBEY2YCCrvm7nKXfd2bOT6PNYUAbBF5n0s3Ed0lYQW5BngpJEjeZROMZjfp9ikwehS/pg== - dependencies: - axios "^0.21.1" - dayjs "^1.8.29" - https-proxy-agent "^5.0.0" - jsonwebtoken "^8.5.1" - lodash "^4.17.19" - q "2.0.x" - qs "^6.9.4" - rootpath "^0.1.2" - scmp "^2.1.0" - url-parse "^1.4.7" - xmlbuilder "^13.0.2" - type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -26058,6 +24716,15 @@ typechain@2.0.0: ts-essentials "^6.0.3" ts-generator "^0.0.8" +typed-array-length@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" + integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + is-typed-array "^1.1.9" + typed-function@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-1.1.0.tgz#ea149706e0fb42aca1791c053a6d94ccd6c4fdcb" @@ -26163,24 +24830,6 @@ typical@^2.6.0, typical@^2.6.1: resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" integrity sha512-ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg== -ua-parser-js@^0.7.18: - version "0.7.31" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6" - integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ== - -ua-parser-js@0.7.28, ua-parser-js@^0.7.18: - version "0.7.28" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" - integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== - -uglify-es@^3.1.9: - version "3.3.9" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" - integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ== - dependencies: - commander "~2.13.0" - source-map "~0.6.1" - uglify-js@^3.1.4: version "3.17.0" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.0.tgz#55bd6e9d19ce5eef0d5ad17cd1f587d85b180a85" @@ -26191,38 +24840,20 @@ uint8array-tools@0.0.7: resolved "https://registry.yarnpkg.com/uint8array-tools/-/uint8array-tools-0.0.7.tgz#a7a2bb5d8836eae2fade68c771454e6a438b390d" integrity sha512-vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ== -ultron@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" - integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po= - ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== -umask@^1.1.0, umask@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" - integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0= - -umzug@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e" - integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw== - dependencies: - babel-runtime "^6.23.0" - bluebird "^3.5.3" - -unbox-primitive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f" - integrity sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA== +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.0" - has-symbols "^1.0.0" - which-boxed-primitive "^1.0.1" + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" + which-boxed-primitive "^1.0.2" unbzip2-stream@^1.0.9: version "1.4.3" @@ -26237,51 +24868,21 @@ unc-path-regex@^0.1.0: resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== -undefsafe@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" - integrity sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY= - dependencies: - debug "^2.2.0" +underscore@1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e" + integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw== -underscore@1.12.1, underscore@1.9.1, underscore@>1.4.4, "underscore@>= 1.3.1", underscore@^1.12.1, underscore@^1.7.0, underscore@^1.8.3: - version "1.13.2" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz#276cea1e8b9722a8dbed0100a407dda572125881" - integrity sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g== +underscore@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" + integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== underscore@>1.4.4, "underscore@>= 1.3.1": version "1.13.4" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee" integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ== -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== - -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== - -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== - dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== - -unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0" - integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg== - union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -26492,7 +25093,15 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@1.4.4, url-parse@^1.4.7, url-parse@^1.5.0, url-parse@^1.5.3: +url-parse@1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8" + integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg== + dependencies: + querystringify "^2.0.0" + requires-port "^1.0.0" + +url-parse@^1.5.3: version "1.5.4" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd" integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg== @@ -26538,13 +25147,6 @@ usb@^1.7.0: node-addon-api "^4.2.0" node-gyp-build "^4.3.0" -use-subscription@^1.0.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1" - integrity sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA== - dependencies: - object-assign "^4.1.1" - use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" @@ -26604,13 +25206,6 @@ util@^0.10.3: version "0.10.4" resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== - dependencies: - inherits "2.0.1" - -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== dependencies: inherits "2.0.3" @@ -26626,7 +25221,7 @@ util@^0.12.0: safe-buffer "^5.1.2" which-typed-array "^1.1.2" -util@^0.12.5: +util@^0.12.4, util@^0.12.5: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== @@ -26652,10 +25247,15 @@ uuid@3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -uuid@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= +uuid@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" + integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== + +uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: version "3.4.0" @@ -26672,10 +25272,15 @@ uuid@^9.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== -v8-compile-cache@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" - integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" + integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== + +v8-compile-cache@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: version "7.1.2" @@ -26686,10 +25291,10 @@ v8-to-istanbul@^7.0.0: convert-source-map "^1.6.0" source-map "^0.7.3" -v8flags@^3.0.1, v8flags@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8" - integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w== +v8-to-istanbul@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265" + integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA== dependencies: "@jridgewell/trace-mapping" "^0.3.12" "@types/istanbul-lib-coverage" "^2.0.1" @@ -26715,15 +25320,17 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -validator@^10.11.0: - version "10.11.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228" - integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw== +validate-npm-package-name@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747" + integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q== + dependencies: + builtins "^5.0.0" -value-or-function@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" - integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM= +value-or-promise@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" + integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== varint@^5.0.0: version "5.0.2" @@ -26744,100 +25351,13 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vinyl-fs@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.3.tgz#3d97e562ebfdd4b66921dea70626b84bde9d2d07" - integrity sha1-PZflYuv91LZpId6nBia4S96dLQc= - dependencies: - duplexify "^3.2.0" - glob-stream "^5.3.2" - graceful-fs "^4.0.0" - gulp-sourcemaps "^1.5.2" - is-valid-glob "^0.3.0" - lazystream "^1.0.0" - lodash.isequal "^4.0.0" - merge-stream "^1.0.0" - mkdirp "^0.5.0" - object-assign "^4.0.0" - readable-stream "^2.0.4" - strip-bom "^2.0.0" - strip-bom-stream "^1.0.0" - through2 "^2.0.0" - through2-filter "^2.0.0" - vali-date "^1.0.0" - vinyl "^1.0.0" - -vinyl-fs@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" - integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng== - dependencies: - fs-mkdirp-stream "^1.0.0" - glob-stream "^6.1.0" - graceful-fs "^4.0.0" - is-valid-glob "^1.0.0" - lazystream "^1.0.0" - lead "^1.0.0" - object.assign "^4.0.4" - pumpify "^1.3.5" - readable-stream "^2.3.3" - remove-bom-buffer "^3.0.0" - remove-bom-stream "^1.2.0" - resolve-options "^1.1.0" - through2 "^2.0.0" - to-through "^2.0.0" - value-or-function "^3.0.0" - vinyl "^2.0.0" - vinyl-sourcemap "^1.1.0" - -vinyl-sourcemap@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" - integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY= - dependencies: - append-buffer "^1.0.2" - convert-source-map "^1.5.0" - graceful-fs "^4.1.6" - normalize-path "^2.1.1" - now-and-later "^2.0.0" - remove-bom-buffer "^3.0.0" - vinyl "^2.0.0" - -vinyl@1.X, vinyl@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" - integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - -vinyl@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" - integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== +vm2@^3.9.8: + version "3.9.17" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" + integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -vlq@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468" - integrity sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w== - -vm-browserify@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" - integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== - -vm2@^3.9.3: - version "3.9.5" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.5.tgz#5288044860b4bbace443101fcd3bddb2a0aa2496" - integrity sha512-LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng== + acorn "^8.7.0" + acorn-walk "^8.2.0" vscode-jsonrpc@^4.0.0: version "4.0.0" @@ -26899,6 +25419,11 @@ walkdir@^0.3.0, walkdir@^0.3.2: resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.3.2.tgz#ac8437a288c295656848ebc19981ebc677a5f590" integrity sha512-0Twghia4Z5wDGDYWURlhZmI47GvERMCsXIu0QZWVVZyW9ZjpbbZvD9Zy9M6cWiQQRRbAcYajIyKNavaZZDt1Uw== +walkdir@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39" + integrity sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ== + walker@^1.0.7, walker@^1.0.8, walker@~1.0.5: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" @@ -28609,7 +27134,7 @@ whatwg-fetch@3.0.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== -whatwg-fetch@^3.0.0: +whatwg-fetch@>=0.10.0, whatwg-fetch@^3.4.1: version "3.6.2" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== @@ -28683,6 +27208,18 @@ which-typed-array@^1.1.2: has-tostringtag "^1.0.0" is-typed-array "^1.1.9" +which-typed-array@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" + integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.10" + which@1.3.1, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -28704,6 +27241,13 @@ wide-align@1.1.3: dependencies: string-width "^1.0.2 || 2" +wide-align@^1.1.0, wide-align@^1.1.2, wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + widest-line@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" @@ -28783,12 +27327,15 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -worker-farm@^1.6.0, worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== - dependencies: - errno "~0.1.7" +workerpool@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58" + integrity sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA== + +workerpool@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" + integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== wrap-ansi@^2.0.0: version "2.1.0" @@ -28857,7 +27404,7 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -write-file-atomic@^4.0.0, write-file-atomic@^4.0.1: +write-file-atomic@^4.0.0, write-file-atomic@^4.0.1, write-file-atomic@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== @@ -28912,13 +27459,10 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@^1.1.0, ws@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" - integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w== - dependencies: - options ">=0.0.5" - ultron "1.0.x" +ws@7.4.6: + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== ws@^3.0.0, ws@^3.3.1: version "3.3.3" @@ -28936,7 +27480,7 @@ ws@^5.1.1: dependencies: async-limiter "~1.0.0" -ws@^7, ws@^7.2.3, ws@^7.4.6: +ws@^7.2.0, ws@^7.2.3, ws@^7.4.6: version "7.5.9" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== @@ -29019,38 +27563,21 @@ xml@^1.0.1: resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw== -xmlbuilder@^13.0.2: - version "13.0.2" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7" - integrity sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ== - -xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= - xmlbuilder@~11.0.0: version "11.0.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmldoc@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-1.1.2.tgz#6666e029fe25470d599cd30e23ff0d1ed50466d7" - integrity sha512-ruPC/fyPNck2BD1dpz0AZZyrEwMOrWTO5lDdIXS91rs3wtm4j+T8Rp2o+zoOYkkAxJTZRPOSnOGei1egoRmKMQ== - dependencies: - sax "^1.2.1" - -"xmldom@>= 0.1.x": - version "0.3.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.3.0.tgz#e625457f4300b5df9c2e1ecb776147ece47f3e5a" - integrity sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g== - xmlhttprequest@*, xmlhttprequest@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" @@ -29061,11 +27588,6 @@ xpath.js@~1.1.0: resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1" integrity sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ== -xpipe@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf" - integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98= - xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" @@ -29116,7 +27638,7 @@ yallist@^2.0.0, yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -29209,40 +27731,7 @@ yargs-unparser@2.0.0, yargs-unparser@^2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@13.2.4: - version "13.2.4" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" - integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - os-locale "^3.1.0" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.0" - -yargs@13.3.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.1" - -yargs@13.3.2, yargs@^13.1.0, yargs@^13.2.0, yargs@^13.2.4, yargs@^13.3.0: +yargs@13.3.2, yargs@^13.3.0: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== @@ -29306,25 +27795,7 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^12.0.1: - version "12.0.5" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== - dependencies: - cliui "^4.0.0" - decamelize "^1.2.0" - find-up "^3.0.0" - get-caller-file "^1.0.1" - os-locale "^3.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1 || ^4.0.0" - yargs-parser "^11.1.1" - -yargs@^14.0.0, yargs@^14.2.0, yargs@^14.2.3: +yargs@^14.0.0: version "14.2.3" resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414" integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg== @@ -29341,7 +27812,7 @@ yargs@^14.0.0, yargs@^14.2.0, yargs@^14.2.3: y18n "^4.0.0" yargs-parser "^15.0.1" -yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1: +yargs@^15.3.1, yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== From d4dedb867f32657bdb84d141bd0e881d40ddd694 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:28:44 -0400 Subject: [PATCH 024/184] update ganache & ethereumjs version --- package.json | 2 +- packages/protocol/package.json | 6 +- packages/sdk/contractkit/package.json | 2 +- packages/sdk/identity/package.json | 2 +- packages/sdk/utils/package.json | 2 +- yarn.lock | 257 ++++++++++++++++++-------- 6 files changed, 191 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index 9650b549913..3ae095a01ff 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "typescript-tslint-plugin": "^0.5.4" }, "resolutions": { - "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", + "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", "@types/bn.js": "4.11.6", "bignumber.js": "9.0.0", "@ethereumjs/block": "4.0.1", diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 728b10541ab..9983025c760 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -55,8 +55,8 @@ "@celo/connect": "4.0.1-dev", "@celo/cryptographic-utils": "4.0.1-dev", "@celo/utils": "4.0.1-dev", - "@ethereumjs/util": "8.0.2", - "@ethereumjs/vm": "npm:@soloseng/ethereumjs-vm@6.2.3", + "@ethereumjs/util": "8.0.5", + "@ethereumjs/vm": "npm:@soloseng/ethereumjs-vm@6.4.1", "@ganache/console.log": "0.3.0", "@openzeppelin/upgrades": "^2.8.0", "@truffle/artifactor": "4.0.180", @@ -73,7 +73,7 @@ "ethereumjs-wallet": "^0.6.3", "ethereum-cryptography": "1.2.0", "fs-extra": "^5.0.0", - "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", + "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", "glob-fs": "^0.1.7", "graphql": "^14.1.1", "j6": "^1.0.2", diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 6855733981e..245800da17a 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -50,7 +50,7 @@ "@celo/protocol": "1.0.0", "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", - "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", + "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", "jest": "^29.0.2", "ts-node": "8.3.0", "typedoc": "^0.19.2", diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json index 7b4ae96abeb..289c652e3e5 100644 --- a/packages/sdk/identity/package.json +++ b/packages/sdk/identity/package.json @@ -44,7 +44,7 @@ "@celo/wallet-local": "4.0.1-dev", "@types/elliptic": "^6.4.12", "fetch-mock": "9.10.4", - "ganache": "npm:@soloseng/ganache@7.7.5-beta.3", + "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", "old-identity-sdk": "npm:@celo/identity@1.5.2" }, "engines": { diff --git a/packages/sdk/utils/package.json b/packages/sdk/utils/package.json index 1792f3f474e..c9cc8b42190 100644 --- a/packages/sdk/utils/package.json +++ b/packages/sdk/utils/package.json @@ -23,7 +23,7 @@ ], "dependencies": { "@celo/base": "4.0.1-dev", - "@ethereumjs/util": "8.0.2", + "@ethereumjs/util": "8.0.5", "@types/bn.js": "^5.1.0", "@types/elliptic": "^6.4.9", "@types/node": "^10.12.18", diff --git a/yarn.lock b/yarn.lock index 4ba0b58b24b..18c88c0a9c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1132,6 +1132,27 @@ eth-lib "^0.2.8" ethereumjs-util "^5.2.0" +"@chainsafe/as-sha256@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.3.1.tgz#3639df0e1435cab03f4d9870cc3ac079e57a6fc9" + integrity sha512-hldFFYuf49ed7DAakWVXSJODuq3pzJEguD8tQ7h+sGkM18vja+OFoJI9krnGmgzyuZC2ETX0NOIcCTy31v2Mtg== + +"@chainsafe/persistent-merkle-tree@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.4.2.tgz#4c9ee80cc57cd3be7208d98c40014ad38f36f7ff" + integrity sha512-lLO3ihKPngXLTus/L7WHKaw9PnNJWizlOF1H9NNzHP6Xvh82vzg9F2bzkXhYIFshMZ2gTCEz8tq6STe7r5NDfQ== + dependencies: + "@chainsafe/as-sha256" "^0.3.1" + +"@chainsafe/ssz@0.9.4": + version "0.9.4" + resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.9.4.tgz#696a8db46d6975b600f8309ad3a12f7c0e310497" + integrity sha512-77Qtg2N1ayqs4Bg/wvnWfg5Bta7iy7IRh8XqXh7oNMeP2HBbBwx8m6yTpA8p0EHItWPEBkgZd5S5/LSlp3GXuQ== + dependencies: + "@chainsafe/as-sha256" "^0.3.1" + "@chainsafe/persistent-merkle-tree" "^0.4.2" + case "^1.6.3" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1204,7 +1225,7 @@ resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA== -"@ethereumjs/block@4.0.1", "@ethereumjs/block@^4.0.1": +"@ethereumjs/block@4.0.1", "@ethereumjs/block@4.2.1", "@ethereumjs/block@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-4.0.1.tgz#bc865daa901c3165c43b1bad2c6db544d4e9b3dd" integrity sha512-cYkJaogUL5V3iZOSm7WgSP8Fvm9R/jN/dotRQZpj5SJ3fP6GF00xtmYpQGE10SnK/Lo+iyXwZ2K7M1zn/0wnXw== @@ -1217,7 +1238,7 @@ ethereum-cryptography "^1.1.2" ethers "^5.7.1" -"@ethereumjs/blockchain@6.0.2": +"@ethereumjs/blockchain@6.0.2", "@ethereumjs/blockchain@6.2.1": version "6.0.2" resolved "https://registry.yarnpkg.com/@ethereumjs/blockchain/-/blockchain-6.0.2.tgz#51f7b573dccc976077a699f08882276e54ab1fd8" integrity sha512-32zKVQ8iOb7oOwKqGsLvdAzGaTQP6FepW6ssTycJOZ2r0NAHcN8+dsk77mv48yZkuQ4kt0D/73bj8lApiO5Uew== @@ -1243,12 +1264,12 @@ crc-32 "^1.2.0" ethereumjs-util "^7.1.1" -"@ethereumjs/common@3.0.1", "@ethereumjs/common@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.0.1.tgz#c2dbd444d96e4014c7f7befd0529b5c1a02f590b" - integrity sha512-AHsJB7ydfb7TFCT7ORGY0tRiKkAylWZd/Qt6Lmc3Oycs66bMeE1JuYHbc0U6qsAZKZMFsUmL/UJDT/w7Z0cytw== +"@ethereumjs/common@3.1.1", "@ethereumjs/common@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.1.1.tgz#6f754c8933727ad781f63ca3929caab542fe184e" + integrity sha512-iEl4gQtcrj2udNhEizs04z7WA15ez1QoXL0XzaCyaNgwRyXezIg1DnfNeZUUpJnkrOF/0rYXyq2UFSLxt1NPQg== dependencies: - "@ethereumjs/util" "^8.0.0" + "@ethereumjs/util" "^8.0.5" crc-32 "^1.2.0" "@ethereumjs/common@^2.5.0", "@ethereumjs/common@^2.6.3", "@ethereumjs/common@^2.6.4": @@ -1259,6 +1280,14 @@ crc-32 "^1.2.0" ethereumjs-util "^7.1.5" +"@ethereumjs/common@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.0.1.tgz#c2dbd444d96e4014c7f7befd0529b5c1a02f590b" + integrity sha512-AHsJB7ydfb7TFCT7ORGY0tRiKkAylWZd/Qt6Lmc3Oycs66bMeE1JuYHbc0U6qsAZKZMFsUmL/UJDT/w7Z0cytw== + dependencies: + "@ethereumjs/util" "^8.0.0" + crc-32 "^1.2.0" + "@ethereumjs/ethash@2.0.1", "@ethereumjs/ethash@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-2.0.1.tgz#eb79d642ee5bd9200ed68080aa28753753c1271e" @@ -1271,37 +1300,54 @@ bigint-crypto-utils "^3.0.23" ethereum-cryptography "^1.1.2" -"@ethereumjs/evm@npm:@soloseng/ethereumjs-evm@1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-evm/-/ethereumjs-evm-1.2.4.tgz#7f6ac5bc9362f49c7d3ccaf2902887078e460da1" - integrity sha512-PtKPDqV6dMfKtDCV8WBys9jJAnmyX3+dBtTKGPsCcSHrEOzcdrTyQjUXo82vXDSLtyhjKYsgSu35FyRHAqop3g== +"@ethereumjs/evm@npm:@soloseng/ethereumjs-evm@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-evm/-/ethereumjs-evm-1.3.1.tgz#89786afeb1b017e70f96d0622312bfe9c5ff33df" + integrity sha512-9oVEhVS0UVq4qxCsTwuXMQpBpBeJNPKNoFI65Nxa4JvHuFG9ihYS0t2VJV2nFvqi3PPKX1doJ24LzPQSYiUVWg== dependencies: - "@ethereumjs/common" "3.0.1" - "@ethereumjs/util" "8.0.2" + "@ethereumjs/common" "3.1.1" + "@ethereumjs/tx" "4.1.1" + "@ethereumjs/util" "8.0.5" "@ethersproject/providers" "^5.7.1" debug "^4.3.3" ethereum-cryptography "^1.1.2" mcl-wasm "^0.7.1" rustbn.js "~0.2.0" -"@ethereumjs/rlp@4.0.0", "@ethereumjs/rlp@^4.0.0", "@ethereumjs/rlp@^4.0.0-beta.2": +"@ethereumjs/rlp@4.0.1", "@ethereumjs/rlp@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.1.tgz#626fabfd9081baab3d0a3074b0c7ecaf674aaa41" + integrity sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw== + +"@ethereumjs/rlp@^4.0.0", "@ethereumjs/rlp@^4.0.0-beta.2": version "4.0.0" resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.0.tgz#66719891bd727251a7f233f9ca80212d1994f8c8" integrity sha512-LM4jS5n33bJN60fM5EC8VeyhUgga6/DjCPBV2vWjnfVtobqtOiNC4SQ1MRFqyBSmJGGdB533JZWewyvlcdJtkQ== -"@ethereumjs/statemanager@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/statemanager/-/statemanager-1.0.1.tgz#1ded98f3c139af1f9b4b3feb8ea7272aaeb7348f" - integrity sha512-Ao9NPuoh7ijH+mexgCZdANSKF80Fd6DuzTgXUwag+uGhUclErjjJ7m2b4YCaUVwLkhgHPOTa8r2E4sPC/DltkQ== +"@ethereumjs/statemanager@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@ethereumjs/statemanager/-/statemanager-1.0.4.tgz#02fb3f05794a2476a78d73660745e9815b476e02" + integrity sha512-+dNZGqOUXlA+ifkSlz6AvEF/PCRZD7vqKcruoyGtaxOQ0gdfvL/lDiuzV07fECjrqPAEDnQwcO4CTGv+On/0wA== dependencies: - "@ethereumjs/common" "^3.0.1" - "@ethereumjs/rlp" "^4.0.0" + "@ethereumjs/common" "^3.1.1" + "@ethereumjs/rlp" "^4.0.1" debug "^4.3.3" ethereum-cryptography "^1.1.2" ethers "^5.7.1" js-sdsl "^4.1.4" -"@ethereumjs/trie@5.0.1", "@ethereumjs/trie@^5.0.1": +"@ethereumjs/trie@5.0.4": + version "5.0.4" + resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.4.tgz#eb06ce2c7957f6a8f07c0db43fb0335b256f3705" + integrity sha512-ycYtAF7BJAu9eaCtrEX+efE5xEQEfItRXXHBcTSMHsF7NfLHcniI0S7KUVYXbJ6imczBmnMHeggCqv8PYQbbOw== + dependencies: + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/util" "^8.0.5" + "@types/readable-stream" "^2.3.13" + ethereum-cryptography "^1.1.2" + readable-stream "^3.6.0" + +"@ethereumjs/trie@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.1.tgz#3cb5730450839c8a540ec48e16a7825a1d0897e5" integrity sha512-MA8uXR2pa+r8+wBvlyeZoUewwbUZe4Iy4zKi38THP6/flYvIIY+bTVjf/EA3jMhH68j6nJH5SFu5wi5SBdS/2A== @@ -1320,16 +1366,17 @@ "@ethereumjs/common" "^2.5.0" ethereumjs-util "^7.1.2" -"@ethereumjs/tx@4.0.1", "@ethereumjs/tx@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.0.1.tgz#bb8333e883952b61c40dbc7a3335d99cc5f1c2e4" - integrity sha512-JFq66cjjwnWOdKuDNNq0Hr1j04A546ymUo/8xnPa7wAm3s+RyGVt8VbaNF71/GJqN4tuY62gxvTfZ+B62foyPw== - dependencies: - "@ethereumjs/common" "^3.0.1" - "@ethereumjs/rlp" "^4.0.0" - "@ethereumjs/util" "^8.0.0" +"@ethereumjs/tx@4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.1.1.tgz#d1b5bf2c4fd3618f2f333b66e262848530d4686a" + integrity sha512-QDj7nuROfoeyK83RObMA0XCZ+LUDdneNkSCIekO498uEKTY25FxI4Whduc/6j0wdd4IqpQvkq+/7vxSULjGIBQ== + dependencies: + "@chainsafe/ssz" "0.9.4" + "@ethereumjs/common" "^3.1.1" + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/util" "^8.0.5" + "@ethersproject/providers" "^5.7.2" ethereum-cryptography "^1.1.2" - ethers "^5.7.1" "@ethereumjs/tx@^3.3.0", "@ethereumjs/tx@^3.3.2", "@ethereumjs/tx@^3.5.1": version "3.5.2" @@ -1339,6 +1386,17 @@ "@ethereumjs/common" "^2.6.4" ethereumjs-util "^7.1.5" +"@ethereumjs/tx@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.0.1.tgz#bb8333e883952b61c40dbc7a3335d99cc5f1c2e4" + integrity sha512-JFq66cjjwnWOdKuDNNq0Hr1j04A546ymUo/8xnPa7wAm3s+RyGVt8VbaNF71/GJqN4tuY62gxvTfZ+B62foyPw== + dependencies: + "@ethereumjs/common" "^3.0.1" + "@ethereumjs/rlp" "^4.0.0" + "@ethereumjs/util" "^8.0.0" + ethereum-cryptography "^1.1.2" + ethers "^5.7.1" + "@ethereumjs/util@8.0.2", "@ethereumjs/util@^8.0.0", "@ethereumjs/util@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.0.2.tgz#b7348fc7253649b0f00685a94546c6eee1fad819" @@ -1348,20 +1406,29 @@ async "^3.2.4" ethereum-cryptography "^1.1.2" -"@ethereumjs/vm@npm:@soloseng/ethereumjs-vm@6.2.3": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-vm/-/ethereumjs-vm-6.2.3.tgz#1f1dbd055698c35b2d993aab8a907ff7d3390167" - integrity sha512-+IP8/oqC3JCRIYwEIefGwJdxTPPTzjS9tUavQ9z39uvJEUf56+HIM4mk5wi++2bL6OP4u6pDZMFGnwA/Dh8VjA== - dependencies: - "@ethereumjs/block" "4.0.1" - "@ethereumjs/blockchain" "6.0.2" - "@ethereumjs/common" "3.0.1" - "@ethereumjs/evm" "npm:@soloseng/ethereumjs-evm@1.2.4" - "@ethereumjs/rlp" "4.0.0" - "@ethereumjs/statemanager" "1.0.1" - "@ethereumjs/trie" "5.0.1" - "@ethereumjs/tx" "4.0.1" - "@ethereumjs/util" "8.0.2" +"@ethereumjs/util@8.0.5", "@ethereumjs/util@^8.0.5": + version "8.0.5" + resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.0.5.tgz#b9088fc687cc13f0c1243d6133d145dfcf3fe446" + integrity sha512-259rXKK3b3D8HRVdRmlOEi6QFvwxdt304hhrEAmpZhsj7ufXEOTIc9JRZPMnXatKjECokdLNBcDOFBeBSzAIaw== + dependencies: + "@chainsafe/ssz" "0.9.4" + "@ethereumjs/rlp" "^4.0.1" + ethereum-cryptography "^1.1.2" + +"@ethereumjs/vm@npm:@soloseng/ethereumjs-vm@6.4.1": + version "6.4.1" + resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-vm/-/ethereumjs-vm-6.4.1.tgz#3410be54e4c26452f139aee5c99de277ad0dba2f" + integrity sha512-5ypbEalBtHDlEqnTbkkBYNGIcw9M8J/+XTXLXddhKmtKXXYli84iLkVJgitoDrCrDloRAR2LKYRyYWW7ldB3rg== + dependencies: + "@ethereumjs/block" "4.2.1" + "@ethereumjs/blockchain" "6.2.1" + "@ethereumjs/common" "3.1.1" + "@ethereumjs/evm" "npm:@soloseng/ethereumjs-evm@1.3.1" + "@ethereumjs/rlp" "4.0.1" + "@ethereumjs/statemanager" "1.0.4" + "@ethereumjs/trie" "5.0.4" + "@ethereumjs/tx" "4.1.1" + "@ethereumjs/util" "8.0.5" debug "^4.3.3" ethereum-cryptography "^1.1.2" mcl-wasm "^0.7.1" @@ -1625,7 +1692,7 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1": +"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2": version "5.7.2" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg== @@ -5543,7 +5610,7 @@ dependencies: "@trufflesuite/spinnies" "^0.1.1" -"@trufflesuite/bigint-buffer@1.1.10": +"@trufflesuite/bigint-buffer@*": version "1.1.10" resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.10.tgz#a1d9ca22d3cad1a138b78baaf15543637a3e1692" integrity sha512-pYIQC5EcMmID74t26GCC67946mgTJFiLXOT/BYozgrd4UEY2JHEGLhWi9cMiQCt5BSqFEvKkCHNnoj82SRjiEw== @@ -5580,6 +5647,16 @@ cli-cursor "^3.1.0" strip-ansi "^6.0.0" +"@trufflesuite/uws-js-unofficial@20.10.0-unofficial.2": + version "20.10.0-unofficial.2" + resolved "https://registry.yarnpkg.com/@trufflesuite/uws-js-unofficial/-/uws-js-unofficial-20.10.0-unofficial.2.tgz#7ed613ce3260cd5d1773a4d5787a2a106acd1a91" + integrity sha512-oQQlnS3oNeGsgS4K3KCSSavJgSb0W9D5ktZs4FacX9VbM7b+NlhjH96d6/G4fMrz+bc5MXRyco419on0X0dvRA== + dependencies: + ws "8.2.3" + optionalDependencies: + bufferutil "4.0.5" + utf-8-validate "5.0.7" + "@tsconfig/node10@^1.0.7": version "1.0.9" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" @@ -8538,6 +8615,11 @@ cardinal@^2.1.1: ansicolors "~0.3.2" redeyed "~2.1.0" +case@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" + integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== + caseless@^0.12.0, caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -13000,12 +13082,13 @@ funpermaproxy@^1.0.1: resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== -ganache@7.7.3, ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.7.5-beta.3": - version "7.7.5-beta.3" - resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.7.5-beta.3.tgz#078e3c685c0b97a5b8d11c8c9892e082d2d76a9a" - integrity sha512-IwopVN98CdRDRNPFTUe38DZgPWswfmdspNNh/ZmM9G1nSc+v50KUK5UFGIjPxZMCZs8mnHGL0kKK4JQq/Ivz/w== +ganache@7.7.3, ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.8.0-beta.1": + version "7.8.0-beta.1" + resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.8.0-beta.1.tgz#168d3c2f1ea05c350e972f227872d4a4b15e5f9e" + integrity sha512-ptjs631aKpxG7xexDDyxh5NevKQaUcSfm3/Aeh0smJ/3xQgNrJ+st6CVYVbVbhGkgNcq9NIvCCaIgt0L64GOCA== dependencies: "@trufflesuite/bigint-buffer" "1.1.10" + "@trufflesuite/uws-js-unofficial" "20.10.0-unofficial.2" "@types/bn.js" "^5.1.0" "@types/lru-cache" "5.1.1" "@types/seedrandom" "3.0.1" @@ -16914,22 +16997,22 @@ keccak256@^1.0.0: buffer "^6.0.3" keccak "^3.0.2" -keccak@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" - integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA== +keccak@*: + version "3.0.3" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" + integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" + readable-stream "^3.6.0" -keccak@3.0.2, keccak@^3.0.0, keccak@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" - integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== +keccak@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" + integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" - readable-stream "^3.6.0" keccak@^1.0.2: version "1.4.0" @@ -16941,6 +17024,15 @@ keccak@^1.0.2: nan "^2.2.1" safe-buffer "^5.1.0" +keccak@^3.0.0, keccak@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" + integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" + keytar@^7.3.0: version "7.9.0" resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" @@ -17300,6 +17392,15 @@ level@^8.0.0: browser-level "^1.0.1" classic-level "^1.2.0" +leveldown@*: + version "6.1.1" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.1.tgz#0f0e480fa88fd807abf94c33cb7e40966ea4b5ce" + integrity sha512-88c+E+Eizn4CkQOBHwqlCJaTNEjGpaEIikn1S+cINc5E9HEvJ77bqY4JY/HxT5u0caWqsc3P3DcFIKBI1vHt+A== + dependencies: + abstract-leveldown "^7.2.0" + napi-macros "~2.0.0" + node-gyp-build "^4.3.0" + leveldown@5.6.0, leveldown@^5.4.0: version "5.6.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" @@ -17309,15 +17410,6 @@ leveldown@5.6.0, leveldown@^5.4.0: napi-macros "~2.0.0" node-gyp-build "~4.1.0" -leveldown@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee" - integrity sha512-8C7oJDT44JXxh04aSSsfcMI8YiaGRhOFI9/pMEL7nWJLVsWajDPTRxsSHTM2WcTVY5nXM+SuRHzPPi0GbnDX+w== - dependencies: - abstract-leveldown "^7.2.0" - napi-macros "~2.0.0" - node-gyp-build "^4.3.0" - levelup@4.4.0, levelup@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" @@ -19052,6 +19144,11 @@ node-addon-api@^4.2.0, node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +node-addon-api@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762" + integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA== + node-emoji@^1.4.1: version "1.11.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" @@ -22411,13 +22508,13 @@ scryptsy@^2.1.0: resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== -secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" - integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== +secp256k1@*: + version "5.0.0" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-5.0.0.tgz#be6f0c8c7722e2481e9773336d351de8cddd12f7" + integrity sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA== dependencies: elliptic "^6.5.4" - node-addon-api "^2.0.0" + node-addon-api "^5.0.0" node-gyp-build "^4.2.0" secp256k1@^3.0.1: @@ -22434,6 +22531,15 @@ secp256k1@^3.0.1: nan "^2.14.0" safe-buffer "^5.1.2" +secp256k1@^4.0.0, secp256k1@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" + integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== + dependencies: + elliptic "^6.5.4" + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + seed-random@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" @@ -27464,6 +27570,11 @@ ws@7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== +ws@8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== + ws@^3.0.0, ws@^3.3.1: version "3.3.3" resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" From eb47b9bbfd57c5f427faadfbd47519725aaab74c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 22 Apr 2023 15:20:02 -0400 Subject: [PATCH 025/184] - removed resolutions - using fixed node-fetch types version --- package.json | 5 +- packages/celotool/package.json | 2 +- yarn.lock | 6015 +++++++++++++------------------- 3 files changed, 2446 insertions(+), 3576 deletions(-) diff --git a/package.json b/package.json index 3ae095a01ff..6b1c52f5091 100644 --- a/package.json +++ b/package.json @@ -85,9 +85,6 @@ "resolutions": { "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", "@types/bn.js": "4.11.6", - "bignumber.js": "9.0.0", - "@ethereumjs/block": "4.0.1", - "@ethereumjs/blockchain": "6.0.2", - "@ethereumjs/ethash": "2.0.1" + "bignumber.js": "9.0.0" } } diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 6e67e82a434..52451b361aa 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -52,7 +52,7 @@ "@types/chai": "^4.1.3", "@types/dotenv": "^8.2.0", "@types/mocha": "^7.0.2", - "@types/node-fetch": "^2.5.7", + "@types/node-fetch": "2.5.7", "@types/prompts": "^1.1.1", "@types/string-hash": "^1.1.1", "@types/yargs": "^13.0.2", diff --git a/yarn.lock b/yarn.lock index 18c88c0a9c3..e8747a77c0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,28 +2,28 @@ # yarn lockfile v1 -"@0x/assert@^3.0.35": - version "3.0.35" - resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.35.tgz#7aca28d2423ac26200a44d232b9e9bd0a67879f2" - integrity sha512-OqG7CEfBK5OJmaiBBKALYqPiftYpj4p/JTdfZouVtRYYT4dLgFysMfZLbFo/X08PIauGmPtv/GnW/tQwXEZpxg== +"@0x/assert@^3.0.35", "@0x/assert@^3.0.36": + version "3.0.36" + resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.36.tgz#91f82973e11826c08011a5830508246262b43284" + integrity sha512-sUtrV5MhixXvWZpATjFqIDtgvvv64duSTuOyPdPJjB+/Lcl5jQhlSNuoN0X3XP0P79Sp+6tuez5MupgFGPA2QQ== dependencies: - "@0x/json-schemas" "^6.4.5" + "@0x/json-schemas" "^6.4.6" "@0x/typescript-typings" "^5.3.2" "@0x/utils" "^7.0.0" "@types/node" "12.12.54" lodash "^4.17.21" valid-url "^1.0.9" -"@0x/dev-utils@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-5.0.1.tgz#bd2f69a18104add32a8ba351677ce36484687030" - integrity sha512-R9qN1LNmnOcXAVEovd4Op+YRcMi3LFGr5npCN0vXZ/0FsC2FGawzfph9ugA5ibbDQBnQg74IAtaF2Dicyr7UdA== +"@0x/dev-utils@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-5.0.3.tgz#8de9b2f8241caa649ceffc6b891122aa923150a0" + integrity sha512-V58tT2aiiHNSQtEt2XQWZDsPMsQ4wPDnjZRUaW38W46QasIFfCbcpKmfCsAGJyFxM7t0m0JJJwmYTJwZhCGcoQ== dependencies: - "@0x/subproviders" "^7.0.1" + "@0x/subproviders" "^8.0.1" "@0x/types" "^3.3.7" "@0x/typescript-typings" "^5.3.2" "@0x/utils" "^7.0.0" - "@0x/web3-wrapper" "^8.0.0" + "@0x/web3-wrapper" "^8.0.1" "@types/node" "12.12.54" "@types/web3-provider-engine" "^14.0.0" chai "^4.0.1" @@ -34,28 +34,28 @@ lodash "^4.17.21" web3-provider-engine "16.0.4" -"@0x/json-schemas@^6.4.5": - version "6.4.5" - resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.4.5.tgz#c509411360fcf0a6aa5774ba99e337ac4427fdf0" - integrity sha512-G43tVIGMwWwaEFts3vwRKSnpnRmv1pOsfHtQTdIuh8+tnChlgGoWcBN8cht1wHNv/mUzYL/CBxoT/OZvlJFY8A== +"@0x/json-schemas@^6.4.6": + version "6.4.6" + resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.4.6.tgz#3904b8219ad2fefdf47ddb94fb65c1b9fb82d1d7" + integrity sha512-TaqvhOkmLN/vkcpMUNVFZBTnWP05ZVo9iGAnP1CG/B8l4rvnUbLZvWx8KeDKs62I/5d7jdYISvXyOwP4EwrG4w== dependencies: "@0x/typescript-typings" "^5.3.2" "@types/node" "12.12.54" ajv "^6.12.5" lodash.values "^4.3.0" -"@0x/sol-compiler@^4.8.3": - version "4.8.3" - resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.8.3.tgz#9be058bad352ad3d3b81713dd18c69596fac7eef" - integrity sha512-ZYAoXK7J5VcU3g1EL8vjc9SCLIJCenIlcJ4m1pxSrUrHbnRHLesTRj8GTsV/PRqjwHgQNeCiT62ina3Qk8aKdg== +"@0x/sol-compiler@^4.8.3", "@0x/sol-compiler@^4.8.5": + version "4.8.5" + resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.8.5.tgz#49579cee7de838d8ebd1bfd094a0d30a9e96506c" + integrity sha512-hAc3ZjpD+/fgSt/UQaAim8d2fQL3kWpnP5+tSEVf3/xetDDp3BhTOMi+wKnVuYo9FzuTgHx5MFueWM+mojE41A== dependencies: - "@0x/assert" "^3.0.35" - "@0x/json-schemas" "^6.4.5" + "@0x/assert" "^3.0.36" + "@0x/json-schemas" "^6.4.6" "@0x/sol-resolver" "^3.1.13" "@0x/types" "^3.3.7" "@0x/typescript-typings" "^5.3.2" "@0x/utils" "^7.0.0" - "@0x/web3-wrapper" "^8.0.0" + "@0x/web3-wrapper" "^8.0.1" "@types/node" "12.12.54" "@types/yargs" "^11.0.0" chalk "^2.3.0" @@ -74,12 +74,12 @@ yargs "^17.5.1" "@0x/sol-coverage@^4.0.47": - version "4.0.47" - resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.47.tgz#53b4f14118fe9758fb1b60114bd01c9e3eaa7e9f" - integrity sha512-9L4eke1j5N7HWCTuPcCss7h2K1cOVEz2vQAwmdEQyVklw+YfSYJBVVEYyglcFvrf0vUCmilKppsAqfYceWW3pg== + version "4.0.49" + resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.49.tgz#15bb1210263a7dacc5a19f939892a9fb15bf2e5a" + integrity sha512-gphKAO63NBysXgFV2fqxHmnBnHnD/i6rarmEwMKMKjWJ1shqQsKgJL984jBtek0UPsR5X4QM5tcHNKuCSe2Tuw== dependencies: - "@0x/sol-tracing-utils" "^7.3.3" - "@0x/subproviders" "^7.0.1" + "@0x/sol-tracing-utils" "^7.3.5" + "@0x/subproviders" "^8.0.1" "@0x/typescript-typings" "^5.3.2" "@types/minimatch" "^3.0.3" "@types/node" "12.12.54" @@ -89,12 +89,12 @@ web3-provider-engine "16.0.4" "@0x/sol-profiler@^4.1.37": - version "4.1.37" - resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.37.tgz#6172f1f67b243ccf8098941ab95abaf882adaa82" - integrity sha512-vOj+xp6sJpYY/4Dmf9OXYsaLYoz+6EdmmUASVJrQMANuuC15CjQ5UdMOih+LlRvfKV9wKp+YvKeYInhf2v9/iw== + version "4.1.39" + resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.39.tgz#2a2f13056d8306bdea242df1d2566c0d80ac5e1e" + integrity sha512-yrEHRun6RvXsg1NWhx4iH/YBeJXZDTQRAyNGQai+P1hrcOE7yoZ7PKtMv+69r3vCH38xVcWzF6xQKa7p4BIvlA== dependencies: - "@0x/sol-tracing-utils" "^7.3.3" - "@0x/subproviders" "^7.0.1" + "@0x/sol-tracing-utils" "^7.3.5" + "@0x/subproviders" "^8.0.1" "@0x/typescript-typings" "^5.3.2" "@0x/utils" "^7.0.0" "@types/node" "12.12.54" @@ -114,12 +114,12 @@ lodash "^4.17.21" "@0x/sol-trace@^3.0.47": - version "3.0.47" - resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.47.tgz#1da8ec5cacd85893cb9c017dffa0a9cd774a052d" - integrity sha512-ufGVN57iMGoO+ke9rCLnnYdjnoZGi0EHLcQyivB//WdVtFWWZx5sdcIOR1FDZQXp0lvchh3gbbd5kDV0gZs7zA== + version "3.0.49" + resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.49.tgz#10b2a4e079c187a11d3fca9d32031c10fb3d0a7e" + integrity sha512-mCNbUCX6Oh1Z1e1g4AsD7sSbgMN7IGQyR0w+4xQYApgjwtYOaRPZMiluMXqp9nNHX75LwCfVd7NEIJIUMVQf2A== dependencies: - "@0x/sol-tracing-utils" "^7.3.3" - "@0x/subproviders" "^7.0.1" + "@0x/sol-tracing-utils" "^7.3.5" + "@0x/subproviders" "^8.0.1" "@0x/typescript-typings" "^5.3.2" "@types/node" "12.12.54" chalk "^2.3.0" @@ -129,18 +129,18 @@ loglevel "^1.6.1" web3-provider-engine "16.0.4" -"@0x/sol-tracing-utils@^7.3.3": - version "7.3.3" - resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.3.3.tgz#05aef503007297d55bf537260c582573b88aa605" - integrity sha512-piLT43xm0ASDkIHQ+1i9dnboAIiP3geAjaDoHZRSCOmkjq07H9Cr1AB+8lWSCweoiPpTeJNuv/h/K1yDv0nTVQ== +"@0x/sol-tracing-utils@^7.3.5": + version "7.3.5" + resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.3.5.tgz#9fe3fb36462424a72437a0310d872611bc5f970a" + integrity sha512-KzLTcUcLiQD5N/NzkZnIwI0i4w775z4w/H0o2FeM3Gp/0BcBx2DZ+sqKVoCEUSussm+jx2v8MNJnM3wcdvvDlg== dependencies: - "@0x/dev-utils" "^5.0.1" - "@0x/sol-compiler" "^4.8.3" + "@0x/dev-utils" "^5.0.3" + "@0x/sol-compiler" "^4.8.5" "@0x/sol-resolver" "^3.1.13" - "@0x/subproviders" "^7.0.1" + "@0x/subproviders" "^8.0.1" "@0x/typescript-typings" "^5.3.2" "@0x/utils" "^7.0.0" - "@0x/web3-wrapper" "^8.0.0" + "@0x/web3-wrapper" "^8.0.1" "@types/node" "12.12.54" "@types/solidity-parser-antlr" "^0.2.3" chalk "^2.3.0" @@ -187,6 +187,30 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^5.51.1" +"@0x/subproviders@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-8.0.1.tgz#b934547bfa1c8049030b243a134de9755792d53a" + integrity sha512-Lax7Msb1Ef9D6Dd7PQ19oPgjl5GIrKje7XsrO7YCfx5A0RM3Hr4nSQIxgg78jwvuulSFxQ5Sr8WiZ2hTHATtQg== + dependencies: + "@0x/assert" "^3.0.36" + "@0x/types" "^3.3.7" + "@0x/typescript-typings" "^5.3.2" + "@0x/utils" "^7.0.0" + "@0x/web3-wrapper" "^8.0.1" + "@ethereumjs/common" "^2.6.3" + "@ethereumjs/tx" "^3.5.1" + "@types/hdkey" "^0.7.0" + "@types/node" "12.12.54" + "@types/web3-provider-engine" "^14.0.0" + bip39 "2.5.0" + ethereum-types "^3.7.1" + ethereumjs-util "^7.1.5" + ganache "^7.4.0" + hdkey "2.1.0" + json-rpc-error "2.0.0" + lodash "^4.17.21" + web3-provider-engine "16.0.4" + "@0x/types@^3.3.7": version "3.3.7" resolved "https://registry.yarnpkg.com/@0x/types/-/types-3.3.7.tgz#2a8556b3398b6d6fac942c63de23ab22836624ee" @@ -228,13 +252,13 @@ js-sha3 "^0.7.0" lodash "^4.17.21" -"@0x/web3-wrapper@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-8.0.0.tgz#c92bd794363e99b7181810547199bd8cd6aca6e8" - integrity sha512-bDaoXT+3L/hhDARQot8OSfdfReAscQYMUIB/Xy2ZLqwS6ajpGpYS13uVQ+UWmFWgNq4cAWBB96PWVEbL8gVgig== +"@0x/web3-wrapper@^8.0.0", "@0x/web3-wrapper@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-8.0.1.tgz#3625e63737d005fe6a92b71d0e676b4d03e88c60" + integrity sha512-2rqugeCld5r/3yg+Un9sPCUNVeZW5J64Fm6i/W6qRE87X+spIJG48oJymTjSMDXw/w3FaP4nAvhSj2C5fvhN6w== dependencies: - "@0x/assert" "^3.0.35" - "@0x/json-schemas" "^6.4.5" + "@0x/assert" "^3.0.36" + "@0x/json-schemas" "^6.4.6" "@0x/typescript-typings" "^5.3.2" "@0x/utils" "^7.0.0" "@types/node" "12.12.54" @@ -243,18 +267,18 @@ ethers "~4.0.4" lodash "^4.17.21" -"@ampproject/remapping@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== +"@ampproject/remapping@^2.2.0": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" + integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== dependencies: - "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" "@apidevtools/json-schema-ref-parser@^9.0.3": - version "9.0.9" - resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#d720f9256e3609621280584f2b47ae165359268b" - integrity sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w== + version "9.1.2" + resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.2.tgz#8ff5386b365d4c9faa7c8b566ff16a46a577d9b8" + integrity sha512-r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg== dependencies: "@jsdevtools/ono" "^7.1.3" "@types/json-schema" "^7.0.6" @@ -280,23 +304,48 @@ "@types/node" "^10.1.0" long "^4.0.0" +"@apollo/protobufjs@1.2.7": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.7.tgz#3a8675512817e4a046a897e5f4f16415f16a7d8a" + integrity sha512-Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + long "^4.0.0" + +"@apollo/usage-reporting-protobuf@^4.0.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.0.tgz#b54b8c32702bbe81aa0e399076ddabaf75a13f9b" + integrity sha512-hXouMuw5pQVkzi8dgMybmr6Y11+eRmMQVoB5TF0HyTwAg9SOq/v3OCuiYqcVUKdBcskU9Msp+XvjAk0GKpWCwQ== + dependencies: + "@apollo/protobufjs" "1.2.7" + "@apollo/utils.dropunuseddefinitions@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929" integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg== "@apollo/utils.keyvaluecache@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.1.tgz#46f310f859067efe9fa126156c6954f8381080d2" - integrity sha512-nLgYLomqjVimEzQ4cdvVQkcryi970NDvcRVPfd0OPeXhBfda38WjBq+WhQFk+czSHrmrSp34YHBxpat0EtiowA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz#2bfe358c4d82f3a0950518451996758c52613f57" + integrity sha512-p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg== dependencies: "@apollo/utils.logger" "^1.0.0" - lru-cache "^7.10.1" + lru-cache "7.10.1 - 7.13.1" "@apollo/utils.logger@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.0.tgz#6e3460a2250c2ef7c2c3b0be6b5e148a1596f12b" - integrity sha512-dx9XrjyisD2pOa+KsB5RcDbWIAdgC91gJfeyLCgy0ctJMjQe7yZK5kdWaWlaOoCeX0z6YI9iYlg7vMPyMpQF3Q== + version "1.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.1.tgz#aea0d1bb7ceb237f506c6bbf38f10a555b99a695" + integrity sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA== "@apollo/utils.printwithreducedwhitespace@^1.1.0": version "1.1.0" @@ -321,16 +370,16 @@ integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w== "@apollo/utils.usagereporting@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.0.tgz#b81df180f4ca78b91a22cb49105174a7f070db1e" - integrity sha512-5PL7hJMkTPmdo3oxPtigRrIyPxDk/ddrUryHPDaezL1lSFExpNzsDd2f1j0XJoHOg350GRd3LyD64caLA2PU1w== + version "1.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz#3c70b49e554771659576fe35381c7a4b321d27fd" + integrity sha512-6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ== dependencies: + "@apollo/usage-reporting-protobuf" "^4.0.0" "@apollo/utils.dropunuseddefinitions" "^1.1.0" "@apollo/utils.printwithreducedwhitespace" "^1.1.0" "@apollo/utils.removealiases" "1.0.0" "@apollo/utils.sortast" "^1.1.0" "@apollo/utils.stripsensitiveliterals" "^1.2.0" - apollo-reporting-protobuf "^3.3.1" "@apollographql/apollo-tools@^0.5.3": version "0.5.4" @@ -360,9 +409,9 @@ tslib "^2.2.0" "@azure/core-client@^1.0.0", "@azure/core-client@^1.3.0", "@azure/core-client@^1.5.0": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.6.1.tgz#a1aad3f7c69b6e5d9dddb39fabaeba013eac9313" - integrity sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA== + version "1.7.2" + resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.7.2.tgz#e1e0670c9a5086dd62fd0080d2fd8b426babad9e" + integrity sha512-ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.4.0" @@ -382,36 +431,36 @@ "@azure/core-rest-pipeline" "^1.3.0" "@azure/core-lro@^2.2.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.3.0.tgz#f972e42f58db570ff67abc919695be8517b985d3" - integrity sha512-n53pk9Gs450rv1zDr9H7aPmMkYHMu9Bwks9qFlK+P46b4virATRf3TNuBZH7DIGVs8ePjtRCNYhcM4D+/Gyn6A== + version "2.5.2" + resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.5.2.tgz#712439f12b39ade7576f55780a4e005472c67b19" + integrity sha512-tucUutPhBwCPu6v16KEFYML81npEL6gnT+iwewXvK5ZD55sr0/Vw2jfQETMiKVeARRrXHB2QQ3SpxxGi1zAUWg== dependencies: "@azure/abort-controller" "^1.0.0" + "@azure/core-util" "^1.2.0" "@azure/logger" "^1.0.0" tslib "^2.2.0" "@azure/core-paging@^1.1.1": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.3.0.tgz#ebf6520a931be7d5ff1cf58bc4fe6c14d6a3080d" - integrity sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg== + version "1.5.0" + resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.5.0.tgz#5a5b09353e636072e6a7fc38f7879e11d0afb15f" + integrity sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw== dependencies: tslib "^2.2.0" "@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.3.0", "@azure/core-rest-pipeline@^1.8.0", "@azure/core-rest-pipeline@^1.9.1": - version "1.9.2" - resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.2.tgz#47ee72ca96e2b82e3d1362c29fd7688dc7464527" - integrity sha512-8rXI6ircjenaLp+PkOFpo37tQ1PQfztZkfVj97BIF3RPxHAsoVSgkJtu3IK/bUEWcb7HzXSoyBe06M7ODRkRyw== + version "1.10.3" + resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.3.tgz#7603afd71ff3c290351dbeeab2c814832e47b8ef" + integrity sha512-AMQb0ttiGJ0MIV/r+4TVra6U4+90mPeOveehFnrqKlo7dknPJYdJ61wOzYJXJjDxF8LcCtSogfRelkq+fCGFTw== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.4.0" "@azure/core-tracing" "^1.0.1" - "@azure/core-util" "^1.0.0" + "@azure/core-util" "^1.3.0" "@azure/logger" "^1.0.0" form-data "^4.0.0" http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" tslib "^2.2.0" - uuid "^8.3.0" "@azure/core-tracing@1.0.0-preview.12": version "1.0.0-preview.12" @@ -428,11 +477,12 @@ dependencies: tslib "^2.2.0" -"@azure/core-util@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.1.0.tgz#36736b274e9abee4b6cc6e4d162683b4e1e3db52" - integrity sha512-+i93lNJNA3Pl3KSuC6xKP2jTL4YFeDfO6VNOaYdk0cppZcLCxt811gS878VsqsCisaltdhl9lhMzK5kbxCiF4w== +"@azure/core-util@^1.0.0", "@azure/core-util@^1.2.0", "@azure/core-util@^1.3.0": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.3.1.tgz#e830b99231e2091a2dc9ed652fff1cda69ba6582" + integrity sha512-pjfOUAb+MPLODhGuXot/Hy8wUgPD0UTqYkY3BiYcwEETrLcUCVM1t0roIvlQMgvn1lc48TGy5bsonsFpF862Jw== dependencies: + "@azure/abort-controller" "^1.0.0" tslib "^2.2.0" "@azure/identity@^1.1.0": @@ -460,9 +510,9 @@ keytar "^7.3.0" "@azure/keyvault-keys@^4.1.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@azure/keyvault-keys/-/keyvault-keys-4.5.0.tgz#28f03eb974fdd0f9b2694f42ce7eaf0630d28319" - integrity sha512-F+0qpUrIxp1/uuQ3sFsAf4rTXErFwmuVLoXlD2e3ebrONrmYjqszwmlN4tBqAag1W9wGuZTL0jE8X8b+LB83ow== + version "4.7.0" + resolved "https://registry.yarnpkg.com/@azure/keyvault-keys/-/keyvault-keys-4.7.0.tgz#a117935fc3a87ff2f9a5393352a96814c2f33c01" + integrity sha512-HScWdORbRCKi1vdKI6EChe/t/P/zV7jcGZWfj18BOyeensk5d1/Ynfx1t6xfAy5zUIQvAWVU97hXdCznDpULbQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -477,9 +527,9 @@ tslib "^2.2.0" "@azure/keyvault-secrets@^4.1.0": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@azure/keyvault-secrets/-/keyvault-secrets-4.5.1.tgz#0a06a0c279bfaddaf53e9cddcf307932eeb54822" - integrity sha512-DTfEC/fflo8AcvLb0P6Qhu1B3uxQiX5+dZ7HISc3hZMp3caDKvXae+gTCDDE1piTaA3AnYglAgzRnIE5vdbS4g== + version "4.7.0" + resolved "https://registry.yarnpkg.com/@azure/keyvault-secrets/-/keyvault-secrets-4.7.0.tgz#a9b7aa460cd3e6a47f6a7eb0027f45f23df8eb45" + integrity sha512-YvlFXRQ+SI5NT4GtSFbb6HGo6prW3yzDab8tr6vga2/SjDQew3wJsCAAr/xwZz6XshFXCYEX26CDKmPf+SJKJg== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -494,9 +544,9 @@ tslib "^2.2.0" "@azure/logger@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96" - integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.4.tgz#28bc6d0e5b3c38ef29296b32d35da4e483593fa1" + integrity sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg== dependencies: tslib "^2.2.0" @@ -506,9 +556,9 @@ integrity sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw== "@azure/ms-rest-js@^2.0.4": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz#185a9d643ea55c696134af76a5c6026c94e26217" - integrity sha512-0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg== + version "2.6.6" + resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz#a2ae4a515565ae1b73729b52b25875853bb3240a" + integrity sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q== dependencies: "@azure/core-auth" "^1.1.4" abort-controller "^3.0.0" @@ -518,7 +568,7 @@ tslib "^1.10.0" tunnel "0.0.6" uuid "^8.3.2" - xml2js "^0.4.19" + xml2js "^0.5.0" "@azure/ms-rest-nodeauth@^3.0.10": version "3.1.1" @@ -546,47 +596,40 @@ jsonwebtoken "^8.5.1" uuid "^8.3.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.21.4": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.21.4": +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.0.tgz#d2f5f4f2033c00de8096be3c9f45772563e150c3" - integrity sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ== + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" + integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.0" - "@babel/helper-compilation-targets" "^7.19.0" - "@babel/helper-module-transforms" "^7.19.0" - "@babel/helpers" "^7.19.0" - "@babel/parser" "^7.19.0" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.4" + "@babel/helper-compilation-targets" "^7.21.4" + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helpers" "^7.21.0" + "@babel/parser" "^7.21.4" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.4" + "@babel/types" "^7.21.4" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.12.5", "@babel/generator@^7.21.4": +"@babel/generator@^7.21.4", "@babel/generator@^7.7.2": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== @@ -596,16 +639,7 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/generator@^7.19.0", "@babel/generator@^7.7.2": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a" - integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg== - dependencies: - "@babel/types" "^7.19.0" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/helper-compilation-targets@^7.19.0": +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== @@ -616,21 +650,24 @@ lru-cache "^5.1.1" semver "^6.3.0" +"@babel/helper-define-polyfill-provider@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" + integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== + dependencies: + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-plugin-utils" "^7.16.7" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" + "@babel/helper-environment-visitor@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== -"@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== - dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0": +"@babel/helper-function-name@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== @@ -638,13 +675,6 @@ "@babel/template" "^7.20.7" "@babel/types" "^7.21.0" -"@babel/helper-get-function-arity@^7.10.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== - dependencies: - "@babel/types" "^7.16.7" - "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" @@ -652,21 +682,14 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-imports@^7.8.3": +"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== dependencies: "@babel/types" "^7.21.4" -"@babel/helper-module-transforms@^7.19.0": +"@babel/helper-module-transforms@^7.21.2": version "7.21.2" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== @@ -680,12 +703,7 @@ "@babel/traverse" "^7.21.2" "@babel/types" "^7.21.2" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.3": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== @@ -697,13 +715,6 @@ dependencies: "@babel/types" "^7.20.2" -"@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== - dependencies: - "@babel/types" "^7.11.0" - "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" @@ -716,11 +727,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== - "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" @@ -731,7 +737,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== -"@babel/helpers@^7.19.0": +"@babel/helpers@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== @@ -749,17 +755,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" - integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== - -"@babel/parser@^7.14.7", "@babel/parser@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" - integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== - -"@babel/parser@^7.20.7", "@babel/parser@^7.21.4": +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== @@ -779,11 +775,11 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c" - integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -863,37 +859,25 @@ "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-runtime@^7.5.5": - version "7.9.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd" - integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w== - dependencies: - "@babel/helper-module-imports" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - resolve "^1.8.1" - semver "^5.5.1" - -"@babel/runtime@^7.0.0": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.9.tgz#97dbe2116e2630c489f22e0656decd60aaa1fcee" - integrity sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.12.1", "@babel/runtime@^7.15.4", "@babel/runtime@^7.6.3", "@babel/runtime@^7.9.2": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78" - integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA== + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz#2e1da21ca597a7d01fc96b699b21d8d2023191aa" + integrity sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA== dependencies: - regenerator-runtime "^0.13.4" + "@babel/helper-module-imports" "^7.21.4" + "@babel/helper-plugin-utils" "^7.20.2" + babel-plugin-polyfill-corejs2 "^0.3.3" + babel-plugin-polyfill-corejs3 "^0.6.0" + babel-plugin-polyfill-regenerator "^0.4.1" + semver "^6.3.0" -"@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.10.4", "@babel/template@^7.18.10", "@babel/template@^7.20.7": +"@babel/template@^7.20.7", "@babel/template@^7.3.3": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== @@ -902,47 +886,7 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/template@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" - -"@babel/traverse@^7.1.0": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" - integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.19" - -"@babel/traverse@^7.19.0", "@babel/traverse@^7.7.2": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.0.tgz#eb9c561c7360005c592cc645abafe0c3c4548eed" - integrity sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.0" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.19.0" - "@babel/types" "^7.19.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2": +"@babel/traverse@^7.1.0", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.7.2": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== @@ -958,16 +902,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.11.0", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" - integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== - dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@babel/types@^7.10.4", "@babel/types@^7.16.7", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4": +"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== @@ -1225,30 +1160,31 @@ resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA== -"@ethereumjs/block@4.0.1", "@ethereumjs/block@4.2.1", "@ethereumjs/block@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-4.0.1.tgz#bc865daa901c3165c43b1bad2c6db544d4e9b3dd" - integrity sha512-cYkJaogUL5V3iZOSm7WgSP8Fvm9R/jN/dotRQZpj5SJ3fP6GF00xtmYpQGE10SnK/Lo+iyXwZ2K7M1zn/0wnXw== - dependencies: - "@ethereumjs/common" "^3.0.1" - "@ethereumjs/rlp" "^4.0.0" - "@ethereumjs/trie" "^5.0.1" - "@ethereumjs/tx" "^4.0.1" - "@ethereumjs/util" "^8.0.0" +"@ethereumjs/block@4.2.1", "@ethereumjs/block@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-4.2.1.tgz#cb0d8b770fe69c61e6e41d6693d285de76b3a7cb" + integrity sha512-Z/Ty8EkD8o5tvEX5JPrr0pvf60JkSxmwV231aBZ744N75SLvq54dTu/Gk7azC/2xaWhSu1dOp5D5+bryqgG5Cg== + dependencies: + "@ethereumjs/common" "^3.1.1" + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/trie" "^5.0.4" + "@ethereumjs/tx" "^4.1.1" + "@ethereumjs/util" "^8.0.5" ethereum-cryptography "^1.1.2" ethers "^5.7.1" -"@ethereumjs/blockchain@6.0.2", "@ethereumjs/blockchain@6.2.1": - version "6.0.2" - resolved "https://registry.yarnpkg.com/@ethereumjs/blockchain/-/blockchain-6.0.2.tgz#51f7b573dccc976077a699f08882276e54ab1fd8" - integrity sha512-32zKVQ8iOb7oOwKqGsLvdAzGaTQP6FepW6ssTycJOZ2r0NAHcN8+dsk77mv48yZkuQ4kt0D/73bj8lApiO5Uew== - dependencies: - "@ethereumjs/block" "^4.0.1" - "@ethereumjs/common" "^3.0.1" - "@ethereumjs/ethash" "^2.0.1" - "@ethereumjs/rlp" "^4.0.0" - "@ethereumjs/trie" "^5.0.1" - "@ethereumjs/util" "^8.0.2" +"@ethereumjs/blockchain@6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/blockchain/-/blockchain-6.2.1.tgz#9bda6b26dff7399a8f6f71efa86ae6dfe343f916" + integrity sha512-gP7EtXAPMDna/e28ZMDErfatF/2FRYi4HA2qleIKuEC33RbizGmTK34BoEuSXVeWHTIyNBLO5m9fwQhsF2LNyA== + dependencies: + "@ethereumjs/block" "^4.2.1" + "@ethereumjs/common" "^3.1.1" + "@ethereumjs/ethash" "^2.0.4" + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/trie" "^5.0.4" + "@ethereumjs/tx" "^4.1.1" + "@ethereumjs/util" "^8.0.5" abstract-level "^1.0.3" debug "^4.3.3" ethereum-cryptography "^1.1.2" @@ -1280,22 +1216,14 @@ crc-32 "^1.2.0" ethereumjs-util "^7.1.5" -"@ethereumjs/common@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-3.0.1.tgz#c2dbd444d96e4014c7f7befd0529b5c1a02f590b" - integrity sha512-AHsJB7ydfb7TFCT7ORGY0tRiKkAylWZd/Qt6Lmc3Oycs66bMeE1JuYHbc0U6qsAZKZMFsUmL/UJDT/w7Z0cytw== - dependencies: - "@ethereumjs/util" "^8.0.0" - crc-32 "^1.2.0" - -"@ethereumjs/ethash@2.0.1", "@ethereumjs/ethash@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-2.0.1.tgz#eb79d642ee5bd9200ed68080aa28753753c1271e" - integrity sha512-3+Z7ot2j3MKD9+bzoqfAVoN+T89d+g7KKX2hwQ8s2wNvuZoki1uhg/hRy5XmHbOtFhQ0pjUqC1kk3U+CsN4+rQ== +"@ethereumjs/ethash@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-2.0.4.tgz#1892e8e17a11b10efeee3075fb09cd3cbd12c33b" + integrity sha512-WREZZEZKh8baGbG4IwLXvjA+ItFWzD/myUnefKALuAcB9+um93e1YBaeSQzeyY6m5jiDmpxu55SxF0mB8e+xdQ== dependencies: - "@ethereumjs/block" "^4.0.1" - "@ethereumjs/rlp" "^4.0.0" - "@ethereumjs/util" "^8.0.0" + "@ethereumjs/block" "^4.2.1" + "@ethereumjs/rlp" "^4.0.1" + "@ethereumjs/util" "^8.0.5" abstract-level "^1.0.3" bigint-crypto-utils "^3.0.23" ethereum-cryptography "^1.1.2" @@ -1314,16 +1242,11 @@ mcl-wasm "^0.7.1" rustbn.js "~0.2.0" -"@ethereumjs/rlp@4.0.1", "@ethereumjs/rlp@^4.0.1": +"@ethereumjs/rlp@4.0.1", "@ethereumjs/rlp@^4.0.0-beta.2", "@ethereumjs/rlp@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.1.tgz#626fabfd9081baab3d0a3074b0c7ecaf674aaa41" integrity sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw== -"@ethereumjs/rlp@^4.0.0", "@ethereumjs/rlp@^4.0.0-beta.2": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.0.tgz#66719891bd727251a7f233f9ca80212d1994f8c8" - integrity sha512-LM4jS5n33bJN60fM5EC8VeyhUgga6/DjCPBV2vWjnfVtobqtOiNC4SQ1MRFqyBSmJGGdB533JZWewyvlcdJtkQ== - "@ethereumjs/statemanager@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@ethereumjs/statemanager/-/statemanager-1.0.4.tgz#02fb3f05794a2476a78d73660745e9815b476e02" @@ -1336,7 +1259,7 @@ ethers "^5.7.1" js-sdsl "^4.1.4" -"@ethereumjs/trie@5.0.4": +"@ethereumjs/trie@5.0.4", "@ethereumjs/trie@^5.0.4": version "5.0.4" resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.4.tgz#eb06ce2c7957f6a8f07c0db43fb0335b256f3705" integrity sha512-ycYtAF7BJAu9eaCtrEX+efE5xEQEfItRXXHBcTSMHsF7NfLHcniI0S7KUVYXbJ6imczBmnMHeggCqv8PYQbbOw== @@ -1347,17 +1270,6 @@ ethereum-cryptography "^1.1.2" readable-stream "^3.6.0" -"@ethereumjs/trie@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/trie/-/trie-5.0.1.tgz#3cb5730450839c8a540ec48e16a7825a1d0897e5" - integrity sha512-MA8uXR2pa+r8+wBvlyeZoUewwbUZe4Iy4zKi38THP6/flYvIIY+bTVjf/EA3jMhH68j6nJH5SFu5wi5SBdS/2A== - dependencies: - "@ethereumjs/rlp" "^4.0.0" - "@ethereumjs/util" "^8.0.0" - "@types/readable-stream" "^2.3.13" - ethereum-cryptography "^1.1.2" - readable-stream "^3.6.0" - "@ethereumjs/tx@3.3.2": version "3.3.2" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.2.tgz#348d4624bf248aaab6c44fec2ae67265efe3db00" @@ -1366,7 +1278,7 @@ "@ethereumjs/common" "^2.5.0" ethereumjs-util "^7.1.2" -"@ethereumjs/tx@4.1.1": +"@ethereumjs/tx@4.1.1", "@ethereumjs/tx@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.1.1.tgz#d1b5bf2c4fd3618f2f333b66e262848530d4686a" integrity sha512-QDj7nuROfoeyK83RObMA0XCZ+LUDdneNkSCIekO498uEKTY25FxI4Whduc/6j0wdd4IqpQvkq+/7vxSULjGIBQ== @@ -1378,7 +1290,7 @@ "@ethersproject/providers" "^5.7.2" ethereum-cryptography "^1.1.2" -"@ethereumjs/tx@^3.3.0", "@ethereumjs/tx@^3.3.2", "@ethereumjs/tx@^3.5.1": +"@ethereumjs/tx@^3.3.0", "@ethereumjs/tx@^3.5.1": version "3.5.2" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.5.2.tgz#197b9b6299582ad84f9527ca961466fce2296c1c" integrity sha512-gQDNJWKrSDGu2w7w0PzVXVBNMzb7wwdDOmOqczmhNjqFxFuIbhVJDwiGEnxFNC2/b8ifcZzY7MLcluizohRzNw== @@ -1386,18 +1298,7 @@ "@ethereumjs/common" "^2.6.4" ethereumjs-util "^7.1.5" -"@ethereumjs/tx@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-4.0.1.tgz#bb8333e883952b61c40dbc7a3335d99cc5f1c2e4" - integrity sha512-JFq66cjjwnWOdKuDNNq0Hr1j04A546ymUo/8xnPa7wAm3s+RyGVt8VbaNF71/GJqN4tuY62gxvTfZ+B62foyPw== - dependencies: - "@ethereumjs/common" "^3.0.1" - "@ethereumjs/rlp" "^4.0.0" - "@ethereumjs/util" "^8.0.0" - ethereum-cryptography "^1.1.2" - ethers "^5.7.1" - -"@ethereumjs/util@8.0.2", "@ethereumjs/util@^8.0.0", "@ethereumjs/util@^8.0.2": +"@ethereumjs/util@8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.0.2.tgz#b7348fc7253649b0f00685a94546c6eee1fad819" integrity sha512-b1Fcxmq+ckCdoLPhVIBkTcH8szigMapPuEmD8EDakvtI5Na5rzmX1sBW73YQqaPc7iUxGCAzZP1LrFQ7aEMugA== @@ -1523,34 +1424,20 @@ "@ethersproject/logger" "^5.7.0" bn.js "^5.2.1" -"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== dependencies: "@ethersproject/logger" "^5.7.0" -"@ethersproject/bytes@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.4.tgz#328d9d929a3e970964ecf5d62e12568a187189f1" - integrity sha512-9R6A6l9JN8x1U4s1dJCR+9h3MZTT3xQofr/Xx8wbDvj6NnY4CbBB0o8ZgHXvR74yV90pY2EzCekpkMBJnRzkSw== - dependencies: - "@ethersproject/logger" "^5.0.5" - -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== dependencies: "@ethersproject/bignumber" "^5.7.0" -"@ethersproject/constants@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.4.tgz#9ddaa5f3c738a94e5adc4b3f71b36206fa5cdf88" - integrity sha512-Df32lcXDHPgZRPgp1dgmByNbNe4Ki1QoXR+wU61on5nggQGTqWR1Bb7pp9VtI5Go9kyE/JflFc4Te6o9MvYt8A== - dependencies: - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/contracts@5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.7.0.tgz#c305e775abd07e48aa590e1a877ed5c316f8bd1e" @@ -1627,24 +1514,12 @@ "@ethersproject/bytes" "^5.7.0" js-sha3 "0.8.0" -"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.7.0": +"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.7.0.tgz#6ce9ae168e74fecf287be17062b590852c311892" integrity sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig== -"@ethersproject/logger@^5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.5.tgz#e3ba3d0bcf9f5be4da5f043b1e328eb98b80002f" - integrity sha512-gJj72WGzQhUtCk6kfvI8elTaPOQyMvrMghp/nbz0ivTo39fZ7IjypFh/ySDeUSdBNplAwhzWKKejQhdpyefg/w== - -"@ethersproject/networks@5.7.0", "@ethersproject/networks@^5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.0.tgz#df72a392f1a63a57f87210515695a31a245845ad" - integrity sha512-MG6oHSQHd4ebvJrleEQQ4HhVu8Ichr0RDYEfHzsVAVjHNM+w36x9wp9r+hf1JstMXtseXDtkiVoARAG6M959AA== - dependencies: - "@ethersproject/logger" "^5.7.0" - -"@ethersproject/networks@5.7.1": +"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== @@ -1666,32 +1541,6 @@ dependencies: "@ethersproject/logger" "^5.7.0" -"@ethersproject/providers@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.0.tgz#a885cfc7650a64385e7b03ac86fe9c2d4a9c2c63" - integrity sha512-+TTrrINMzZ0aXtlwO/95uhAggKm4USLm1PbeCBR/3XZ7+Oey+3pMyddzZEyRhizHpy1HXV0FRWRMI1O3EGYibA== - dependencies: - "@ethersproject/abstract-provider" "^5.7.0" - "@ethersproject/abstract-signer" "^5.7.0" - "@ethersproject/address" "^5.7.0" - "@ethersproject/base64" "^5.7.0" - "@ethersproject/basex" "^5.7.0" - "@ethersproject/bignumber" "^5.7.0" - "@ethersproject/bytes" "^5.7.0" - "@ethersproject/constants" "^5.7.0" - "@ethersproject/hash" "^5.7.0" - "@ethersproject/logger" "^5.7.0" - "@ethersproject/networks" "^5.7.0" - "@ethersproject/properties" "^5.7.0" - "@ethersproject/random" "^5.7.0" - "@ethersproject/rlp" "^5.7.0" - "@ethersproject/sha2" "^5.7.0" - "@ethersproject/strings" "^5.7.0" - "@ethersproject/transactions" "^5.7.0" - "@ethersproject/web" "^5.7.0" - bech32 "1.1.4" - ws "7.4.6" - "@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2": version "5.7.2" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" @@ -1726,7 +1575,7 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.0.3", "@ethersproject/rlp@^5.7.0": +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== @@ -1743,7 +1592,7 @@ "@ethersproject/logger" "^5.7.0" hash.js "1.1.7" -"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.0.4", "@ethersproject/signing-key@^5.7.0": +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== @@ -1776,7 +1625,7 @@ "@ethersproject/constants" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -1791,21 +1640,6 @@ "@ethersproject/rlp" "^5.7.0" "@ethersproject/signing-key" "^5.7.0" -"@ethersproject/transactions@^5.0.0-beta.135": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.5.tgz#9a966f9ef4817b1752265d4efee0f1e9fd6aeaad" - integrity sha512-1Ga/QmbcB74DItggP8/DK1tggu4ErEvwTkIwIlUXUcvIAuRNXXE7kgQhlp+w1xA/SAQFhv56SqCoyqPiiLCvVA== - dependencies: - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/rlp" "^5.0.3" - "@ethersproject/signing-key" "^5.0.4" - "@ethersproject/units@5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.7.0.tgz#637b563d7e14f42deeee39245275d477aae1d8b1" @@ -1836,18 +1670,7 @@ "@ethersproject/transactions" "^5.7.0" "@ethersproject/wordlists" "^5.7.0" -"@ethersproject/web@5.7.0", "@ethersproject/web@^5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.0.tgz#40850c05260edad8b54827923bbad23d96aac0bc" - integrity sha512-ApHcbbj+muRASVDSCl/tgxaH2LBkRMEYfLOLVa0COipx0+nlu0QKet7U2lEg0vdkh8XRSLf2nd1f1Uk9SrVSGA== - dependencies: - "@ethersproject/base64" "^5.7.0" - "@ethersproject/bytes" "^5.7.0" - "@ethersproject/logger" "^5.7.0" - "@ethersproject/properties" "^5.7.0" - "@ethersproject/strings" "^5.7.0" - -"@ethersproject/web@5.7.1": +"@ethersproject/web@5.7.1", "@ethersproject/web@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae" integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w== @@ -2429,21 +2252,21 @@ "@graphql-tools/utils" "8.9.0" tslib "^2.4.0" -"@graphql-tools/merge@8.3.6": - version "8.3.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.6.tgz#97a936d4c8e8f935e58a514bb516c476437b5b2c" - integrity sha512-uUBokxXi89bj08P+iCvQk3Vew4vcfL5ZM6NTylWi8PIpoq4r5nJ625bRuN8h2uubEdRiH8ntN9M4xkd/j7AybQ== +"@graphql-tools/merge@^8.4.1": + version "8.4.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.1.tgz#52879e5f73565f504ceea04fcd9ef90a6e733c62" + integrity sha512-hssnPpZ818mxgl5+GfyOOSnnflAxiaTn1A1AojZcIbh4J52sS1Q0gSuBR5VrnUDjuxiqoCotpXdAQl+K+U6KLQ== dependencies: - "@graphql-tools/utils" "8.12.0" + "@graphql-tools/utils" "^9.2.1" tslib "^2.4.0" "@graphql-tools/mock@^8.1.2": - version "8.7.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.6.tgz#701d898f7fe6c22e40d6d80e25874e464359ce11" - integrity sha512-cQGPyY6dF4x28552zjAg9En2WWVury62u1/xzipCNUSCdKRVOsAupTNBcAGdMjsKPLcGzzk1cPA8dP0DUfNqzg== + version "8.7.20" + resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.20.tgz#c83ae0f1940d194a3982120c9c85f3ac6b4f7f20" + integrity sha512-ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ== dependencies: - "@graphql-tools/schema" "9.0.4" - "@graphql-tools/utils" "8.12.0" + "@graphql-tools/schema" "^9.0.18" + "@graphql-tools/utils" "^9.2.1" fast-json-stable-stringify "^2.1.0" tslib "^2.4.0" @@ -2457,22 +2280,15 @@ tslib "^2.4.0" value-or-promise "1.0.11" -"@graphql-tools/schema@9.0.4": - version "9.0.4" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.4.tgz#1a74608b57abf90fae6fd929d25e5482c57bc05d" - integrity sha512-B/b8ukjs18fq+/s7p97P8L1VMrwapYc3N2KvdG/uNThSazRRn8GsBK0Nr+FH+mVKiUfb4Dno79e3SumZVoHuOQ== - dependencies: - "@graphql-tools/merge" "8.3.6" - "@graphql-tools/utils" "8.12.0" - tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/utils@8.12.0": - version "8.12.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.12.0.tgz#243bc4f5fc2edbc9e8fd1038189e57d837cbe31f" - integrity sha512-TeO+MJWGXjUTS52qfK4R8HiPoF/R7X+qmgtOYd8DTH0l6b+5Y/tlg5aGeUJefqImRq7nvi93Ms40k/Uz4D5CWw== +"@graphql-tools/schema@^9.0.18": + version "9.0.18" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.18.tgz#f66dd5e76e1aba85904cb649fde88ae01718c45c" + integrity sha512-Kckb+qoo36o5RSIVfBNU5XR5fOg4adNa1xuhhUgbQejDaI684tIJbTWwYbrDPVEGL/dqJJX3rrsq7RLufjNFoQ== dependencies: + "@graphql-tools/merge" "^8.4.1" + "@graphql-tools/utils" "^9.2.1" tslib "^2.4.0" + value-or-promise "1.0.12" "@graphql-tools/utils@8.9.0": version "8.9.0" @@ -2481,6 +2297,19 @@ dependencies: tslib "^2.4.0" +"@graphql-tools/utils@^9.2.1": + version "9.2.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57" + integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + tslib "^2.4.0" + +"@graphql-typed-document-node/core@^3.1.1": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" + integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== + "@grpc/grpc-js@^0.3.0": version "0.3.6" resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-0.3.6.tgz#d9b52043907170d38e06711d9477fde29ab46fa8" @@ -2488,27 +2317,20 @@ dependencies: semver "^5.5.0" -"@grpc/grpc-js@^1.0.0", "@grpc/grpc-js@~1.6.0": - version "1.6.12" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.12.tgz#20f710d8a8c5c396b2ae9530ba6c06b984614fdf" - integrity sha512-JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw== +"@grpc/grpc-js@^1.0.0": + version "1.8.14" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.14.tgz#4fe0f9917d6f094cf59245763c275442b182e9ad" + integrity sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A== dependencies: "@grpc/proto-loader" "^0.7.0" "@types/node" ">=12.12.47" -"@grpc/grpc-js@~1.0.0": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.5.tgz#09948c0810e62828fdd61455b2eb13d7879888b0" - integrity sha512-Hm+xOiqAhcpT9RYM8lc15dbQD7aQurM7ZU8ulmulepiPlN7iwBXXwP3vSBUimoFoApRqz7pSIisXU8pZaCB4og== - dependencies: - semver "^6.2.0" - -"@grpc/grpc-js@~1.4.0": - version "1.4.6" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.4.6.tgz#8108d7ab7c0c21b38c538c1a48583edbbf2c2412" - integrity sha512-Byau4xiXfIixb1PnW30V/P9mkrZ05lknyNqiK+cVY9J5hj3gecxd/anwaUbAM8j834zg1x78NvAbwGnMfWEu7A== +"@grpc/grpc-js@~1.6.0": + version "1.6.12" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.12.tgz#20f710d8a8c5c396b2ae9530ba6c06b984614fdf" + integrity sha512-JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw== dependencies: - "@grpc/proto-loader" "^0.6.4" + "@grpc/proto-loader" "^0.7.0" "@types/node" ">=12.12.47" "@grpc/proto-loader@0.6.9": @@ -2530,7 +2352,7 @@ lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.5.0", "@grpc/proto-loader@^0.5.1": +"@grpc/proto-loader@^0.5.0": version "0.5.6" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== @@ -2538,7 +2360,7 @@ lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.6.1", "@grpc/proto-loader@^0.6.4": +"@grpc/proto-loader@^0.6.12": version "0.6.13" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc" integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g== @@ -2550,9 +2372,9 @@ yargs "^16.2.0" "@grpc/proto-loader@^0.7.0": - version "0.7.2" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.2.tgz#fa63178853afe1473c50cff89fe572f7c8b20154" - integrity sha512-jCdyLIT/tdQ1zhrbTQnJNK5nbDf0GoBpy5jVNywBzzMDF+Vs6uEaHnfz46dMtDxkvwrF2hzk5Z67goliceH0sA== + version "0.7.6" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.6.tgz#b71fdf92b184af184b668c4e9395a5ddc23d61de" + integrity sha512-QyAXR8Hyh7uMDmveWxDSUcJr9NAWaZ2I6IXgAYvQmfflwouTM+rArE2eEaCtLlRqO81j7pRLCt81IefUei6Zbw== dependencies: "@types/long" "^4.0.1" lodash.camelcase "^4.3.0" @@ -2598,18 +2420,6 @@ jest-util "^26.6.2" slash "^3.0.0" -"@jest/console@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.0.2.tgz#3a02dccad4dd37c25fd30013df67ec50998402ce" - integrity sha512-Fv02ijyhF4D/Wb3DvZO3iBJQz5DnzpJEIDBDbvje8Em099N889tNMUnBw7SalmSuOI+NflNG40RA1iK71kImPw== - dependencies: - "@jest/types" "^29.0.2" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^29.0.2" - jest-util "^29.0.2" - slash "^3.0.0" - "@jest/console@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.5.0.tgz#593a6c5c0d3f75689835f1b3b4688c4f8544cb57" @@ -2700,7 +2510,7 @@ "@types/node" "*" jest-mock "^26.6.2" -"@jest/environment@^29.0.2", "@jest/environment@^29.5.0": +"@jest/environment@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65" integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ== @@ -2710,14 +2520,14 @@ "@types/node" "*" jest-mock "^29.5.0" -"@jest/expect-utils@^29.1.2", "@jest/expect-utils@^29.5.0": +"@jest/expect-utils@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036" integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg== dependencies: jest-get-type "^29.4.3" -"@jest/expect@^29.0.2", "@jest/expect@^29.5.0": +"@jest/expect@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba" integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g== @@ -2830,7 +2640,7 @@ strip-ansi "^6.0.0" v8-to-istanbul "^9.0.1" -"@jest/schemas@^29.0.0", "@jest/schemas@^29.4.3": +"@jest/schemas@^29.4.3": version "29.4.3" resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg== @@ -2865,16 +2675,6 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-result@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.0.2.tgz#dde4922e6234dd311c85ddf1ec2b7f600a90295d" - integrity sha512-b5rDc0lLL6Kx73LyCx6370k9uZ8o5UKdCpMS6Za3ke7H9y8PtAU305y6TeghpBmf2In8p/qqi3GpftgzijSsNw== - dependencies: - "@jest/console" "^29.0.2" - "@jest/types" "^29.0.2" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - "@jest/test-result@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408" @@ -2927,27 +2727,6 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/transform@^29.1.2": - version "29.1.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.1.2.tgz#20f814696e04f090421f6d505c14bbfe0157062a" - integrity sha512-2uaUuVHTitmkx1tHF+eBjb4p7UuzBG7SXIaA/hNIkaMP6K+gXYGxP38ZcrofzqN0HeZ7A90oqsOa97WU7WZkSw== - dependencies: - "@babel/core" "^7.11.6" - "@jest/types" "^29.1.2" - "@jridgewell/trace-mapping" "^0.3.15" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.1.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.1.2" - jest-regex-util "^29.0.0" - jest-util "^29.1.2" - micromatch "^4.0.4" - pirates "^4.0.4" - slash "^3.0.0" - write-file-atomic "^4.0.1" - "@jest/transform@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9" @@ -2980,42 +2759,6 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@jest/types@^29.0.2": - version "29.0.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.0.2.tgz#5a5391fa7f7f41bf4b201d6d2da30e874f95b6c1" - integrity sha512-5WNMesBLmlkt1+fVkoCjHa0X3i3q8zc4QLTDkdHgCa2gyPZc7rdlZBWgVLqwS1860ZW5xJuCDwAzqbGaXIr/ew== - dependencies: - "@jest/schemas" "^29.0.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@jest/types@^29.0.3": - version "29.0.3" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.0.3.tgz#0be78fdddb1a35aeb2041074e55b860561c8ef63" - integrity sha512-coBJmOQvurXjN1Hh5PzF7cmsod0zLIOXpP8KD161mqNlroMhLcwpODiEzi7ZsRl5Z/AIuxpeNm8DCl43F4kz8A== - dependencies: - "@jest/schemas" "^29.0.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@jest/types@^29.1.2": - version "29.1.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.1.2.tgz#7442d32b16bcd7592d9614173078b8c334ec730a" - integrity sha512-DcXGtoTykQB5jiwCmVr8H4vdg2OJhQex3qPkG+ISyDO7xQXbt/4R6dowcRyPemRnkH7JoHvZuxPBdlq+9JxFCg== - dependencies: - "@jest/schemas" "^29.0.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - "@jest/types@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" @@ -3033,38 +2776,40 @@ resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb" integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/resolve-uri@3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": +"@jridgewell/resolve-uri@^3.0.3": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + +"@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" @@ -3073,15 +2818,7 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.15" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" - integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/trace-mapping@^0.3.17": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": version "0.3.18" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== @@ -3111,16 +2848,6 @@ rxjs "6" semver "^7.3.5" -"@ledgerhq/devices@^7.0.1": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-7.0.7.tgz#3499304a1c9d3aa7399de2ad390719bef5d1e89c" - integrity sha512-PZ9TtaTGBYUm/g0qNKPbECZt7DDNvqM3ILS5wAtOMna2cBR+mrywUGXrkjuOWlHpuqZ8wenaAKveQBbzF2ba8w== - dependencies: - "@ledgerhq/errors" "^6.12.3" - "@ledgerhq/logs" "^6.10.1" - rxjs "6" - semver "^7.3.5" - "@ledgerhq/devices@^8.0.1": version "8.0.1" resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.1.tgz#4c475f6ae249daf00ef08f5098924206233f3179" @@ -3136,7 +2863,7 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.50.0.tgz#e3a6834cb8c19346efca214c1af84ed28e69dad9" integrity sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow== -"@ledgerhq/errors@^6.10.2", "@ledgerhq/errors@^6.12.3", "@ledgerhq/errors@^6.12.4": +"@ledgerhq/errors@^6.12.4": version "6.12.4" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.4.tgz#1c2f75dc3dee91b069f3446be484fa28676d1b45" integrity sha512-qi5poMrcIuFuivdzRjjQsNp7rRwUA5v3eo6D4yEy+l+w8wT4d4JtQ5u1TbrlGfFHfgLq7Lv6dsvh2ooLyWTyfg== @@ -3172,7 +2899,7 @@ "@ledgerhq/logs" "^5.50.0" node-hid "2.1.1" -"@ledgerhq/hw-transport-node-hid-noevents@^6.27.4": +"@ledgerhq/hw-transport-node-hid-noevents@^6.27.13": version "6.27.13" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.13.tgz#96f3667a18ea3602160af5d08db677ae0b8e3bb7" integrity sha512-Lq85zoc95eb5npudlgTARVrB57jbk8oZ8KuyVOovNm1AjR0OrYfl0iCqw49h+SL/UFWWVyBisLg6IOYCpj1SNQ== @@ -3198,17 +2925,17 @@ usb "^1.7.0" "@ledgerhq/hw-transport-node-hid@^6.27.4": - version "6.27.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.4.tgz#a7e0c048be5bb94e2d5653f0cd70c1148228bb53" - integrity sha512-7dnQMUXKPcnlHaJsPT3Oo5WXYfeIqqA6u0mo/rbvFdz3/KsJtDaBF2E3RtBXFHrDmXjBA0leqXFeWXdHDFdF3A== - dependencies: - "@ledgerhq/devices" "^7.0.1" - "@ledgerhq/errors" "^6.10.2" - "@ledgerhq/hw-transport" "^6.27.4" - "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.4" - "@ledgerhq/logs" "^6.10.0" + version "6.27.13" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.13.tgz#741644d7b8761f682b36eda36e1bf7876357efda" + integrity sha512-j4c1UOMylX9cE9ebTh+qqMfzZDJpK8WZ7/kalxdY/MHWQcO+F2XAMvEqdZOaMjSIhI0vbgL/OoEvO2nxGFhObA== + dependencies: + "@ledgerhq/devices" "^8.0.1" + "@ledgerhq/errors" "^6.12.4" + "@ledgerhq/hw-transport" "^6.28.2" + "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.13" + "@ledgerhq/logs" "^6.10.1" lodash "^4.17.21" - node-hid "2.1.1" + node-hid "^2.1.2" usb "^1.7.0" "@ledgerhq/hw-transport-webusb@^5.53.1": @@ -3230,15 +2957,6 @@ "@ledgerhq/errors" "^5.50.0" events "^3.3.0" -"@ledgerhq/hw-transport@^6.27.4": - version "6.27.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.27.4.tgz#a06853fabb1795f728b5989078e58cad44146cc4" - integrity sha512-i3RYKfSIZ7PHM2sFljAU443qOYMTlghx8l5AZqsNKsXbawHkuOr7EtISW3zqbC0Wh3uws7u63qQ/50TLmylr7g== - dependencies: - "@ledgerhq/devices" "^7.0.1" - "@ledgerhq/errors" "^6.10.2" - events "^3.3.0" - "@ledgerhq/hw-transport@^6.28.2": version "6.28.2" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.2.tgz#483f9a39403ee63b03d452e30bfe8189dcca5785" @@ -3262,49 +2980,44 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186" integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA== -"@ledgerhq/logs@^6.10.0": - version "6.10.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.0.tgz#c012c1ecc1a0e53d50e6af381618dca5268461c1" - integrity sha512-lLseUPEhSFUXYTKj6q7s2O3s2vW2ebgA11vMAlKodXGf5AFw4zUoEbTz9CoFOC9jS6xY4Qr8BmRnxP/odT4Uuw== - "@ledgerhq/logs@^6.10.1": version "6.10.1" resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.1.tgz#5bd16082261d7364eabb511c788f00937dac588d" integrity sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w== -"@lerna/add@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.5.0.tgz#33c671dc01153f1bda8929de8ed7267d16858ce6" - integrity sha512-RdJ8yyE8BizzrYRjZuqeXtgkHBE/KzcS7tmBG+UKCQ5QFLnkdORzaVECNy2sfZl0vTtrxj4cv+kuwxIeg/4XVQ== - dependencies: - "@lerna/bootstrap" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/filter-options" "5.5.0" - "@lerna/npm-conf" "5.5.0" - "@lerna/validation-error" "5.5.0" +"@lerna/add@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.6.2.tgz#d0e25fd4900b6f8a9548f940cc016ce8a3e2d2ba" + integrity sha512-NHrm7kYiqP+EviguY7/NltJ3G9vGmJW6v2BASUOhP9FZDhYbq3O+rCDlFdoVRNtcyrSg90rZFMOWHph4KOoCQQ== + dependencies: + "@lerna/bootstrap" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/filter-options" "5.6.2" + "@lerna/npm-conf" "5.6.2" + "@lerna/validation-error" "5.6.2" dedent "^0.7.0" npm-package-arg "8.1.1" p-map "^4.0.0" pacote "^13.6.1" semver "^7.3.4" -"@lerna/bootstrap@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-5.5.0.tgz#6773c1357fb88d0cb203b233f9ad9269fb2f43ef" - integrity sha512-GeXLSDi6gxj2O3t5T7qgFabBKoC5EQwiFyQ4ufqx1Wm/mWxqRI+enTBnbaBbmhQaVQ9wfPvMPDukJ5Q9PCTUcQ== - dependencies: - "@lerna/command" "5.5.0" - "@lerna/filter-options" "5.5.0" - "@lerna/has-npm-version" "5.5.0" - "@lerna/npm-install" "5.5.0" - "@lerna/package-graph" "5.5.0" - "@lerna/pulse-till-done" "5.5.0" - "@lerna/rimraf-dir" "5.5.0" - "@lerna/run-lifecycle" "5.5.0" - "@lerna/run-topologically" "5.5.0" - "@lerna/symlink-binary" "5.5.0" - "@lerna/symlink-dependencies" "5.5.0" - "@lerna/validation-error" "5.5.0" +"@lerna/bootstrap@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-5.6.2.tgz#a0f015ae7c30189a3064c0d5940134010ece635e" + integrity sha512-S2fMOEXbef7nrybQhzBywIGSLhuiQ5huPp1sU+v9Y6XEBsy/2IA+lb0gsZosvPqlRfMtiaFstL+QunaBhlWECA== + dependencies: + "@lerna/command" "5.6.2" + "@lerna/filter-options" "5.6.2" + "@lerna/has-npm-version" "5.6.2" + "@lerna/npm-install" "5.6.2" + "@lerna/package-graph" "5.6.2" + "@lerna/pulse-till-done" "5.6.2" + "@lerna/rimraf-dir" "5.6.2" + "@lerna/run-lifecycle" "5.6.2" + "@lerna/run-topologically" "5.6.2" + "@lerna/symlink-binary" "5.6.2" + "@lerna/symlink-dependencies" "5.6.2" + "@lerna/validation-error" "5.6.2" "@npmcli/arborist" "5.3.0" dedent "^0.7.0" get-port "^5.1.1" @@ -3316,100 +3029,100 @@ p-waterfall "^2.1.1" semver "^7.3.4" -"@lerna/changed@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-5.5.0.tgz#7242804f3400491035399cc3108324c154963c8b" - integrity sha512-ZEnVHrPEpf2Iii/Z59g1lfKEwPA1V2an5L27MzNQjbWe6JQZqTU+8V6m+Vmbr4VdEH5jfRL5NVETGCLl7qN/pQ== +"@lerna/changed@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-5.6.2.tgz#96a647ed202d8146b2077bf13a682466e8607f9a" + integrity sha512-uUgrkdj1eYJHQGsXXlpH5oEAfu3x0qzeTjgvpdNrxHEdQWi7zWiW59hRadmiImc14uJJYIwVK5q/QLugrsdGFQ== dependencies: - "@lerna/collect-updates" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/listable" "5.5.0" - "@lerna/output" "5.5.0" + "@lerna/collect-updates" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/listable" "5.6.2" + "@lerna/output" "5.6.2" -"@lerna/check-working-tree@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-5.5.0.tgz#7b2e4725032fdb17f7d4823e96d443e617af07fb" - integrity sha512-U35yV8R+tv6zQgoDr0rnBt4wm4gyhDcE4tUEeB8m7JHVu7g45Fjv2jFLH1z5RM1PVaEbzKVebqfN5ccB0EBuyg== +"@lerna/check-working-tree@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-5.6.2.tgz#dd03b0c3fe9f141c31c0c47a9a0162ee9c0f6c28" + integrity sha512-6Vf3IB6p+iNIubwVgr8A/KOmGh5xb4SyRmhFtAVqe33yWl2p3yc+mU5nGoz4ET3JLF1T9MhsePj0hNt6qyOTLQ== dependencies: - "@lerna/collect-uncommitted" "5.5.0" - "@lerna/describe-ref" "5.5.0" - "@lerna/validation-error" "5.5.0" + "@lerna/collect-uncommitted" "5.6.2" + "@lerna/describe-ref" "5.6.2" + "@lerna/validation-error" "5.6.2" -"@lerna/child-process@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-5.5.0.tgz#b3fbfadd766f79a2c54226de9d7e73643a82d79c" - integrity sha512-er7bsj2W/H8JWAIB+CkgCLk9IlMkyVzywbOZcMC+xic2fp7rmM/BdtAE4nTjkKwfaRYF/bwjHyZowZUR3s8cEg== +"@lerna/child-process@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-5.6.2.tgz#4adbd09ff5a8e43b9471f1a987ae65a7d669421b" + integrity sha512-QIOQ3jIbWdduHd5892fbo3u7/dQgbhzEBB7cvf+Ys/iCPP8UQrBECi1lfRgA4kcTKC2MyMz0SoyXZz/lFcXc3A== dependencies: chalk "^4.1.0" execa "^5.0.0" strong-log-transformer "^2.1.0" -"@lerna/clean@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-5.5.0.tgz#474e2e30bd3fa9a09482188659a87bcef0bd6f6e" - integrity sha512-TRW4Gkv6QpWSy0tm72NrxvgmTAC+W0LqhLPlFM5k5feFS75/HGOycpf97M4JSUueyBCuVjsPfzqp/e6MB3Ntng== - dependencies: - "@lerna/command" "5.5.0" - "@lerna/filter-options" "5.5.0" - "@lerna/prompt" "5.5.0" - "@lerna/pulse-till-done" "5.5.0" - "@lerna/rimraf-dir" "5.5.0" +"@lerna/clean@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-5.6.2.tgz#9611adf3e3035731af2b71aabeb850f7d16fc27d" + integrity sha512-A7j8r0Hk2pGyLUyaCmx4keNHen1L/KdcOjb4nR6X8GtTJR5AeA47a8rRKOCz9wwdyMPlo2Dau7d3RV9viv7a5g== + dependencies: + "@lerna/command" "5.6.2" + "@lerna/filter-options" "5.6.2" + "@lerna/prompt" "5.6.2" + "@lerna/pulse-till-done" "5.6.2" + "@lerna/rimraf-dir" "5.6.2" p-map "^4.0.0" p-map-series "^2.1.0" p-waterfall "^2.1.1" -"@lerna/cli@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-5.5.0.tgz#3463fff62cc2233b6a85ccaed23fad1432b57c30" - integrity sha512-7TtnO2xfnfrpWGIui6ANrH4/AVHmSfjaExSoZKNhh2dKSSEOETEUfFIIzfEAirAVR7EOXAJwDdFbbpB4lQtyUg== +"@lerna/cli@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-5.6.2.tgz#87a3dea0f066fa4b01c38ab191f316885dfe9fcd" + integrity sha512-w0NRIEqDOmYKlA5t0iyqx0hbY7zcozvApmfvwF0lhkuhf3k6LRAFSamtimGQWicC779a7J2NXw4ASuBV47Fs1Q== dependencies: - "@lerna/global-options" "5.5.0" + "@lerna/global-options" "5.6.2" dedent "^0.7.0" npmlog "^6.0.2" yargs "^16.2.0" -"@lerna/collect-uncommitted@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-5.5.0.tgz#9ecd3a4fe852715aa83d02e0e0b072015e6ee196" - integrity sha512-oVGXS0fC8q2d1lG695eCd8dkr0fhmUx4bWA1IshVd/u0Puk7f8+m71POcLV3h1gR/2Fqs7vb7G/sPyuzGtwn8w== +"@lerna/collect-uncommitted@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-5.6.2.tgz#8f62d5a57c7800e9f5278897c7b254c1e3d425fe" + integrity sha512-i0jhxpypyOsW2PpPwIw4xg6EPh7/N3YuiI6P2yL7PynZ8nOv8DkIdoyMkhUP4gALjBfckH8Bj94eIaKMviqW4w== dependencies: - "@lerna/child-process" "5.5.0" + "@lerna/child-process" "5.6.2" chalk "^4.1.0" npmlog "^6.0.2" -"@lerna/collect-updates@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-5.5.0.tgz#2180052edd727a65a71d5a047f36166a1dee221f" - integrity sha512-6kBMi6K6PHIBvZKlfp/0PvRgmzvvfx+eZpmLjF+0yjcfwBn+QDkq7H+QohBiCzt2vxHVHsM6zutNhl2jNTmChg== +"@lerna/collect-updates@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-5.6.2.tgz#7dc9df48183ef35a975154182d338c64de76104f" + integrity sha512-DdTK13X6PIsh9HINiMniFeiivAizR/1FBB+hDVe6tOhsXFBfjHMw1xZhXlE+mYIoFmDm1UFK7zvQSexoaxRqFA== dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/describe-ref" "5.5.0" + "@lerna/child-process" "5.6.2" + "@lerna/describe-ref" "5.6.2" minimatch "^3.0.4" npmlog "^6.0.2" slash "^3.0.0" -"@lerna/command@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/command/-/command-5.5.0.tgz#7be7228bd8f87181274974ff3e539bdd1b4b91e6" - integrity sha512-ut055kFWc1OJFdI9Cj1kDxtJ4ejvAsfRgUoVxWT1Fw4Me/OzQRHYmUupW0FK8Kc+7gcz4mGKzUVWmRmDBvn+Fw== - dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/package-graph" "5.5.0" - "@lerna/project" "5.5.0" - "@lerna/validation-error" "5.5.0" - "@lerna/write-log-file" "5.5.0" +"@lerna/command@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/command/-/command-5.6.2.tgz#6cbb42b63c40a33565a7d39302d0e171e8e0f5b6" + integrity sha512-eLVGI9TmxcaGt1M7TXGhhBZoeWOtOedMiH7NuCGHtL6TMJ9k+SCExyx+KpNmE6ImyNOzws6EvYLPLjftiqmoaA== + dependencies: + "@lerna/child-process" "5.6.2" + "@lerna/package-graph" "5.6.2" + "@lerna/project" "5.6.2" + "@lerna/validation-error" "5.6.2" + "@lerna/write-log-file" "5.6.2" clone-deep "^4.0.1" dedent "^0.7.0" execa "^5.0.0" is-ci "^2.0.0" npmlog "^6.0.2" -"@lerna/conventional-commits@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-5.5.0.tgz#570a7766fd21fb8c9e78e5980a30fdfc54d549cb" - integrity sha512-qPTRNCm3H4MvZAdQLzyYq7ifJyofMSeZmel232b5mglW3OSehxPQUxzr/u/0p8Nqs89uZxZRHyznLnhRNdXcJQ== +"@lerna/conventional-commits@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-5.6.2.tgz#23f1a86ab79e48609c98a572eb59a705d7f0512f" + integrity sha512-fPrJpYJhxCgY2uyOCTcAAC6+T6lUAtpEGxLbjWHWTb13oKKEygp9THoFpe6SbAD0fYMb3jeZCZCqNofM62rmuA== dependencies: - "@lerna/validation-error" "5.5.0" + "@lerna/validation-error" "5.6.2" conventional-changelog-angular "^5.0.12" conventional-changelog-core "^4.2.4" conventional-recommended-bump "^6.1.0" @@ -3420,27 +3133,26 @@ pify "^5.0.0" semver "^7.3.4" -"@lerna/create-symlink@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-5.5.0.tgz#8532b0a1651f1ca7363e7e0e25c1d3ebdb4cea26" - integrity sha512-vWGvRbTh3ji3J/8mVyLPa9Yst4MZzp9W2+8hyYHw8eAzCtHPuH3Z0AReIHpYRfoViUvxIl/rEEuD2D1sDh61BQ== +"@lerna/create-symlink@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-5.6.2.tgz#9bd327128e30a144ef50a45242433a2325081391" + integrity sha512-0WIs3P6ohPVh2+t5axrLZDE5Dt7fe3Kv0Auj0sBiBd6MmKZ2oS76apIl0Bspdbv8jX8+TRKGv6ib0280D0dtEw== dependencies: cmd-shim "^5.0.0" fs-extra "^9.1.0" npmlog "^6.0.2" -"@lerna/create@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-5.5.0.tgz#78fbe4f56efe7f6715a05faff5d6f70bb297419a" - integrity sha512-B+ERbzgFMYspsaU9We65Wqf9Y7sGsEYVFPi3EKpCXxkvVr65YRFL6Mz/WAVggwYkR49umduXXVmjnCWcuT0Ydw== +"@lerna/create@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-5.6.2.tgz#2c2e4b089cd8426cd256c6b0a0df5e676aa3503a" + integrity sha512-+Y5cMUxMNXjTTU9IHpgRYIwKo39w+blui1P+s+qYlZUSCUAew0xNpOBG8iN0Nc5X9op4U094oIdHxv7Dyz6tWQ== dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/npm-conf" "5.5.0" - "@lerna/validation-error" "5.5.0" + "@lerna/child-process" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/npm-conf" "5.6.2" + "@lerna/validation-error" "5.6.2" dedent "^0.7.0" fs-extra "^9.1.0" - globby "^11.0.2" init-package-json "^3.0.2" npm-package-arg "8.1.1" p-reduce "^2.1.0" @@ -3452,218 +3164,218 @@ validate-npm-package-name "^4.0.0" yargs-parser "20.2.4" -"@lerna/describe-ref@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-5.5.0.tgz#9c50ffac8c761408e091a9e717ccc7a74dbe513d" - integrity sha512-gNt9deRWcDoIKCwKRHu/TEt2HcHhQxzVlP8GQHYp4NuWTG9c+gTQfyuXvbZd0K9jCijPUBNy/oMb6usXceJWeg== +"@lerna/describe-ref@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-5.6.2.tgz#8beb9884b59c419c67cec935cd90c08704e4c9b0" + integrity sha512-UqU0N77aT1W8duYGir7R+Sk3jsY/c4lhcCEcnayMpFScMbAp0ETGsW04cYsHK29sgg+ZCc5zEwebBqabWhMhnA== dependencies: - "@lerna/child-process" "5.5.0" + "@lerna/child-process" "5.6.2" npmlog "^6.0.2" -"@lerna/diff@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-5.5.0.tgz#37790ce266ca139abf1f7f4597aa86e8f2f12d1d" - integrity sha512-2PIka/4kKDOsh5Ht+X2OuLNTWzRk+LcnN5bCin87w7vGw3esdvlT1fj1tKjoZ1/aC/O8tqtKXyeP9WE6YHWVpw== +"@lerna/diff@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-5.6.2.tgz#059f62c95e08a506574e0e66044934a395e15b11" + integrity sha512-aHKzKvUvUI8vOcshC2Za/bdz+plM3r/ycqUrPqaERzp+kc1pYHyPeXezydVdEmgmmwmyKI5hx4+2QNnzOnun2A== dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/validation-error" "5.5.0" + "@lerna/child-process" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/validation-error" "5.6.2" npmlog "^6.0.2" -"@lerna/exec@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-5.5.0.tgz#bf97d67e772f326e58a3f3d259e77c61ca508a72" - integrity sha512-4asvrCYFGgnEbXtSiKJLDd6DShUl7FIRRCWx7JXJfa0B6sg00cB9Cg3JTp+F+cQWCOspRkzqRetqu57o6wRpXg== - dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/filter-options" "5.5.0" - "@lerna/profiler" "5.5.0" - "@lerna/run-topologically" "5.5.0" - "@lerna/validation-error" "5.5.0" +"@lerna/exec@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-5.6.2.tgz#b4edee66e26760de28bbf8472993ae8ad7508073" + integrity sha512-meZozok5stK7S0oAVn+kdbTmU+kHj9GTXjW7V8kgwG9ld+JJMTH3nKK1L3mEKyk9TFu9vFWyEOF7HNK6yEOoVg== + dependencies: + "@lerna/child-process" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/filter-options" "5.6.2" + "@lerna/profiler" "5.6.2" + "@lerna/run-topologically" "5.6.2" + "@lerna/validation-error" "5.6.2" p-map "^4.0.0" -"@lerna/filter-options@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-5.5.0.tgz#f71297519d4b4407013f9500db82f089bf45b80a" - integrity sha512-Hwn4sOixZdWVe6SFZ7aPFjhMYoSHz0zbwy3t40KXuhjLqT8T5RLmGWW1u2Al6dQ5fuQyhWXGS4DWfobs7Th62A== +"@lerna/filter-options@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-5.6.2.tgz#0201d3aaf71eb7d7f8b1d28193218710c3220aa0" + integrity sha512-4Z0HIhPak2TabTsUqEBQaQeOqgqEt0qyskvsY0oviYvqP/nrJfJBZh4H93jIiNQF59LJCn5Ce3KJJrLExxjlzw== dependencies: - "@lerna/collect-updates" "5.5.0" - "@lerna/filter-packages" "5.5.0" + "@lerna/collect-updates" "5.6.2" + "@lerna/filter-packages" "5.6.2" dedent "^0.7.0" npmlog "^6.0.2" -"@lerna/filter-packages@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-5.5.0.tgz#5fad84745eec01779a830040bab79c222d8794f3" - integrity sha512-Ad23aRPKgr/zt6jMWi8xKL+2z47GBQyxC4HhsDEMp62OGeGhGyK1sGW+S8OTEh17sIVpGG2GX9eCfnG8pvfxUQ== +"@lerna/filter-packages@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-5.6.2.tgz#1118a9318f3e08f9e21fb03d23f91e1f77f4a72a" + integrity sha512-el9V2lTEG0Bbz+Omo45hATkRVnChCTJhcTpth19cMJ6mQ4M5H4IgbWCJdFMBi/RpTnOhz9BhJxDbj95kuIvvzw== dependencies: - "@lerna/validation-error" "5.5.0" + "@lerna/validation-error" "5.6.2" multimatch "^5.0.0" npmlog "^6.0.2" -"@lerna/get-npm-exec-opts@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.5.0.tgz#55fb0c2ce17b304e98df1f6ce714825dd86c413f" - integrity sha512-WRt560FB6rsj4yVtR1wIJWJufITajECaw1omNi2KkL7/o7ky4NvHACVOtibETUNMXrnuPJ/QBww4roLFVIAyog== +"@lerna/get-npm-exec-opts@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.6.2.tgz#a5e1a93f62eba817961210b7be148c0768ee4eee" + integrity sha512-0RbSDJ+QC9D5UWZJh3DN7mBIU1NhBmdHOE289oHSkjDY+uEjdzMPkEUy+wZ8fCzMLFnnNQkAEqNaOAzZ7dmFLA== dependencies: npmlog "^6.0.2" -"@lerna/get-packed@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-5.5.0.tgz#d8d103ed01ca19e72b19d6807232a808dad414c8" - integrity sha512-X+91ma9SQPrsVctsrFRBABn4+T87lnTEd/BngB7OYlYFsJCc+a6vd+5pnIWxKK5OiUr6+tRpMbJp8BUXJFdb4Q== +"@lerna/get-packed@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-5.6.2.tgz#cc5008008442ae00cfa5ed9484e76a44d48e37b6" + integrity sha512-pp5nNDmtrtd21aKHjwwOY5CS7XNIHxINzGa+Jholn1jMDYUtdskpN++ZqYbATGpW831++NJuiuBVyqAWi9xbXg== dependencies: fs-extra "^9.1.0" ssri "^9.0.1" tar "^6.1.0" -"@lerna/github-client@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-5.5.0.tgz#8653db4049525c55a10d2e8ce2693ed7913ecfd4" - integrity sha512-CaBleVR0F+8Yv4FQu6r7Ocqnh3DEq6dQeu0r4RX+mc9jBn9J/N2SdLKRdC7vcvmkcLCxacg8ewuesYqvakQ8HQ== +"@lerna/github-client@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-5.6.2.tgz#b40a71ddf5d40aefe178a48713aa107ef735f056" + integrity sha512-pjALazZoRZtKqfwLBwmW3HPptVhQm54PvA8s3qhCQ+3JkqrZiIFwkkxNZxs3jwzr+aaSOzfhSzCndg0urb0GXA== dependencies: - "@lerna/child-process" "5.5.0" + "@lerna/child-process" "5.6.2" "@octokit/plugin-enterprise-rest" "^6.0.1" "@octokit/rest" "^19.0.3" - git-url-parse "^12.0.0" + git-url-parse "^13.1.0" npmlog "^6.0.2" -"@lerna/gitlab-client@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-5.5.0.tgz#b97de42c044345bd28bf672c2322876f87c055cf" - integrity sha512-ktKfBgQnt0MtyiTM3wuec47Wk7nHc+k2YvoC1roDGaXpgWS7lOQnA8RyorX4Hal3ZsrL95qi9vZOolWvUnxS3w== +"@lerna/gitlab-client@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-5.6.2.tgz#3bb3c350d28f38f719ddbba083ca28dbd353494e" + integrity sha512-TInJmbrsmYIwUyrRxytjO82KjJbRwm67F7LoZs1shAq6rMvNqi4NxSY9j+hT/939alFmEq1zssoy/caeLXHRfQ== dependencies: node-fetch "^2.6.1" npmlog "^6.0.2" -"@lerna/global-options@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-5.5.0.tgz#80d4fd02ce0789751aebf535c983048c8298668c" - integrity sha512-ydEsnXi2LRpxkzpSf8GFeCdh1roTKANZdqzjkhuUlBHrKzKxywpNPpGbXmh6JziHMYdgKGZUjnY35TxBlVRN6Q== +"@lerna/global-options@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-5.6.2.tgz#30bec81cdb4ac0bb47588e4a502ce908a982ff7c" + integrity sha512-kaKELURXTlczthNJskdOvh6GGMyt24qat0xMoJZ8plYMdofJfhz24h1OFcvB/EwCUwP/XV1+ohE5P+vdktbrEg== -"@lerna/has-npm-version@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-5.5.0.tgz#9bc4a09bd6b6b72b54b0eeed4d65b1fb57a51ac4" - integrity sha512-ALvz0fF1I7Dx+c+0rvkFdqEtp/hs4F/Av2blhOaFWTs78D7FTQa7IpURmvdVDi56H30fqa9b4nEQqnaCRJZKpQ== +"@lerna/has-npm-version@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-5.6.2.tgz#5359e9870941f66fb3b859995120801800880944" + integrity sha512-kXCnSzffmTWsaK0ol30coyCfO8WH26HFbmJjRBzKv7VGkuAIcB6gX2gqRRgNLLlvI+Yrp+JSlpVNVnu15SEH2g== dependencies: - "@lerna/child-process" "5.5.0" + "@lerna/child-process" "5.6.2" semver "^7.3.4" -"@lerna/import@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/import/-/import-5.5.0.tgz#0e7f491edef25181d9dd8e4b30ad5d55b767167c" - integrity sha512-mn87JOcb/j4KBV37Kv589avN5uArcJcASBonm1iWcTwxTvcNFj2BjxnUoVVY6EFamDfBLwWBcAvCO+cvmJkj3Q== - dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/prompt" "5.5.0" - "@lerna/pulse-till-done" "5.5.0" - "@lerna/validation-error" "5.5.0" +"@lerna/import@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/import/-/import-5.6.2.tgz#7be2321fbc41fa0f7fdd233eb62571e8418fcb75" + integrity sha512-xQUE49mtcP0z3KUdXBsyvp8rGDz6phuYUoQbhcFRJ7WPcQKzMvtm0XYrER6c2YWEX7QOuDac6tU82P8zTrTBaA== + dependencies: + "@lerna/child-process" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/prompt" "5.6.2" + "@lerna/pulse-till-done" "5.6.2" + "@lerna/validation-error" "5.6.2" dedent "^0.7.0" fs-extra "^9.1.0" p-map-series "^2.1.0" -"@lerna/info@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/info/-/info-5.5.0.tgz#1dc31a67fdc5288433ec76e06c94d616c043174f" - integrity sha512-2pgogAahv8tqY2sFarOCSXcxJFEag9z1pPGnHwKsq8NtekR0exLwFp93iTbDKRff8ScSmH82lNh22GFKZKLm/A== +"@lerna/info@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/info/-/info-5.6.2.tgz#82280cdae6e08aab5b3017c359f6e496116a62ae" + integrity sha512-MPjY5Olj+fiZHgfEdwXUFRKamdEuLr9Ob/qut8JsB/oQSQ4ALdQfnrOcMT8lJIcC2R67EA5yav2lHPBIkezm8A== dependencies: - "@lerna/command" "5.5.0" - "@lerna/output" "5.5.0" + "@lerna/command" "5.6.2" + "@lerna/output" "5.6.2" envinfo "^7.7.4" -"@lerna/init@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/init/-/init-5.5.0.tgz#f0f573914600131041accbf7bbc986458dda61be" - integrity sha512-dPjuk12s2pSnSL6ib7KQ+RKFyFYvsWAnSMro3sanb07og3tJkwVne8srlmYQsd/NghU8sBdQFFKIV+pzg2sg9w== +"@lerna/init@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/init/-/init-5.6.2.tgz#8f92868c3f9081245f5a8e0b94ce6b5979b8541e" + integrity sha512-ahU3/lgF+J8kdJAQysihFJROHthkIDXfHmvhw7AYnzf94HjxGNXj7nz6i3At1/dM/1nQhR+4/uNR1/OU4tTYYQ== dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/project" "5.5.0" + "@lerna/child-process" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/project" "5.6.2" fs-extra "^9.1.0" p-map "^4.0.0" write-json-file "^4.3.0" -"@lerna/link@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/link/-/link-5.5.0.tgz#7ff74081fe6beb864096f6d5fd768c65d1c12c26" - integrity sha512-wucP0DBKBG2Mkr9PNkPB9ez5pRxLEIY+6s0hB3iTxCTmef5GYPlQ+ftiaN2/IGVYb569AW97YilROuU2gDMrMw== +"@lerna/link@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/link/-/link-5.6.2.tgz#6af5addff89cd455c1837a47a36f430a2c6ae6a5" + integrity sha512-hXxQ4R3z6rUF1v2x62oIzLyeHL96u7ZBhxqYMJrm763D1VMSDcHKF9CjJfc6J9vH5Z2ZbL6CQg50Hw5mUpJbjg== dependencies: - "@lerna/command" "5.5.0" - "@lerna/package-graph" "5.5.0" - "@lerna/symlink-dependencies" "5.5.0" - "@lerna/validation-error" "5.5.0" + "@lerna/command" "5.6.2" + "@lerna/package-graph" "5.6.2" + "@lerna/symlink-dependencies" "5.6.2" + "@lerna/validation-error" "5.6.2" p-map "^4.0.0" slash "^3.0.0" -"@lerna/list@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/list/-/list-5.5.0.tgz#8a4a5b2d9a102283e4adf55daba9f2a7585b5140" - integrity sha512-vic7CeD/TL0bh6hzpgHK2Ogz7MW1NB6Sws1J7cl5CTn4sAGm/KZ/g4MNsLFVLJNAiPh+t2cmT0ndyNluShnjqA== +"@lerna/list@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/list/-/list-5.6.2.tgz#5fdf8c678891eacef1d90afb84fb461deb6bb662" + integrity sha512-WjE5O2tQ3TcS+8LqXUaxi0YdldhxUhNihT5+Gg4vzGdIlrPDioO50Zjo9d8jOU7i3LMIk6EzCma0sZr2CVfEGg== dependencies: - "@lerna/command" "5.5.0" - "@lerna/filter-options" "5.5.0" - "@lerna/listable" "5.5.0" - "@lerna/output" "5.5.0" + "@lerna/command" "5.6.2" + "@lerna/filter-options" "5.6.2" + "@lerna/listable" "5.6.2" + "@lerna/output" "5.6.2" -"@lerna/listable@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-5.5.0.tgz#91c2d3ea2b1edab73a12291d3f44fcdfb446f17b" - integrity sha512-2kCpn8vlmRTVA3tGr1XRkHOW2ljXjb/hRNxSK3DUf0k6sl9sEdQFSH7cf5qPnCAPcuLHS7b8kuFhA6x8nXFP3g== +"@lerna/listable@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-5.6.2.tgz#1a35e8da081f2dc286647cbf4a4a7fb3c7fb1102" + integrity sha512-8Yp49BwkY/5XqVru38Zko+6Wj/sgbwzJfIGEPy3Qu575r1NA/b9eI1gX22aMsEeXUeGOybR7nWT5ewnPQHjqvA== dependencies: - "@lerna/query-graph" "5.5.0" + "@lerna/query-graph" "5.6.2" chalk "^4.1.0" columnify "^1.6.0" -"@lerna/log-packed@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-5.5.0.tgz#9485d22db36d17d56ed9875e24fe924ff9e7c45f" - integrity sha512-kVDEy29VfBQeha92IBuPq9W/kP6ffboCWuU64lBIAljTDdpFrMFBeLRrWfLSLIVe2fq8FpGk8PInNlDHmvT5PA== +"@lerna/log-packed@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-5.6.2.tgz#05d26f038ce64e8ce8395c1745dfeb7589f89790" + integrity sha512-O9GODG7tMtWk+2fufn2MOkIDBYMRoKBhYMHshO5Aw/VIsH76DIxpX1koMzWfUngM/C70R4uNAKcVWineX4qzIw== dependencies: byte-size "^7.0.0" columnify "^1.6.0" has-unicode "^2.0.1" npmlog "^6.0.2" -"@lerna/npm-conf@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-5.5.0.tgz#e97aa65c6a94b4a9a74c6f6bc3a1c15537917bc8" - integrity sha512-ml1Pmn26a61y6nFijpNE9RAbsNOF2XL1Kqyd3x7+XFaDmqbSDqo2g5qlsb4gTdUj/Uy1niRGzy3XdC0FH5G+mg== +"@lerna/npm-conf@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-5.6.2.tgz#3b72fc528c8a1cd0acc9b277749a6153bd8de083" + integrity sha512-gWDPhw1wjXYXphk/PAghTLexO5T6abVFhXb+KOMCeem366mY0F5bM88PiorL73aErTNUoR8n+V4X29NTZzDZpQ== dependencies: config-chain "^1.1.12" pify "^5.0.0" -"@lerna/npm-dist-tag@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-5.5.0.tgz#a8d4139689fb13b13320175202f07bf42112e902" - integrity sha512-Hz6n9tqbGUuqI1q9IS3tAGx95TkOqLfXRay9kr/hjswj+HKp0Dtw1cu8YRtizA7CuIWw831eXCbqfFyILfytaA== +"@lerna/npm-dist-tag@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-5.6.2.tgz#6115aa4b005b57520d76428926ee7d12030f5e53" + integrity sha512-t2RmxV6Eog4acXkUI+EzWuYVbeVVY139pANIWS9qtdajfgp4GVXZi1S8mAIb70yeHdNpCp1mhK0xpCrFH9LvGQ== dependencies: - "@lerna/otplease" "5.5.0" + "@lerna/otplease" "5.6.2" npm-package-arg "8.1.1" npm-registry-fetch "^13.3.0" npmlog "^6.0.2" -"@lerna/npm-install@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-5.5.0.tgz#1ddff558304f62897feaad120c7da28331f5844e" - integrity sha512-axMtqZYuAl5qGcRCBYKqINimMrbQRM1f09sz9rKtwnx15066qT0IaKUt9YYo5bsZm/i3BXpBqcUxZXlGzQNWBQ== +"@lerna/npm-install@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-5.6.2.tgz#d5bd1e10c1c31f69a9ca5351b0cbe72dbc288dc2" + integrity sha512-AT226zdEo+uGENd37jwYgdALKJAIJK4pNOfmXWZWzVb9oMOr8I2YSjPYvSYUNG7gOo2YJQU8x5Zd7OShv2924Q== dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/get-npm-exec-opts" "5.5.0" + "@lerna/child-process" "5.6.2" + "@lerna/get-npm-exec-opts" "5.6.2" fs-extra "^9.1.0" npm-package-arg "8.1.1" npmlog "^6.0.2" signal-exit "^3.0.3" write-pkg "^4.0.0" -"@lerna/npm-publish@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-5.5.0.tgz#388e60b46315c3bdc2b3b7227e503adad13454f7" - integrity sha512-eDcmga5CcXGmSdVXBO75eCX3vypEwQO/lN7VqRpLSOsIHIRUGbfwo/stbz8sIF4+HAkaAFGj6BScjvjlyoh2pQ== +"@lerna/npm-publish@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-5.6.2.tgz#4e5e225b47589a7f8f96b7eee68b547e8ce432a2" + integrity sha512-ldSyewCfv9fAeC5xNjL0HKGSUxcC048EJoe/B+KRUmd+IPidvZxMEzRu08lSC/q3V9YeUv9ZvRnxATXOM8CffA== dependencies: - "@lerna/otplease" "5.5.0" - "@lerna/run-lifecycle" "5.5.0" + "@lerna/otplease" "5.6.2" + "@lerna/run-lifecycle" "5.6.2" fs-extra "^9.1.0" libnpmpublish "^6.0.4" npm-package-arg "8.1.1" @@ -3671,85 +3383,85 @@ pify "^5.0.0" read-package-json "^5.0.1" -"@lerna/npm-run-script@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-5.5.0.tgz#f98377022358cb179b304fc05253972afc272bfb" - integrity sha512-ltEtw28CLpG/VaWX4PZ1enJ0wxA/Qw8ScAwhQTZj0xL6Lhkq5H0LoEALVRAq2gK10h1p2IUs/W034oXT1chH0w== +"@lerna/npm-run-script@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-5.6.2.tgz#66e3391ebdd6136312277be37a1b62ce48c12abf" + integrity sha512-MOQoWNcAyJivM8SYp0zELM7vg/Dj07j4YMdxZkey+S1UO0T4/vKBxb575o16hH4WeNzC3Pd7WBlb7C8dLOfNwQ== dependencies: - "@lerna/child-process" "5.5.0" - "@lerna/get-npm-exec-opts" "5.5.0" + "@lerna/child-process" "5.6.2" + "@lerna/get-npm-exec-opts" "5.6.2" npmlog "^6.0.2" -"@lerna/otplease@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-5.5.0.tgz#68ac55c9dd2e1589772852834e9012d29d1f2e7a" - integrity sha512-zNS315iH2VRQz/LJTrqUUuEqMnNsCoMXOMOaBzcB/AL29mYMvJlT05dMqenMPKrRtW0tAFzPC7jLTzybdRa7Qg== +"@lerna/otplease@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-5.6.2.tgz#a94e4daf9d3d42bfc0366a6889b8809ed32dbdd0" + integrity sha512-dGS4lzkEQVTMAgji82jp8RK6UK32wlzrBAO4P4iiVHCUTuwNLsY9oeBXvVXSMrosJnl6Hbe0NOvi43mqSucGoA== dependencies: - "@lerna/prompt" "5.5.0" + "@lerna/prompt" "5.6.2" -"@lerna/output@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/output/-/output-5.5.0.tgz#dff2b336d9f92403af23b9533f8448763422818c" - integrity sha512-f+MXc9X1xEe2w0AC+CAMr093MumCTNYmyIt8eUMYQMmoRkWT2n4tN8/KvWw9ucSWLKMkZtOTJiC+S6RJ4nWUig== +"@lerna/output@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/output/-/output-5.6.2.tgz#fa97315d16cfe005a2891a3fc98f6f4fd3f518ed" + integrity sha512-++d+bfOQwY66yo7q1XuAvRcqtRHCG45e/awP5xQomTZ6R1rhWiZ3whWdc9Z6lF7+UtBB9toSYYffKU/xc3L0yQ== dependencies: npmlog "^6.0.2" -"@lerna/pack-directory@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-5.5.0.tgz#502d67f9ae4772755c8211cb62d46865f8e5aa9d" - integrity sha512-zHpIAeZOpIH/Slb8vuh75XR46mc4RZNwPS6XpwRgMRpp3Y1Bazlv6hDcq+pZTg1FwYKIDQDRfxW3IQi/aDPIjA== +"@lerna/pack-directory@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-5.6.2.tgz#ced0287d13d8575fe928ad7d9ad92dc6554cc86d" + integrity sha512-w5Jk5fo+HkN4Le7WMOudTcmAymcf0xPd302TqAQncjXpk0cb8tZbj+5bbNHsGb58GRjOIm5icQbHXooQUxbHhA== dependencies: - "@lerna/get-packed" "5.5.0" - "@lerna/package" "5.5.0" - "@lerna/run-lifecycle" "5.5.0" - "@lerna/temp-write" "5.5.0" + "@lerna/get-packed" "5.6.2" + "@lerna/package" "5.6.2" + "@lerna/run-lifecycle" "5.6.2" + "@lerna/temp-write" "5.6.2" npm-packlist "^5.1.1" npmlog "^6.0.2" tar "^6.1.0" -"@lerna/package-graph@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-5.5.0.tgz#d73b84aed819924250cbc21c8fcf1d7e945f809a" - integrity sha512-g378NrCTEmVXqkAkv9EX8L3K7JTioPNuxItXTHQxlHDhZ2RM9KCVbT/ihwefVujWwwMPNij10bmfJUaEp2TGPQ== +"@lerna/package-graph@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-5.6.2.tgz#cb0a70b83afc418c5b5363bb96746d501decdbeb" + integrity sha512-TmL61qBBvA3Tc4qICDirZzdFFwWOA6qicIXUruLiE2PblRowRmCO1bKrrP6XbDOspzwrkPef6N2F2/5gHQAnkQ== dependencies: - "@lerna/prerelease-id-from-version" "5.5.0" - "@lerna/validation-error" "5.5.0" + "@lerna/prerelease-id-from-version" "5.6.2" + "@lerna/validation-error" "5.6.2" npm-package-arg "8.1.1" npmlog "^6.0.2" semver "^7.3.4" -"@lerna/package@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/package/-/package-5.5.0.tgz#2189e43c4acbbeabf6cd4ae33ad097da7789596e" - integrity sha512-vP08ZdMd3A7B0hEI4ZNgCeBef64yCidrnFUIiIhXb/tAsDmGCGqS2IFdGRNE9vv01tVg0WrPLim4tl8AjoigKw== +"@lerna/package@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/package/-/package-5.6.2.tgz#da73b350693fdd4154cf5b19799bfaadff57442e" + integrity sha512-LaOC8moyM5J9WnRiWZkedjOninSclBOJyPqhif6mHb2kCFX6jAroNYzE8KM4cphu8CunHuhI6Ixzswtv+Dultw== dependencies: load-json-file "^6.2.0" npm-package-arg "8.1.1" write-pkg "^4.0.0" -"@lerna/prerelease-id-from-version@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.5.0.tgz#5f228106078a13d58a84b364c2aa8634451798df" - integrity sha512-cpy0EgfO/7fXPhl/EsJnD8uGv0f8d6FHG2R1Xr7sJvmkffhkIy90qkFA7uSaZAA+ar9QFSAUJ+wGox0bhGJhHA== +"@lerna/prerelease-id-from-version@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.6.2.tgz#63002662024a261310c6fbf01a50cb5f50569ca8" + integrity sha512-7gIm9fecWFVNy2kpj/KbH11bRcpyANAwpsft3X5m6J7y7A6FTUscCbEvl3ZNdpQKHNuvnHgCtkm3A5PMSCEgkA== dependencies: semver "^7.3.4" -"@lerna/profiler@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-5.5.0.tgz#6ab9604ea2850e38ca654d0b8d1f5594c83c2d7d" - integrity sha512-2DkkMxYCq/RsBptN+gJtmqwdrFqji6QMpNlm7v9JgS9kN2aHUIxcavtHXDaYf9sdPoey/bGypRv9DDTDcuw9MA== +"@lerna/profiler@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-5.6.2.tgz#5bfd52fb666ad0506cac3b8d2839e904d0acf90a" + integrity sha512-okwkagP5zyRIOYTceu/9/esW7UZFt7lyL6q6ZgpSG3TYC5Ay+FXLtS6Xiha/FQdVdumFqKULDWTGovzUlxcwaw== dependencies: fs-extra "^9.1.0" npmlog "^6.0.2" upath "^2.0.1" -"@lerna/project@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/project/-/project-5.5.0.tgz#92f1988c70606dbe1aba7f83f265428f7c1601a0" - integrity sha512-TD6/QGv/+Uh7GRXM/9m3EC0QpK2+U1WA+hoE5pSnpU5oDzwwUkynS3RuAcd2ID19e/u/ajfZtV+xcpaM7t+SHw== +"@lerna/project@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/project/-/project-5.6.2.tgz#a893851cdceeace36d30fdfdbc2da9159a9e2041" + integrity sha512-kPIMcIy/0DVWM91FPMMFmXyAnCuuLm3NdhnA8NusE//VuY9wC6QC/3OwuCY39b2dbko/fPZheqKeAZkkMH6sGg== dependencies: - "@lerna/package" "5.5.0" - "@lerna/validation-error" "5.5.0" + "@lerna/package" "5.6.2" + "@lerna/validation-error" "5.6.2" cosmiconfig "^7.0.0" dedent "^0.7.0" dot-prop "^6.0.1" @@ -3762,38 +3474,38 @@ resolve-from "^5.0.0" write-json-file "^4.3.0" -"@lerna/prompt@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-5.5.0.tgz#5c77de96f09bbcecb45d0db40233f4db7a12a1df" - integrity sha512-B7QEmmyleR+1XAewqEPdgZPecekJgVoAZ8YZgR8l4QlAMvf5BTHI//3AJI/HPN4DYZWGcjDoGFLEkpX906T8Rw== +"@lerna/prompt@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-5.6.2.tgz#7ea10fd3543aced0bf5521741808d86ffcf4b320" + integrity sha512-4hTNmVYADEr0GJTMegWV+GW6n+dzKx1vN9v2ISqyle283Myv930WxuyO0PeYGqTrkneJsyPreCMovuEGCvZ0iQ== dependencies: inquirer "^8.2.4" npmlog "^6.0.2" -"@lerna/publish@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-5.5.0.tgz#0ac309bf9fb8a37321534ab83aaf8fa0b6a967e2" - integrity sha512-ZstILgupYxB8TpGkWgPZg1uoFIQUij07kizHau1BZXdV3xwPU6jtYAzGXuztinJDnnxfwjc7SjuinoYZcbmJXg== - dependencies: - "@lerna/check-working-tree" "5.5.0" - "@lerna/child-process" "5.5.0" - "@lerna/collect-updates" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/describe-ref" "5.5.0" - "@lerna/log-packed" "5.5.0" - "@lerna/npm-conf" "5.5.0" - "@lerna/npm-dist-tag" "5.5.0" - "@lerna/npm-publish" "5.5.0" - "@lerna/otplease" "5.5.0" - "@lerna/output" "5.5.0" - "@lerna/pack-directory" "5.5.0" - "@lerna/prerelease-id-from-version" "5.5.0" - "@lerna/prompt" "5.5.0" - "@lerna/pulse-till-done" "5.5.0" - "@lerna/run-lifecycle" "5.5.0" - "@lerna/run-topologically" "5.5.0" - "@lerna/validation-error" "5.5.0" - "@lerna/version" "5.5.0" +"@lerna/publish@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-5.6.2.tgz#c8a26610c4fb2c7c5a232e04852bf545b242ee65" + integrity sha512-QaW0GjMJMuWlRNjeDCjmY/vjriGSWgkLS23yu8VKNtV5U3dt5yIKA3DNGV3HgZACuu45kQxzMDsfLzgzbGNtYA== + dependencies: + "@lerna/check-working-tree" "5.6.2" + "@lerna/child-process" "5.6.2" + "@lerna/collect-updates" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/describe-ref" "5.6.2" + "@lerna/log-packed" "5.6.2" + "@lerna/npm-conf" "5.6.2" + "@lerna/npm-dist-tag" "5.6.2" + "@lerna/npm-publish" "5.6.2" + "@lerna/otplease" "5.6.2" + "@lerna/output" "5.6.2" + "@lerna/pack-directory" "5.6.2" + "@lerna/prerelease-id-from-version" "5.6.2" + "@lerna/prompt" "5.6.2" + "@lerna/pulse-till-done" "5.6.2" + "@lerna/run-lifecycle" "5.6.2" + "@lerna/run-topologically" "5.6.2" + "@lerna/validation-error" "5.6.2" + "@lerna/version" "5.6.2" fs-extra "^9.1.0" libnpmaccess "^6.0.3" npm-package-arg "8.1.1" @@ -3804,98 +3516,99 @@ pacote "^13.6.1" semver "^7.3.4" -"@lerna/pulse-till-done@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-5.5.0.tgz#fc5fbba9494f1e6c2aa2dd2b366b0cb59b5a11f0" - integrity sha512-PcPSCWGzLp00UGJ5VHDpdqpBQ9C9Cs7E5FImEITGHE9UwcAC23LwSp7tOzdXWPyj3u8PLYLn+ebt9ml1jWSKgA== +"@lerna/pulse-till-done@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-5.6.2.tgz#061c4ba2894fa08333fe4502299f9f9f24bdb91c" + integrity sha512-eA/X1RCxU5YGMNZmbgPi+Kyfx1Q3bn4P9jo/LZy+/NRRr1po3ASXP2GJZ1auBh/9A2ELDvvKTOXCVHqczKC6rA== dependencies: npmlog "^6.0.2" -"@lerna/query-graph@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-5.5.0.tgz#8e3baee06bb5a5272f947c40451d5a0b3be20b29" - integrity sha512-mqCzZRF+IDPSj2zYJ1eO3PQsZshiKf54BXAe7HnYYJNbs1i8JMRpdaLr3TEyKDpVTcVzbEmFKwGi7KMhJG6rBQ== +"@lerna/query-graph@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-5.6.2.tgz#c507e9a9cb613c6d4d163d7d115a52ef8c1a9d3f" + integrity sha512-KRngr96yBP8XYDi9/U62fnGO+ZXqm04Qk6a2HtoTr/ha8QvO1s7Tgm0xs/G7qWXDQHZgunWIbmK/LhxM7eFQrw== dependencies: - "@lerna/package-graph" "5.5.0" + "@lerna/package-graph" "5.6.2" -"@lerna/resolve-symlink@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-5.5.0.tgz#3a90a7c6be3d7622c4698636736a88af299b02d9" - integrity sha512-J44Kc6OWa1uNZh+YSWuIBorTpTuXhuuJ7DtX4vwfF3AAp2frW6pBrmFZMibOcyOQ6QCp+PeiHQCXCF42uSq8pA== +"@lerna/resolve-symlink@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-5.6.2.tgz#51b6f4bbee36a1dcbf52634d05dcd08bb286f2cf" + integrity sha512-PDQy+7M8JEFtwIVHJgWvSxHkxJf9zXCENkvIWDB+SsoDPhw9+caewt46bTeP5iGm9pOMu3oZukaWo/TvF7sNjg== dependencies: fs-extra "^9.1.0" npmlog "^6.0.2" read-cmd-shim "^3.0.0" -"@lerna/rimraf-dir@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-5.5.0.tgz#fe22c154f2ebd678f27f5258cb655f7b3c948bb4" - integrity sha512-dwWN5SGXQ39FocRAZ3uL7tYUuK98r/VHQZRcJjJ8hxpuxti+EPzGegtA05NsvvmW2PpFsBzYKITFQHX3GX4LWA== +"@lerna/rimraf-dir@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-5.6.2.tgz#219c51a46c27b94789d683fc0424539f14505fea" + integrity sha512-jgEfzz7uBUiQKteq3G8MtJiA2D2VoKmZSSY3VSiW/tPOSXYxxSHxEsClQdCeNa6+sYrDNDT8fP6MJ3lPLjDeLA== dependencies: - "@lerna/child-process" "5.5.0" + "@lerna/child-process" "5.6.2" npmlog "^6.0.2" path-exists "^4.0.0" rimraf "^3.0.2" -"@lerna/run-lifecycle@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-5.5.0.tgz#50a434b9fd55134bb285c7c7a24532996a6c0d8d" - integrity sha512-BtnEO3IlZ7znUmQtSxd7oSSmgzJbSH+v58foTpbuvMtOBFJxV4LNyv2uyto2t4bYdCWEnw4ybd8j32aEEG9UNQ== +"@lerna/run-lifecycle@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-5.6.2.tgz#b6954f334b40ca80caeb9e0cb7ca936222f39915" + integrity sha512-u9gGgq/50Fm8dvfcc/TSHOCAQvzLD7poVanDMhHYWOAqRDnellJEEmA1K/Yka4vZmySrzluahkry9G6jcREt+g== dependencies: - "@lerna/npm-conf" "5.5.0" + "@lerna/npm-conf" "5.6.2" "@npmcli/run-script" "^4.1.7" npmlog "^6.0.2" p-queue "^6.6.2" -"@lerna/run-topologically@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-5.5.0.tgz#39d94868ab39e4f3951bd5322603695a1ebba2e0" - integrity sha512-zl4I/SNg/yiLja1aF0B4X22CRzpRdvLB47KGjAgiGydcHwx2TUmI3MPoQVjvUbaOuctF/wSMS2tI6Hgdo60I0Q== +"@lerna/run-topologically@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-5.6.2.tgz#ef00aa6751b4164ae4825244917cdd4bc2562501" + integrity sha512-QQ/jGOIsVvUg3izShWsd67RlWYh9UOH2yw97Ol1zySX9+JspCMVQrn9eKq1Pk8twQOFhT87LpT/aaxbTBgREPw== dependencies: - "@lerna/query-graph" "5.5.0" + "@lerna/query-graph" "5.6.2" p-queue "^6.6.2" -"@lerna/run@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/run/-/run-5.5.0.tgz#294a1b374567255e70e545ae2567ec5c2565dcf6" - integrity sha512-yYR65A/GcDgEMmk2lMSBHGAbdgLMi6wICugLzVXfXISuTbEMzN1dCwSeGBOxzK2cvKV2Bpn4WeEYs64FNmNJbQ== - dependencies: - "@lerna/command" "5.5.0" - "@lerna/filter-options" "5.5.0" - "@lerna/npm-run-script" "5.5.0" - "@lerna/output" "5.5.0" - "@lerna/profiler" "5.5.0" - "@lerna/run-topologically" "5.5.0" - "@lerna/timer" "5.5.0" - "@lerna/validation-error" "5.5.0" +"@lerna/run@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/run/-/run-5.6.2.tgz#a964110d2fd13e4a3fe0fb4d752d0497651b26cb" + integrity sha512-c2kJxdFrNg5KOkrhmgwKKUOsfSrGNlFCe26EttufOJ3xfY0VnXlEw9rHOkTgwtu7969rfCdyaVP1qckMrF1Dgw== + dependencies: + "@lerna/command" "5.6.2" + "@lerna/filter-options" "5.6.2" + "@lerna/npm-run-script" "5.6.2" + "@lerna/output" "5.6.2" + "@lerna/profiler" "5.6.2" + "@lerna/run-topologically" "5.6.2" + "@lerna/timer" "5.6.2" + "@lerna/validation-error" "5.6.2" + fs-extra "^9.1.0" p-map "^4.0.0" -"@lerna/symlink-binary@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-5.5.0.tgz#1af7df1905dc01b5312af35f1f2f77269ebb9a65" - integrity sha512-vpVzEWgVfKGzMheb9XizF8hF/Ypfov0iMPBSAzVNxu5eNQVUz3KFrIZNgiBsFdIVN4W/y4jLwOSgXXKwvIodkA== +"@lerna/symlink-binary@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-5.6.2.tgz#f8c68273f8a4f382bc0420593815dc13027f245a" + integrity sha512-Cth+miwYyO81WAmrQbPBrLHuF+F0UUc0el5kRXLH6j5zzaRS3kMM68r40M7MmfH8m3GPi7691UARoWFEotW5jw== dependencies: - "@lerna/create-symlink" "5.5.0" - "@lerna/package" "5.5.0" + "@lerna/create-symlink" "5.6.2" + "@lerna/package" "5.6.2" fs-extra "^9.1.0" p-map "^4.0.0" -"@lerna/symlink-dependencies@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-5.5.0.tgz#7b94c8385397bea1c1be4b280c335155f2e431cf" - integrity sha512-gqFZ4AeVr+nqyfg8c2xNizGzBemfgtCpGv4NnjA/66HJWCE+/fT7NTIi8Qk2glbYf37ojRcjUfc0RvW7NGv5qA== +"@lerna/symlink-dependencies@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-5.6.2.tgz#263866a869c253db805a9a385741e8919b0aa341" + integrity sha512-dUVNQLEcjVOIQiT9OlSAKt0ykjyJPy8l9i4NJDe2/0XYaUjo8PWsxJ0vrutz27jzi2aZUy07ASmowQZEmnLHAw== dependencies: - "@lerna/create-symlink" "5.5.0" - "@lerna/resolve-symlink" "5.5.0" - "@lerna/symlink-binary" "5.5.0" + "@lerna/create-symlink" "5.6.2" + "@lerna/resolve-symlink" "5.6.2" + "@lerna/symlink-binary" "5.6.2" fs-extra "^9.1.0" p-map "^4.0.0" p-map-series "^2.1.0" -"@lerna/temp-write@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/temp-write/-/temp-write-5.5.0.tgz#82eb605edaba76ea2d43b95f7585dc92d7cadffe" - integrity sha512-7MmqTfyWcjGkgPkWHaldmCmDBSLka50z0+lsmZuGLwIvQl72ZfC+ZJF/6107m+hgtUJBpJQ3UYEhrrdfR4L46Q== +"@lerna/temp-write@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/temp-write/-/temp-write-5.6.2.tgz#724fcadfe12bfaa723c1ea0fbc14804653816db0" + integrity sha512-S5ZNVTurSwWBmc9kh5alfSjmO3+BnRT6shYtOlmVIUYqWeYVYA5C1Htj322bbU4CSNCMFK6NQl4qGKL17HMuig== dependencies: graceful-fs "^4.1.15" is-stream "^2.0.0" @@ -3903,37 +3616,38 @@ temp-dir "^1.0.0" uuid "^8.3.2" -"@lerna/timer@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-5.5.0.tgz#c70ecc74a02757d76f9dd4b6013a2bacdb1bb6ae" - integrity sha512-jgCL2ZmZNn7sWL+M/TuGJukTkUs/il6EwBYcgd10h0JazQ4fAiBhFq36ZzTvYkz6ujKvKOcqyWrMdmi8Q339qA== +"@lerna/timer@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-5.6.2.tgz#57de5dde716539c699f295b8a8c182dd41801b2e" + integrity sha512-AjMOiLc2B+5Nzdd9hNORetAdZ/WK8YNGX/+2ypzM68TMAPfIT5C40hMlSva9Yg4RsBz22REopXgM5s2zQd5ZQA== -"@lerna/validation-error@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-5.5.0.tgz#aad031859878516707c83b9e4d1ea9aeb0180005" - integrity sha512-o/8sEaZKdZdE4/t+E/cFpnYIiDzt7uMHVpWmpCG0l6nZSDzB8+5ehAAudy2qJOwxEAKJ6QGvi7jWLjc2NWa4HQ== +"@lerna/validation-error@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-5.6.2.tgz#75310749d94395f009c67a8fd47e146a86ce2943" + integrity sha512-4WlDUHaa+RSJNyJRtX3gVIAPVzjZD2tle8AJ0ZYBfdZnZmG0VlB2pD1FIbOQPK8sY2h5m0cHLRvfLoLncqHvdQ== dependencies: npmlog "^6.0.2" -"@lerna/version@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/version/-/version-5.5.0.tgz#a40dfd48b3d751d5007e48bcc9828fc69ee812ab" - integrity sha512-E6ZrzTrYwof5cSvyTpztZKOiJKAK+aXi/gfsGbLdbYGMArY4B/pYOMOcRMXHBh7BuLicMih/mRUb4M7uCnuE0A== - dependencies: - "@lerna/check-working-tree" "5.5.0" - "@lerna/child-process" "5.5.0" - "@lerna/collect-updates" "5.5.0" - "@lerna/command" "5.5.0" - "@lerna/conventional-commits" "5.5.0" - "@lerna/github-client" "5.5.0" - "@lerna/gitlab-client" "5.5.0" - "@lerna/output" "5.5.0" - "@lerna/prerelease-id-from-version" "5.5.0" - "@lerna/prompt" "5.5.0" - "@lerna/run-lifecycle" "5.5.0" - "@lerna/run-topologically" "5.5.0" - "@lerna/temp-write" "5.5.0" - "@lerna/validation-error" "5.5.0" +"@lerna/version@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/version/-/version-5.6.2.tgz#211ed1c0af3be0bb6bf6f79ef0d3e8daa1266ff0" + integrity sha512-odNSR2rTbHW++xMZSQKu/F6Syrd/sUvwDLPaMKktoOSPKmycHt/eWcuQQyACdtc43Iqeu4uQd7PCLsniqOVFrw== + dependencies: + "@lerna/check-working-tree" "5.6.2" + "@lerna/child-process" "5.6.2" + "@lerna/collect-updates" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/conventional-commits" "5.6.2" + "@lerna/github-client" "5.6.2" + "@lerna/gitlab-client" "5.6.2" + "@lerna/output" "5.6.2" + "@lerna/prerelease-id-from-version" "5.6.2" + "@lerna/prompt" "5.6.2" + "@lerna/run-lifecycle" "5.6.2" + "@lerna/run-topologically" "5.6.2" + "@lerna/temp-write" "5.6.2" + "@lerna/validation-error" "5.6.2" + "@nrwl/devkit" ">=14.8.1 < 16" chalk "^4.1.0" dedent "^0.7.0" load-json-file "^6.2.0" @@ -3947,30 +3661,15 @@ slash "^3.0.0" write-json-file "^4.3.0" -"@lerna/write-log-file@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-5.5.0.tgz#6f3d7945ee6dda220f9188d3160eda775bd8941e" - integrity sha512-XPnp5B+bcmwpXJpJn45V8e2SU6Z1oTwW0vW9uW3l0nmbOvpT9PbPkf9hC80cZOWovXSBefUDwEGqA5fQdhvqGg== +"@lerna/write-log-file@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-5.6.2.tgz#a297307c80356abe4c3cfc75664febfa4658ec31" + integrity sha512-J09l18QnWQ3sXIRwuJkjXY3+KwPR2uO5NgbZGE3GXJK1V/LzOBRMvjGAIbuQHXw25uqe7vpLUpB8drtnFrubCQ== dependencies: npmlog "^6.0.2" write-file-atomic "^4.0.1" -"@mapbox/node-pre-gyp@^1.0.0": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc" - integrity sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw== - dependencies: - detect-libc "^2.0.0" - https-proxy-agent "^5.0.0" - make-dir "^3.1.0" - node-fetch "^2.6.7" - nopt "^5.0.0" - npmlog "^5.0.1" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.11" - -"@mapbox/node-pre-gyp@^1.0.4": +"@mapbox/node-pre-gyp@^1.0.0", "@mapbox/node-pre-gyp@^1.0.4": version "1.0.10" resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c" integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA== @@ -3998,21 +3697,11 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@noble/hashes@1.1.2", "@noble/hashes@~1.1.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183" - integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA== - "@noble/hashes@1.2.0", "@noble/hashes@~1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.2.0.tgz#a3150eeb09cc7ab207ebf6d7b9ad311a9bdbed12" integrity sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ== -"@noble/secp256k1@1.6.3", "@noble/secp256k1@~1.6.0": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.6.3.tgz#7eed12d9f4404b416999d0c87686836c4c5c9b94" - integrity sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ== - "@noble/secp256k1@1.7.1", "@noble/secp256k1@~1.7.0": version "1.7.1" resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c" @@ -4194,19 +3883,75 @@ read-package-json-fast "^2.0.3" which "^2.0.2" -"@nrwl/cli@14.6.5": - version "14.6.5" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.6.5.tgz#6751d7c48fff78095fb19874bda6a1f786e47ce8" - integrity sha512-sjT4/oMk1F4+dTpCp08IVE8hfqKsokebUECzC1hTu4pCeFo0oviIi7bQTuCIbG9w4iiHLioa6QmLRXBwVJEr9w== +"@nrwl/cli@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.2.tgz#82537d3d85410b0143d37a3b4fade09675356084" + integrity sha512-QoCmyrcGakHAYTJaNBbOerRQAmqJHMYGCdqtQidV+aP9p1Dy33XxDELfhd+IYmGqngutXuEWChNpWNhPloLnoA== dependencies: - nx "14.6.5" + nx "15.9.2" -"@nrwl/tao@14.6.5": - version "14.6.5" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.6.5.tgz#202d9ed3e13cb873dd7f218c0622ba8972ba8cd6" - integrity sha512-sSbTSN4Bfh4vQR2iCl9arNzEhJztG6paY2j+k/GwQZdN+QssX9xV32jLWYIC3rDmPJWaZ11uD3TgAyr3X7GXhw== +"@nrwl/devkit@>=14.8.1 < 16": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.9.2.tgz#482b89f1bf88d3600b11f8b7e3e4452c5766eca4" + integrity sha512-2DvTstVZb91m+d4wqUJMBHQ3elxyabdmFE6/3aXmtOGeDxTyXyDzf/1O6JvBBiL8K6XC3ZYchjtxUHgxl/NJ5A== dependencies: - nx "14.6.5" + ejs "^3.1.7" + ignore "^5.0.4" + semver "7.3.4" + tmp "~0.2.1" + tslib "^2.3.0" + +"@nrwl/nx-darwin-arm64@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.2.tgz#612d8d714ec876cafd6f1483bf5565704d1b75be" + integrity sha512-Yv+OVsQt3C/hmWOC+YhJZQlsyph5w1BHfbp4jyCvV1ZXBbb8NdvwxgDHPWXxKPTc1EXuB7aEX3qzxM3/OWEUJg== + +"@nrwl/nx-darwin-x64@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.2.tgz#3f77bd90dbabf4782d81f773cfb2739a443e595f" + integrity sha512-qHfdluHlPzV0UHOwj1ZJ+qNEhzfLGiBuy1cOth4BSzDlvMnkuqBWoprfaXoztzYcus2NSILY1/7b3Jw4DAWmMw== + +"@nrwl/nx-linux-arm-gnueabihf@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.2.tgz#3374a5a1692b222ce18f2213a47b4d68fb509e70" + integrity sha512-0GzwbablosnYnnJDCJvAeZv8LlelSrNwUnGhe43saeoZdAew35Ay1E34zBrg/GCGTASuz+knEEYFM+gDD9Mc6A== + +"@nrwl/nx-linux-arm64-gnu@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.2.tgz#e3ec95c6ee3285c77422886cf4cbec1f04804460" + integrity sha512-3mFIY7iUTPG45hSIRaM2DmraCy8W6hNoArAGRrTgYw40BIJHtLrW+Rt7DLyvVXaYCvrKugWOKtxC+jG7kpIZVA== + +"@nrwl/nx-linux-arm64-musl@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.2.tgz#72ce601d256083ded7380c598f1b3eb4dc2a3472" + integrity sha512-FNBnXEtockwxZa4I3NqggrJp0YIbNokJvt/clrICP+ijOacdUDkv8mJedavobkFsRsNq9gzCbRbUScKymrOLrg== + +"@nrwl/nx-linux-x64-gnu@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.2.tgz#2da6bb50cd80d699310e91c7331baa6cfc8ce197" + integrity sha512-gHWsP5lbe4FNQCa1Q/VLxIuik+BqAOcSzyPjdUa4gCDcbxPa8xiE57PgXB5E1XUzOWNnDTlXa/Ll07/TIuKuog== + +"@nrwl/nx-linux-x64-musl@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.2.tgz#39b3bda5868a53b722f1d42700dce71c5ff3f6b9" + integrity sha512-EaFUukCbmoHsYECX2AS4pxXH933yesBFVvBgD38DkoFDxDoJMVt6JqYwm+d5R7S4R2P9U3l++aurljQTRq567Q== + +"@nrwl/nx-win32-arm64-msvc@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.2.tgz#bc350be5cb7d0bfa6c2c5ced40c5af163a457a2c" + integrity sha512-PGAe7QMr51ivx1X3avvs8daNlvv1wGo3OFrobjlu5rSyjC1Y3qHwT9+wdlwzNZ93FIqWOq09s+rE5gfZRfpdAg== + +"@nrwl/nx-win32-x64-msvc@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.2.tgz#3e46c3f7af196bdbf0deb336ec4f9448c54e4a9f" + integrity sha512-Q8onNzhuAZ0l9DNkm8D4Z1AEIzJr8JiT4L2fVBLYrV/R75C2HS3q7lzvfo6oqMY6mXge1cFPcrTtg3YXBQaSWA== + +"@nrwl/tao@15.9.2": + version "15.9.2" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.2.tgz#e970efa8b3fb828007b02286e9e505247032b5b3" + integrity sha512-+LqNC37w9c6q6Ukdpf0z0tt1PQFNi4gwhHpJvkYQiKRETHjyrrlyqTNEPEyA7PI62RuYC6VrpVw2gzI7ufqZEA== + dependencies: + nx "15.9.2" "@oclif/color@^0.1.2": version "0.1.2" @@ -4232,16 +3977,16 @@ semver "^7.3.2" "@oclif/command@^1.4.29", "@oclif/command@^1.4.31", "@oclif/command@^1.5.4", "@oclif/command@^1.6.0", "@oclif/command@^1.8.14", "@oclif/command@^1.8.15", "@oclif/command@^1.8.6", "@oclif/command@^1.8.9": - version "1.8.16" - resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.8.16.tgz#bea46f81b2061b47e1cda318a0b923e62ca4cc0c" - integrity sha512-rmVKYEsKzurfRU0xJz+iHelbi1LGlihIWZ7Qvmb/CBz1EkhL7nOkW4SVXmG2dA5Ce0si2gr88i6q4eBOMRNJ1w== + version "1.8.23" + resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.8.23.tgz#b27e6b35b48c692eba53a35db7be736cdf5e4411" + integrity sha512-H78+YbPKw9VankmlFizkHPP81UpoPC2x0MrTdU5/kzy0CCyTBmSGAxaUsiNi9tK7wKxMXOUbCYkk9MHr99zBaw== dependencies: "@oclif/config" "^1.18.2" - "@oclif/errors" "^1.3.5" + "@oclif/errors" "^1.3.6" "@oclif/help" "^1.0.1" - "@oclif/parser" "^3.8.6" + "@oclif/parser" "^3.8.10" debug "^4.1.1" - semver "^7.3.2" + semver "^7.4.0" "@oclif/config@1.18.2": version "1.18.2" @@ -4255,18 +4000,30 @@ is-wsl "^2.1.1" tslib "^2.0.0" -"@oclif/config@^1.17.1", "@oclif/config@^1.18.2", "@oclif/config@^1.6.0", "@oclif/config@^1.6.22", "@oclif/config@^1.8.7": - version "1.18.3" - resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.18.3.tgz#ddfc144fdab66b1658c2f1b3478fa7fbfd317e79" - integrity sha512-sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA== +"@oclif/config@1.18.6": + version "1.18.6" + resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.18.6.tgz#37367026b3110a2f04875509b1920a8ee4489f21" + integrity sha512-OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA== dependencies: - "@oclif/errors" "^1.3.5" - "@oclif/parser" "^3.8.0" - debug "^4.1.1" - globby "^11.0.1" + "@oclif/errors" "^1.3.6" + "@oclif/parser" "^3.8.9" + debug "^4.3.4" + globby "^11.1.0" is-wsl "^2.1.1" tslib "^2.3.1" +"@oclif/config@^1.17.1", "@oclif/config@^1.18.2", "@oclif/config@^1.6.0", "@oclif/config@^1.6.22", "@oclif/config@^1.8.7": + version "1.18.8" + resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.18.8.tgz#efaccbd0381f90a98fa69c9131e14c5a91fc0659" + integrity sha512-FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg== + dependencies: + "@oclif/errors" "^1.3.6" + "@oclif/parser" "^3.8.10" + debug "^4.3.4" + globby "^11.1.0" + is-wsl "^2.1.1" + tslib "^2.5.0" + "@oclif/dev-cli@^1.23.0": version "1.26.10" resolved "https://registry.yarnpkg.com/@oclif/dev-cli/-/dev-cli-1.26.10.tgz#d8df3a79009b68552f5e7f249d1d19ca52278382" @@ -4286,7 +4043,7 @@ qqjs "^0.3.10" tslib "^2.0.3" -"@oclif/errors@1.3.5", "@oclif/errors@^1.2.2", "@oclif/errors@^1.3.3", "@oclif/errors@^1.3.5": +"@oclif/errors@1.3.5": version "1.3.5" resolved "https://registry.yarnpkg.com/@oclif/errors/-/errors-1.3.5.tgz#a1e9694dbeccab10fe2fe15acb7113991bed636c" integrity sha512-OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ== @@ -4297,13 +4054,24 @@ strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +"@oclif/errors@1.3.6", "@oclif/errors@^1.2.2", "@oclif/errors@^1.3.3", "@oclif/errors@^1.3.5", "@oclif/errors@^1.3.6": + version "1.3.6" + resolved "https://registry.yarnpkg.com/@oclif/errors/-/errors-1.3.6.tgz#e8fe1fc12346cb77c4f274e26891964f5175f75d" + integrity sha512-fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ== + dependencies: + clean-stack "^3.0.0" + fs-extra "^8.1" + indent-string "^4.0.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + "@oclif/help@^1.0.0", "@oclif/help@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@oclif/help/-/help-1.0.1.tgz#fd96a3dd9fb2314479e6c8584c91b63754a7dff5" - integrity sha512-8rsl4RHL5+vBUAKBL6PFI3mj58hjPCp2VYyXD4TAa7IMStikFfOH2gtWmqLzIlxAED2EpD0dfYwo9JJxYsH7Aw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/@oclif/help/-/help-1.0.5.tgz#0a370d0340fcf167ec3cb7a4f3074ebb3db8a94a" + integrity sha512-77ZXqVXcd+bQ6EafN56KbL4PbNtZM/Lq4GQElekNav+CPIgPNKT3AtMTQrc0fWke6bb/BTLB+1Fu1gWgx643jQ== dependencies: - "@oclif/config" "1.18.2" - "@oclif/errors" "1.3.5" + "@oclif/config" "1.18.6" + "@oclif/errors" "1.3.6" chalk "^4.1.2" indent-string "^4.0.0" lodash "^4.17.21" @@ -4317,15 +4085,15 @@ resolved "https://registry.yarnpkg.com/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91" integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw== -"@oclif/parser@^3.8.0", "@oclif/parser@^3.8.6": - version "3.8.7" - resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.8.7.tgz#236d48db05d0b00157d3b42d31f9dac7550d2a7c" - integrity sha512-b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q== +"@oclif/parser@^3.8.0", "@oclif/parser@^3.8.10", "@oclif/parser@^3.8.6", "@oclif/parser@^3.8.9": + version "3.8.10" + resolved "https://registry.yarnpkg.com/@oclif/parser/-/parser-3.8.10.tgz#7b1048566e1d3f45ed09ca92b2e30f09bd9647e1" + integrity sha512-J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ== dependencies: - "@oclif/errors" "^1.3.5" + "@oclif/errors" "^1.3.6" "@oclif/linewrap" "^1.0.0" chalk "^4.1.0" - tslib "^2.3.1" + tslib "^2.5.0" "@oclif/plugin-autocomplete@^0.1.5": version "0.1.5" @@ -4463,11 +4231,11 @@ "@octokit/types" "^6.0.3" "@octokit/auth-token@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.1.tgz#88bc2baf5d706cb258474e722a720a8365dff2ec" - integrity sha512-/USkK4cioY209wXRpund6HZzHo9GmjakpV9ycOkpMcMxMk7QVcVFVyCMtzvXYiHsB2crgDgrtNYSELYFBXhhaA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.3.tgz#ce7e48a3166731f26068d7a7a7996b5da58cbe0c" + integrity sha512-/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA== dependencies: - "@octokit/types" "^7.0.0" + "@octokit/types" "^9.0.0" "@octokit/core@^3.5.1": version "3.6.0" @@ -4482,16 +4250,16 @@ before-after-hook "^2.2.0" universal-user-agent "^6.0.0" -"@octokit/core@^4.0.0": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.0.5.tgz#589e68c0a35d2afdcd41dafceab072c2fbc6ab5f" - integrity sha512-4R3HeHTYVHCfzSAi0C6pbGXV8UDI5Rk+k3G7kLVNckswN9mvpOzW9oENfjfH3nEmzg8y3AmKmzs8Sg6pLCeOCA== +"@octokit/core@^4.1.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.0.tgz#8c253ba9605aca605bc46187c34fcccae6a96648" + integrity sha512-AgvDRUg3COpR82P7PBdGZF/NNqGmtMq2NiPqeSsDIeCfYFOZ9gddqWNQHnFdEUf+YwOj4aZYmJnlPp7OXmDIDg== dependencies: "@octokit/auth-token" "^3.0.0" "@octokit/graphql" "^5.0.0" "@octokit/request" "^6.0.0" "@octokit/request-error" "^3.0.0" - "@octokit/types" "^7.0.0" + "@octokit/types" "^9.0.0" before-after-hook "^2.2.0" universal-user-agent "^6.0.0" @@ -4505,11 +4273,11 @@ universal-user-agent "^6.0.0" "@octokit/endpoint@^7.0.0": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.2.tgz#11ee868406ba7bb1642e61bbe676d641f79f02be" - integrity sha512-8/AUACfE9vpRpehE6ZLfEtzkibe5nfsSwFZVMsG8qabqRt1M81qZYUFRZa1B8w8lP6cdfDJfRq9HWS+MbmR7tw== + version "7.0.5" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.5.tgz#2bb2a911c12c50f10014183f5d596ce30ac67dd1" + integrity sha512-LG4o4HMY1Xoaec87IqQ41TQ+glvIeTKqfjkCEmt5AIwDZJwQeVZFIEYXrYY6yLwK+pAScb9Gj4q+Nz2qSw1roA== dependencies: - "@octokit/types" "^7.0.0" + "@octokit/types" "^9.0.0" is-plain-object "^5.0.0" universal-user-agent "^6.0.0" @@ -4523,12 +4291,12 @@ universal-user-agent "^6.0.0" "@octokit/graphql@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.1.tgz#a06982514ad131fb6fbb9da968653b2233fade9b" - integrity sha512-sxmnewSwAixkP1TrLdE6yRG53eEhHhDTYUykUwdV9x8f91WcbhunIHk9x1PZLALdBZKRPUO2HRcm4kezZ79HoA== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.5.tgz#a4cb3ea73f83b861893a6370ee82abb36e81afd2" + integrity sha512-Qwfvh3xdqKtIznjX9lz2D458r7dJPP8l6r4GQkIdWQouZwHQK0mVT88uwiU2bdTU2OtT1uOlKpRciUWldpG0yQ== dependencies: "@octokit/request" "^6.0.0" - "@octokit/types" "^7.0.0" + "@octokit/types" "^9.0.0" universal-user-agent "^6.0.0" "@octokit/openapi-types@^12.11.0": @@ -4536,10 +4304,10 @@ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0" integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ== -"@octokit/openapi-types@^13.9.0": - version "13.9.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-13.9.0.tgz#847a31b174b44f33a09615a83bc20eeaa59e9ce0" - integrity sha512-MOYjRyLIM0zzNb9RfEwVK6HLIc2nIF2OMVtMqiNOGbX0SHrQvQbI6X1K16ktmaHr8WUBv+eeul8cD9mz4rNiWQ== +"@octokit/openapi-types@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.0.0.tgz#7356d287f48b20e9a1f497ef8dfaabdff9cf8622" + integrity sha512-V8BVJGN0ZmMlURF55VFHFd/L92XQQ43KvFjNmY1IYbCN3V/h/uUFV6iQi19WEHM395Nn+1qhUbViCAD/1czzog== "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" @@ -4553,12 +4321,12 @@ dependencies: "@octokit/types" "^6.40.0" -"@octokit/plugin-paginate-rest@^4.0.0": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-4.2.2.tgz#3923b03c0ecf45ff7b3686eba86d2cb2558b30f0" - integrity sha512-oslJFmdcWeB3Q8dzn2WNFBzEAvqCH+cvrjBUhS7uwQxAt5yH91w1eo2flWiR0Rqxh+EijQS5ImoB0iQ3hz7P2Q== +"@octokit/plugin-paginate-rest@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz#f34b5a7d9416019126042cd7d7b811e006c0d561" + integrity sha512-Sq5VU1PfT6/JyuXPyt04KZNVsFOSBaYOAq2QRZUwzVlI10KFvcbUo8lR258AAQL1Et60b0WuVik+zOWKLuDZxw== dependencies: - "@octokit/types" "^7.3.0" + "@octokit/types" "^9.0.0" "@octokit/plugin-request-log@^1.0.4": version "1.0.4" @@ -4573,12 +4341,12 @@ "@octokit/types" "^6.39.0" deprecation "^2.3.1" -"@octokit/plugin-rest-endpoint-methods@^6.0.0": - version "6.5.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.5.0.tgz#c793231ddb8926dffeda170f80aeb276fd9f0108" - integrity sha512-+r/tWwc7hI3vYDb+d0hAqbr04Kle6pL+MmGxMDTUn7wIwry5qFXnUA8RCa5CO8EcuHbZLywnqIVRLdM08qV8Ew== +"@octokit/plugin-rest-endpoint-methods@^7.0.0": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz#f7ebe18144fd89460f98f35a587b056646e84502" + integrity sha512-pnCaLwZBudK5xCdrR823xHGNgqOzRnJ/mpC/76YPpNP7DybdsJtP7mdOwh+wYZxK5jqeQuhu59ogMI4NRlBUvA== dependencies: - "@octokit/types" "^7.3.0" + "@octokit/types" "^9.0.0" deprecation "^2.3.1" "@octokit/plugin-retry@^3.0.3": @@ -4599,11 +4367,11 @@ once "^1.4.0" "@octokit/request-error@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.1.tgz#3fd747913c06ab2195e52004a521889dadb4b295" - integrity sha512-ym4Bp0HTP7F3VFssV88WD1ZyCIRoE8H35pXSKwLeMizcdZAYc/t6N9X9Yr9n6t3aG9IH75XDnZ6UeZph0vHMWQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.3.tgz#ef3dd08b8e964e53e55d471acfe00baa892b9c69" + integrity sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ== dependencies: - "@octokit/types" "^7.0.0" + "@octokit/types" "^9.0.0" deprecation "^2.0.0" once "^1.4.0" @@ -4620,13 +4388,13 @@ universal-user-agent "^6.0.0" "@octokit/request@^6.0.0": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.1.tgz#3ceeb22dab09a29595d96594b6720fc14495cf4e" - integrity sha512-gYKRCia3cpajRzDSU+3pt1q2OcuC6PK8PmFIyxZDWCzRXRSIBH8jXjFJ8ZceoygBIm0KsEUg4x1+XcYBz7dHPQ== + version "6.2.3" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.3.tgz#76d5d6d44da5c8d406620a4c285d280ae310bdb4" + integrity sha512-TNAodj5yNzrrZ/VxP+H5HiYaZep0H3GU0O7PaF+fhDrt8FPrnkei9Aal/txsN/1P7V3CPiThG0tIvpPDYUsyAA== dependencies: "@octokit/endpoint" "^7.0.0" "@octokit/request-error" "^3.0.0" - "@octokit/types" "^7.0.0" + "@octokit/types" "^9.0.0" is-plain-object "^5.0.0" node-fetch "^2.6.7" universal-user-agent "^6.0.0" @@ -4642,14 +4410,14 @@ "@octokit/plugin-rest-endpoint-methods" "^5.12.0" "@octokit/rest@^19.0.3": - version "19.0.4" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.4.tgz#fd8bed1cefffa486e9ae46a9dc608ce81bcfcbdd" - integrity sha512-LwG668+6lE8zlSYOfwPj4FxWdv/qFXYBpv79TWIQEpBLKA9D/IMcWsF/U9RGpA3YqMVDiTxpgVpEW3zTFfPFTA== + version "19.0.7" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.7.tgz#d2e21b4995ab96ae5bfae50b4969da7e04e0bb70" + integrity sha512-HRtSfjrWmWVNp2uAkEpQnuGMJsu/+dBr47dRc5QVgsCbnIc1+GFEaoKBWkYG+zjrsHpSqcAElMio+n10c0b5JA== dependencies: - "@octokit/core" "^4.0.0" - "@octokit/plugin-paginate-rest" "^4.0.0" + "@octokit/core" "^4.1.0" + "@octokit/plugin-paginate-rest" "^6.0.0" "@octokit/plugin-request-log" "^1.0.4" - "@octokit/plugin-rest-endpoint-methods" "^6.0.0" + "@octokit/plugin-rest-endpoint-methods" "^7.0.0" "@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.39.0", "@octokit/types@^6.40.0": version "6.41.0" @@ -4658,22 +4426,22 @@ dependencies: "@octokit/openapi-types" "^12.11.0" -"@octokit/types@^7.0.0", "@octokit/types@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-7.3.0.tgz#658f916c4a53b552a8f95f866589abae6dbfc7b5" - integrity sha512-7Ar22AVxsJBYZuPkGQwFQybGt2YjuP6j6Z36bPntIYy3R9qSowB55mXOsb16hc0UqtJkYBrRMVXKlaX1OHsh1g== +"@octokit/types@^9.0.0": + version "9.1.1" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.1.1.tgz#8a71f05c4e72fe51aac2c66ed71999abdd7e2777" + integrity sha512-hFheiHJEZzE5qn/u4R2IeMLXqUzXgd1vSokHS5x4oq+klHhXNFLL69kanAtrlTqj3K9Dps9XhOqOtDhDmPdlxQ== dependencies: - "@octokit/openapi-types" "^13.9.0" + "@octokit/openapi-types" "^17.0.0" "@opentelemetry/api@^1.0.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.2.0.tgz#89ef99401cde6208cff98760b67663726ef26686" - integrity sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g== + version "1.4.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f" + integrity sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA== "@opentelemetry/semantic-conventions@^1.0.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.6.0.tgz#ed410c9eb0070491cff9fe914246ce41f88d6f74" - integrity sha512-aPfcBeLErM/PPiAuAbNFLN5sNbZLc3KZlar27uohllN8Zs6jJbHyJU1y7cMA6W/zuq+thkaG8mujiS+3iD/FWQ== + version "1.12.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.12.0.tgz#19c959bdb900986e74939d4227e757aa16936b91" + integrity sha512-hO+bdeGOlJwqowUBoZF5LyP3ORUFOP1G0GRv8N45W/cztXbT2ZEXaAzfokRS9Xc9FWmYrDj32mF6SzH6wuoIyA== "@openzeppelin/upgrades@^2.8.0": version "2.8.0" @@ -4845,15 +4613,6 @@ resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938" integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA== -"@scure/bip32@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.1.0.tgz#dea45875e7fbc720c2b4560325f1cf5d2246d95b" - integrity sha512-ftTW3kKX54YXLCxH6BB7oEEoJfoE2pIgw7MINKAs5PsS6nqKPuKk1haTF/EuHmYqG330t5GSrdmtRuHaY1a62Q== - dependencies: - "@noble/hashes" "~1.1.1" - "@noble/secp256k1" "~1.6.0" - "@scure/base" "~1.1.0" - "@scure/bip32@1.1.5": version "1.1.5" resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.1.5.tgz#d2ccae16dcc2e75bc1d75f5ef3c66a338d1ba300" @@ -4863,14 +4622,6 @@ "@noble/secp256k1" "~1.7.0" "@scure/base" "~1.1.0" -"@scure/bip39@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.0.tgz#92f11d095bae025f166bef3defcc5bf4945d419a" - integrity sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w== - dependencies: - "@noble/hashes" "~1.1.1" - "@scure/base" "~1.1.0" - "@scure/bip39@1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.1.tgz#b54557b2e86214319405db819c4b6a370cf340c5" @@ -4894,15 +4645,15 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.15.0.tgz#96915baa05e6a6a1d137badf4984d3fc05820bb6" integrity sha512-lu8BpxjAtRCAo5ifytTpCPCj99LF7o/2Myn+NXyNCBqvPYn7Pjd76AMmUB5l7XF1U6t0hcWrlEM5ESufW7wAeA== -"@sindresorhus/is@^4.6.0": +"@sindresorhus/is@^4.0.0", "@sindresorhus/is@^4.6.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== "@sinonjs/commons@^1.7.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" - integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== + version "1.8.6" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" + integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== dependencies: type-detect "4.0.8" @@ -4927,10 +4678,17 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@solidity-parser/parser@^0.14.0", "@solidity-parser/parser@^0.14.1", "@solidity-parser/parser@^0.14.3": - version "0.14.3" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.3.tgz#0d627427b35a40d8521aaa933cc3df7d07bfa36f" - integrity sha512-29g2SZ29HtsqA58pLCtopI1P/cPy5/UAzlcAXO6T/CNJimG6yA8kx4NaseMyJULiC+TEs02Y9/yeHzClqoA0hw== +"@solidity-parser/parser@^0.14.0", "@solidity-parser/parser@^0.14.1": + version "0.14.5" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.5.tgz#87bc3cc7b068e08195c219c91cd8ddff5ef1a804" + integrity sha512-6dKnHZn7fg/iQATVEzqyUOyEidbn05q7YA2mQ9hC0MMXhhV3/JrsxmFSYZAcr7j1yUP700LLhTruvJ3MiQmjJg== + dependencies: + antlr4ts "^0.5.0-alpha.4" + +"@solidity-parser/parser@^0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.16.0.tgz#1fb418c816ca1fc3a1e94b08bcfe623ec4e1add4" + integrity sha512-ESipEcHyRHg4Np4SqBCfcXwyxxna1DgFVz69bgpLV8vzl/NP1DtcKsJ4dJZXWQhY/Z4J2LeKBiOkOVZn9ct33Q== dependencies: antlr4ts "^0.5.0-alpha.4" @@ -4981,6 +4739,13 @@ dependencies: defer-to-connect "^1.0.1" +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== + dependencies: + defer-to-connect "^2.0.0" + "@szmarczak/http-timer@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-5.0.1.tgz#c7c1bf1141cdd4751b0399c8fc7b8b664cd5be3a" @@ -4998,20 +4763,10 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@truffle/abi-utils@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.0.tgz#edbdce6152c6ee711b7b8e267ff5745891931c59" - integrity sha512-W4Kbm17+QQeeK/uXB80t10gw1H8lEnAu+B7bu7NZl2Zy74kwhsrGC+qCjynhRQtGsFnCcsI58VxjjNkn1PsgSg== - dependencies: - change-case "3.0.2" - faker "5.5.3" - fast-check "3.1.1" - web3-utils "1.7.4" - -"@truffle/abi-utils@^0.3.8": - version "0.3.8" - resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.8.tgz#23cafa152673dfff8d0d22f08f44b8c0f9719a52" - integrity sha512-RevMtlEuQw9cE2VWzQuvLDSYPCVSZQQUOsaK8ArcwxXct6ugiJCDC7tNouhHzP1Y4ccdZtG2y/XPHQJdzgYdZQ== +"@truffle/abi-utils@^0.3.0", "@truffle/abi-utils@^0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.9.tgz#c476f5cfe01072b513b3e93fd7bea05cf7bd9d96" + integrity sha512-G5dqgwRHx5zwlXjz3QT8OJVfB2cOqWwD6DwKso0KttUt/zejhCjnkKq72rSgyeLMkz7wBB9ERLOsupLBILM8MA== dependencies: change-case "3.0.2" fast-check "3.1.1" @@ -5027,23 +4782,18 @@ lodash "^4.17.21" "@truffle/artifactor@^4.0.36": - version "4.0.167" - resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.167.tgz#d4459cf73d68cf276cf061ff21075a645c8e0558" - integrity sha512-zcW3h/Zki++wAikF1WQKhUBXBL8yqDbVuZSqVhtgjroCp0BLsyY+I5dxDRj26zcgiJEzNVYLxOjJpETTDZEbGw== + version "4.0.188" + resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.188.tgz#2197300fd61a4196f2be9599fc0bb82e5d0b1817" + integrity sha512-PqSiLHLGyWhoRWt6dimXBM5JsEXvVY3KejSEw3g8X+QInyNTivwSpHQMdP+9avVWkRjX8OltRAbg5i3fzS1Suw== dependencies: - "@truffle/contract-schema" "^3.4.9" + "@truffle/contract-schema" "^3.4.13" fs-extra "^9.1.0" lodash "^4.17.21" -"@truffle/blockchain-utils@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.4.tgz#1365b88c3d2922a066d947e93748f09b0fac2e93" - integrity sha512-HegAo5A8UX9vE8dtceBRgCY207gOb9wj54c8mNOOWHcFpkyJz7kZYGo44As6Imh10/0hD2j7vHQ56Jf+uszJ3A== - -"@truffle/blockchain-utils@^0.1.6": - version "0.1.6" - resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.6.tgz#7ea0a16b8135e5aeb688bf3bd014fa8f6ba45adb" - integrity sha512-SldoNRIFSm3+HMBnSc2jFsu5TWDkCN4X6vL3wrd0t6DIeF7nD6EoPPjxwbFSoqCnkkRxMuZeL6sUx7UMJS/wSA== +"@truffle/blockchain-utils@^0.1.6", "@truffle/blockchain-utils@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.7.tgz#cf7923a3ae5b591ae4c2a5ee45994a310ccaf1ee" + integrity sha512-1nibqGjEHC7KAyDThEFvbm2+EO8zAHee/VjCtxkYBE3ySwP50joh0QCEBjy7K/9z+icpMoDucfxmgaKToBFUgQ== "@truffle/code-utils@^3.0.2": version "3.0.2" @@ -5052,13 +4802,13 @@ dependencies: cbor "^5.2.0" -"@truffle/codec@^0.14.15": - version "0.14.15" - resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.15.tgz#79d253c05c09a036ccba86a2a909519ebf14309a" - integrity sha512-cooWy8blmvYQQRBKgzWJnDUS6mZE9cvnmpVN15jU6TseAQkBtmfYfCH12QCKEWMq2+R4yQICP54WNCYg78g72g== +"@truffle/codec@^0.14.17": + version "0.14.17" + resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.17.tgz#4ab11fab335854dad0d4aef75db2960ebd76fcd8" + integrity sha512-kD4dD86huLeaBEq5R8D1zleJEu6NsXbyYLdXl1V1TKdiO8odw5CBC6Y/+wdu5d3t1dyEYrTbhn1dqknZa52pmw== dependencies: - "@truffle/abi-utils" "^0.3.8" - "@truffle/compile-common" "^0.9.3" + "@truffle/abi-utils" "^0.3.9" + "@truffle/compile-common" "^0.9.4" big.js "^6.0.3" bn.js "^5.1.3" cbor "^5.2.0" @@ -5068,22 +4818,6 @@ utf8 "^3.0.0" web3-utils "1.8.2" -"@truffle/codec@^0.14.3": - version "0.14.3" - resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.3.tgz#2b37f7763390391b488c927b12f2310fe7cdb129" - integrity sha512-8lwWQXkbrmewwiDSekZPUiweysGKXOpFSNhtWCi1CS6gtla3bNK8/xE1nUi3ALsuKw2745kzzLZpwKsipGtGKg== - dependencies: - "@truffle/abi-utils" "^0.3.0" - "@truffle/compile-common" "^0.8.0" - big.js "^6.0.3" - bn.js "^5.1.3" - cbor "^5.2.0" - debug "^4.3.1" - lodash "^4.17.21" - semver "7.3.7" - utf8 "^3.0.0" - web3-utils "1.7.4" - "@truffle/compile-common@^0.3.9": version "0.3.12" resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.3.12.tgz#73e3849aa61de1f98596b440f0bfce7e3063c2e4" @@ -5094,18 +4828,10 @@ mocha "8.0.1" ts-node "8.10.2" -"@truffle/compile-common@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.8.0.tgz#8efcf68c82c2a62651255ebaf4150f222984fd9b" - integrity sha512-3mtEC73dQODTI3/ZwonunVHyPS2BGexXSBIv4pOgMrWwnZPcHlo2+IW2+m2At/DnZehL78bkF993Vti2pJfx6Q== - dependencies: - "@truffle/error" "^0.1.1" - colors "1.4.0" - -"@truffle/compile-common@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.9.3.tgz#d8e78195992669430d21e2b3c63c5a4bc72d8e10" - integrity sha512-9S86H5DRC0zEj164KeClP/6jVt1M/nRd7St89h6QbuIU0JjpqSz1SXpkvqhbFoV9hhW+4ZGh0NysjrdPlk7gFw== +"@truffle/compile-common@^0.9.4": + version "0.9.4" + resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.9.4.tgz#064208cda70491692b538f717809bb904a122c20" + integrity sha512-mnqJB/hLiPHNf+WKwt/2MH6lv34xSG/SFCib7+ckAklutUqVLeFo8EwQxinuHNkU7LY0C+YgZXhK1WTCO5YRJQ== dependencies: "@truffle/error" "^0.2.0" colors "1.4.0" @@ -5132,15 +4858,15 @@ solc "^0.6.0" "@truffle/compile-solidity@^6.0.54": - version "6.0.61" - resolved "https://registry.yarnpkg.com/@truffle/compile-solidity/-/compile-solidity-6.0.61.tgz#415f484f0a12aa434ae5fc09a049c239caa5fa57" - integrity sha512-0XZZ9OeeGtp2b+4Q2yHb7VaZ1Haf3rYHQdVChmvxLYKbq+8S/8zPCFs/4fcfi2lI2v/FayvNBYljXh8cZYHLJw== + version "6.0.66" + resolved "https://registry.yarnpkg.com/@truffle/compile-solidity/-/compile-solidity-6.0.66.tgz#28b432a90766d49530bba6371a7a00f8246e79d9" + integrity sha512-IAOSBRf32kI6SzD3G9ZA8D6Df96TX2G+XW9m8tKEUghYk38NCTqKTg13u6GKrIuDrtTzWw/f/Eq8mn0bTdDoig== dependencies: - "@truffle/compile-common" "^0.9.3" - "@truffle/config" "^1.3.52" + "@truffle/compile-common" "^0.9.4" + "@truffle/config" "^1.3.55" "@truffle/contract-sources" "^0.2.0" "@truffle/expect" "^0.1.5" - "@truffle/profiler" "^0.1.44" + "@truffle/profiler" "^0.1.47" axios "1.2.4" axios-retry "^3.1.9" debug "^4.3.1" @@ -5151,7 +4877,7 @@ original-require "^1.0.1" require-from-string "^2.0.2" semver "7.3.7" - solc "0.8.18" + solc "0.8.19" "@truffle/compile-vyper@^1.0.33": version "1.0.71" @@ -5163,53 +4889,24 @@ eslint "^5.5.0" minimatch "^3.0.4" -"@truffle/config@^1.2.29", "@truffle/config@^1.2.6", "@truffle/config@^1.3.37": - version "1.3.37" - resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.37.tgz#b0bf87d3cba82da199926e450a7237643f8214eb" - integrity sha512-QscARxWIu7ezFgVzSDXhnTz9bpKNvhJh15NDn71uS5k7CdLEs2ZI0w+2Z82bQPXkxDNCur57l8WL0UDLuGDyQg== - dependencies: - "@truffle/error" "^0.1.1" - "@truffle/events" "^0.1.14" - "@truffle/provider" "^0.2.59" - conf "^10.1.2" - find-up "^2.1.0" - lodash "^4.17.21" - original-require "^1.0.1" - -"@truffle/config@^1.3.52": - version "1.3.52" - resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.52.tgz#8de19ccc9e3146f743e880ffbfeb4980caf21b16" - integrity sha512-yH4ektrDfcKieJUPjxLq6MIht8mx9eFFv312irUCqzuRD8WtqZp90eB2Wx0CwAKfJ4+4maNCD6vyFShMrdcO8Q== +"@truffle/config@^1.2.29", "@truffle/config@^1.2.6", "@truffle/config@^1.3.55": + version "1.3.55" + resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.55.tgz#70ac7103e5a844717303d04deab32ca16356ad83" + integrity sha512-18nLgtnkDCwMiTB3fyJxXzRzuO28wtJyY3YIgJBMg4ujKYpAxeI6hOPafhrp9qGqR7tC0Pj1o+ip3wFxEZJtuQ== dependencies: "@truffle/error" "^0.2.0" "@truffle/events" "^0.1.22" - "@truffle/provider" "^0.3.5" + "@truffle/provider" "^0.3.8" conf "^10.1.2" debug "^4.3.1" find-up "^2.1.0" lodash "^4.17.21" original-require "^1.0.1" -"@truffle/contract-schema@^3.2.5", "@truffle/contract-schema@^3.4.9": - version "3.4.9" - resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.9.tgz#57119245452e49f7b1ea6c71900bb6c053d76c8c" - integrity sha512-nhYMXWbUs6dMYHL1f8DTkRk/uo1sADK0yeSYXo/p/7nqnjlHzqrr75BBsKbB7OFIVT05des+GFNQJqBaRZVdxQ== - dependencies: - ajv "^6.10.0" - debug "^4.3.1" - -"@truffle/contract-schema@^3.3.1": - version "3.4.10" - resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.10.tgz#c11a814c13ad55a5e454fb35ddfa291ae0d24ace" - integrity sha512-BhRNRoRvlj2th6E5RNS0BnS0ZxQe01JJz8I7MjkGqdeXSvrn6qDCAnbmvhNgUv0l5h8w5+gBOQhAJhILf1shdQ== - dependencies: - ajv "^6.10.0" - debug "^4.3.1" - -"@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.12": - version "3.4.12" - resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.12.tgz#038518c7a6af81d8ce3df16e8b0d114062d04d0c" - integrity sha512-XpMMps/bqHwiRuCyLiEEGWEAvGGzGj4u1X1+lzxrtIsrwbQhSZcdgEbXl9vGxOOJWOup3HXRCIsjlao27kS4OA== +"@truffle/contract-schema@^3.2.5", "@truffle/contract-schema@^3.3.1", "@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.13": + version "3.4.13" + resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.13.tgz#48447673f29380830f5821e8139ceefbbd545aac" + integrity sha512-emG7upuryYFrsPDbHqeASPWXL824M1tinhQwSPG0phSoa3g+RX9fUNNN/VPmF3tSkXLWUMhRnb7ehxnaCuRbZg== dependencies: ajv "^6.10.0" debug "^4.3.1" @@ -5250,37 +4947,17 @@ web3-eth-abi "1.8.1" web3-utils "1.8.1" -"@truffle/contract@^4.0.37", "@truffle/contract@^4.2.3": - version "4.5.23" - resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.5.23.tgz#8540f0c2d4ebc4782f1d4647016213fa4cac0107" - integrity sha512-ni/RzBdDFo60jaCb8ETCPBfPHRr1WVH5Y27EKmfEyrNg8TC7WZ28SQylMBkwdrgLjqAyPw3Pq7Y5us1f9tcyMQ== - dependencies: - "@ensdomains/ensjs" "^2.1.0" - "@truffle/blockchain-utils" "^0.1.4" - "@truffle/contract-schema" "^3.4.9" - "@truffle/debug-utils" "^6.0.33" - "@truffle/error" "^0.1.1" - "@truffle/interface-adapter" "^0.5.21" - bignumber.js "^7.2.1" - debug "^4.3.1" - ethers "^4.0.32" - web3 "1.7.4" - web3-core-helpers "1.7.4" - web3-core-promievent "1.7.4" - web3-eth-abi "1.7.4" - web3-utils "1.7.4" - -"@truffle/contract@^4.6.10": - version "4.6.15" - resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.6.15.tgz#2a2e0cb146534cd10d24a57e224e60f0bbade18f" - integrity sha512-3V+50z94XRh+I3axz6Zrot1wlMhRiG2O9XjR20LwR5YBnzHV7YFfOs8x6pluXVLQyxcVJBISJyqxvGxpkecrZg== +"@truffle/contract@^4.0.37", "@truffle/contract@^4.2.3", "@truffle/contract@^4.6.10": + version "4.6.20" + resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.6.20.tgz#48237b9d3fe3e5019eac2c8ce9794201ae84fdf8" + integrity sha512-s7Mbc37L/CF5Apy/cjPnalkgACmG9tTAmcIW28cIZLRLOUAze18pqhtdHryxAQhEOtKGaDAho6TriqL7/74uHw== dependencies: "@ensdomains/ensjs" "^2.1.0" - "@truffle/blockchain-utils" "^0.1.6" - "@truffle/contract-schema" "^3.4.12" - "@truffle/debug-utils" "^6.0.46" + "@truffle/blockchain-utils" "^0.1.7" + "@truffle/contract-schema" "^3.4.13" + "@truffle/debug-utils" "^6.0.48" "@truffle/error" "^0.2.0" - "@truffle/interface-adapter" "^0.5.29" + "@truffle/interface-adapter" "^0.5.32" bignumber.js "^7.2.1" debug "^4.3.1" ethers "^4.0.32" @@ -5305,48 +4982,28 @@ tiny-typed-emitter "^2.1.0" ws "^7.2.0" -"@truffle/dashboard-message-bus-client@^0.1.6": - version "0.1.6" - resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-client/-/dashboard-message-bus-client-0.1.6.tgz#1956c1582fd2c1a923343d12d8543db92eba6baf" - integrity sha512-qIf5e+/xfZfXiiOkfWKtRjwbkstpjQpCkbndKSKhZcnz3QLkDIvfgSU6K9d+j4AyNCq4oN38gWoLDa3PVqZo8Q== - dependencies: - "@truffle/dashboard-message-bus-common" "^0.1.4" - "@truffle/promise-tracker" "^0.1.3" - axios "0.27.2" - debug "^4.3.1" - delay "^5.0.0" - isomorphic-ws "^4.0.1" - node-abort-controller "^3.0.1" - tiny-typed-emitter "^2.1.0" - ws "^7.2.0" - -"@truffle/dashboard-message-bus-common@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-common/-/dashboard-message-bus-common-0.1.4.tgz#f5b5326eb4774d5d209c310c135309f4b3f42bea" - integrity sha512-R+16jYcr/mxhz5pI+0GAJI14XUvYySLTB650kWubMBrVf4vi4QaIOdAOrx4KxAIA6e/5Nq9j0le59Y2c+xAHYg== - "@truffle/dashboard-message-bus-common@^0.1.5": version "0.1.5" resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-common/-/dashboard-message-bus-common-0.1.5.tgz#180c8c421b2836b7bd109944e7956f427236d8ab" integrity sha512-F4RfXi7ymNA3HFOlaujRJxAb3I8ciErCRQq+MZVaqjSPF9LSw23IizZsGpLaY43K2bGoBSxyNQRZWxsUEBujPQ== "@truffle/db-loader@^0.2.12": - version "0.2.17" - resolved "https://registry.yarnpkg.com/@truffle/db-loader/-/db-loader-0.2.17.tgz#85b9c4b4e63b3ad1249a75bddbe6da5a1a967427" - integrity sha512-oVDZ3vlYopbUwkHl9sYpF3T//P2diJMwDWYWK3oSg7uEpLm4uroAK8MyrOpLW5XAsIUn+Z4BLS3JGMwQd8aI2Q== + version "0.2.22" + resolved "https://registry.yarnpkg.com/@truffle/db-loader/-/db-loader-0.2.22.tgz#539af96de442d680244afbce7173125f0107a29a" + integrity sha512-Ws5zZQZdemLyc//dJR3w9U+i3TSb+8w/OExsQhadU/rpyZb1EBOazj7Zr8IkDJolhqZgWyVwshoRNULZ56NHhA== optionalDependencies: - "@truffle/db" "^2.0.17" + "@truffle/db" "^2.0.22" -"@truffle/db@^2.0.12", "@truffle/db@^2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@truffle/db/-/db-2.0.17.tgz#358f490f58050c0a67e47211ef2b920e10e7bea6" - integrity sha512-7vO595WwvE2Tjp6p4rFmr4Q4d5qJFM4fhAsUBHzfVpWlz0szBsSnzn2RK5/NSS4Rqqp8HLBcfuRShuYFqajx0w== +"@truffle/db@^2.0.12", "@truffle/db@^2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@truffle/db/-/db-2.0.22.tgz#c7156fb78cc356b35c20866a3540dab3e367cf71" + integrity sha512-Pn6zKfQMTNqYbcz7EEcagBoNOp1ORMVddocr2pIVPnzPyryhAkC/QJGK9HUazQues3QjzmKcCEMQqUfrFfRt1A== dependencies: "@graphql-tools/delegate" "^8.4.3" "@graphql-tools/schema" "^8.3.1" - "@truffle/abi-utils" "^0.3.8" + "@truffle/abi-utils" "^0.3.9" "@truffle/code-utils" "^3.0.2" - "@truffle/config" "^1.3.52" + "@truffle/config" "^1.3.55" abstract-leveldown "^7.2.0" apollo-server "^3.11.0" debug "^4.3.1" @@ -5362,24 +5019,12 @@ pouchdb-find "^7.0.0" web3-utils "1.8.2" -"@truffle/debug-utils@^6.0.33": - version "6.0.33" - resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.33.tgz#cd2104fecb3d45861d697a88fcf73fcd39bc42ad" - integrity sha512-nz6nApTxeqyRM1f9gO4g7sexmlC66YZ6dE1x2KbIz24FYx1yzfT5fAsQ2ZDoFHH++Ah4LH/1TMso76zspcn+vQ== - dependencies: - "@truffle/codec" "^0.14.3" - "@trufflesuite/chromafi" "^3.0.0" - bn.js "^5.1.3" - chalk "^2.4.2" - debug "^4.3.1" - highlightjs-solidity "^2.0.5" - -"@truffle/debug-utils@^6.0.42", "@truffle/debug-utils@^6.0.46": - version "6.0.46" - resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.46.tgz#1fba4d76bb737a90ca510e24d30e381e2aaefd1b" - integrity sha512-MWko3c1M0NI8IT0yNh8Dh2xoDgR2R1apP8hc/9VsR/4Q7P6OE/578WRpZnvo2HWXYBiJ2PrWBDtMYBHntImrrA== +"@truffle/debug-utils@^6.0.42", "@truffle/debug-utils@^6.0.48": + version "6.0.48" + resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.48.tgz#218caa0e00d95a03abadb05dfe63d621530e113a" + integrity sha512-HdK/7eH5EFrcTPeZVEgKaKkkzuZ4xsrH8yw+EoLEsScLsOEuQeKynY61NctjuU93voATWrYmV99Sfb/MRq2i2g== dependencies: - "@truffle/codec" "^0.14.15" + "@truffle/codec" "^0.14.17" "@trufflesuite/chromafi" "^3.0.0" bn.js "^5.1.3" chalk "^2.4.2" @@ -5387,13 +5032,13 @@ highlightjs-solidity "^2.0.6" "@truffle/debugger@^11.0.23": - version "11.0.28" - resolved "https://registry.yarnpkg.com/@truffle/debugger/-/debugger-11.0.28.tgz#7f393a66f2cd6255779958bd23aedfb386194c88" - integrity sha512-0AN7GjwXTDHGzdx9H3+5JTRtSsCy0T4C+QoJ/iOUpT5palzxIykMEB064afu9TUo/jLtLNOR29pQSmmTKW6d7w== + version "11.0.33" + resolved "https://registry.yarnpkg.com/@truffle/debugger/-/debugger-11.0.33.tgz#2b929da8a09479fb0caef3a204cbbda17e2cebd3" + integrity sha512-4UJCvLRIiAg5jpPm5umCmoK/R50vYkRtZROQVn+spJE5CZFZVbrmwJBU5YvgXMMX4vkw3s77jENpOl6BhIpCUw== dependencies: - "@truffle/abi-utils" "^0.3.8" - "@truffle/codec" "^0.14.15" - "@truffle/source-map-utils" "^1.3.107" + "@truffle/abi-utils" "^0.3.9" + "@truffle/codec" "^0.14.17" + "@truffle/source-map-utils" "^1.3.110" bn.js "^5.1.3" debug "^4.3.1" json-pointer "^0.6.1" @@ -5426,17 +5071,6 @@ resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.2.0.tgz#65de6f03f5c041f883cc87677eecf8231428f1ab" integrity sha512-Fe0/z4WWb7IP2gBnv3l6zqP87Y0kSMs7oiSLakKJq17q3GUunrHSdioKuNspdggxkXIBhEQLhi8C+LJdwmHKWQ== -"@truffle/events@^0.1.14": - version "0.1.14" - resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.14.tgz#6a3f1026dc1739bfac18b7f8351935b9f2756045" - integrity sha512-6hAaThmkiMe7Hub+p6tyOlOqRQS4VUtxXQkSKN3ol5FphCXe7XE2ZFGRPOK+hUgNcrPXjzD2Q6GbSosVqO65oA== - dependencies: - "@truffle/dashboard-message-bus-client" "^0.1.6" - "@truffle/spinners" "^0.2.2" - debug "^4.3.1" - emittery "^0.4.1" - web3-utils "1.7.4" - "@truffle/events@^0.1.22": version "0.1.22" resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.22.tgz#007617de4d20093e8c257a63ddc1193a21a9c5b8" @@ -5479,76 +5113,45 @@ glob "^7.1.2" web3-utils "1.2.1" -"@truffle/interface-adapter@^0.5.21": - version "0.5.21" - resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.21.tgz#f22c99b7cb5d5c4ebbb6106f9274ea844baeaa2b" - integrity sha512-2ltbu3upsWS0TAQu1kLQc048XlXNmDkCzH6iebX4dg3VBB+l7oG/pu5+/kl8t+LRfzGoEMLKwOQt7vk0Vm3PNA== - dependencies: - bn.js "^5.1.3" - ethers "^4.0.32" - web3 "1.7.4" - -"@truffle/interface-adapter@^0.5.26", "@truffle/interface-adapter@^0.5.29": - version "0.5.29" - resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.29.tgz#e75e5b5dd120e699774bbea6465c6d1d7c75056e" - integrity sha512-6UlJ+f87z7y/dWk9UfbIU+4e80iRsp8h03LEiE5B+PvZbr6cuMjLJUBtBBQZMo3+xrIcS/2u3p5hOxW8OJm8tw== +"@truffle/interface-adapter@^0.5.26", "@truffle/interface-adapter@^0.5.32": + version "0.5.32" + resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.32.tgz#2ae896ea85a9d267abcd5d0139afc0f06ebc5745" + integrity sha512-7Hgmdb4nJUcWtq4vvgWY7Mr2RLOTOp5FZaWyMiFmjkcEEhDlezm2QstALWAXgT0W6q7tDmDBpw3vTIFenRhHBA== dependencies: bn.js "^5.1.3" ethers "^4.0.32" web3 "1.8.2" -"@truffle/profiler@^0.1.44": - version "0.1.44" - resolved "https://registry.yarnpkg.com/@truffle/profiler/-/profiler-0.1.44.tgz#07ccf3f4e934416987848acd27eb5ff25f2e1492" - integrity sha512-rmhfO072o9FNSMmRWOHCLxmA0dYyg5pJVc8MmmCwlP5JnNPxuLAQJQqchAYc3N+oMrG8vK6dPL0aRQ1g/nbK8g== +"@truffle/profiler@^0.1.47": + version "0.1.47" + resolved "https://registry.yarnpkg.com/@truffle/profiler/-/profiler-0.1.47.tgz#fee15be5ff2131115762f973228d64d960862f3c" + integrity sha512-CMX6TzlrFFpRb8RoHmlICRbusFPp0F8u0d1GaC2TW1tvfe5Ug4oLjAh5dBGpENDbm9DpMrbHV/2YvAyJzSYa1w== dependencies: "@truffle/contract-sources" "^0.2.0" "@truffle/expect" "^0.1.5" debug "^4.3.1" -"@truffle/promise-tracker@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@truffle/promise-tracker/-/promise-tracker-0.1.3.tgz#8a971a5f22ea6922b3578a49b05be481d2d2a3fa" - integrity sha512-1Z5qEfu0KSS+774xe9aPPlLMvzCJNdEeTofne2HkEPLBb53Lb28ZZoMYrwE8eJRjMKMG+y75IYpX7SKcSgj+OQ== - "@truffle/promise-tracker@^0.1.5": version "0.1.5" resolved "https://registry.yarnpkg.com/@truffle/promise-tracker/-/promise-tracker-0.1.5.tgz#df68df14d45a32bda6237ab85169d1808e4b3928" integrity sha512-wZx8eeu/6rcwwkmRF0Y832/NSQR9A9u6pyhTozv+j77jklnd/KZvu2JlACaAjP30eL5SOtSrSOzAMcSh/trJjg== -"@truffle/provider@^0.2.59": - version "0.2.59" - resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.2.59.tgz#a6bc51c53a6bf0e376e9b3167fae255f3b0d9208" - integrity sha512-4b79yUSZlEd7KqzaPkQiiT4aRCGaI+pXPdwJMD0olLvnZrGoNrBtRQSmnXesxBcqi6FaSDxxC+/9URG2HBPE2g== - dependencies: - "@truffle/error" "^0.1.1" - "@truffle/interface-adapter" "^0.5.21" - debug "^4.3.1" - web3 "1.7.4" - -"@truffle/provider@^0.3.5": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.3.5.tgz#8be196e7f38a14d4db3b70ef796ac23b29680473" - integrity sha512-Df55yLshSnEEFrbGKqKrAbW5hzlbZOZ1EC5hucBmoYLeN1Ar1D3InSUbEg9rA29ip2LsmmJZ5QGmQQ4oYaAPfQ== +"@truffle/provider@^0.3.8": + version "0.3.8" + resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.3.8.tgz#8b34d17edf701226c8fab05e34cd6b09742c4041" + integrity sha512-qukkmGOZPsbV7WeKlj/bfYWOu/dbHWlF67QHDhV2KHBVardN06VDf40aB8WeeVkONHijb623hkUI/DE4DpHO+Q== dependencies: "@truffle/error" "^0.2.0" - "@truffle/interface-adapter" "^0.5.29" + "@truffle/interface-adapter" "^0.5.32" debug "^4.3.1" web3 "1.8.2" -"@truffle/provisioner@^0.2.0": - version "0.2.60" - resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.60.tgz#12f7d2bc8977ae248a154ce569d290cf8676eba1" - integrity sha512-qlFiu+oyP6ULlCgLshenzoiNQNNyHSIZX8R/LLTw8l0R5fiNVNnkLqi1Z54Vk3ubsX4/nEQPxQ0SwwM0H0X6cQ== +"@truffle/provisioner@^0.2.0", "@truffle/provisioner@^0.2.70": + version "0.2.78" + resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.78.tgz#4aad0b8b911bd5a182637504e9b629015150b1eb" + integrity sha512-DFT3n6oXIsvTRwg4/f5RA+iyQB8ivQTyo44JkgUecBgpX1tQ20wRgbfww/018kkeKVix4n9J/CzRJvv3YOve/w== dependencies: - "@truffle/config" "^1.3.37" - -"@truffle/provisioner@^0.2.70": - version "0.2.75" - resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.75.tgz#ace362a97bee52d5d291eab01c55cfd3eb29ee90" - integrity sha512-tLjjFj/A1xb6uqm4lMYI7/UGttc7KvX7XdmsR9HcGGilph5a5OohdRpf00MFXqlv9VgQUOalap13Hl3UvsrRuQ== - dependencies: - "@truffle/config" "^1.3.52" + "@truffle/config" "^1.3.55" "@truffle/resolver@9.0.27": version "9.0.27" @@ -5584,25 +5187,18 @@ source-map-support "^0.5.16" supports-color "^7.1.0" -"@truffle/source-map-utils@^1.3.107": - version "1.3.107" - resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.107.tgz#b5460cf3e37cabb2fa96d4439c181a6c0f356b9e" - integrity sha512-R82cl+I2rpIvJciomfqAq4w5niywymgFIHqbhl0v6srrtn3roksrtIq5R/dXJSaMv4o0C5E6sxZ1IMy3E3+ahw== +"@truffle/source-map-utils@^1.3.110": + version "1.3.110" + resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.110.tgz#cc6729b4f9a407368ff20023e5197c4b31142cab" + integrity sha512-lkKWwLxGfQITRXjH9fWdy95jSIIzyfX+ggUi5rgkjz5rUUEXFaJ/YX3mxQLQJMi18kKn/yv0ZiGju84aMR3qoA== dependencies: "@truffle/code-utils" "^3.0.2" - "@truffle/codec" "^0.14.15" + "@truffle/codec" "^0.14.17" debug "^4.3.1" json-pointer "^0.6.1" node-interval-tree "^1.3.3" web3-utils "1.8.2" -"@truffle/spinners@^0.2.2": - version "0.2.2" - resolved "https://registry.yarnpkg.com/@truffle/spinners/-/spinners-0.2.2.tgz#0f69f18f3d8242eb6a9a20497e73e1c97e8ca0ac" - integrity sha512-6srCpV5MykkROtkj+ak5YX0GexAVuw+AB+lZIQxWLGP3i75pfJer7vL2nnqgr0madaAUuIixb7A2NJDFx3lOdg== - dependencies: - "@trufflesuite/spinnies" "^0.1.1" - "@truffle/spinners@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@truffle/spinners/-/spinners-0.2.3.tgz#5689d06ef16855a9f6b70dc0cd40188de54450ec" @@ -5610,7 +5206,7 @@ dependencies: "@trufflesuite/spinnies" "^0.1.1" -"@trufflesuite/bigint-buffer@*": +"@trufflesuite/bigint-buffer@1.1.10": version "1.1.10" resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.10.tgz#a1d9ca22d3cad1a138b78baaf15543637a3e1692" integrity sha512-pYIQC5EcMmID74t26GCC67946mgTJFiLXOT/BYozgrd4UEY2JHEGLhWi9cMiQCt5BSqFEvKkCHNnoj82SRjiEw== @@ -5678,9 +5274,9 @@ integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== "@types/abstract-leveldown@*": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz#f055979a99f7654e84d6b8e6267419e9c4cfff87" - integrity sha512-q5veSX6zjUy/DlDhR4Y4cU0k2Ar+DT2LUraP00T19WLmTO6Se1djepCCaqU6nQrwcJ5Hyo/CWqxTzrrFg8eqbQ== + version "7.2.1" + resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-7.2.1.tgz#bb16403c17754b0c4d5772d71d03b924a03d4c80" + integrity sha512-YK8irIC+eMrrmtGx0H4ISn9GgzLd9dojZWJaMbjp1YHLl2VqqNFBNrL5Q3KjGf4VE3sf/4hmq6EhQZ7kZp1NoQ== "@types/accepts@^1.3.5": version "1.3.5" @@ -5690,11 +5286,11 @@ "@types/node" "*" "@types/archiver@^5.1.0": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.3.1.tgz#02991e940a03dd1a32678fead4b4ca03d0e387ca" - integrity sha512-wKYZaSXaDvTZuInAWjCeGG7BEAgTWG2zZW0/f7IYFcoHB2X2d9lkVFnrOlXl3W6NrvO6Ml3FLLu8Uksyymcpnw== + version "5.3.2" + resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.3.2.tgz#a9f0bcb0f0b991400e7766d35f6e19d163bdadcc" + integrity sha512-IctHreBuWE5dvBDz/0WeKtyVKVRs4h75IblxOACL92wU66v+HGAfEYAOyXkOFphvRJMhuXdI9huDXpX0FC6lCw== dependencies: - "@types/glob" "*" + "@types/readdir-glob" "*" "@types/asn1js@^0.0.2": version "0.0.2" @@ -5704,12 +5300,12 @@ "@types/pvutils" "*" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7": - version "7.1.19" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" - integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" + integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" "@types/babel__generator" "*" "@types/babel__template" "*" "@types/babel__traverse" "*" @@ -5730,13 +5326,13 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.18.1" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.1.tgz#ce5e2c8c272b99b7a9fd69fa39f0b4cd85028bd9" - integrity sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA== + version "7.18.3" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" + integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== dependencies: "@babel/types" "^7.3.0" -"@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5", "@types/bn.js@^5.1.0": +"@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5", "@types/bn.js@^5.1.0", "@types/bn.js@^5.1.1": version "4.11.6" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== @@ -5766,15 +5362,15 @@ "@types/long" "^3.0.0" "@types/node" "*" -"@types/cacheable-request@^6.0.2": - version "6.0.2" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9" - integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA== +"@types/cacheable-request@^6.0.1", "@types/cacheable-request@^6.0.2": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== dependencies: "@types/http-cache-semantics" "*" - "@types/keyv" "*" + "@types/keyv" "^3.1.4" "@types/node" "*" - "@types/responselike" "*" + "@types/responselike" "^1.0.0" "@types/caseless@*": version "0.12.2" @@ -5796,14 +5392,14 @@ "@types/chai" "*" "@types/chai@*", "@types/chai@^4.1.3", "@types/chai@^4.1.4": - version "4.3.3" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.3.tgz#3c90752792660c4b562ad73b3fbd68bf3bc7ae07" - integrity sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g== + version "4.3.4" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4" + integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw== "@types/cli-table@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@types/cli-table/-/cli-table-0.3.0.tgz#f1857156bf5fd115c6a2db260ba0be1f8fc5671c" - integrity sha512-QnZUISJJXyhyD6L1e5QwXDV/A5i2W1/gl6D6YMc8u0ncPepbv/B4w3S+izVvtAg60m6h+JP09+Y/0zF2mojlFQ== + version "0.3.1" + resolved "https://registry.yarnpkg.com/@types/cli-table/-/cli-table-0.3.1.tgz#a0ae06290284f7abebb90a2ddc0187de6d22e963" + integrity sha512-m3+6WWfSSl6zqoXy8uQQifbgqV7Gt6fsyWnHLgUWVtJQk75+OfUB+edSZ52YDj7leSiZtX7w1/E4w2x/Hb0orA== "@types/command-exists@^1.2.0": version "1.2.0" @@ -5829,11 +5425,18 @@ resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8" integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog== -"@types/cors@2.8.12", "@types/cors@^2.8.5": +"@types/cors@2.8.12": version "2.8.12" resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== +"@types/cors@^2.8.5": + version "2.8.13" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" + integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA== + dependencies: + "@types/node" "*" + "@types/country-data@^0.0.0": version "0.0.0" resolved "https://registry.yarnpkg.com/@types/country-data/-/country-data-0.0.0.tgz#6f5563cae3d148780c5b6539803a29bd93f8f1a1" @@ -5882,12 +5485,13 @@ "@types/bn.js" "*" "@types/node" "*" -"@types/express-serve-static-core@*": - version "4.17.5" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c" - integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw== +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.33": + version "4.17.33" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" + integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== dependencies: "@types/node" "*" + "@types/qs" "*" "@types/range-parser" "*" "@types/express-serve-static-core@4.17.31": @@ -5899,24 +5503,6 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express-serve-static-core@^4.17.18": - version "4.17.24" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" - integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express-serve-static-core@^4.17.33": - version "4.17.33" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" - integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - "@types/express@4.17.14": version "4.17.14" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" @@ -5936,7 +5522,7 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" -"@types/express@^4.17.13": +"@types/express@^4.17.14", "@types/express@^4.17.6": version "4.17.17" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== @@ -5946,16 +5532,6 @@ "@types/qs" "*" "@types/serve-static" "*" -"@types/express@^4.17.6": - version "4.17.8" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a" - integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "*" - "@types/qs" "*" - "@types/serve-static" "*" - "@types/fetch-mock@^7.3.5": version "7.3.5" resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-7.3.5.tgz#7aee678c4e7c7e1a168bae8fdab5b8d712e377f6" @@ -5969,18 +5545,18 @@ "@types/node" "*" "@types/fs-extra@^8.0.0", "@types/fs-extra@^8.1.0": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d" - integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg== + version "8.1.2" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f" + integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg== dependencies: "@types/node" "*" "@types/glob@*": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.0.tgz#321607e9cbaec54f687a0792b2d1d370739455d2" - integrity sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA== + version "8.1.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" + integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== dependencies: - "@types/minimatch" "*" + "@types/minimatch" "^5.1.2" "@types/node" "*" "@types/glob@^7.1.1": @@ -5997,9 +5573,9 @@ integrity sha512-C3ydakLTQa8HxtYf9ge4q6uT9krDX8smSIxmmW3oACFi5g5vv6T068PRExF7UyWbWpuYiDG8Nm24q2X5XhcZWw== "@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" - integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== + version "4.1.6" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" + integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== dependencies: "@types/node" "*" @@ -6058,9 +5634,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@^29.1.1": - version "29.1.1" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.1.1.tgz#cf21a0835a1ba9a30ea1966019f1261c6a114c92" - integrity sha512-U9Ey07dGWl6fUFaIaUQUKWG5NoKi/zizeVQCGV8s4nSU0jPgqphVZvS64+8BtWYvrc3ZGw6wo943NSYPxkrp/g== + version "29.5.1" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.1.tgz#83c818aa9a87da27d6da85d3378e5a34d2f31a47" + integrity sha512-tEuVcHrpaixS36w7hpsfLBLpjtMRJUE09/MHXn923LOVojDwyC14cWcfc0rDs0VEfUyYmt/+iX1kxxp+gZMcaQ== dependencies: expect "^29.0.0" pretty-format "^29.0.0" @@ -6075,14 +5651,14 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/jsonwebtoken@^8.5.8": +"@types/jsonwebtoken@^8.5.9": version "8.5.9" resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz#2c064ecb0b3128d837d2764aa0b117b0ff6e4586" integrity sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg== dependencies: "@types/node" "*" -"@types/keyv@*": +"@types/keyv@^3.1.4": version "3.1.4" resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== @@ -6114,9 +5690,9 @@ "@types/node" "*" "@types/lodash@^4.14.104", "@types/lodash@^4.14.170": - version "4.14.184" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe" - integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q== + version "4.14.194" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76" + integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g== "@types/long@^3.0.0": version "3.0.32" @@ -6145,7 +5721,7 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== -"@types/minimatch@*": +"@types/minimatch@*", "@types/minimatch@^5.1.2": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== @@ -6182,7 +5758,7 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@^2.5.7": +"@types/node-fetch@2.5.7": version "2.5.7" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c" integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw== @@ -6197,10 +5773,10 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@18.7.16", "@types/node@>=12.12.47", "@types/node@>=13.7.0": - version "18.7.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" - integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^18.7.16": + version "18.15.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" + integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== "@types/node@10.12.18": version "10.12.18" @@ -6217,6 +5793,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.54.tgz#a4b58d8df3a4677b6c08bfbc94b7ad7a7a5f82d1" integrity sha512-ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w== +"@types/node@18.7.16": + version "18.7.16" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" + integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== + "@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" @@ -6227,25 +5808,15 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^13.7.0": - version "13.13.52" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.52.tgz#03c13be70b9031baaed79481c0c0cfb0045e53f7" - integrity sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ== - -"@types/node@^18.7.16": - version "18.7.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154" - integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg== - "@types/node@^6.0.52": version "6.14.13" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== "@types/node@^8.0.0": - version "8.10.59" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04" - integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ== + version "8.10.66" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" + integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -6284,9 +5855,9 @@ integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== "@types/prettier@^2.0.0", "@types/prettier@^2.1.5": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc" - integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A== + version "2.7.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" + integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== "@types/prompt@1.1.1": version "1.1.1" @@ -6336,15 +5907,15 @@ integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== "@types/react@*": - version "18.0.18" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.18.tgz#9f16f33d57bc5d9dca848d12c3572110ff9429ac" - integrity sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg== + version "18.0.38" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.38.tgz#02a23bef8848b360a0d1dceef4432c15c21c600c" + integrity sha512-ExsidLLSzYj4cvaQjGnQCk4HFfVT9+EZ9XZsQ8Hsrcn8QNgXtpZ3m9vSIC2MWtx7jHictK6wYhQgGh6ic58oOw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" -"@types/readable-stream@^2.3.13": +"@types/readable-stream@^2.3.13", "@types/readable-stream@^2.3.5": version "2.3.15" resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.15.tgz#3d79c9ceb1b6a57d5f6e6976f489b9b5384321ae" integrity sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ== @@ -6352,13 +5923,12 @@ "@types/node" "*" safe-buffer "~5.1.1" -"@types/readable-stream@^2.3.5": - version "2.3.14" - resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.14.tgz#1282cdc03a1fc9ed52982aa8f0553d7c251070b9" - integrity sha512-8jQ5Mp7bsDJEnW/69i6nAaQMoLwAVJVc7ZRAVTrdh/o6XueQsX38TEvKuYyoQj76/mg7WdlRfMrtl9pDLCJWsg== +"@types/readdir-glob@*": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/readdir-glob/-/readdir-glob-1.1.1.tgz#27ac2db283e6aa3d110b14ff9da44fcd1a5c38b1" + integrity sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ== dependencies: "@types/node" "*" - safe-buffer "*" "@types/request@^2.48.1": version "2.48.8" @@ -6377,13 +5947,6 @@ dependencies: "@types/node" "*" -"@types/responselike@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-3.0.0.tgz#5ecc1fc88552e5ac03de648a7796f9e125d002dc" - integrity sha512-zfgGLWx5IQOTJgQPD4UfGEhapTKUPC1ra/QCG02y3GUJWrhX05bBf/EfTh3aFj2DKi7cLo+cipXLNclD27tQXQ== - dependencies: - responselike "*" - "@types/responselike@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" @@ -6405,9 +5968,9 @@ "@types/node" "*" "@types/scheduler@*": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + version "0.16.3" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" + integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== "@types/secp256k1@^4.0.0", "@types/secp256k1@^4.0.1": version "4.0.3" @@ -6427,9 +5990,9 @@ integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now== "@types/serve-static@*": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" - integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== + version "1.15.1" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d" + integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ== dependencies: "@types/mime" "*" "@types/node" "*" @@ -6457,9 +6020,9 @@ integrity sha512-ijt3zdHi2DmZxQpQTmozXszzDo78V4R3EdvX0jFMfnMH2ZzQSmCbaWOMPGXFUYSzSIdStv78HDjg32m5dxc+tA== "@types/superagent@*": - version "4.1.15" - resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.15.tgz#63297de457eba5e2bc502a7609426c4cceab434a" - integrity sha512-mu/N4uvfDN2zVQQ5AYJI/g4qxn2bHB6521t1UuH09ShNWjebTqN0ZFuYK9uYjcgmI0dTQEs+Owi1EO6U0OkOZQ== + version "4.1.16" + resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.16.tgz#12c9c16f232f9d89beab91d69368f96ce8e2d881" + integrity sha512-tLfnlJf6A5mB6ddqF159GqcDizfzbMUB1/DeT59/wBNqzRTNNKsaw79A/1TZ84X+f/EwWH8FeuSkjlCLyqS/zQ== dependencies: "@types/cookiejar" "*" "@types/node" "*" @@ -6517,6 +6080,11 @@ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== +"@types/triple-beam@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8" + integrity sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g== + "@types/underscore@^1.8.8": version "1.11.4" resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.4.tgz#62e393f8bc4bd8a06154d110c7d042a93751def3" @@ -6564,29 +6132,44 @@ "@types/yargs-parser" "*" "@types/yargs@^15.0.0": - version "15.0.14" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" - integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== + version "15.0.15" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158" + integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg== dependencies: "@types/yargs-parser" "*" "@types/yargs@^17.0.8": - version "17.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526" - integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ== + version "17.0.24" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" + integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== dependencies: "@types/yargs-parser" "*" -"@xmldom/xmldom@^0.7.0": - version "0.7.5" - resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" - integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A== +"@xmldom/xmldom@^0.8.3": + version "0.8.7" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.7.tgz#8b1e39c547013941974d83ad5e9cf5042071a9a0" + integrity sha512-sI1Ly2cODlWStkINzqGrZ8K6n+MTSbAeQnAipGyL+KZCXuHaRlj2gyyy8B/9MvsFFqN7XHryQnB2QwhzvJXovg== "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +"@yarnpkg/parsers@^3.0.0-rc.18": + version "3.0.0-rc.42" + resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.42.tgz#3814e90a81bb1f9c06cc83c6a009139c55efe94d" + integrity sha512-eW9Mbegmb5bJjwawJM9ghjUjUqciNMhC6L7XrQPF/clXS5bbP66MstsgCT5hy9VlfUh/CfBT+0Wucf531dMjHA== + dependencies: + js-yaml "^3.10.0" + tslib "^2.4.0" + +"@zkochan/js-yaml@0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826" + integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg== + dependencies: + argparse "^2.0.1" + JSONStream@^1.0.4, JSONStream@^1.2.1: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -6641,9 +6224,9 @@ abort-controller@^2.0.2: event-target-shim "^5.0.0" abortcontroller-polyfill@^1.1.9, abortcontroller-polyfill@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5" - integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q== + version "1.7.5" + resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed" + integrity sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ== abstract-level@1.0.3, abstract-level@^1.0.0, abstract-level@^1.0.2, abstract-level@^1.0.3: version "1.0.3" @@ -6745,9 +6328,9 @@ acorn-walk@^8.1.1, acorn-walk@^8.2.0: integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^6.0.7: - version "6.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" - integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== acorn@^7.1.1: version "7.4.1" @@ -6755,16 +6338,16 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" - integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== adal-node@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.2.3.tgz#87ed3dbed344f6e114e36bf18fe1c4e7d3cc6069" - integrity sha512-gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ== + version "0.2.4" + resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.2.4.tgz#881beed9d493b76a86706ad5c8dc6f60eff04520" + integrity sha512-zIcvbwQFKMUtKxxj8YMHeTT1o/TPXfVNsTXVgXD8sxwV6h4AFQgK77dRciGhuEF9/Sdm3UQPJVPc/6XxrccSeA== dependencies: - "@xmldom/xmldom" "^0.7.0" + "@xmldom/xmldom" "^0.8.3" async "^2.6.3" axios "^0.21.1" date-utils "*" @@ -6803,12 +6386,12 @@ agent-base@^4.3.0: es6-promisify "^5.0.0" agentkeepalive@^4.1.3, agentkeepalive@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" - integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255" + integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg== dependencies: debug "^4.1.0" - depd "^1.1.2" + depd "^2.0.0" humanize-ms "^1.2.1" aggregate-error@^3.0.0: @@ -6837,9 +6420,9 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.5, ajv@^6.12.6, aj uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.6.3: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -6977,9 +6560,9 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -6992,17 +6575,17 @@ apollo-datasource@^3.3.2: "@apollo/utils.keyvaluecache" "^1.0.1" apollo-server-env "^4.2.1" -apollo-reporting-protobuf@^3.3.1, apollo-reporting-protobuf@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.3.tgz#df2b7ff73422cd682af3f1805d32301aefdd9e89" - integrity sha512-L3+DdClhLMaRZWVmMbBcwl4Ic77CnEBPXLW53F7hkYhkaZD88ivbCVB1w/x5gunO6ZHrdzhjq0FHmTsBvPo7aQ== +apollo-reporting-protobuf@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz#6edd31f09d4a3704d9e808d1db30eca2229ded26" + integrity sha512-h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog== dependencies: "@apollo/protobufjs" "1.2.6" -apollo-server-core@^3.11.1: - version "3.11.1" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.11.1.tgz#89d83aeaa71a59f760ebfa35bb0cbd31e15474ca" - integrity sha512-t/eCKrRFK1lYZlc5pHD99iG7Np7CEm3SmbDiONA7fckR3EaB/pdsEdIkIwQ5QBBpT5JLp/nwvrZRVwhaWmaRvw== +apollo-server-core@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.12.0.tgz#8aa2a7329ce6fe1823290c45168c749db01548df" + integrity sha512-hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg== dependencies: "@apollo/utils.keyvaluecache" "^1.0.1" "@apollo/utils.logger" "^1.0.0" @@ -7013,11 +6596,11 @@ apollo-server-core@^3.11.1: "@graphql-tools/schema" "^8.0.0" "@josephg/resolvable" "^1.0.0" apollo-datasource "^3.3.2" - apollo-reporting-protobuf "^3.3.3" + apollo-reporting-protobuf "^3.4.0" apollo-server-env "^4.2.1" apollo-server-errors "^3.3.1" - apollo-server-plugin-base "^3.7.1" - apollo-server-types "^3.7.1" + apollo-server-plugin-base "^3.7.2" + apollo-server-types "^3.8.0" async-retry "^1.2.1" fast-json-stable-stringify "^2.1.0" graphql-tag "^2.11.0" @@ -7040,10 +6623,10 @@ apollo-server-errors@^3.3.1: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== -apollo-server-express@^3.11.1: - version "3.11.1" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.11.1.tgz#f46d2f2f8db3d99ede6c0c144fea02f24b73cb78" - integrity sha512-x9ngcpXbBlt4naCXTwNtBFb/mOd9OU0wtFXvJkObHF26NsRazu3DxDfEuekA6V1NFOocD+A9jmVMQeQWug5MgA== +apollo-server-express@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.12.0.tgz#a6e392bb0427544b8c7e5d841ef07f7691b0c105" + integrity sha512-m8FaGPUfDOEGSm7QRWRmUUGjG/vqvpQoorkId9/FXkC57fz/A59kEdrzkMt9538Xgsa5AV+X4MEWLJhTvlW3LQ== dependencies: "@types/accepts" "^1.3.5" "@types/body-parser" "1.19.2" @@ -7051,37 +6634,37 @@ apollo-server-express@^3.11.1: "@types/express" "4.17.14" "@types/express-serve-static-core" "4.17.31" accepts "^1.3.5" - apollo-server-core "^3.11.1" - apollo-server-types "^3.7.1" + apollo-server-core "^3.12.0" + apollo-server-types "^3.8.0" body-parser "^1.19.0" cors "^2.8.5" parseurl "^1.3.3" -apollo-server-plugin-base@^3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.1.tgz#aa78ef49bd114e35906ca9cf7493fed2664cbde8" - integrity sha512-g3vJStmQtQvjGI289UkLMfThmOEOddpVgHLHT2bNj0sCD/bbisj4xKbBHETqaURokteqSWyyd4RDTUe0wAUDNQ== +apollo-server-plugin-base@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz#c19cd137bc4c993ba2490ba2b571b0f3ce60a0cd" + integrity sha512-wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw== dependencies: - apollo-server-types "^3.7.1" + apollo-server-types "^3.8.0" -apollo-server-types@^3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.7.1.tgz#87adfcb52ec0893999a9cfafd5474bfda7ab0798" - integrity sha512-aE9RDVplmkaOj/OduNmGa+0a1B5RIWI0o3zC1zLvBTVWMKTpo0ifVf11TyMkLCY+T7cnZqVqwyShziOyC3FyUw== +apollo-server-types@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.8.0.tgz#d976b6967878681f715fe2b9e4dad9ba86b1346f" + integrity sha512-ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A== dependencies: "@apollo/utils.keyvaluecache" "^1.0.1" "@apollo/utils.logger" "^1.0.0" - apollo-reporting-protobuf "^3.3.3" + apollo-reporting-protobuf "^3.4.0" apollo-server-env "^4.2.1" apollo-server@^3.11.0: - version "3.11.1" - resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-3.11.1.tgz#831646081323aadf2cb53cdc3401786e41d44d81" - integrity sha512-3RZ/veWGbi0zXy2YVaPkYIAavpbHyEVui91DNYvz6UFS0fZmhJwG7f1VmGheeRiqiV8nFa8GuBejI1niTeAYzA== + version "3.12.0" + resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-3.12.0.tgz#bd43d6dadb8cb16ed34edfc6ad97a81b1fab748a" + integrity sha512-wZHLgBoIdGxr/YpPTG5RwNnS+B2y70T/nCegCnU6Yl+H3PXB92OIguLMhdJIZVjukIOhiQT12dNIehqLQ+1hMQ== dependencies: "@types/express" "4.17.14" - apollo-server-core "^3.11.1" - apollo-server-express "^3.11.1" + apollo-server-core "^3.12.0" + apollo-server-express "^3.12.0" express "^4.17.1" app-module-path@^2.2.0: @@ -7294,18 +6877,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.map@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.4.tgz#0d97b640cfdd036c1b41cfe706a5e699aa0711f2" - integrity sha512-Qds9QnX7A0qISY7JT5WuJO0NJPE9CMlC6JzHQfhpqAAQQzufVRoeH7EzUY5GcPTx72voG8LV/5eo+b8Qi8hmhA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - es-array-method-boxes-properly "^1.0.0" - is-string "^1.0.7" - -array.prototype.map@^1.0.5: +array.prototype.map@^1.0.1, array.prototype.map@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.5.tgz#6e43c2fee6c0fb5e4806da2dc92eb00970809e55" integrity sha512-gfaKntvwqYIuC7mLLyv2wzZIJqrRhn5PZ9EfFejSx6a78sV7iDsGpG9P+3oUPtm1Rerqm6nrKS4FYuTIvWfo3g== @@ -7316,14 +6888,14 @@ array.prototype.map@^1.0.5: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" -array.prototype.reduce@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f" - integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw== +array.prototype.reduce@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac" + integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" @@ -7351,7 +6923,7 @@ as-array@^2.0.0: resolved "https://registry.yarnpkg.com/as-array/-/as-array-2.0.0.tgz#4f04805d87f8fce8e511bc2108f8e5e3a287d547" integrity sha512-1Sd1LrodN0XYxYeZcN1J4xYZvmvTwD5tDWaPUGPIzH1mFsmzsPnVtd2exWhecMjtZk/wYWjNZJiD3b1SLCeJqg== -asap@^2.0.0, asap@~2.0.3: +asap@^2.0.0, asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== @@ -7416,9 +6988,9 @@ astral-regex@^1.0.0: integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== async-each@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77" + integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg== async-eventemitter@0.2.4, async-eventemitter@^0.2.2: version "0.2.4" @@ -7478,7 +7050,7 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -atob@^2.1.1: +atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== @@ -7494,9 +7066,9 @@ available-typed-arrays@^1.0.5: integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== aws-sdk@^2.705.0: - version "2.1211.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1211.0.tgz#b7907679a4f2d84e5a507020f27d1f2f1130a479" - integrity sha512-lr4XdoLiLop7e8ftdNdS4OAaZWdY43Z4yx+WR9qcXSdaac1U89MrAybAbLL0SXW94chscd+FIfzmf2dNZnyVfQ== + version "2.1363.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1363.0.tgz#30c3b7fe999ee2ba1103a533ea27e1b0f5708e1f" + integrity sha512-M2MZZXehgi/EMQv5GlzRkn3TlhoOYHg2cYdSAAqhjv67WaEG50MjaQy5vRvfN1i8XvB24aJFJ5pCrx69TaCaIg== dependencies: buffer "4.9.2" events "1.1.1" @@ -7507,7 +7079,7 @@ aws-sdk@^2.705.0: url "0.10.3" util "^0.12.4" uuid "8.0.0" - xml2js "0.4.19" + xml2js "0.5.0" aws-sign2@~0.7.0: version "0.7.0" @@ -7515,26 +7087,18 @@ aws-sign2@~0.7.0: integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + version "1.12.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" + integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== axios-retry@^3.1.9: - version "3.3.1" - resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.3.1.tgz#47624646138aedefbad2ac32f226f4ee94b6dcab" - integrity sha512-RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q== + version "3.4.0" + resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.4.0.tgz#f464dbe9408e5aa78fa319afd38bb69b533d8854" + integrity sha512-VdgaP+gHH4iQYCCNUWF2pcqeciVOdGrBBAYUfTY+wPcO5Ltvp/37MLFNCmJKo7Gj3SHvCSdL8ouI1qLYJN3liA== dependencies: "@babel/runtime" "^7.15.4" is-retry-allowed "^2.2.0" -axios@0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== - dependencies: - follow-redirects "^1.14.9" - form-data "^4.0.0" - axios@1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.4.tgz#6555dd955d2efa9b8f4cb4cb0b3371b7b243537a" @@ -7566,6 +7130,15 @@ axios@^0.25.0: dependencies: follow-redirects "^1.14.7" +axios@^1.0.0: + version "1.3.6" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646" + integrity sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-jest@^26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" @@ -7580,20 +7153,7 @@ babel-jest@^26.6.3: graceful-fs "^4.2.4" slash "^3.0.0" -babel-jest@^29.1.2: - version "29.1.2" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.1.2.tgz#540d3241925c55240fb0c742e3ffc5f33a501978" - integrity sha512-IuG+F3HTHryJb7gacC7SQ59A9kO56BctUsT67uJHp1mMCHUOMXpDwOHWGifWqdWVknN2WNkCVQELPjXx0aLJ9Q== - dependencies: - "@jest/transform" "^29.1.2" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^29.0.2" - chalk "^4.0.0" - graceful-fs "^4.2.9" - slash "^3.0.0" - -babel-jest@^29.5.0: +babel-jest@^29.1.2, babel-jest@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5" integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q== @@ -7606,18 +7166,7 @@ babel-jest@^29.5.0: graceful-fs "^4.2.9" slash "^3.0.0" -babel-plugin-istanbul@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" - integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^4.0.0" - test-exclude "^6.0.0" - -babel-plugin-istanbul@^6.1.1: +babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== @@ -7638,7 +7187,7 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-jest-hoist@^29.0.2, babel-plugin-jest-hoist@^29.5.0: +babel-plugin-jest-hoist@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a" integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w== @@ -7648,6 +7197,30 @@ babel-plugin-jest-hoist@^29.0.2, babel-plugin-jest-hoist@^29.5.0: "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" +babel-plugin-polyfill-corejs2@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" + integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== + dependencies: + "@babel/compat-data" "^7.17.7" + "@babel/helper-define-polyfill-provider" "^0.3.3" + semver "^6.1.1" + +babel-plugin-polyfill-corejs3@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" + integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.3" + core-js-compat "^3.25.1" + +babel-plugin-polyfill-regenerator@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" + integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.3" + babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" @@ -7674,14 +7247,6 @@ babel-preset-jest@^26.6.2: babel-plugin-jest-hoist "^26.6.2" babel-preset-current-node-syntax "^1.0.0" -babel-preset-jest@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.0.2.tgz#e14a7124e22b161551818d89e5bdcfb3b2b0eac7" - integrity sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA== - dependencies: - babel-plugin-jest-hoist "^29.0.2" - babel-preset-current-node-syntax "^1.0.0" - babel-preset-jest@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2" @@ -7717,12 +7282,7 @@ base-x@^3.0.2, base-x@^3.0.8: dependencies: safe-buffer "^5.0.1" -base64-js@^1.0.2, base64-js@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" - integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== - -base64-js@^1.3.1: +base64-js@^1.0.2, base64-js@^1.3.0, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -7788,9 +7348,9 @@ big-integer@1.6.36: integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg== big-integer@^1.6.15, big-integer@^1.6.17, big-integer@^1.6.44: - version "1.6.48" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" - integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== + version "1.6.51" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" + integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== big.js@^6.0.3: version "6.2.1" @@ -7803,16 +7363,9 @@ bigi@^1.1.0, bigi@^1.4.2: integrity sha512-ddkU+dFIuEIW8lE7ZwdIAf2UPoM90eaprg5m3YXAVVTmKlqV/9BX4A2M8BOK2yOq6/VgZFVhK6QAxJebhlbhzw== bigint-crypto-utils@^3.0.23: - version "3.1.8" - resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.1.8.tgz#e2e0f40cf45488f9d7f0e32ff84152aa73819d5d" - integrity sha512-+VMV9Laq8pXLBKKKK49nOoq9bfR3j7NNQAtbA617a4nw9bVLo8rsqkKMBgM2AJWlNX9fEIyYaYX+d0laqYV4tw== - dependencies: - bigint-mod-arith "^3.1.0" - -bigint-mod-arith@^3.1.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bigint-mod-arith/-/bigint-mod-arith-3.1.2.tgz#658e416bc593a463d97b59766226d0a3021a76b1" - integrity sha512-nx8J8bBeiRR+NlsROFH9jHswW5HO8mgfOSqW0AmjicMMvaONDa8AO+5ViKDUUNytBPWiwfvZP4/Bj4Y3lUfvgQ== + version "3.2.2" + resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.2.2.tgz#e30a49ec38357c6981cd3da5aaa6480b1f752ee4" + integrity sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw== bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js#master", "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", bignumber.js@~9.0.2: version "9.0.0" @@ -7881,6 +7434,17 @@ bip32@3.1.0, bip32@^3.1.0: typeforce "^1.11.5" wif "^2.0.6" +bip39@2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.5.0.tgz#51cbd5179460504a63ea3c000db3f787ca051235" + integrity sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA== + dependencies: + create-hash "^1.1.0" + pbkdf2 "^3.0.9" + randombytes "^2.0.1" + safe-buffer "^5.0.1" + unorm "^1.3.3" + bip39@^2.2.0, bip39@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.6.0.tgz#9e3a720b42ec8b3fbe4038f1e445317b6a99321c" @@ -7993,10 +7557,10 @@ bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3, bn.js@^5.2.0, bn.js@^5.2 resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@1.20.0, body-parser@^1.16.0, body-parser@^1.18.3, body-parser@^1.19.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" - integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: bytes "3.1.2" content-type "~1.0.4" @@ -8006,11 +7570,29 @@ body-parser@1.20.0, body-parser@^1.16.0, body-parser@^1.18.3, body-parser@^1.19. http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.10.3" + qs "6.11.0" raw-body "2.5.1" type-is "~1.6.18" unpipe "1.0.0" +body-parser@^1.16.0, body-parser@^1.18.3, body-parser@^1.19.0: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -8175,15 +7757,15 @@ browserify-sign@^4.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -browserslist@^4.21.3: - version "4.21.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" - integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== +browserslist@^4.21.3, browserslist@^4.21.5: + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001370" - electron-to-chromium "^1.4.202" - node-releases "^2.0.6" - update-browserslist-db "^1.0.5" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" bs-logger@0.x: version "0.2.6" @@ -8328,9 +7910,9 @@ bufferutil@4.0.5: node-gyp-build "^4.3.0" bufferutil@^4.0.1: - version "4.0.6" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.6.tgz#ebd6c67c7922a0e902f053e5d8be5ec850e48433" - integrity sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw== + version "4.0.7" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad" + integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw== dependencies: node-gyp-build "^4.3.0" @@ -8485,6 +8067,11 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +cacheable-lookup@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" + integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== + cacheable-lookup@^6.0.4: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz#0330a543471c61faa4e9035db583aad753b36385" @@ -8516,7 +8103,7 @@ cacheable-request@^7.0.2: normalize-url "^6.0.1" responselike "^2.0.0" -call-bind@^1.0.0, call-bind@^1.0.2: +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -8525,9 +8112,9 @@ call-bind@^1.0.0, call-bind@^1.0.2: get-intrinsic "^1.0.2" call-me-maybe@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" - integrity sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw== + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa" + integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ== caller-callsite@^2.0.0: version "2.0.0" @@ -8595,10 +8182,10 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001370: - version "1.0.30001390" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz#158a43011e7068ef7fc73590e9fd91a7cece5e7f" - integrity sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g== +caniuse-lite@^1.0.30001449: + version "1.0.30001481" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912" + integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ== capture-exit@^2.0.0: version "2.0.0" @@ -8676,13 +8263,13 @@ chai-subset@^1.6.0: integrity sha512-K3d+KmqdS5XKW5DWPd5sgNffL3uxdDe+6GdnJh3AYPhwnBGRY5urfvfcbRtWIvvpz+KxkL9FeBB6MZewLUNwug== chai@^4.0.1, chai@^4.1.2, chai@^4.2.0, chai@^4.3.6: - version "4.3.6" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c" - integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q== + version "4.3.7" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51" + integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A== dependencies: assertion-error "^1.1.0" check-error "^1.0.2" - deep-eql "^3.0.1" + deep-eql "^4.1.2" get-func-name "^2.0.0" loupe "^2.3.1" pathval "^1.1.1" @@ -8695,14 +8282,6 @@ chainsaw@~0.1.0: dependencies: traverse ">=0.3.0 <0.4" -chalk@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -8731,7 +8310,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -8861,7 +8440,7 @@ chokidar@3.3.1: optionalDependencies: fsevents "~2.1.2" -chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.5.1: +chokidar@3.5.3, chokidar@^3.0.2: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -8876,7 +8455,7 @@ chokidar@3.5.3, chokidar@^3.0.2, chokidar@^3.5.1: optionalDependencies: fsevents "~2.3.2" -chownr@^1.0.1, chownr@^1.1.1: +chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -8892,9 +8471,9 @@ ci-info@^2.0.0: integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== ci-info@^3.2.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128" - integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg== + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== cids@^0.7.1: version "0.7.5" @@ -8948,14 +8527,14 @@ class-utils@^0.3.5: static-extend "^0.1.1" classic-level@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/classic-level/-/classic-level-1.2.0.tgz#2d52bdec8e7a27f534e67fdeb890abef3e643c27" - integrity sha512-qw5B31ANxSluWz9xBzklRWTUAJ1SXIdaVKTVS7HcTGKOAmExx65Wo5BUICW+YGORe2FOUaDghoI9ZDxj82QcFg== + version "1.3.0" + resolved "https://registry.yarnpkg.com/classic-level/-/classic-level-1.3.0.tgz#5e36680e01dc6b271775c093f2150844c5edd5c8" + integrity sha512-iwFAJQYtqRTRM0F6L8h4JCt00ZSGdOyqh7yVrhhjrOpFhmBjNlRUey64MCiyo6UmQHMJ+No3c81nujPv+n9yrg== dependencies: abstract-level "^1.0.2" catering "^2.1.0" module-error "^1.0.1" - napi-macros "~2.0.0" + napi-macros "^2.2.2" node-gyp-build "^4.3.0" clean-stack@^2.0.0: @@ -9002,9 +8581,9 @@ cli-cursor@^2.1.0: restore-cursor "^2.0.0" cli-progress@^3.4.0: - version "3.11.2" - resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" - integrity sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA== + version "3.12.0" + resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942" + integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A== dependencies: string-width "^4.2.3" @@ -9014,9 +8593,9 @@ cli-spinners@2.6.1: integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== cli-spinners@^2.0.0, cli-spinners@^2.5.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" - integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== + version "2.8.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.8.0.tgz#e97a3e2bd00e6d85aa0c13d7f9e3ce236f7787fc" + integrity sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ== cli-table3@^0.5.0: version "0.5.1" @@ -9556,13 +9135,13 @@ configstore@^5.0.0, configstore@^5.0.1: xdg-basedir "^4.0.0" connect@^3.6.2: - version "3.6.6" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524" - integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ= + version "3.7.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" + integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== dependencies: debug "2.6.9" - finalhandler "1.1.0" - parseurl "~1.3.2" + finalhandler "1.1.2" + parseurl "~1.3.3" utils-merge "1.0.1" console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: @@ -9594,10 +9173,10 @@ content-hash@^2.5.2: multicodec "^0.5.5" multihashes "^0.4.15" -content-type@^1.0.4, content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +content-type@^1.0.4, content-type@~1.0.4, content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== conventional-changelog-angular@^5.0.12: version "5.0.13" @@ -9681,13 +9260,11 @@ conventional-recommended-bump@^6.1.0: meow "^8.0.0" q "^1.5.1" -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" - +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== + convert-source-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" @@ -9703,12 +9280,7 @@ cookie@0.5.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== -cookiejar@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" - integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== - -cookiejar@^2.1.3: +cookiejar@^2.1.1, cookiejar@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b" integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw== @@ -9718,10 +9290,17 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== +core-js-compat@^3.25.1: + version "3.30.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.1.tgz#961541e22db9c27fc48bfc13a3cafa8734171dfe" + integrity sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw== + dependencies: + browserslist "^4.21.5" + core-js-pure@^3.0.1: - version "3.25.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.1.tgz#79546518ae87cc362c991d9c2d211f45107991ee" - integrity sha512-7Fr74bliUDdeJCBMxkkIuQ4xfxn/SwrVg+HkJUAoNEXVqYLv55l6Af0dJ5Lq2YBUW9yKqSkLXaS5SYPK6MGa/A== + version "3.30.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.1.tgz#7d93dc89e7d47b8ef05d7e79f507b0e99ea77eec" + integrity sha512-nXBEVpmUnNRhz83cHd9JRQC52cTMcuXAmR56+9dSMpRdpeA4I1PX6yjmhd71Eyc/wXNsdBdUDIj1QTIeZpU5Tg== core-js@3.6.5: version "3.6.5" @@ -9729,19 +9308,14 @@ core-js@3.6.5: integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== core-js@^2.4.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== - -core-js@^3.0.0: - version "3.25.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.1.tgz#5818e09de0db8956e16bf10e2a7141e931b7c69c" - integrity sha512-sr0FY4lnO1hkQ4gLDr24K0DGnweGO1QwSj5BpfQjpSJPdqWalja4cTps29Y/PJVG/P7FYlPDkH3hO+Tr0CvDgQ== + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.2.1: - version "3.25.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.5.tgz#e86f651a2ca8a0237a5f064c2fe56cef89646e27" - integrity sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw== +core-js@^3.0.0, core-js@^3.2.1: + version "3.30.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.1.tgz#fc9c5adcc541d8e9fa3e381179433cbf795628ba" + integrity sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ== core-util-is@1.0.2: version "1.0.2" @@ -9772,9 +9346,9 @@ cosmiconfig@^5.0.7, cosmiconfig@^5.2.1: parse-json "^4.0.0" cosmiconfig@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== + version "7.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" + integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== dependencies: "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" @@ -9978,9 +9552,9 @@ cssstyle@^2.3.0: cssom "~0.3.6" csstype@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" - integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== + version "3.1.2" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" + integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== csv-parser@^2.0.0: version "2.3.5" @@ -10096,14 +9670,14 @@ debug@3.2.6: dependencies: ms "^2.1.1" -debug@4, debug@4.3.4, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@4.3.1, debug@^4.3.1: +debug@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -10117,22 +9691,15 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw== decamelize-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" + integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg== dependencies: decamelize "^1.1.0" map-obj "^1.0.0" @@ -10153,14 +9720,14 @@ decimal.js@10.2.0: integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw== decimal.js@^10.0.0, decimal.js@^10.2.1: - version "10.4.0" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.0.tgz#97a7448873b01e92e5ff9117d89a7bca8e63e0fe" - integrity sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg== + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== decompress-response@^3.2.0, decompress-response@^3.3.0: version "3.3.0" @@ -10241,17 +9808,24 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== +deep-eql@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" + integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== dependencies: type-detect "^4.0.0" -deep-equal@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - integrity sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw== +deep-equal@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + dependencies: + is-arguments "^1.0.4" + is-date-object "^1.0.1" + is-regex "^1.0.4" + object-is "^1.0.1" + object-keys "^1.1.1" + regexp.prototype.flags "^1.2.0" deep-extend@^0.6.0: version "0.6.0" @@ -10269,14 +9843,14 @@ deep-is@^0.1.3, deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== defaults@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" + integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== dependencies: clone "^1.0.2" @@ -10285,7 +9859,7 @@ defer-to-connect@^1.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== -defer-to-connect@^2.0.1: +defer-to-connect@^2.0.0, defer-to-connect@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== @@ -10318,10 +9892,10 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== +define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -10348,20 +9922,20 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -defined@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ== +defined@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf" + integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q== degenerator@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235" - integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.3.tgz#a081ac30052ca84e1d1c6e86c972ae8dabbc4079" + integrity sha512-FTq/qYMeBJACu1gHcXJvzsRBTK6aw5zWCYbEnIOyamOt5UJufWJRQ5XfDb6OuayfJWvmWAHgcZyt43vm/hbj7g== dependencies: ast-types "^0.13.2" escodegen "^1.8.1" esprima "^4.0.0" - vm2 "^3.9.8" + vm2 "^3.9.11" delay@^5.0.0: version "5.0.0" @@ -10393,7 +9967,7 @@ depd@2.0.0, depd@^2.0.0, depd@~2.0.0: resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -depd@^1.1.2, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== @@ -10489,15 +10063,7 @@ detox@^17.13.2: yargs "^16.0.3" yargs-unparser "^2.0.0" -dezalgo@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" - integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY= - dependencies: - asap "^2.0.0" - wrappy "1" - -dezalgo@^1.0.4: +dezalgo@^1.0.0, dezalgo@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig== @@ -10547,9 +10113,9 @@ diffie-hellman@^5.0.0: randombytes "^2.0.0" dijkstrajs@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257" - integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz#4c8dbdea1f0f6478bff94d9c49c784d623e4fc23" + integrity sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA== dir-glob@2.0.0: version "2.0.0" @@ -10672,9 +10238,9 @@ dotdir-regex@^0.1.0: integrity sha512-00odj/E9hnwoi/W0ZcudUwlR/OSjhMgcBgevA4G8tgSJdGy0cVIKrmKLkh97Kw6aXvE47islrIisBld19+X1AQ== dotenv@*: - version "16.0.2" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.2.tgz#0b0f8652c016a3858ef795024508cddc4bffc5bf" - integrity sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA== + version "16.0.3" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" + integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== dotenv@8.2.0: version "8.2.0" @@ -10696,6 +10262,13 @@ dotenv@~10.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== +dotignore@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/dotignore/-/dotignore-0.1.2.tgz#f942f2200d28c3a76fbdd6f0ee9f3257c8a2e905" + integrity sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw== + dependencies: + minimatch "^3.0.4" + double-ended-queue@2.1.0-0: version "2.1.0-0" resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" @@ -10782,10 +10355,17 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.202: - version "1.4.243" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz#9d5f1b10eafd6e434b687a88f1e7b0441dee168a" - integrity sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw== +ejs@^3.1.7: + version "3.1.9" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" + integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== + dependencies: + jake "^10.8.5" + +electron-to-chromium@^1.4.284: + version "1.4.369" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.369.tgz#a98d838cdd79be4471cd04e9b4dffe891d037874" + integrity sha512-LfxbHXdA/S+qyoTEA4EbhxGjrxx7WK2h6yb5K2v0UCOufUKX+VZaHbl3svlzZfv9sGseym/g3Ne4DpsgRULmqg== elliptic@6.3.3: version "6.3.3" @@ -10830,11 +10410,6 @@ emittery@^0.7.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== -emoji-regex@^10.1.0: - version "10.2.1" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.2.1.tgz#a41c330d957191efd3d9dfe6e1e8e1e9ab048b3f" - integrity sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA== - emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -10850,12 +10425,12 @@ enabled@2.0.x: resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== -encode-utf8@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda" - integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw== +encode-utf8@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-2.0.0.tgz#c6abd75e6962cde0eb5ef82890515ef6b635cde6" + integrity sha512-3EyMFxZj1/7oMotElDQUEQcP7N4TIe1aJ0m1uBDoyQ8I2LBHhBsXx8P3KsPbqNlGzG+NYxFwEauUwMPHZg3YDQ== -encodeurl@~1.0.1, encodeurl@~1.0.2: +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== @@ -10919,7 +10494,7 @@ ent@^2.2.0: resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== -entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: +entities@^4.2.0, entities@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -10940,9 +10515,9 @@ err-code@^2.0.2: integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== errno@~0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" @@ -10953,24 +10528,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0-next.1: - version "1.17.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" - integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.5" - is-regex "^1.0.5" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" - -es-abstract@^1.19.0, es-abstract@^1.19.2, es-abstract@^1.20.0, es-abstract@^1.20.1, es-abstract@^1.20.4, es-abstract@^1.5.0: +es-abstract@^1.17.0-next.1, es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2: version "1.21.2" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== @@ -11016,18 +10574,19 @@ es-array-method-boxes-properly@^1.0.0: integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== es-get-iterator@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9" - integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw== + version "1.1.3" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" + integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.1" - has-symbols "^1.0.1" - is-arguments "^1.0.4" - is-map "^2.0.1" - is-set "^2.0.1" - is-string "^1.0.5" + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + has-symbols "^1.0.3" + is-arguments "^1.1.1" + is-map "^2.0.2" + is-set "^2.0.2" + is-string "^1.0.7" isarray "^2.0.5" + stop-iteration-iterator "^1.0.0" es-set-tostringtag@^2.0.1: version "2.0.1" @@ -11120,7 +10679,7 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1 resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: +escape-string-regexp@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== @@ -11260,9 +10819,9 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== dependencies: estraverse "^5.1.0" @@ -11479,7 +11038,7 @@ ethereum-common@^0.0.18: resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f" integrity sha512-EoltVQTRNg2Uy4o84qpa2aXymXDJhxm7eos/ACOg0DG4baAbMjhbdAEsx9GeE8sC3XCxnYvrrzZDH8D8MtA2iQ== -ethereum-cryptography@1.2.0, ethereum-cryptography@^1.1.2: +ethereum-cryptography@1.2.0, ethereum-cryptography@^1.0.3, ethereum-cryptography@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz#5ccfa183e85fdaf9f9b299a79430c044268c9b3a" integrity sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw== @@ -11510,16 +11069,6 @@ ethereum-cryptography@^0.1.3: secp256k1 "^4.0.1" setimmediate "^1.0.5" -ethereum-cryptography@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.1.2.tgz#74f2ac0f0f5fe79f012c889b3b8446a9a6264e6d" - integrity sha512-XDSJlg4BD+hq9N2FjvotwUET9Tfxpxc3kWGE2AqUG5vcbeunnbImVk3cj6e/xT3phdW21mE8R5IugU4fspQDcQ== - dependencies: - "@noble/hashes" "1.1.2" - "@noble/secp256k1" "1.6.3" - "@scure/bip32" "1.1.0" - "@scure/bip39" "1.1.0" - ethereum-types@^3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-3.7.1.tgz#8fa75e5d9f5da3c85535ea0d4bcd2614b1d650a8" @@ -11528,7 +11077,15 @@ ethereum-types@^3.7.1: "@types/node" "12.12.54" bignumber.js "~9.0.2" -ethereumjs-abi@^0.6.8, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": +ethereumjs-abi@^0.6.8: + version "0.6.8" + resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz#71bc152db099f70e62f108b7cdfca1b362c6fcae" + integrity sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA== + dependencies: + bn.js "^4.11.8" + ethereumjs-util "^6.0.0" + +"ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": version "0.6.8" resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0" dependencies: @@ -11747,43 +11304,7 @@ ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: uuid "2.0.1" xmlhttprequest "1.8.0" -ethers@^5.0.13: - version "5.7.0" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.0.tgz#0055da174b9e076b242b8282638bc94e04b39835" - integrity sha512-5Xhzp2ZQRi0Em+0OkOcRHxPzCfoBfgtOQA+RUylSkuHbhTEaQklnYi2hsWbRgs3ztJsXVXd9VKBcO1ScWL8YfA== - dependencies: - "@ethersproject/abi" "5.7.0" - "@ethersproject/abstract-provider" "5.7.0" - "@ethersproject/abstract-signer" "5.7.0" - "@ethersproject/address" "5.7.0" - "@ethersproject/base64" "5.7.0" - "@ethersproject/basex" "5.7.0" - "@ethersproject/bignumber" "5.7.0" - "@ethersproject/bytes" "5.7.0" - "@ethersproject/constants" "5.7.0" - "@ethersproject/contracts" "5.7.0" - "@ethersproject/hash" "5.7.0" - "@ethersproject/hdnode" "5.7.0" - "@ethersproject/json-wallets" "5.7.0" - "@ethersproject/keccak256" "5.7.0" - "@ethersproject/logger" "5.7.0" - "@ethersproject/networks" "5.7.0" - "@ethersproject/pbkdf2" "5.7.0" - "@ethersproject/properties" "5.7.0" - "@ethersproject/providers" "5.7.0" - "@ethersproject/random" "5.7.0" - "@ethersproject/rlp" "5.7.0" - "@ethersproject/sha2" "5.7.0" - "@ethersproject/signing-key" "5.7.0" - "@ethersproject/solidity" "5.7.0" - "@ethersproject/strings" "5.7.0" - "@ethersproject/transactions" "5.7.0" - "@ethersproject/units" "5.7.0" - "@ethersproject/wallet" "5.7.0" - "@ethersproject/web" "5.7.0" - "@ethersproject/wordlists" "5.7.0" - -ethers@^5.2.0, ethers@^5.7.1: +ethers@^5.0.13, ethers@^5.2.0, ethers@^5.7.1: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -12084,18 +11605,7 @@ expect@^26.6.2: jest-message-util "^26.6.2" jest-regex-util "^26.0.0" -expect@^29.0.0: - version "29.1.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.1.2.tgz#82f8f28d7d408c7c68da3a386a490ee683e1eced" - integrity sha512-AuAGn1uxva5YBbBlXb+2JPxJRuemZsmlGcapPXWNSBNsQtAULfjioREGBWuI0EOvYUKjDnrCy8PW5Zlr1md5mw== - dependencies: - "@jest/expect-utils" "^29.1.2" - jest-get-type "^29.0.0" - jest-matcher-utils "^29.1.2" - jest-message-util "^29.1.2" - jest-util "^29.1.2" - -expect@^29.5.0: +expect@^29.0.0, expect@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7" integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg== @@ -12114,13 +11624,13 @@ export-files@^2.0.1: lazy-cache "^1.0.3" express@^4.14.0, express@^4.16.4, express@^4.17.1: - version "4.18.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" - integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.0" + body-parser "1.20.1" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.5.0" @@ -12139,7 +11649,7 @@ express@^4.14.0, express@^4.16.4, express@^4.17.1: parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.10.3" + qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" send "0.18.0" @@ -12247,11 +11757,6 @@ fake-merkle-patricia-tree@^1.0.1: dependencies: checkpoint-store "^1.1.0" -faker@5.5.3: - version "5.5.3" - resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e" - integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g== - fast-check@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-3.1.1.tgz#72c5ae7022a4e86504762e773adfb8a5b0b01252" @@ -12293,9 +11798,9 @@ fast-glob@^2.0.2: micromatch "^3.1.10" fast-glob@^3.0.3, fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -12325,12 +11830,7 @@ fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.1.1: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== -fast-text-encoding@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz#3e5ce8293409cfaa7177a71b9ca84e1b1e6f25ef" - integrity sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ== - -fast-text-encoding@^1.0.3: +fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3: version "1.0.6" resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== @@ -12348,9 +11848,9 @@ fastest-levenshtein@^1.0.7: integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -12369,9 +11869,9 @@ faye-websocket@0.11.4: websocket-driver ">=0.5.1" fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== dependencies: bser "2.1.1" @@ -12471,6 +11971,13 @@ file-uri-to-path@2: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba" integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg== +filelist@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" @@ -12517,17 +12024,17 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" - integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw== +finalhandler@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== dependencies: debug "2.6.9" - encodeurl "~1.0.1" + encodeurl "~1.0.2" escape-html "~1.0.3" on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.3.1" + parseurl "~1.3.3" + statuses "~1.5.0" unpipe "~1.0.0" finalhandler@1.2.0: @@ -12640,9 +12147,9 @@ firebase-functions-test@^0.3.3: lodash "^4.17.5" firebase-functions@^3.15.7: - version "3.23.0" - resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.23.0.tgz#ac8da127ff3e97c354f3cd740a71534572d1f4ca" - integrity sha512-/jujnNChTWIuoXK3IPNGYu1zjXF1fYRy88uYbkrJhs3dhK6EdXZi0rX6JUEOCB7h6IkRQvbio+bvtaoI7h+4Lg== + version "3.24.1" + resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.24.1.tgz#50d13274c4ae96b2308a67e9fc76f1a74cff690d" + integrity sha512-GYhoyOV0864HFMU1h/JNBXYNmDk2MlbvU7VO/5qliHX6u/6vhSjTJjlyCG4leDEI8ew8IvmkIC5QquQ1U8hAuA== dependencies: "@types/cors" "^2.8.5" "@types/express" "4.17.3" @@ -12788,16 +12295,11 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" -follow-redirects@^1.12.1, follow-redirects@^1.15.0: +follow-redirects@^1.12.1, follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== -follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== - for-each@^0.3.3, for-each@~0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -12873,10 +12375,10 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formidable@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.1.tgz#81269cbea1a613240049f5f61a9d97731517414f" - integrity sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ== +formidable@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.2.tgz#fa973a2bec150e4ce7cac15589d7a25fc30ebd89" + integrity sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g== dependencies: dezalgo "^1.0.4" hexoid "^1.0.0" @@ -12936,10 +12438,10 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== +fs-extra@^11.1.0: + version "11.1.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" + integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -12972,7 +12474,7 @@ fs-extra@^6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^7.0.0, fs-extra@^7.0.1: +fs-extra@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== @@ -12990,7 +12492,7 @@ fs-extra@^8.1, fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0, fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0, fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -13000,7 +12502,7 @@ fs-extra@^9.0, fs-extra@^9.0.1, fs-extra@^9.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^1.2.5: +fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -13052,7 +12554,7 @@ ftp@^0.3.10: readable-stream "1.1.x" xregexp "2.0.0" -function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== @@ -13072,7 +12574,7 @@ functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== -functions-have-names@^1.2.2: +functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -13156,17 +12658,6 @@ gaxios@^1.0.2, gaxios@^1.0.4, gaxios@^1.2.1, gaxios@^1.2.2, gaxios@^1.5.0: https-proxy-agent "^2.2.1" node-fetch "^2.3.0" -gaxios@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.0.3.tgz#497730758f5b0d43a32ebdbebe5f1bd9f7db7aed" - integrity sha512-PkzQludeIFhd535/yucALT/Wxyj/y2zLyrMwPcJmnLHDugmV49NvAi/vb+VUq/eWztATZCNcb8ue+ywPG+oLuw== - dependencies: - abort-controller "^3.0.0" - extend "^3.0.2" - https-proxy-agent "^5.0.0" - is-stream "^2.0.0" - node-fetch "^2.3.0" - gaxios@^4.0.0: version "4.3.3" resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22" @@ -13186,14 +12677,6 @@ gcp-metadata@^1.0.0: gaxios "^1.0.2" json-bigint "^0.3.0" -gcp-metadata@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.1.0.tgz#8b9b5903882076948554af471c838e7ea2f564b4" - integrity sha512-r57SV28+olVsflPlKyVig3Muo/VDlcsObMtvDGOEtEJXj+DDE8bEl0coIkXh//hbkSDTvo+f5lbihZOndYXQQQ== - dependencies: - gaxios "^3.0.0" - json-bigint "^0.3.0" - gcp-metadata@^4.2.0: version "4.3.1" resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9" @@ -13260,7 +12743,7 @@ get-installed-path@^4.0.8: dependencies: global-modules "1.0.0" -get-intrinsic@^1.0.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== @@ -13269,15 +12752,6 @@ get-intrinsic@^1.0.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: has "^1.0.3" has-symbols "^1.0.3" -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.3" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -13428,20 +12902,20 @@ git-semver-tags@^4.1.1: meow "^8.0.0" semver "^6.0.0" -git-up@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/git-up/-/git-up-6.0.0.tgz#dbd6e4eee270338be847a0601e6d0763c90b74db" - integrity sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA== +git-up@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-7.0.0.tgz#bace30786e36f56ea341b6f69adfd83286337467" + integrity sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ== dependencies: is-ssh "^1.4.0" - parse-url "^7.0.2" + parse-url "^8.1.0" -git-url-parse@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-12.0.0.tgz#4ba70bc1e99138321c57e3765aaf7428e5abb793" - integrity sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q== +git-url-parse@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.0.tgz#07e136b5baa08d59fabdf0e33170de425adf07b4" + integrity sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA== dependencies: - git-up "^6.0.0" + git-up "^7.0.0" gitconfiglocal@^1.0.0: version "1.0.0" @@ -13456,9 +12930,9 @@ github-from-package@0.0.0: integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== github-slugger@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" - integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== + version "1.5.0" + resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.5.0.tgz#17891bbc73232051474d68bd867a34625c955f7d" + integrity sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw== glob-base@^0.3.0: version "0.3.0" @@ -13649,7 +13123,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.2.3: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -13662,9 +13136,9 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl path-is-absolute "^1.0.0" glob@^8.0.1: - version "8.0.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" - integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -13672,18 +13146,6 @@ glob@^8.0.1: minimatch "^5.0.1" once "^1.3.0" -glob@~7.1.4: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - 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" - global-dirs@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" @@ -13692,9 +13154,9 @@ global-dirs@^2.0.1: ini "1.3.7" global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" + integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA== dependencies: ini "2.0.0" @@ -13770,7 +13232,7 @@ globby@^10.0.1: merge2 "^1.2.3" slash "^3.0.0" -globby@^11.0.1, globby@^11.0.2: +globby@^11.0.1, globby@^11.0.2, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -13810,21 +13272,6 @@ google-auth-library@^3.0.0, google-auth-library@^3.1.1: lru-cache "^5.0.0" semver "^5.5.0" -google-auth-library@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.0.1.tgz#b5bbff2583f024188a37920cb509e194f2cc4dd2" - integrity sha512-NWEM9W0o+fmUJMK/wEuJ1vAc8H/JAseOWB8tjOAAkz8yobU+5IDtO/rPCbbRwFF1obIOCe0lj1pkq9ld2OFZeg== - dependencies: - arrify "^2.0.0" - base64-js "^1.3.0" - ecdsa-sig-formatter "^1.0.11" - fast-text-encoding "^1.0.0" - gaxios "^3.0.0" - gcp-metadata "^4.1.0" - gtoken "^5.0.0" - jws "^4.0.0" - lru-cache "^5.0.0" - google-auth-library@^6.1.3: version "6.1.6" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.1.6.tgz#deacdcdb883d9ed6bac78bb5d79a078877fdf572" @@ -13840,7 +13287,7 @@ google-auth-library@^6.1.3: jws "^4.0.0" lru-cache "^6.0.0" -google-auth-library@^7.0.0, google-auth-library@^7.14.0, google-auth-library@^7.14.1, google-auth-library@^7.6.1: +google-auth-library@^7.0.0, google-auth-library@^7.14.0, google-auth-library@^7.14.1: version "7.14.1" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.1.tgz#e3483034162f24cc71b95c8a55a210008826213c" integrity sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA== @@ -13894,49 +13341,29 @@ google-gax@^0.25.0: semver "^6.0.0" walkdir "^0.3.2" -google-gax@^2.0.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.6.1.tgz#ab09c4f94ccdd0a81a0f743f49fec83108587fbf" - integrity sha512-AKQKfaaXCJhMrP4nniz/ei7j+uyqG7nNrGmQxDBIBtDMUbZUMnH0Kw8asts35vmciEV5UeIWfclVcAU+VaJptw== - dependencies: - "@grpc/grpc-js" "~1.0.0" - "@grpc/proto-loader" "^0.5.1" - "@types/long" "^4.0.0" - abort-controller "^3.0.0" - duplexify "^3.6.0" - google-auth-library "^6.0.0" - is-stream-ended "^0.1.4" - lodash.at "^4.6.0" - lodash.has "^4.5.2" - node-fetch "^2.6.0" - protobufjs "^6.9.0" - retry-request "^4.0.0" - semver "^6.0.0" - walkdir "^0.4.0" - -google-gax@^2.24.1: - version "2.28.0" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.28.0.tgz#30ec17bac62f6002cfe10a0237155554b262156a" - integrity sha512-kuqc8a4+CTCMBcF3tlOL7Sa74JWkTzcZxatAQTCVK35WToXkHnJ0qncFOJuegUv3EbV9IQY4j/+NZdFLv+lbTA== +google-gax@^2.0.1, google-gax@^2.24.1: + version "2.30.5" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.5.tgz#e836f984f3228900a8336f608c83d75f9cb73eff" + integrity sha512-Jey13YrAN2hfpozHzbtrwEfEHdStJh1GwaQ2+Akh1k0Tv/EuNVSuBtHZoKSBm5wBMvNsxTsEIZ/152NrYyZgxQ== dependencies: - "@grpc/grpc-js" "~1.4.0" - "@grpc/proto-loader" "^0.6.1" + "@grpc/grpc-js" "~1.6.0" + "@grpc/proto-loader" "^0.6.12" "@types/long" "^4.0.0" abort-controller "^3.0.0" duplexify "^4.0.0" fast-text-encoding "^1.0.3" - google-auth-library "^7.6.1" + google-auth-library "^7.14.0" is-stream-ended "^0.1.4" node-fetch "^2.6.1" - object-hash "^2.1.1" - proto3-json-serializer "^0.1.1" - protobufjs "6.11.2" + object-hash "^3.0.0" + proto3-json-serializer "^0.1.8" + protobufjs "6.11.3" retry-request "^4.0.0" google-libphonenumber@^3.2.15, google-libphonenumber@^3.2.27: - version "3.2.30" - resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.30.tgz#a9f421ff1ff87694de11fe5a1c2b9693b996ee67" - integrity sha512-Kx2/AqmY0P6863vOhkiCFqfAxfY3jagMe916ByU38JRKiRCqSHGJW1qTOZNV4+ag8Xda69dk6w8VwEeswVy44w== + version "3.2.32" + resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.32.tgz#63c48a9c247b64a3bc2eec21bdf3fcfbf2e148c0" + integrity sha512-mcNgakausov/B/eTgVeX8qc8IwWjRrupk9UzZZ/QDEvdh5fAjE7Aa211bkZpZj42zKkeS6MTT8avHUwjcLxuGQ== google-p12-pem@^1.0.0: version "1.0.5" @@ -13946,13 +13373,6 @@ google-p12-pem@^1.0.0: node-forge "^0.10.0" pify "^4.0.0" -google-p12-pem@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.0.1.tgz#a220c05a8d7ee9751dd133ee72ecfc855820d5ab" - integrity sha512-VlQgtozgNVVVcYTXS36eQz4PXPt9gIPqLOhHN0QiV6W6h4qSCNVKPtKC5INtJsaHHF2r7+nOIa26MJeJMTaZEQ== - dependencies: - node-forge "^0.9.0" - google-p12-pem@^3.1.3: version "3.1.4" resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b" @@ -14032,6 +13452,23 @@ got@9.6.0, got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" +got@^11.8.5: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + got@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" @@ -14053,9 +13490,9 @@ got@^7.1.0: url-to-options "^1.0.1" graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== grapheme-splitter@^1.0.4: version "1.0.4" @@ -14122,16 +13559,6 @@ gtoken@^2.3.2: mime "^2.2.0" pify "^4.0.0" -gtoken@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.0.1.tgz#b93f309d89adfe230bb0f24269b978284ba89e0f" - integrity sha512-33w4FNDkUcyIOq/TqyC+drnKdI4PdXmWp9lZzssyEQKuvu9ZFN3KttaSnDKo52U3E51oujVGop93mKxmqO8HHg== - dependencies: - gaxios "^3.0.0" - google-p12-pem "^3.0.0" - jws "^4.0.0" - mime "^2.2.0" - gtoken@^5.0.4: version "5.3.2" resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f" @@ -14220,7 +13647,7 @@ has-symbol-support-x@^1.4.1: resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== -has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: +has-symbols@^1.0.0, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== @@ -14317,6 +13744,16 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hdkey@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-2.1.0.tgz#755b30b73f54e93c31919c1b2f19205a8e57cb92" + integrity sha512-i9Wzi0Dy49bNS4tXXeGeu0vIcn86xXdPQUpEYg+SO1YiO8HtomjmmRMaRyqL0r59QfcD4PfVbSF3qmsWFwAemA== + dependencies: + bs58check "^2.1.2" + ripemd160 "^2.0.2" + safe-buffer "^5.1.1" + secp256k1 "^4.0.0" + hdkey@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632" @@ -14348,17 +13785,12 @@ hexoid@^1.0.0: resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== -highlight.js@^10.2.0: - version "10.3.2" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.3.2.tgz#135fd3619a00c3cbb8b4cd6dbc78d56bfcbc46f1" - integrity sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw== - -highlight.js@^10.4.1: +highlight.js@^10.2.0, highlight.js@^10.4.1: version "10.7.3" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== -highlightjs-solidity@^2.0.5, highlightjs-solidity@^2.0.6: +highlightjs-solidity@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/highlightjs-solidity/-/highlightjs-solidity-2.0.6.tgz#e7a702a2b05e0a97f185e6ba39fd4846ad23a990" integrity sha512-DySXWfQghjm2l6a/flF+cteroJqD4gI8GSdL4PtvxZSsAHie8m3yVe2JFoRg03ROKT6hp2Lc/BxXkqerNmtQYg== @@ -14404,9 +13836,9 @@ hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: lru-cache "^6.0.0" hosted-git-info@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594" - integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q== + version "5.2.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz#0ba1c97178ef91f3ab30842ae63d6a272341156f" + integrity sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw== dependencies: lru-cache "^7.5.1" @@ -14423,14 +13855,14 @@ html-escaper@^2.0.0: integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== htmlparser2@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" - integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== dependencies: domelementtype "^2.3.0" - domhandler "^5.0.2" + domhandler "^5.0.3" domutils "^3.0.1" - entities "^4.3.0" + entities "^4.4.0" http-basic@^8.1.1: version "8.1.3" @@ -14443,9 +13875,9 @@ http-basic@^8.1.1: parse-cache-control "^1.0.1" http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== http-call@^5.1.2, http-call@^5.2.2, http-call@^5.3.0: version "5.3.0" @@ -14525,10 +13957,18 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + http2-wrapper@^2.1.10: - version "2.1.11" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-2.1.11.tgz#d7c980c7ffb85be3859b6a96c800b2951ae257ef" - integrity sha512-aNAk5JzLturWEUiuhAN73Jcbq96R7rTitAoXV54FYMatvihnpD2+6PUgU4ce3D/m5VDbw+F5CsyKSF176ptitQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-2.2.0.tgz#b80ad199d216b7d3680195077bd7b9060fa9d7f3" + integrity sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ== dependencies: quick-lru "^5.1.1" resolve-alpn "^1.2.0" @@ -14560,9 +14000,9 @@ human-signals@^2.1.0: integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== humanize-duration@^3.17.0, humanize-duration@^3.21.0: - version "3.27.3" - resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.27.3.tgz#db654e72ebf5ccfe232c7f56bc58aa3a6fe4df88" - integrity sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw== + version "3.28.0" + resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.28.0.tgz#f79770c0bec34d3bfd4899338cc40643bc04df72" + integrity sha512-jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A== humanize-ms@^1.2.1: version "1.2.1" @@ -14661,16 +14101,16 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -immediate@3.3.0: +immediate@3.3.0, immediate@^3.2.3: version "3.3.0" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== -immediate@^3.2.3, immediate@~3.2.3: +immediate@~3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c" integrity sha512-RrGCXRm/fRVqMIhqXrGEX9rRADavPiDFSoMb/k64i9XMk8uH4r/Omi5Ctierj6XzNecwDbO4WuFbDD1zmpl3Tg== @@ -14771,9 +14211,9 @@ init-package-json@^3.0.2: validate-npm-package-name "^4.0.0" inquirer@^6.2.2: - version "6.5.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42" - integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA== + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== dependencies: ansi-escapes "^3.2.0" chalk "^2.4.2" @@ -14809,9 +14249,9 @@ inquirer@^7.0.5: through "^2.3.6" inquirer@^8.2.4: - version "8.2.4" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.4.tgz#ddbfe86ca2f67649a67daa6f1051c128f684f0b4" - integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg== + version "8.2.5" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8" + integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ== dependencies: ansi-escapes "^4.2.1" chalk "^4.1.1" @@ -14849,11 +14289,11 @@ inquirer@~6.3.1: through "^2.3.6" install-artifact-from-github@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.1.tgz#eefaad9af35d632e5d912ad1569c1de38c3c2462" - integrity sha512-3l3Bymg2eKDsN5wQuMfgGEj2x6l5MCAv0zPL6rxHESufFVlEAKW/6oY9F1aGgvY/EgWm5+eWGRjINveL4X7Hgg== + version "1.3.2" + resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.2.tgz#1a16d9508e40330523a3017ae0d4713ccc64de82" + integrity sha512-yCFcLvqk0yQdxx0uJz4t9Z3adDMLAYrcGYv546uRXCSvxE+GqNYhhz/KmrGcUKGI/gVLR9n/e/zM9jX/+ASMJQ== -internal-slot@^1.0.5: +internal-slot@^1.0.4, internal-slot@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== @@ -14863,9 +14303,9 @@ internal-slot@^1.0.5: side-channel "^1.0.4" interpret@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" - integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== interpret@^2.2.0: version "2.2.0" @@ -14941,7 +14381,7 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-arguments@^1.0.4: +is-arguments@^1.0.4, is-arguments@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== @@ -15005,12 +14445,7 @@ is-buffer@^2.0.2, is-buffer@^2.0.5, is-buffer@~2.0.3: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.1.3, is-callable@^1.1.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" - integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== - -is-callable@^1.1.5, is-callable@^1.2.7: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -15022,27 +14457,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.0.0, is-core-module@^2.11.0: +is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1: version "2.12.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== dependencies: has "^1.0.3" -is-core-module@^2.5.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" - integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== - dependencies: - has "^1.0.3" - -is-core-module@^2.8.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== - dependencies: - has "^1.0.3" - is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -15236,7 +14657,7 @@ is-lower-case@^1.1.0: dependencies: lower-case "^1.1.0" -is-map@^2.0.1: +is-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== @@ -15359,7 +14780,7 @@ is-property@^1.0.2: resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g== -is-regex@^1.0.5, is-regex@^1.1.4: +is-regex@^1.0.4, is-regex@^1.1.4, is-regex@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -15384,7 +14805,7 @@ is-retry-allowed@^2.2.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== -is-set@^2.0.1: +is-set@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== @@ -15444,7 +14865,7 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" -is-typed-array@^1.1.10: +is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9: version "1.1.10" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== @@ -15455,17 +14876,6 @@ is-typed-array@^1.1.10: gopd "^1.0.1" has-tostringtag "^1.0.0" -is-typed-array@^1.1.3, is-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67" - integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -15540,9 +14950,9 @@ is-yarn-global@^0.3.0: integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== is2@^2.0.6: - version "2.0.7" - resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.7.tgz#d084e10cab3bd45d6c9dfde7a48599fcbb93fcac" - integrity sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA== + version "2.0.9" + resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.9.tgz#ff63b441f90de343fa8fac2125ee170da8e8240d" + integrity sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g== dependencies: deep-is "^0.1.3" ip-regex "^4.1.0" @@ -15616,7 +15026,7 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== -istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: +istanbul-lib-instrument@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== @@ -15627,9 +15037,9 @@ istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: semver "^6.3.0" istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f" - integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A== + version "5.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" + integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -15692,9 +15102,9 @@ isurl@^1.0.0-alpha5: is-object "^1.0.1" iter-tools@^7.0.2: - version "7.5.0" - resolved "https://registry.yarnpkg.com/iter-tools/-/iter-tools-7.5.0.tgz#061240dcac13668e66bb787b0fcd407a58ea39ab" - integrity sha512-L0p/RG3Hwk1urilryDKqU8pQ1t5AaaMc7CHmiwJD/uh63Lv7VyjNng/esstf+Tct1587IpetpcDFdufz8sG+sQ== + version "7.5.1" + resolved "https://registry.yarnpkg.com/iter-tools/-/iter-tools-7.5.1.tgz#0b0253403bf9364335917d562ba7735d19b4c16a" + integrity sha512-YWfjOIj1x3mPY6zB+c1HqnVzOHAVM2iWmNlylvBtSnXC0mnSmCAlmUhfEO4M82m1avdSxe//TlxmLQ3hdj75Cg== dependencies: "@babel/runtime" "^7.12.1" @@ -15731,6 +15141,16 @@ jStat@^1.5.2: resolved "https://registry.yarnpkg.com/jStat/-/jStat-1.8.6.tgz#ab4d465b21f583d37a72ab2f97a300492da7575d" integrity sha512-Oh/ePZVSoFigme69pHTQudcGh64cpNH9Lz3hBZcRJWLrDqpw7JfuYU9F3dj9py3tBYmHz7og7ZT8hXTNbYq9Rw== +jake@^10.8.5: + version "10.8.5" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.1" + minimatch "^3.0.4" + java-parser@2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/java-parser/-/java-parser-2.0.2.tgz#488160fbf4fd1351880134f9af832537f2124995" @@ -15761,32 +15181,7 @@ jest-changed-files@^29.5.0: execa "^5.0.0" p-limit "^3.1.0" -jest-circus@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.0.2.tgz#7dda94888a8d47edb58e85a8e5f688f9da6657a3" - integrity sha512-YTPEsoE1P1X0bcyDQi3QIkpt2Wl9om9k2DQRuLFdS5x8VvAKSdYAVJufgvudhnKgM8WHvvAzhBE+1DRQB8x1CQ== - dependencies: - "@jest/environment" "^29.0.2" - "@jest/expect" "^29.0.2" - "@jest/test-result" "^29.0.2" - "@jest/types" "^29.0.2" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - dedent "^0.7.0" - is-generator-fn "^2.0.0" - jest-each "^29.0.2" - jest-matcher-utils "^29.0.2" - jest-message-util "^29.0.2" - jest-runtime "^29.0.2" - jest-snapshot "^29.0.2" - jest-util "^29.0.2" - p-limit "^3.1.0" - pretty-format "^29.0.2" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-circus@^29.5.0: +jest-circus@^29.0.2, jest-circus@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317" integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA== @@ -15946,17 +15341,6 @@ jest-each@^26.6.2: jest-util "^26.6.2" pretty-format "^26.6.2" -jest-each@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.0.2.tgz#f98375a79a37761137e11d458502dfe1f00ba5b0" - integrity sha512-+sA9YjrJl35iCg0W0VCrgCVj+wGhDrrKQ+YAqJ/DHBC4gcDFAeePtRRhpJnX9gvOZ63G7gt52pwp2PesuSEx0Q== - dependencies: - "@jest/types" "^29.0.2" - chalk "^4.0.0" - jest-get-type "^29.0.0" - jest-util "^29.0.2" - pretty-format "^29.0.2" - jest-each@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06" @@ -16010,7 +15394,7 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-get-type@^29.0.0, jest-get-type@^29.4.3: +jest-get-type@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg== @@ -16036,25 +15420,6 @@ jest-haste-map@^26.6.2: optionalDependencies: fsevents "^2.1.2" -jest-haste-map@^29.1.2: - version "29.1.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.1.2.tgz#93f3634aa921b6b654e7c94137b24e02e7ca6ac9" - integrity sha512-xSjbY8/BF11Jh3hGSPfYTa/qBFrm3TPM7WU8pU93m2gqzORVLkHFWvuZmFsTEBPRKndfewXhMOuzJNHyJIZGsw== - dependencies: - "@jest/types" "^29.1.2" - "@types/graceful-fs" "^4.1.3" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^29.0.0" - jest-util "^29.1.2" - jest-worker "^29.1.2" - micromatch "^4.0.4" - walker "^1.0.8" - optionalDependencies: - fsevents "^2.3.2" - jest-haste-map@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de" @@ -16134,7 +15499,7 @@ jest-matcher-utils@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-matcher-utils@^29.0.2, jest-matcher-utils@^29.1.2, jest-matcher-utils@^29.5.0: +jest-matcher-utils@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5" integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw== @@ -16159,7 +15524,7 @@ jest-message-util@^26.6.2: slash "^3.0.0" stack-utils "^2.0.2" -jest-message-util@^29.0.2, jest-message-util@^29.1.2, jest-message-util@^29.5.0: +jest-message-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e" integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA== @@ -16192,20 +15557,15 @@ jest-mock@^29.5.0: jest-util "^29.5.0" jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + version "1.2.3" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" + integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== jest-regex-util@^26.0.0: version "26.0.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-regex-util@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.0.0.tgz#b442987f688289df8eb6c16fa8df488b4cd007de" - integrity sha512-BV7VW7Sy0fInHWN93MMPtlClweYv2qrSCwfeFWmpribGZtQPWNvRSq9XOVgOEjU1iBGRKXUZil0o2AH7Iy9Lug== - jest-regex-util@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8" @@ -16343,7 +15703,7 @@ jest-runtime@^26.6.3: strip-bom "^4.0.0" yargs "^15.4.1" -jest-runtime@^29.0.2, jest-runtime@^29.5.0: +jest-runtime@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420" integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw== @@ -16442,43 +15802,7 @@ jest-util@^26.6.2: is-ci "^2.0.0" micromatch "^4.0.2" -jest-util@^29.0.0: - version "29.0.3" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.0.3.tgz#06d1d77f9a1bea380f121897d78695902959fbc0" - integrity sha512-Q0xaG3YRG8QiTC4R6fHjHQPaPpz9pJBEi0AeOE4mQh/FuWOijFjGXMMOfQEaU9i3z76cNR7FobZZUQnL6IyfdQ== - dependencies: - "@jest/types" "^29.0.3" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-util@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.0.2.tgz#c75c5cab7f3b410782f9570a60c5558b5dfb6e3a" - integrity sha512-ozk8ruEEEACxqpz0hN9UOgtPZS0aN+NffwQduR5dVlhN+eN47vxurtvgZkYZYMpYrsmlAEx1XabkB3BnN0GfKQ== - dependencies: - "@jest/types" "^29.0.2" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-util@^29.1.2: - version "29.1.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.1.2.tgz#ac5798e93cb6a6703084e194cfa0898d66126df1" - integrity sha512-vPCk9F353i0Ymx3WQq3+a4lZ07NXu9Ca8wya6o4Fe4/aO1e1awMMprZ3woPFpKwghEOW+UXgd15vVotuNN9ONQ== - dependencies: - "@jest/types" "^29.1.2" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-util@^29.5.0: +jest-util@^29.0.0, jest-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== @@ -16550,16 +15874,6 @@ jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^29.1.2: - version "29.1.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.1.2.tgz#a68302af61bce82b42a9a57285ca7499d29b2afc" - integrity sha512-AdTZJxKjTSPHbXT/AIOjQVmoFx0LHFcVabWu0sxI7PAy7rFf8c0upyvgBKgguVXdM4vY74JdwkyD4hSmpTW8jA== - dependencies: - "@types/node" "*" - jest-util "^29.1.2" - merge-stream "^2.0.0" - supports-color "^8.0.0" - jest-worker@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" @@ -16608,7 +15922,7 @@ join-path@^1.1.1: url-join "0.0.1" valid-url "^1" -jose@^2.0.5: +jose@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.6.tgz#894ba19169af339d3911be933f913dd02fc57c7c" integrity sha512-FVoPY7SflDodE4lknJmbAHSUjLCzE2H1F6MS0RYKMQ8SR+lNccpMf8R4eqkNYyyUjR5qZReOzZo5C5YiHOCjjg== @@ -16648,7 +15962,7 @@ js-yaml@3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@3.14.1, js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@3.14.1, js-yaml@3.x, js-yaml@^3.10.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -16820,11 +16134,11 @@ json-stable-stringify-without-jsonify@^1.0.1: integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0" + integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g== dependencies: - jsonify "~0.0.0" + jsonify "^0.0.1" json-stringify-nice@^1.1.4: version "1.1.4" @@ -16851,22 +16165,22 @@ json-to-ast@^2.0.3: code-error-fragment "0.0.230" grapheme-splitter "^1.0.4" -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== +json5@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" -json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@^2.2.2, json5@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jsonc-parser@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" - integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== +jsonc-parser@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" + integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== jsonfile@^2.1.0: version "2.4.0" @@ -16891,10 +16205,10 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA== +jsonify@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978" + integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg== jsonparse@^1.2.0, jsonparse@^1.3.1: version "1.3.1" @@ -16933,14 +16247,14 @@ jsprim@^1.2.2: verror "1.10.0" just-diff-apply@^5.2.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b" - integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g== + version "5.5.0" + resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.5.0.tgz#771c2ca9fa69f3d2b54e7c3f5c1dfcbcc47f9f0f" + integrity sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw== just-diff@^5.0.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202" - integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.2.0.tgz#60dca55891cf24cd4a094e33504660692348a241" + integrity sha512-6ufhP9SHjb7jibNFrNxyFZ6od3g+An6Ai9mhGRvcYe8UJlH0prseN64M+6ZBBUoKYHZsitDP42gAJ8+eVWr3lw== jwa@^1.4.1: version "1.4.1" @@ -16961,14 +16275,14 @@ jwa@^2.0.0: safe-buffer "^5.0.1" jwks-rsa@^2.0.2: - version "2.1.4" - resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-2.1.4.tgz#38ebfbe9cb4cdce3be070e6575796304917bae97" - integrity sha512-mpArfgPkUpX11lNtGxsF/szkasUcbWHGplZl/uFvFO2NuMHmt0dQXIihh0rkPU2yQd5niQtuUHbXnG/WKiXF6Q== + version "2.1.5" + resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-2.1.5.tgz#bb7bf8c5767836bc273bf5b27870066aca39c1bb" + integrity sha512-IODtn1SwEm7n6GQZnQLY0oxKDrMh7n/jRH1MzE8mlxWMrh2NnMyOsXTebu8vJ1qCpmuTJcL4DdiE0E4h8jnwsA== dependencies: - "@types/express" "^4.17.13" - "@types/jsonwebtoken" "^8.5.8" + "@types/express" "^4.17.14" + "@types/jsonwebtoken" "^8.5.9" debug "^4.3.4" - jose "^2.0.5" + jose "^2.0.6" limiter "^1.1.5" lru-memoizer "^2.1.4" @@ -16997,15 +16311,6 @@ keccak256@^1.0.0: buffer "^6.0.3" keccak "^3.0.2" -keccak@*: - version "3.0.3" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" - integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== - dependencies: - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - readable-stream "^3.6.0" - keccak@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" @@ -17014,6 +16319,15 @@ keccak@3.0.1: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" +keccak@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" + integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" + keccak@^1.0.2: version "1.4.0" resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.4.0.tgz#572f8a6dbee8e7b3aa421550f9e6408ca2186f80" @@ -17025,9 +16339,9 @@ keccak@^1.0.2: safe-buffer "^5.1.0" keccak@^3.0.0, keccak@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" - integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" + integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" @@ -17049,9 +16363,9 @@ keyv@^3.0.0: json-buffer "3.0.0" keyv@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.0.tgz#dbce9ade79610b6e641a9a65f2f6499ba06b9bc6" - integrity sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA== + version "4.5.2" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" + integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== dependencies: json-buffer "3.0.1" @@ -17186,29 +16500,32 @@ lcid@^2.0.0: invert-kv "^2.0.0" lerna@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-5.5.0.tgz#94ebc67ebe67079e5ac74f6ba7c0b130c88f3e90" - integrity sha512-1cZIijUWcI9ZqK+ejj1dBejTOLL64b0pIjYXb9KN8soNIONm/1zbJiSBiAyF4Hd6x4XuIC3kdFx7Ff3Pb9KsYA== - dependencies: - "@lerna/add" "5.5.0" - "@lerna/bootstrap" "5.5.0" - "@lerna/changed" "5.5.0" - "@lerna/clean" "5.5.0" - "@lerna/cli" "5.5.0" - "@lerna/create" "5.5.0" - "@lerna/diff" "5.5.0" - "@lerna/exec" "5.5.0" - "@lerna/import" "5.5.0" - "@lerna/info" "5.5.0" - "@lerna/init" "5.5.0" - "@lerna/link" "5.5.0" - "@lerna/list" "5.5.0" - "@lerna/publish" "5.5.0" - "@lerna/run" "5.5.0" - "@lerna/version" "5.5.0" + version "5.6.2" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-5.6.2.tgz#cdcdfe4e8bf07eccb4ecff1c216def9c67e62af2" + integrity sha512-Y0yMPslvnBnTZi7Nrs/gDyYZYauNf61xWNCehISHIORxZmmpoluNkcWTfcyb47is5uJQCv5QJX5xKKubbs+a6w== + dependencies: + "@lerna/add" "5.6.2" + "@lerna/bootstrap" "5.6.2" + "@lerna/changed" "5.6.2" + "@lerna/clean" "5.6.2" + "@lerna/cli" "5.6.2" + "@lerna/command" "5.6.2" + "@lerna/create" "5.6.2" + "@lerna/diff" "5.6.2" + "@lerna/exec" "5.6.2" + "@lerna/import" "5.6.2" + "@lerna/info" "5.6.2" + "@lerna/init" "5.6.2" + "@lerna/link" "5.6.2" + "@lerna/list" "5.6.2" + "@lerna/publish" "5.6.2" + "@lerna/run" "5.6.2" + "@lerna/version" "5.6.2" + "@nrwl/devkit" ">=14.8.1 < 16" import-local "^3.0.2" + inquirer "^8.2.4" npmlog "^6.0.2" - nx ">=14.6.1 < 16" + nx ">=14.8.1 < 16" typescript "^3 || ^4" level-codec@9.0.2, level-codec@^9.0.0: @@ -17392,15 +16709,6 @@ level@^8.0.0: browser-level "^1.0.1" classic-level "^1.2.0" -leveldown@*: - version "6.1.1" - resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.1.tgz#0f0e480fa88fd807abf94c33cb7e40966ea4b5ce" - integrity sha512-88c+E+Eizn4CkQOBHwqlCJaTNEjGpaEIikn1S+cINc5E9HEvJ77bqY4JY/HxT5u0caWqsc3P3DcFIKBI1vHt+A== - dependencies: - abstract-leveldown "^7.2.0" - napi-macros "~2.0.0" - node-gyp-build "^4.3.0" - leveldown@5.6.0, leveldown@^5.4.0: version "5.6.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" @@ -17410,6 +16718,15 @@ leveldown@5.6.0, leveldown@^5.4.0: napi-macros "~2.0.0" node-gyp-build "~4.1.0" +leveldown@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee" + integrity sha512-8C7oJDT44JXxh04aSSsfcMI8YiaGRhOFI9/pMEL7nWJLVsWajDPTRxsSHTM2WcTVY5nXM+SuRHzPPi0GbnDX+w== + dependencies: + abstract-leveldown "^7.2.0" + napi-macros "~2.0.0" + node-gyp-build "^4.3.0" + levelup@4.4.0, levelup@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" @@ -17488,6 +16805,11 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +lines-and-columns@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b" + integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w== + listenercount@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" @@ -17617,6 +16939,11 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== + lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -17798,20 +17125,21 @@ log-symbols@4.1.0, log-symbols@^4.1.0: is-unicode-supported "^0.1.0" logform@^2.3.2, logform@^2.4.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.2.tgz#a617983ac0334d0c3b942c34945380062795b47c" - integrity sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw== + version "2.5.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.5.1.tgz#44c77c34becd71b3a42a3970c77929e52c6ed48b" + integrity sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg== dependencies: "@colors/colors" "1.5.0" + "@types/triple-beam" "^1.3.2" fecha "^4.2.0" ms "^2.1.1" safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" loglevel@^1.6.1, loglevel@^1.6.8: - version "1.8.0" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114" - integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA== + version "1.8.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4" + integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== long@^4.0.0: version "4.0.0" @@ -17819,9 +17147,9 @@ long@^4.0.0: integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== long@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz#2696dadf4b4da2ce3f6f6b89186085d94d52fd61" - integrity sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w== + version "5.2.3" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" + integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== long@~3: version "3.2.0" @@ -17836,9 +17164,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0: js-tokens "^3.0.0 || ^4.0.0" loupe@^2.3.1: - version "2.3.4" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3" - integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ== + version "2.3.6" + resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53" + integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA== dependencies: get-func-name "^2.0.0" @@ -17869,7 +17197,12 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== -lru-cache@^4.0.1, lru-cache@^4.1.3: +"lru-cache@7.10.1 - 7.13.1": + version "7.13.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" + integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== + +lru-cache@^4.0.1: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -17891,10 +17224,10 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.10.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: - version "7.14.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" - integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ== +lru-cache@^7.14.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: + version "7.18.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== lru-cache@~4.0.0: version "4.0.2" @@ -17905,9 +17238,9 @@ lru-cache@~4.0.0: yallist "^2.0.0" lru-memoizer@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.1.4.tgz#b864d92b557f00b1eeb322156a0409cb06dafac6" - integrity sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.2.0.tgz#b9d90c91637b4b1a423ef76f3156566691293df8" + integrity sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw== dependencies: lodash.clonedeep "^4.5.0" lru-cache "~4.0.0" @@ -18313,24 +17646,12 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.0.8, mime-types@^2.1.16, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== - dependencies: - mime-db "1.44.0" - -mime-types@^2.1.12, mime-types@~2.1.34: +mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.16, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -18342,21 +17663,11 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@2.6.0: +mime@2.6.0, mime@^2.2.0, mime@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mime@^2.2.0: - version "2.4.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" - integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== - -mime@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== - mime@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" @@ -18404,10 +17715,10 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mingo@1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/mingo/-/mingo-1.3.3.tgz#6922c4d147efc771a01425a2c4c8f7784478c546" - integrity sha512-Y4wGTD/M7AMqF8QxKaBGps+axq/Z48hdtRAeiKtInkEXMLzUWUwT0OPDzrB26xrav9GF1AOYJfwVWPcLwnkgTA== +mingo@^6.1.0: + version "6.3.2" + resolved "https://registry.yarnpkg.com/mingo/-/mingo-6.3.2.tgz#55c73495e9bc00c63d19cf350e31c003a6110b22" + integrity sha512-9Yrv9shgyQCIOLhBmxZqVWaOgdtJx6zWG4D9X/T0gsIbnOGbisMI5egWzC6xxmsfWIFgqyKzmL7qUc5+Co1WRw== minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" @@ -18468,12 +17779,7 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q== -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== - -minimist@~1.2.0: +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -18536,7 +17842,7 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -18544,14 +17850,7 @@ minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: - version "3.3.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" - integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== - dependencies: - yallist "^4.0.0" - -minipass@^3.1.0, minipass@^3.1.3: +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6: version "3.3.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== @@ -18559,11 +17858,11 @@ minipass@^3.1.0, minipass@^3.1.3: yallist "^4.0.0" minipass@^4.0.0: - version "4.2.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06" - integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ== + version "4.2.8" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" + integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== -minizlib@^1.2.1: +minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -18615,10 +17914,10 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +mkdirp@*: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.0.tgz#758101231418bda24435c0888a91d9bd91f1372d" + integrity sha512-7+JDnNsyCvZXoUJdkMR0oUE2AmAdsNXGTmRbiOjYIwQ6q+bL6NwrozGQdPcmYaNcrhH37F50HHBUzoaBV6FITQ== mkdirp@0.5.1: version "0.5.1" @@ -18641,13 +17940,18 @@ mkdirp@0.5.5: dependencies: minimist "^1.2.5" -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.6, mkdirp@~0.5.1: +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: minimist "^1.2.6" +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mocha@10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a" @@ -18988,16 +18292,16 @@ mz@^2.7.0: thenify-all "^1.0.0" named-placeholders@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8" - integrity sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351" + integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w== dependencies: - lru-cache "^4.1.3" + lru-cache "^7.14.1" -nan@^2.13.2, nan@^2.14.0, nan@^2.16.0, nan@^2.2.1: - version "2.16.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" - integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== +nan@^2.13.2, nan@^2.14.0, nan@^2.17.0, nan@^2.2.1: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== nano-base32@^1.0.1: version "1.0.1" @@ -19036,6 +18340,11 @@ napi-build-utils@^1.0.1: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== +napi-macros@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044" + integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g== + napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" @@ -19077,9 +18386,9 @@ negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3: integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== neo-async@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== neodoc@^2.0.2: version "2.0.2" @@ -19118,16 +18427,16 @@ node-abi@^2.21.0: semver "^5.4.1" node-abi@^3.3.0: - version "3.24.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz#b9d03393a49f2c7e147d0c99f180e680c27c1599" - integrity sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw== + version "3.40.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.40.0.tgz#51d8ed44534f70ff1357dfbc3a89717b1ceac1b4" + integrity sha512-zNy02qivjjRosswoYmPi8hIKJRr8MpQyeKT6qlcq/OnOgA3Rhoae+IYOqsM9V5+JnHWmxKnWOT2GxvtqdtOCXA== dependencies: semver "^7.3.5" node-abort-controller@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" - integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== + version "3.1.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548" + integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ== node-addon-api@^2.0.0: version "2.0.2" @@ -19144,11 +18453,6 @@ node-addon-api@^4.2.0, node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-addon-api@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762" - integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA== - node-emoji@^1.4.1: version "1.11.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" @@ -19177,7 +18481,7 @@ node-fetch@2.6.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== -node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1: +node-fetch@2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -19197,7 +18501,7 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.6.7: +node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.9" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== @@ -19209,11 +18513,6 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-forge@^0.9.0: - version "0.9.2" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.2.tgz#b35a44c28889b2ea55cabf8c79e3563f9676190a" - integrity sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw== - node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -19255,7 +18554,7 @@ node-gyp@8.x: tar "^6.1.2" which "^2.0.2" -node-gyp@^9.0.0: +node-gyp@^9.0.0, node-gyp@^9.3.0: version "9.3.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4" integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg== @@ -19301,11 +18600,6 @@ node-interval-tree@^1.3.3: dependencies: shallowequal "^1.0.2" -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - node-notifier@^8.0.0: version "8.0.2" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" @@ -19318,7 +18612,7 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^2.0.6: +node-releases@^2.0.8: version "2.0.10" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== @@ -19328,12 +18622,7 @@ node-version@^1.0.0: resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d" integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ== -nofilter@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.3.tgz#34e54b4cc9757de0cad38cc0d19462489b1b7f5d" - integrity sha512-FlUlqwRK6reQCaFLAhMcF+6VkVG2caYjKQY3YsRDTl4/SEch595Qb3oLjJRDr8dkHAAOVj2pOx3VknfnSgkE5g== - -nofilter@^1.0.4: +nofilter@^1.0.3, nofilter@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e" integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA== @@ -19411,7 +18700,7 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== -normalize-url@^6.0.1, normalize-url@^6.1.0: +normalize-url@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== @@ -19457,9 +18746,9 @@ npm-package-arg@8.1.1: validate-npm-package-name "^3.0.0" npm-package-arg@^9.0.0, npm-package-arg@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987" - integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw== + version "9.1.2" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.2.tgz#fc8acecb00235f42270dda446f36926ddd9ac2bc" + integrity sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg== dependencies: hosted-git-info "^5.0.0" proc-log "^2.0.1" @@ -19581,20 +18870,23 @@ numeric@^1.2.6: integrity sha512-avBiDAP8siMa7AfJgYyuxw1oyII4z2sswS23+O+ZfV28KrtNzy0wxUFwi4f3RyM4eeeXNs1CThxR7pb5QQcMiw== nwsapi@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" - integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== + version "2.2.4" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" + integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== -nx@14.6.5, "nx@>=14.6.1 < 16": - version "14.6.5" - resolved "https://registry.yarnpkg.com/nx/-/nx-14.6.5.tgz#13524e7355803a8247278374063d8e82b845a621" - integrity sha512-egV8Zrec+0m+27wTENe9W/JKRMkBDx1N0xaFzKjL0WKj5WIe4asao5uwTJEwqi9iQyiijExxUFVU5MNGuF2c+A== +nx@15.9.2, "nx@>=14.8.1 < 16": + version "15.9.2" + resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.2.tgz#d7ace1e5ae64a47f1b553dc5da08dbdd858bde96" + integrity sha512-wtcs+wsuplSckvgk+bV+/XuGlo+sVWzSG0RpgWBjQYeqA3QsVFEAPVY66Z5cSoukDbTV77ddcAjEw+Rz8oOR1A== dependencies: - "@nrwl/cli" "14.6.5" - "@nrwl/tao" "14.6.5" + "@nrwl/cli" "15.9.2" + "@nrwl/tao" "15.9.2" "@parcel/watcher" "2.0.4" - chalk "4.1.0" - chokidar "^3.5.1" + "@yarnpkg/lockfile" "^1.1.0" + "@yarnpkg/parsers" "^3.0.0-rc.18" + "@zkochan/js-yaml" "0.0.6" + axios "^1.0.0" + chalk "^4.1.0" cli-cursor "3.1.0" cli-spinners "2.6.1" cliui "^7.0.2" @@ -19603,23 +18895,35 @@ nx@14.6.5, "nx@>=14.6.1 < 16": fast-glob "3.2.7" figures "3.2.0" flat "^5.0.2" - fs-extra "^10.1.0" + fs-extra "^11.1.0" glob "7.1.4" ignore "^5.0.4" js-yaml "4.1.0" - jsonc-parser "3.0.0" + jsonc-parser "3.2.0" + lines-and-columns "~2.0.3" minimatch "3.0.5" npm-run-path "^4.0.1" open "^8.4.0" semver "7.3.4" string-width "^4.2.3" + strong-log-transformer "^2.1.0" tar-stream "~2.2.0" tmp "~0.2.1" - tsconfig-paths "^3.9.0" + tsconfig-paths "^4.1.2" tslib "^2.3.0" v8-compile-cache "2.3.0" - yargs "^17.4.0" - yargs-parser "21.0.1" + yargs "^17.6.2" + yargs-parser "21.1.1" + optionalDependencies: + "@nrwl/nx-darwin-arm64" "15.9.2" + "@nrwl/nx-darwin-x64" "15.9.2" + "@nrwl/nx-linux-arm-gnueabihf" "15.9.2" + "@nrwl/nx-linux-arm64-gnu" "15.9.2" + "@nrwl/nx-linux-arm64-musl" "15.9.2" + "@nrwl/nx-linux-x64-gnu" "15.9.2" + "@nrwl/nx-linux-x64-musl" "15.9.2" + "@nrwl/nx-win32-arm64-msvc" "15.9.2" + "@nrwl/nx-win32-x64-msvc" "15.9.2" oauth-sign@~0.9.0: version "0.9.0" @@ -19645,30 +18949,23 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-hash@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" - integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== - object-hash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== -object-inspect@^1.12.3, object-inspect@^1.7.0: +object-inspect@^1.12.3, object-inspect@^1.9.0, object-inspect@~1.12.3: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== -object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== - -object-inspect@~1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" - integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ== +object-is@^1.0.1: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" object-keys@^1.0.11, object-keys@^1.1.1: version "1.1.1" @@ -19709,7 +19006,7 @@ object.assign@4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.assign@^4.1.0, object.assign@^4.1.4: +object.assign@^4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -19719,15 +19016,16 @@ object.assign@^4.1.0, object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37" - integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ== +object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312" + integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ== dependencies: - array.prototype.reduce "^1.0.4" + array.prototype.reduce "^1.0.5" call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.1" + define-properties "^1.2.0" + es-abstract "^1.21.2" + safe-array-concat "^1.0.0" object.omit@^1.1.0: version "1.1.0" @@ -19856,9 +19154,9 @@ open@^7.0.0, open@^7.4.2: is-wsl "^2.1.1" open@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== dependencies: define-lazy-prop "^2.0.0" is-docker "^2.1.1" @@ -19966,6 +19264,11 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== + p-cancelable@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050" @@ -20283,22 +19586,19 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== -parse-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-5.0.0.tgz#f933152f3c6d34f4cf36cfc3d07b138ac113649d" - integrity sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A== +parse-path@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b" + integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog== dependencies: protocols "^2.0.0" -parse-url@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-7.0.2.tgz#d21232417199b8d371c6aec0cedf1406fd6393f0" - integrity sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg== +parse-url@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d" + integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w== dependencies: - is-ssh "^1.4.0" - normalize-url "^6.1.0" - parse-path "^5.0.0" - protocols "^2.0.1" + parse-path "^7.0.0" parse5-htmlparser2-tree-adapter@^7.0.0: version "7.0.0" @@ -20314,13 +19614,13 @@ parse5@6.0.1: integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== parse5@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" - integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== dependencies: entities "^4.4.0" -parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@^1.3.3, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== @@ -20347,23 +19647,24 @@ password-prompt@^1.0.7, password-prompt@^1.1.2: cross-spawn "^6.0.5" patch-package@^6.2.2: - version "6.4.7" - resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148" - integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ== + version "6.5.1" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621" + integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA== dependencies: "@yarnpkg/lockfile" "^1.1.0" - chalk "^2.4.2" + chalk "^4.1.2" cross-spawn "^6.0.5" find-yarn-workspace-root "^2.0.0" - fs-extra "^7.0.1" + fs-extra "^9.0.0" is-ci "^2.0.0" klaw-sync "^6.0.0" - minimist "^1.2.0" + minimist "^1.2.6" open "^7.4.2" rimraf "^2.6.3" semver "^5.6.0" slash "^2.0.0" tmp "^0.0.33" + yaml "^1.10.2" path-case@^2.1.0: version "2.1.1" @@ -20414,7 +19715,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6, path-parse@^1.0.7: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -20523,15 +19824,15 @@ pg-pool@^2.0.10: resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a" integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg== -pg-pool@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178" - integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w== +pg-pool@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.6.0.tgz#3190df3e4747a0d23e5e9e8045bcd99bda0a712e" + integrity sha512-clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ== -pg-protocol@^1.2.0, pg-protocol@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" - integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== +pg-protocol@^1.2.0, pg-protocol@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.0.tgz#4c91613c0315349363af2084608db843502f8833" + integrity sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q== pg-types@^2.1.0, pg-types@^2.2.0: version "2.2.0" @@ -20559,15 +19860,15 @@ pg@^7.18.0: semver "4.3.2" pg@^8.2.1: - version "8.8.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686" - integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw== + version "8.10.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.10.0.tgz#5b8379c9b4a36451d110fc8cd98fc325fe62ad24" + integrity sha512-ke7o7qSTMb47iwzOSaZMfeR7xToFdkE71ifIipOAAaLIM0DYzfOAXlgFFmYUIE2BcJtvnVlGCID84ZzCegE8CQ== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "^2.5.0" - pg-pool "^3.5.2" - pg-protocol "^1.5.0" + pg-pool "^3.6.0" + pg-protocol "^1.6.0" pg-types "^2.1.0" pgpass "1.x" @@ -20620,14 +19921,7 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== -pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" - -pirates@^4.0.4: +pirates@^4.0.1, pirates@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== @@ -20988,16 +20282,13 @@ prettier-plugin-solidity@1.0.0-alpha.35: string-width "^4.1.0" prettier-plugin-solidity@^1.0.0-dev.23: - version "1.0.0-dev.23" - resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-dev.23.tgz#e1edf0693d69fe1518519ab704d5e46ee4f842fc" - integrity sha512-440/jZzvtDJcqtoRCQiigo1DYTPAZ85pjNg7gvdd+Lds6QYgID8RyOdygmudzHdFmV2UfENt//A8tzx7iS58GA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.1.3.tgz#9a35124f578404caf617634a8cab80862d726cba" + integrity sha512-fQ9yucPi2sBbA2U2Xjh6m4isUTJ7S7QLc/XDDsktqqxYfTwdYKJ0EnnywXHwCGAaYbQNK+HIYPL1OemxuMsgeg== dependencies: - "@solidity-parser/parser" "^0.14.3" - emoji-regex "^10.1.0" - escape-string-regexp "^4.0.0" - semver "^7.3.7" + "@solidity-parser/parser" "^0.16.0" + semver "^7.3.8" solidity-comments-extractor "^0.0.7" - string-width "^4.2.3" prettier@1.19.1, prettier@^1.14.2, prettier@^1.14.3, prettier@^1.15.3: version "1.19.1" @@ -21010,9 +20301,9 @@ prettier@2.3.1: integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA== prettier@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== + version "2.8.7" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450" + integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw== pretty-format@^26.6.2: version "26.6.2" @@ -21024,25 +20315,7 @@ pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" -pretty-format@^29.0.0: - version "29.1.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.1.2.tgz#b1f6b75be7d699be1a051f5da36e8ae9e76a8e6a" - integrity sha512-CGJ6VVGXVRP2o2Dorl4mAwwvDWT25luIsYhkyVQW32E4nL+TgW939J7LlKT/npq5Cpq6j3s+sy+13yk7xYpBmg== - dependencies: - "@jest/schemas" "^29.0.0" - ansi-styles "^5.0.0" - react-is "^18.0.0" - -pretty-format@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.0.2.tgz#7f7666a7bf05ba2bcacde61be81c6db64f6f3be6" - integrity sha512-wp3CdtUa3cSJVFn3Miu5a1+pxc1iPIQTenOAn+x5erXeN1+ryTcLesV5pbK/rlW5EKwp27x38MoYfNGaNXDDhg== - dependencies: - "@jest/schemas" "^29.0.0" - ansi-styles "^5.0.0" - react-is "^18.0.0" - -pretty-format@^29.5.0: +pretty-format@^29.0.0, pretty-format@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a" integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw== @@ -21111,9 +20384,9 @@ promise-breaker@^5.0.0: integrity sha512-mgsWQuG4kJ1dtO6e/QlNDLFtMkMzzecsC69aI5hlLEjGHFNpHrvGhFi4LiK5jg2SMQj74/diH+wZliL9LpGsyA== promise-call-limit@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24" - integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q== + version "1.0.2" + resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.2.tgz#f64b8dd9ef7693c9c7613e7dfe8d6d24de3031ea" + integrity sha512-1vTUnfI2hzui8AEIixbdAJlFY4LFDXqQswy/2eOlThAscXCY4It8FdVuI0fMJGAB2aWGbdQf/gv0skKYXmdrHA== promise-inflight@^1.0.1: version "1.0.1" @@ -21170,11 +20443,11 @@ promise.allsettled@^1.0.2: iterate-value "^1.0.2" promise@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450" - integrity sha1-5F1osAoXZHttpxG/he1u1HII9FA= + version "8.3.0" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a" + integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg== dependencies: - asap "~2.0.3" + asap "~2.0.6" prompt@1.2.0: version "1.2.0" @@ -21224,7 +20497,7 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -proto3-json-serializer@^0.1.1, proto3-json-serializer@^0.1.8: +proto3-json-serializer@^0.1.8: version "0.1.9" resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.9.tgz#705ddb41b009dd3e6fcd8123edd72926abf65a34" integrity sha512-A60IisqvnuI45qNRygJjrnNjX2TMdQGMY+57tR3nul3ZgO2zXkR9OGR8AXxJhkqx84g0FTnrfi3D5fWMSdANdQ== @@ -21250,17 +20523,7 @@ protobufjs@6.11.2: "@types/node" ">=13.7.0" long "^4.0.0" -protobufjs@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" - integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== - dependencies: - ascli "~1" - bytebuffer "~5" - glob "^7.0.5" - yargs "^3.10.0" - -protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3: +protobufjs@6.11.3, protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8: version "6.11.3" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== @@ -21279,24 +20542,15 @@ protobufjs@^6.10.0, protobufjs@^6.11.2, protobufjs@^6.11.3: "@types/node" ">=13.7.0" long "^4.0.0" -protobufjs@^6.8.0, protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8, protobufjs@^6.9.0: - version "6.9.0" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.9.0.tgz#c08b2bf636682598e6fabbf0edb0b1256ff090bd" - integrity sha512-LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg== +protobufjs@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" + integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" "^13.7.0" - long "^4.0.0" + ascli "~1" + bytebuffer "~5" + glob "^7.0.5" + yargs "^3.10.0" protobufjs@^7.0.0: version "7.2.3" @@ -21442,9 +20696,9 @@ punycode@^1.3.2: integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== pupa@^2.0.1, pupa@^2.1.1: version "2.1.1" @@ -21454,9 +20708,9 @@ pupa@^2.0.1, pupa@^2.1.1: escape-goat "^2.0.0" pure-rand@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-5.0.1.tgz#97a287b4b4960b2a3448c0932bf28f2405cac51d" - integrity sha512-ksWccjmXOHU2gJBnH0cK1lSYdvSZ0zLoCMSz/nTGh6hDvCSgcRxDyIcOBD6KNxFz3xhMPm/T267Tbe2JRymKEQ== + version "5.0.5" + resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-5.0.5.tgz#bda2a7f6a1fc0f284d78d78ca5902f26f2ad35cf" + integrity sha512-BwQpbqxSCBJVpamI6ydzcKqyFmnd5msMWUGvzXLm1aXvusbbgkbOto/EUPM00hjveJEaJtdbhUjKSzWRhQVkaw== pure-rand@^6.0.0: version "6.0.1" @@ -21493,41 +20747,29 @@ qqjs@^0.3.10: write-json-file "^4.1.1" qrcode@^1.4.4: - version "1.5.1" - resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.1.tgz#0103f97317409f7bc91772ef30793a54cd59f0cb" - integrity sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg== + version "1.5.2" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.2.tgz#ac86a8e548edd04e513a7c50734b1fde9d50377b" + integrity sha512-aX3t2vLTDIGhqJujaQkw8SA+D38gcQ/ayPF4187OHMl+1ARZ/2UlBbNTnA2iTOte+QP88K8xY+XNXrR7H9z6fA== dependencies: dijkstrajs "^1.0.1" - encode-utf8 "^1.0.3" + encode-utf8 "^2.0.0" pngjs "^5.0.0" yargs "^15.3.1" -qs@6.10.3: - version "6.10.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" - integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" -qs@^6.10.3, qs@^6.11.0: +qs@^6.11.0, qs@^6.4.0, qs@^6.5.2, qs@^6.6.0, qs@^6.7.0: version "6.11.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f" integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ== dependencies: side-channel "^1.0.4" -qs@^6.4.0, qs@^6.5.2, qs@^6.7.0: - version "6.9.4" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" - integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== - -qs@^6.6.0: - version "6.10.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" - integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== - dependencies: - side-channel "^1.0.4" - qs@~6.5.2: version "6.5.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" @@ -21606,7 +20848,7 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.5.1, raw-body@^2.2.0, raw-body@^2.3.3: +raw-body@2.5.1: version "2.5.1" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== @@ -21616,6 +20858,16 @@ raw-body@2.5.1, raw-body@^2.2.0, raw-body@^2.3.3: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@2.5.2, raw-body@^2.2.0, raw-body@^2.3.3: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + rc@1.2.8, rc@^1.1.2, rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -21627,13 +20879,13 @@ rc@1.2.8, rc@^1.1.2, rc@^1.2.7, rc@^1.2.8: strip-json-comments "~2.0.1" re2@^1.15.8: - version "1.17.7" - resolved "https://registry.yarnpkg.com/re2/-/re2-1.17.7.tgz#e14cab85a177a5534c7215c322d1b043c55aa1e9" - integrity sha512-X8GSuiBoVWwcjuppqSjsIkRxNUKDdjhkO9SBekQbZ2ksqWUReCy7DQPWOVpoTnpdtdz5PIpTTxTFzvJv5UMfjA== + version "1.18.0" + resolved "https://registry.yarnpkg.com/re2/-/re2-1.18.0.tgz#6d6f47c5aaa436eb7a7d68b260f8cf25d7948619" + integrity sha512-MoCYZlJ9YUgksND9asyNF2/x532daXU/ARp1UeJbQ5flMY6ryKNEhrWt85aw3YluzOJlC3vXpGgK2a1jb0b4GA== dependencies: install-artifact-from-github "^1.3.1" - nan "^2.16.0" - node-gyp "^9.0.0" + nan "^2.17.0" + node-gyp "^9.3.0" react-is@^17.0.1: version "17.0.2" @@ -21746,18 +20998,18 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: string_decoder "~0.10.x" "readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" util-deprecate "^1.0.1" readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -21795,9 +21047,9 @@ readable-stream@~2.0.0: util-deprecate "~1.0.1" readdir-glob@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.2.tgz#b185789b8e6a43491635b6953295c5c5e3fd224c" - integrity sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.3.tgz#c3d831f51f5e7bfa62fa2ffbe4b508c640f09584" + integrity sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA== dependencies: minimatch "^5.1.0" @@ -21895,11 +21147,6 @@ regenerator-runtime@^0.13.11: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== - regex-cache@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" @@ -21920,14 +21167,14 @@ regexp-to-ast@0.4.0: resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.4.0.tgz#f3dbcb42726cd71902ba50193f63eab5325cd7cb" integrity sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw== -regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: + version "1.5.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + functions-have-names "^1.2.3" regexpp@^2.0.1: version "2.0.1" @@ -22091,11 +21338,11 @@ reselect-tree@^1.3.7: reselect "^4.0.0" reselect@^4.0.0: - version "4.1.6" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.6.tgz#19ca2d3d0b35373a74dc1c98692cdaffb6602656" - integrity sha512-ZovIuXqto7elwnxyXbBtCPo9YFEr3uJqj2rRbcOOog1bmu2Ag85M4hixSwFWyaBMKXNgvPaJ9OSu9SkBPIeJHQ== + version "4.1.8" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" + integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== -resolve-alpn@^1.2.0: +resolve-alpn@^1.0.0, resolve-alpn@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== @@ -22153,15 +21400,7 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" - integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== - dependencies: - is-core-module "^2.0.0" - path-parse "^1.0.6" - -resolve@^1.11.1, resolve@^1.20.0: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1, resolve@~1.22.1: version "1.22.2" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== @@ -22170,20 +21409,6 @@ resolve@^1.11.1, resolve@^1.20.0: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@~1.11.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" - integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw== - dependencies: - path-parse "^1.0.6" - -responselike@*: - version "3.0.0" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-3.0.0.tgz#20decb6c298aff0dbee1c355ca95461d42823626" - integrity sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg== - dependencies: - lowercase-keys "^3.0.0" - responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -22226,14 +21451,7 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -retry-request@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.0.0.tgz#5c366166279b3e10e9d7aa13274467a05cb69290" - integrity sha512-S4HNLaWcMP6r8E4TMH52Y7/pM8uNayOcTDDQNBwsCccL1uI+Ol2TljxRDPzaNfbhOB30+XWP5NnZkB3LiJxi1w== - dependencies: - through2 "^2.0.0" - -retry-request@^4.2.2: +retry-request@^4.0.0, retry-request@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.2.2.tgz#b7d82210b6d2651ed249ba3497f07ea602f1a903" integrity sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg== @@ -22310,9 +21528,9 @@ rlp@^2.0.0, rlp@^2.2.1, rlp@^2.2.2, rlp@^2.2.3, rlp@^2.2.4: bn.js "^5.2.0" router@^1.3.1: - version "1.3.7" - resolved "https://registry.yarnpkg.com/router/-/router-1.3.7.tgz#7d68cef5558febfd3438a23de07a0f8b92b873f1" - integrity sha512-bYnD9Vv2287+g3AIll2kHITLtHV5+fldq6hVzaul9RbdGme77mvBY/1cO+ahsgstA2RI6DSg/j4W1TYHm4Lz4g== + version "1.3.8" + resolved "https://registry.yarnpkg.com/router/-/router-1.3.8.tgz#1509614ae1fbc67139a728481c54b057ecfb04bf" + integrity sha512-461UFH44NtSfIlS83PUg2N7OZo86BC/kB3dY77gJdsODsBhhw7+2uE0tzTINxrY9CahCUVk1VhpWCA5i1yoIEg== dependencies: array-flatten "3.0.0" debug "2.6.9" @@ -22356,37 +21574,40 @@ rustbn.js@~0.2.0: resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca" integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA== -rxjs@6: +rxjs@6, rxjs@^6.4.0, rxjs@^6.6.0: version "6.6.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" -rxjs@^6.4.0, rxjs@^6.6.0: - version "6.6.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" - integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== - dependencies: - tslib "^1.9.0" - rxjs@^7.5.5: - version "7.5.6" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc" - integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw== + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== dependencies: tslib "^2.1.0" -safe-buffer@*, safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-array-concat@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060" + integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + has-symbols "^1.0.3" + isarray "^2.0.5" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-event-emitter@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/safe-event-emitter/-/safe-event-emitter-1.0.1.tgz#5b692ef22329ed8f69fdce607e50ca734f6f20af" @@ -22416,9 +21637,9 @@ safe-regex@^1.1.0: ret "~0.1.10" safe-stable-stringify@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73" - integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== + version "2.4.3" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" + integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== "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: version "2.1.2" @@ -22448,14 +21669,14 @@ sanitize-filename@^1.6.1: truncate-utf8-bytes "^1.0.0" save@^2.4.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/save/-/save-2.5.0.tgz#426663ca04eeaf87f909656aec52a1ba5d7e6195" - integrity sha512-xiVLpKVbx8EmW0HDkNRjYL271OnIRCo8VGWAEq6/K+E0dgNrwKV2xvKXdfPj6HGYA6l760800LyewSY3ooljCg== + version "2.9.0" + resolved "https://registry.yarnpkg.com/save/-/save-2.9.0.tgz#6659375fadeaf58e4abc6a90ec6b0fb2e2232e0f" + integrity sha512-eg8+g8CjvehE/2C6EbLdtK1pINVD27pcJLj4M9PjWWhoeha/y5bWf4dp/0RF+OzbKTcG1bae9qi3PAqiR8CJTg== dependencies: async "^3.2.2" event-stream "^4.0.1" lodash.assign "^4.2.0" - mingo "1" + mingo "^6.1.0" sax@1.2.1: version "1.2.1" @@ -22508,13 +21729,13 @@ scryptsy@^2.1.0: resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== -secp256k1@*: - version "5.0.0" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-5.0.0.tgz#be6f0c8c7722e2481e9773336d351de8cddd12f7" - integrity sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA== +secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" + integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== dependencies: elliptic "^6.5.4" - node-addon-api "^5.0.0" + node-addon-api "^2.0.0" node-gyp-build "^4.2.0" secp256k1@^3.0.1: @@ -22531,15 +21752,6 @@ secp256k1@^3.0.1: nan "^2.14.0" safe-buffer "^5.1.2" -secp256k1@^4.0.0, secp256k1@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" - integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== - dependencies: - elliptic "^6.5.4" - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - seed-random@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" @@ -22608,14 +21820,21 @@ semver@7.3.5: dependencies: lru-cache "^6.0.0" -semver@7.3.7, semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: +semver@7.3.7: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.4.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== + dependencies: + lru-cache "^6.0.0" + +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -22793,9 +22012,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" - integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== + version "1.8.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== shelljs@^0.8.4: version "0.8.5" @@ -22820,12 +22039,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -signal-exit@^3.0.7: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -22985,9 +22199,9 @@ socks-proxy-agent@^7.0.0: socks "^2.6.2" socks@^2.3.3, socks@^2.6.2: - version "2.7.0" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" - integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== dependencies: ip "^2.0.0" smart-buffer "^4.2.0" @@ -23006,10 +22220,10 @@ solc@0.5.8: tmp "0.0.33" yargs "^11.0.0" -solc@0.8.18: - version "0.8.18" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.18.tgz#a05ce8918540eda5f10aa91f0f52f239b9645dad" - integrity sha512-wVAa2Y3BYd64Aby5LsgS3g6YC2NvZ3bJ+A8TAIAukfVuQb3AjyGrLZpyxQk5YLn14G35uZtSnIgHEpab9klOLQ== +solc@0.8.19, solc@^0.8: + version "0.8.19" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.19.tgz#cac6541106ae3cff101c740042c7742aa56a2ed3" + integrity sha512-yqurS3wzC4LdEvmMobODXqprV4MYJcVtinuxgrp61ac8K2zz40vXA0eSAskSHPgv8dQo7Nux39i3QBsHx4pqyA== dependencies: command-exists "^1.2.8" commander "^8.1.0" @@ -23058,19 +22272,6 @@ solc@^0.6.0: semver "^5.5.0" tmp "0.0.33" -solc@^0.8: - version "0.8.19" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.19.tgz#cac6541106ae3cff101c740042c7742aa56a2ed3" - integrity sha512-yqurS3wzC4LdEvmMobODXqprV4MYJcVtinuxgrp61ac8K2zz40vXA0eSAskSHPgv8dQo7Nux39i3QBsHx4pqyA== - dependencies: - command-exists "^1.2.8" - commander "^8.1.0" - follow-redirects "^1.12.1" - js-sha3 "0.8.0" - memorystream "^0.3.1" - semver "^5.5.0" - tmp "0.0.33" - solhint@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/solhint/-/solhint-2.3.1.tgz#6fee8fc2635112bf5812f7cba8359c14e9d9a491" @@ -23123,11 +22324,11 @@ sort-keys@^4.0.0: is-plain-obj "^2.0.0" source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== dependencies: - atob "^2.1.1" + atob "^2.1.2" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -23141,15 +22342,7 @@ source-map-support@0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.6: - version "0.5.16" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" - integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-support@^0.5.17, source-map-support@^0.5.19: +source-map-support@^0.5.0, source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -23190,9 +22383,9 @@ spark-md5@3.0.2: integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" @@ -23211,9 +22404,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" - integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== + version "3.0.13" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" + integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== spinnies@^0.4.2: version "0.4.3" @@ -23246,9 +22439,9 @@ split2@^3.0.0: readable-stream "^3.0.0" split2@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" - integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== + version "4.2.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" + integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== split@^1.0.0, split@^1.0.1: version "1.0.1" @@ -23268,9 +22461,9 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sqlite3@^5.0.8: - version "5.0.8" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.0.8.tgz#b4b7eab7156debec80866ef492e01165b4688272" - integrity sha512-f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ== + version "5.1.6" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.6.tgz#1d4fbc90fe4fbd51e952e0a90fd8f6c2b9098e97" + integrity sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw== dependencies: "@mapbox/node-pre-gyp" "^1.0.0" node-addon-api "^4.2.0" @@ -23317,14 +22510,7 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== -stack-utils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" - integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg== - dependencies: - escape-string-regexp "^2.0.0" - -stack-utils@^2.0.3: +stack-utils@^2.0.2, stack-utils@^2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== @@ -23349,21 +22535,23 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -"statuses@>= 1.5.0 < 2": +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== -statuses@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg== - stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" integrity sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g== +stop-iteration-iterator@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" + integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ== + dependencies: + internal-slot "^1.0.4" + stoppable@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b" @@ -23436,7 +22624,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.2, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -23454,16 +22642,7 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - 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.prototype.trim@^1.2.7: +string.prototype.trim@^1.2.7, string.prototype.trim@~1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== @@ -23472,16 +22651,7 @@ string.prototype.trim@^1.2.7: define-properties "^1.1.4" es-abstract "^1.20.4" -string.prototype.trim@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea" - integrity sha512-IlEfUereZQqIcv/LJFNPUygFkq0HJCQMnaDr5i+zyRXpeYvF4F8J8u4UFxXICLMY+O3SEfJeaye5AO5miS6a9g== - dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.0" - function-bind "^1.0.2" - -string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.6: +string.prototype.trimend@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== @@ -23490,25 +22660,7 @@ string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.6: define-properties "^1.1.4" es-abstract "^1.20.4" -string.prototype.trimleft@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.3.tgz#dee305118117d0a1843c1fc0d38d5d0754d83c60" - integrity sha512-699Ibssmj/awVzvdNk4g83/Iu8U9vDohzmA/ly2BrQWGhamuY4Tlvs5XKmKliDt3ky6SKbE1bzPhASKCFlx9Sg== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - string.prototype.trimstart "^1.0.3" - -string.prototype.trimright@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.3.tgz#dc16a21d7456cbc8b2c54d47fe01f06d9efe94eb" - integrity sha512-hoOq56oRFnnfDuXNy2lGHiwT77MehHv9d0zGfRZ8QdC+4zjrkFB9vd5i/zYTd/ymFBd4YxtbdgHt3U6ksGeuBw== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - string.prototype.trimend "^1.0.3" - -string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.6: +string.prototype.trimstart@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== @@ -23661,22 +22813,21 @@ sublevel-pouchdb@7.3.1: ltgt "2.2.1" readable-stream "1.1.14" -superagent@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6" - integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g== +superagent@^8.0.5: + version "8.0.9" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.9.tgz#2c6fda6fadb40516515f93e9098c0eb1602e0535" + integrity sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA== dependencies: component-emitter "^1.3.0" - cookiejar "^2.1.3" + cookiejar "^2.1.4" debug "^4.3.4" fast-safe-stringify "^2.1.1" form-data "^4.0.0" - formidable "^2.0.1" + formidable "^2.1.2" methods "^1.1.2" mime "2.6.0" - qs "^6.10.3" - readable-stream "^3.6.0" - semver "^7.3.7" + qs "^6.11.0" + semver "^7.3.8" superstatic@^7.1.0: version "7.1.0" @@ -23711,12 +22862,12 @@ superstatic@^7.1.0: re2 "^1.15.8" supertest@^6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.2.3.tgz#291b220126e5faa654d12abe1ada3658757c8c67" - integrity sha512-3GSdMYTMItzsSYjnIcljxMVZKPW1J9kYHZY+7yLfD0wpPwww97GeImZC1oOk0S5+wYl2niJwuFusBJqwLqYM3g== + version "6.3.3" + resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.3.3.tgz#42f4da199fee656106fd422c094cf6c9578141db" + integrity sha512-EMCG6G8gDu5qEqRQ3JjjPs6+FYT1a7Hv5ApHvtSghmOFJYtsU5S+pSb6Y2EUeCEY3CmEL3mmQ8YWlPOzQomabA== dependencies: methods "^1.1.2" - superagent "^7.1.3" + superagent "^8.0.5" supports-color@5.4.0: version "5.4.0" @@ -23820,15 +22971,15 @@ swarm-js@0.1.39: xhr-request-promise "^0.1.2" swarm-js@^0.1.40: - version "0.1.40" - resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.40.tgz#b1bc7b6dcc76061f6c772203e004c11997e06b99" - integrity sha512-yqiOCEoA4/IShXkY3WKwP5PvZhmoOOD8clsKA7EEcRILMkTEYHCQ21HDCAcVpmIxZq4LyZvWeRJ6quIyHk1caA== + version "0.1.42" + resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.42.tgz#497995c62df6696f6e22372f457120e43e727979" + integrity sha512-BV7c/dVlA3R6ya1lMlSSNPLYrntt0LUq4YMgy3iwpCIc6rZnS5W2wUoctarZ5pXlpKtxDDf9hNziEkcfrxdhqQ== dependencies: bluebird "^3.5.0" buffer "^5.0.5" eth-lib "^0.1.26" fs-extra "^4.0.2" - got "^7.1.0" + got "^11.8.5" mime-types "^2.1.16" mkdirp-promise "^5.0.1" mock-fs "^4.1.0" @@ -23873,27 +23024,29 @@ table@^5.2.3: string-width "^3.0.0" tail@^2.0.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.4.tgz#90dd4c5a174a3fa39dcb65a1df1950a4a0093a41" - integrity sha512-PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ== + version "2.2.6" + resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.6.tgz#24abd701963639b896c42496d5f416216ec0b558" + integrity sha512-IQ6G4wK/t8VBauYiGPLx+d3fA5XjSVagjWV5SIYzvEvglbQjwEcukeYI68JOPpdydjxhZ9sIgzRlSmwSpphHyw== tape@^4.4.0: - version "4.11.0" - resolved "https://registry.yarnpkg.com/tape/-/tape-4.11.0.tgz#63d41accd95e45a23a874473051c57fdbc58edc1" - integrity sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA== - dependencies: - deep-equal "~1.0.1" - defined "~1.0.0" + version "4.16.2" + resolved "https://registry.yarnpkg.com/tape/-/tape-4.16.2.tgz#7565e6af20426565557266e9dda7215869b297b6" + integrity sha512-TUChV+q0GxBBCEbfCYkGLkv8hDJYjMdSWdE0/Lr331sB389dsvFUHNV9ph5iQqKzt8Ss9drzcda/YeexclBFqg== + dependencies: + call-bind "~1.0.2" + deep-equal "~1.1.1" + defined "~1.0.1" + dotignore "~0.1.2" for-each "~0.3.3" - function-bind "~1.1.1" - glob "~7.1.4" + glob "~7.2.3" has "~1.0.3" inherits "~2.0.4" - minimist "~1.2.0" - object-inspect "~1.6.0" - resolve "~1.11.1" + is-regex "~1.1.4" + minimist "~1.2.7" + object-inspect "~1.12.3" + resolve "~1.22.1" resumer "~0.0.0" - string.prototype.trim "~1.1.2" + string.prototype.trim "~1.2.7" through "~2.3.8" tar-fs@^1.8.1: @@ -23941,19 +23094,19 @@ tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0: readable-stream "^3.1.1" tar@^4.0.2, tar@^4.3.0: - version "4.4.15" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8" - integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA== + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" -tar@^6.0.2: +tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2: version "6.1.13" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== @@ -23965,18 +23118,6 @@ tar@^6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -tar@^6.1.0, tar@^6.1.11, tar@^6.1.2: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - targz@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f" @@ -24526,14 +23667,14 @@ ts-generator@^0.0.8: ts-essentials "^1.0.0" ts-jest@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.0.tgz#3617e10c39a76380fe521d0c26186a773f5f1e46" - integrity sha512-OxUaigbv5Aon3OMLY9HBtwkGMs1upWE/URrmmVQFzzOcGlEPVuWzGmXUIkWGt/95Dj/T6MGuTrHHGL6kT6Yn8g== + version "29.1.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.0.tgz#4a9db4104a49b76d2b368ea775b6c9535c603891" + integrity sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA== dependencies: bs-logger "0.x" fast-json-stable-stringify "2.x" jest-util "^29.0.0" - json5 "^2.2.1" + json5 "^2.2.3" lodash.memoize "4.x" make-error "1.x" semver "7.x" @@ -24587,13 +23728,22 @@ ts-node@^10.9.1: v8-compile-cache-lib "^3.0.1" yn "3.1.1" -tsconfig-paths@^3.8.0, tsconfig-paths@^3.9.0: - version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" - integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== +tsconfig-paths@^3.8.0: + version "3.14.2" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" + integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== dependencies: "@types/json5" "^0.0.29" - json5 "^1.0.1" + json5 "^1.0.2" + minimist "^1.2.6" + strip-bom "^3.0.0" + +tsconfig-paths@^4.1.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c" + integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg== + dependencies: + json5 "^2.2.2" minimist "^1.2.6" strip-bom "^3.0.0" @@ -24607,10 +23757,15 @@ tslib@^1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + +tslib@~2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" + integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== tslint-config-prettier@^1.18.0: version "1.18.0" @@ -24922,9 +24077,9 @@ typescript@4.7.4: integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== "typescript@^3 || ^4": - version "4.8.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" - integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== + version "4.9.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== typescript@^3.6.4: version "3.9.10" @@ -24937,9 +24092,9 @@ typical@^2.6.0, typical@^2.6.1: integrity sha512-ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg== uglify-js@^3.1.4: - version "3.17.0" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.0.tgz#55bd6e9d19ce5eef0d5ad17cd1f587d85b180a85" - integrity sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg== + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== uint8array-tools@0.0.7: version "0.0.7" @@ -24985,9 +24140,9 @@ underscore@1.9.1: integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== underscore@>1.4.4, "underscore@>= 1.3.1": - version "1.13.4" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee" - integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ== + version "1.13.6" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" + integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== union-value@^1.0.0: version "1.0.1" @@ -25109,10 +24264,10 @@ upath@^2.0.1: resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== -update-browserslist-db@^1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz#16279639cff1d0f800b14792de43d97df2d11b7d" - integrity sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg== +update-browserslist-db@^1.0.10: + version "1.0.11" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" + integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== dependencies: escalade "^3.1.1" picocolors "^1.0.0" @@ -25208,9 +24363,9 @@ url-parse@1.4.4: requires-port "^1.0.0" url-parse@^1.5.3: - version "1.5.4" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd" - integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg== + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -25266,9 +24421,9 @@ utf-8-validate@5.0.7: node-gyp-build "^4.3.0" utf-8-validate@^5.0.2: - version "5.0.9" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.9.tgz#ba16a822fbeedff1a58918f2a6a6b36387493ea3" - integrity sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q== + version "5.0.10" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2" + integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ== dependencies: node-gyp-build "^4.3.0" @@ -25298,15 +24453,17 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util.promisify@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" - integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.2.tgz#02b3dbadbb80071eee4c43aed58747afdfc516db" + integrity sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA== dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" + call-bind "^1.0.2" + define-properties "^1.2.0" for-each "^0.3.3" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.1" + has-proto "^1.0.1" + has-symbols "^1.0.3" + object.getownpropertydescriptors "^2.1.6" + safe-array-concat "^1.0.0" util@^0.10.3: version "0.10.4" @@ -25315,19 +24472,7 @@ util@^0.10.3: dependencies: inherits "2.0.3" -util@^0.12.0: - version "0.12.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" - integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== - dependencies: - inherits "^2.0.3" - is-arguments "^1.0.4" - is-generator-function "^1.0.7" - is-typed-array "^1.1.3" - safe-buffer "^5.1.2" - which-typed-array "^1.1.2" - -util@^0.12.4, util@^0.12.5: +util@^0.12.0, util@^0.12.4, util@^0.12.5: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== @@ -25438,6 +24583,11 @@ value-or-promise@1.0.11: resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== +value-or-promise@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" + integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== + varint@^5.0.0: version "5.0.2" resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4" @@ -25457,7 +24607,7 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vm2@^3.9.8: +vm2@^3.9.11: version "3.9.17" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== @@ -25525,11 +24675,6 @@ walkdir@^0.3.0, walkdir@^0.3.2: resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.3.2.tgz#ac8437a288c295656848ebc19981ebc677a5f590" integrity sha512-0Twghia4Z5wDGDYWURlhZmI47GvERMCsXIu0QZWVVZyW9ZjpbbZvD9Zy9M6cWiQQRRbAcYajIyKNavaZZDt1Uw== -walkdir@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39" - integrity sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ== - walker@^1.0.7, walker@^1.0.8, walker@~1.0.5: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" @@ -25569,24 +24714,6 @@ web3-bzz@1.3.6: swarm-js "^0.1.40" underscore "1.12.1" -web3-bzz@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.7.4.tgz#9419e606e38a9777443d4ce40506ebd796e06075" - integrity sha512-w9zRhyEqTK/yi0LGRHjZMcPCfP24LBjYXI/9YxFw9VqsIZ9/G0CRCnUt12lUx0A56LRAMpF7iQ8eA73aBcO29Q== - dependencies: - "@types/node" "^12.12.6" - got "9.6.0" - swarm-js "^0.1.40" - -web3-bzz@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.7.5.tgz#edeb262c3a6619109763077a94172513cf07cdde" - integrity sha512-Z53sY0YK/losqjJncmL4vP0zZI9r6tiXg6o7R6e1JD2Iy7FH3serQvU+qXmPjqEBzsnhf8wTG+YcBPB3RHpr0Q== - dependencies: - "@types/node" "^12.12.6" - got "12.1.0" - swarm-js "^0.1.40" - web3-bzz@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.8.1.tgz#81397be5ce262d03d82b92e9d8acc11f8a609ea1" @@ -25605,6 +24732,15 @@ web3-bzz@1.8.2: got "12.1.0" swarm-js "^0.1.40" +web3-bzz@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.9.0.tgz#3334049f386e73e2b3dcfa96432e65391538d8ac" + integrity sha512-9Zli9dikX8GdHwBb5/WPzpSVuy3EWMKY3P4EokCQra31fD7DLizqAAaTUsFwnK7xYkw5ogpHgelw9uKHHzNajg== + dependencies: + "@types/node" "^12.12.6" + got "12.1.0" + swarm-js "^0.1.40" + web3-core-helpers@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.55.tgz#832b8499889f9f514b1d174f00172fd3683d63de" @@ -25634,22 +24770,6 @@ web3-core-helpers@1.3.6: web3-eth-iban "1.3.6" web3-utils "1.3.6" -web3-core-helpers@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.7.4.tgz#f8f808928560d3e64e0c8d7bdd163aa4766bcf40" - integrity sha512-F8PH11qIkE/LpK4/h1fF/lGYgt4B6doeMi8rukeV/s4ivseZHHslv1L6aaijLX/g/j4PsFmR42byynBI/MIzFg== - dependencies: - web3-eth-iban "1.7.4" - web3-utils "1.7.4" - -web3-core-helpers@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.7.5.tgz#e97b3ecac787ade4b9390807a86aca78ed97872b" - integrity sha512-lDDjTks6Q6aNUO87RYrY2xub3UWTKr/RIWxpHJODEqkLxZS1dWdyliJ6aIx3031VQwsNT5HE7NvABe/t0p3iDQ== - dependencies: - web3-eth-iban "1.7.5" - web3-utils "1.7.5" - web3-core-helpers@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.8.1.tgz#7904747b23fd0afa4f2c86ed98ea9418ccad7672" @@ -25666,6 +24786,14 @@ web3-core-helpers@1.8.2: web3-eth-iban "1.8.2" web3-utils "1.8.2" +web3-core-helpers@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.9.0.tgz#a1ca4ac7b9cec822886643312d2e98b0e4d8f1bc" + integrity sha512-NeJzylAp9Yj9xAt2uTT+kyug3X0DLnfBdnAcGZuY6HhoNPDIfQRA9CkJjLngVRlGTLZGjNp9x9eR+RyZQgUlXg== + dependencies: + web3-eth-iban "1.9.0" + web3-utils "1.9.0" + web3-core-method@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.55.tgz#0af994295ac2dd64ccd53305b7df8da76e11da49" @@ -25703,28 +24831,6 @@ web3-core-method@1.3.6: web3-core-subscriptions "1.3.6" web3-utils "1.3.6" -web3-core-method@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.7.4.tgz#3873c6405e1a0a8a1efc1d7b28de8b7550b00c15" - integrity sha512-56K7pq+8lZRkxJyzf5MHQPI9/VL3IJLoy4L/+q8HRdZJ3CkB1DkXYaXGU2PeylG1GosGiSzgIfu1ljqS7CP9xQ== - dependencies: - "@ethersproject/transactions" "^5.6.2" - web3-core-helpers "1.7.4" - web3-core-promievent "1.7.4" - web3-core-subscriptions "1.7.4" - web3-utils "1.7.4" - -web3-core-method@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.7.5.tgz#ffe8883c169468f0e4d13509377f2d8876d9b7be" - integrity sha512-ApTvq1Llzlbxmy0n4L7QaE6NodIsR80VJqk8qN4kLg30SGznt/pNJFebryLI2kpyDmxSgj1TjEWzmHJBp6FhYg== - dependencies: - "@ethersproject/transactions" "^5.6.2" - web3-core-helpers "1.7.5" - web3-core-promievent "1.7.5" - web3-core-subscriptions "1.7.5" - web3-utils "1.7.5" - web3-core-method@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.8.1.tgz#0fc5a433a9fc784c447522f141c0a8e0163c7790" @@ -25747,6 +24853,17 @@ web3-core-method@1.8.2: web3-core-subscriptions "1.8.2" web3-utils "1.8.2" +web3-core-method@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.9.0.tgz#81da8aa21503b470537c9f075f30adfad194a2d8" + integrity sha512-sswbNsY2xRBBhGeaLt9c/eDc+0yDDhi6keUBAkgIRa9ueSx/VKzUY9HMqiV6bXDcGT2fJyejq74FfEB4lc/+/w== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.9.0" + web3-core-promievent "1.9.0" + web3-core-subscriptions "1.9.0" + web3-utils "1.9.0" + web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -25762,20 +24879,6 @@ web3-core-promievent@1.3.6: dependencies: eventemitter3 "4.0.4" -web3-core-promievent@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.7.4.tgz#80a75633fdfe21fbaae2f1e38950edb2f134868c" - integrity sha512-o4uxwXKDldN7ER7VUvDfWsqTx9nQSP1aDssi1XYXeYC2xJbVo0n+z6ryKtmcoWoRdRj7uSpVzal3nEmlr480mA== - dependencies: - eventemitter3 "4.0.4" - -web3-core-promievent@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.7.5.tgz#56a9b06a20e20a0a89d2ab7f88d44c8ae01d5b62" - integrity sha512-uZ1VRErVuhiLtHlyt3oEH/JSvAf6bWPndChHR9PG7i1Zfqm6ZVCeM91ICTPmiL8ddsGQOxASpnJk4vhApcTIww== - dependencies: - eventemitter3 "4.0.4" - web3-core-promievent@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.8.1.tgz#f334c8b2ceac6c2228f06d2a515f6d103157f036" @@ -25790,6 +24893,13 @@ web3-core-promievent@1.8.2: dependencies: eventemitter3 "4.0.4" +web3-core-promievent@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.9.0.tgz#2598a4d91b4edd3607366529f52bc96dee9f6d83" + integrity sha512-PHG1Mn23IGwMZhnPDN8dETKypqsFbHfiyRqP+XsVMPmTHkVfzDQTCBU/c2r6hUktBDoGKut5xZQpGfhFk71KbQ== + dependencies: + eventemitter3 "4.0.4" + web3-core-requestmanager@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" @@ -25806,34 +24916,12 @@ web3-core-requestmanager@1.3.6: resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.6.tgz#4fea269fe913fd4fca464b4f7c65cb94857b5b2a" integrity sha512-2rIaeuqeo7QN1Eex7aXP0ZqeteJEPWXYFS/M3r3LXMiV8R4STQBKE+//dnHJXoo2ctzEB5cgd+7NaJM8S3gPyA== dependencies: - underscore "1.12.1" - util "^0.12.0" - web3-core-helpers "1.3.6" - web3-providers-http "1.3.6" - web3-providers-ipc "1.3.6" - web3-providers-ws "1.3.6" - -web3-core-requestmanager@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.7.4.tgz#2dc8a526dab8183dca3fef54658621801b1d0469" - integrity sha512-IuXdAm65BQtPL4aI6LZJJOrKAs0SM5IK2Cqo2/lMNvVMT9Kssq6qOk68Uf7EBDH0rPuINi+ReLP+uH+0g3AnPA== - dependencies: - util "^0.12.0" - web3-core-helpers "1.7.4" - web3-providers-http "1.7.4" - web3-providers-ipc "1.7.4" - web3-providers-ws "1.7.4" - -web3-core-requestmanager@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.7.5.tgz#be18fc99642689aeb2e016fa43fb47bb9e8c94ce" - integrity sha512-3KpfxW/wVH4mgwWEsSJGHKrtRVoijWlDxtUrm17xgtqRNZ2mFolifKnHAUKa0fY48C9CrxmcCiMIi3W4G6WYRw== - dependencies: + underscore "1.12.1" util "^0.12.0" - web3-core-helpers "1.7.5" - web3-providers-http "1.7.5" - web3-providers-ipc "1.7.5" - web3-providers-ws "1.7.5" + web3-core-helpers "1.3.6" + web3-providers-http "1.3.6" + web3-providers-ipc "1.3.6" + web3-providers-ws "1.3.6" web3-core-requestmanager@1.8.1: version "1.8.1" @@ -25857,6 +24945,17 @@ web3-core-requestmanager@1.8.2: web3-providers-ipc "1.8.2" web3-providers-ws "1.8.2" +web3-core-requestmanager@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.9.0.tgz#9d7d0e7f890cf7a24e9c568b9772c64d57fc4fcd" + integrity sha512-hcJ5PCtTIJpj+8qWxoseqlCovDo94JJjTX7dZOLXgwp8ah7E3WRYozhGyZocerx+KebKyg1mCQIhkDpMwjfo9Q== + dependencies: + util "^0.12.5" + web3-core-helpers "1.9.0" + web3-providers-http "1.9.0" + web3-providers-ipc "1.9.0" + web3-providers-ws "1.9.0" + web3-core-subscriptions@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.55.tgz#105902c13db53466fc17d07a981ad3d41c700f76" @@ -25884,22 +24983,6 @@ web3-core-subscriptions@1.3.6: underscore "1.12.1" web3-core-helpers "1.3.6" -web3-core-subscriptions@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.7.4.tgz#cfbd3fa71081a8c8c6f1a64577a1a80c5bd9826f" - integrity sha512-VJvKWaXRyxk2nFWumOR94ut9xvjzMrRtS38c4qj8WBIRSsugrZr5lqUwgndtj0qx4F+50JhnU++QEqUEAtKm3g== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.7.4" - -web3-core-subscriptions@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.7.5.tgz#c0e25610768ea9d9f9107b4ac74b6b6573125e00" - integrity sha512-YK6utQ7Wwjbe4XZOIA8quWGBPi1lFDS1A+jQYwxKKrCvm6BloBNc3FhvrcSYlDhLe/kOy8+2Je8i9amndgT4ww== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.7.5" - web3-core-subscriptions@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.8.1.tgz#f5ae1380e92746eadfab6475b8a70ef5a1be6bbf" @@ -25916,6 +24999,14 @@ web3-core-subscriptions@1.8.2: eventemitter3 "4.0.4" web3-core-helpers "1.8.2" +web3-core-subscriptions@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.9.0.tgz#dc67b478875dab1875844df3307a986dd7d468dd" + integrity sha512-MaIo29yz7hTV8X8bioclPDbHFOVuHmnbMv+D3PDH12ceJFJAXGyW8GL5KU1DYyWIj4TD1HM4WknyVA/YWBiiLA== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.9.0" + web3-core@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.55.tgz#26b9abbf1bc1837c9cc90f06ecbc4ed714f89b53" @@ -25954,32 +25045,6 @@ web3-core@1.3.6: web3-core-requestmanager "1.3.6" web3-utils "1.3.6" -web3-core@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.7.4.tgz#943fff99134baedafa7c65b4a0bbd424748429ff" - integrity sha512-L0DCPlIh9bgIED37tYbe7bsWrddoXYc897ANGvTJ6MFkSNGiMwDkTLWSgYd9Mf8qu8b4iuPqXZHMwIo4atoh7Q== - dependencies: - "@types/bn.js" "^5.1.0" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.7.4" - web3-core-method "1.7.4" - web3-core-requestmanager "1.7.4" - web3-utils "1.7.4" - -web3-core@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.7.5.tgz#8ee2ca490230a30ca970cb9f308eb65b76405e1d" - integrity sha512-UgOWXZr1fR/3cUQJKWbfMwRxj1/N7o6RSd/dHqdXBlOD+62EjNZItFmLRg5veq5kp9YfXzrNw9bnDkXfsL+nKQ== - dependencies: - "@types/bn.js" "^5.1.0" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.7.5" - web3-core-method "1.7.5" - web3-core-requestmanager "1.7.5" - web3-utils "1.7.5" - web3-core@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.1.tgz#050b1c408d1f9b7ae539e90f7f7d1b7a7d10578b" @@ -26006,6 +25071,19 @@ web3-core@1.8.2: web3-core-requestmanager "1.8.2" web3-utils "1.8.2" +web3-core@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.9.0.tgz#9cfafb2f8c01931429108af75205610406a5a1ab" + integrity sha512-DZ+TPmq/ZLlx4LSVzFgrHCP/QFpKDbGWO4HoquZSdu24cjk5SZ+FEU1SZB2OaK3/bgBh+25mRbmv8y56ysUu1w== + dependencies: + "@types/bn.js" "^5.1.1" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.9.0" + web3-core-method "1.9.0" + web3-core-requestmanager "1.9.0" + web3-utils "1.9.0" + web3-eth-abi@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" @@ -26024,22 +25102,6 @@ web3-eth-abi@1.3.6: underscore "1.12.1" web3-utils "1.3.6" -web3-eth-abi@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.7.4.tgz#3fee967bafd67f06b99ceaddc47ab0970f2a614a" - integrity sha512-eMZr8zgTbqyL9MCTCAvb67RbVyN5ZX7DvA0jbLOqRWCiw+KlJKTGnymKO6jPE8n5yjk4w01e165Qb11hTDwHgg== - dependencies: - "@ethersproject/abi" "^5.6.3" - web3-utils "1.7.4" - -web3-eth-abi@1.7.5, web3-eth-abi@^1.0.0-beta.24: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.7.5.tgz#db9d6dbcc043a6e922252f3228686e9bbd50d7c9" - integrity sha512-qWHvF7sayxql9BD1yqK9sZRLBQ66eJzGeaU53Y1PRq2iFPrhY6NUWxQ3c3ps0rg+dyObvRbloviWpKXcS4RE/A== - dependencies: - "@ethersproject/abi" "^5.6.3" - web3-utils "1.7.5" - web3-eth-abi@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.8.1.tgz#47455d6513217c4b0866fea6f97b1c4afa0b6535" @@ -26056,6 +25118,14 @@ web3-eth-abi@1.8.2: "@ethersproject/abi" "^5.6.3" web3-utils "1.8.2" +web3-eth-abi@1.9.0, web3-eth-abi@^1.0.0-beta.24: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.9.0.tgz#18662ef68bd3d25eedd9a1a1484089c39529c652" + integrity sha512-0BLQ3FKMrzJkA930jOX3fMaybAyubk06HChclLpiR0NWmgWXm1tmBrJdkyRy2ZTZpmfuZc9xTFRfl0yZID1voA== + dependencies: + "@ethersproject/abi" "^5.6.3" + web3-utils "1.9.0" + web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -26091,40 +25161,6 @@ web3-eth-accounts@1.3.6: web3-core-method "1.3.6" web3-utils "1.3.6" -web3-eth-accounts@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.7.4.tgz#7a24a4dfe947f7e9d1bae678529e591aa146167a" - integrity sha512-Y9vYLRKP7VU7Cgq6wG1jFaG2k3/eIuiTKAG8RAuQnb6Cd9k5BRqTm5uPIiSo0AP/u11jDomZ8j7+WEgkU9+Btw== - dependencies: - "@ethereumjs/common" "^2.5.0" - "@ethereumjs/tx" "^3.3.2" - crypto-browserify "3.12.0" - eth-lib "0.2.8" - ethereumjs-util "^7.0.10" - scrypt-js "^3.0.1" - uuid "3.3.2" - web3-core "1.7.4" - web3-core-helpers "1.7.4" - web3-core-method "1.7.4" - web3-utils "1.7.4" - -web3-eth-accounts@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.7.5.tgz#b37ee3aeebcc6bce3337636aeb272cbba0ece547" - integrity sha512-AzMLoTj3RGwKpyp3x3TtHrEeU4VpR99iMOD6NKrWSDumS6QEi0lCo+y7QZhdTlINw3iIA3SFIdvbAOO4NCHSDg== - dependencies: - "@ethereumjs/common" "^2.5.0" - "@ethereumjs/tx" "^3.3.2" - crypto-browserify "3.12.0" - eth-lib "0.2.8" - ethereumjs-util "^7.0.10" - scrypt-js "^3.0.1" - uuid "3.3.2" - web3-core "1.7.5" - web3-core-helpers "1.7.5" - web3-core-method "1.7.5" - web3-utils "1.7.5" - web3-eth-accounts@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.8.1.tgz#1ce7387721f118aeb0376291e4d8bbe2ac323406" @@ -26158,6 +25194,22 @@ web3-eth-accounts@1.8.2: web3-core-method "1.8.2" web3-utils "1.8.2" +web3-eth-accounts@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.9.0.tgz#fab7d563c63bdff2aa5ad89a94faf128961d9504" + integrity sha512-VeIZVevmnSll0AC1k5F/y398ZE89d1SRuYk8IewLUhL/tVAsFEsjl2SGgm0+aDcHmgPrkW+qsCJ+C7rWg/N4ZA== + dependencies: + "@ethereumjs/common" "2.5.0" + "@ethereumjs/tx" "3.3.2" + eth-lib "0.2.8" + ethereumjs-util "^7.1.5" + scrypt-js "^3.0.1" + uuid "^9.0.0" + web3-core "1.9.0" + web3-core-helpers "1.9.0" + web3-core-method "1.9.0" + web3-utils "1.9.0" + web3-eth-admin@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-eth-admin/-/web3-eth-admin-1.0.0-beta.55.tgz#dcbcc5be4e3a008ce367c2ac83432b9a711f39e9" @@ -26201,34 +25253,6 @@ web3-eth-contract@1.3.6: web3-eth-abi "1.3.6" web3-utils "1.3.6" -web3-eth-contract@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.7.4.tgz#e5761cfb43d453f57be4777b2e5e7e1082078ff7" - integrity sha512-ZgSZMDVI1pE9uMQpK0T0HDT2oewHcfTCv0osEqf5qyn5KrcQDg1GT96/+S0dfqZ4HKj4lzS5O0rFyQiLPQ8LzQ== - dependencies: - "@types/bn.js" "^5.1.0" - web3-core "1.7.4" - web3-core-helpers "1.7.4" - web3-core-method "1.7.4" - web3-core-promievent "1.7.4" - web3-core-subscriptions "1.7.4" - web3-eth-abi "1.7.4" - web3-utils "1.7.4" - -web3-eth-contract@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.7.5.tgz#a032419579bcec062513a3d089ad0e89ac63d731" - integrity sha512-qab7NPJRKRlTs58ozsqK8YIEwWpxIm3vD/okSIKBGkFx5gIHWW+vGmMh5PDSfefLJM9rCd+T+Lc0LYvtME7uqg== - dependencies: - "@types/bn.js" "^5.1.0" - web3-core "1.7.5" - web3-core-helpers "1.7.5" - web3-core-method "1.7.5" - web3-core-promievent "1.7.5" - web3-core-subscriptions "1.7.5" - web3-eth-abi "1.7.5" - web3-utils "1.7.5" - web3-eth-contract@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.8.1.tgz#bdf3e33bbcb79a1b6144dffd6a0deefd2e459272" @@ -26257,6 +25281,20 @@ web3-eth-contract@1.8.2: web3-eth-abi "1.8.2" web3-utils "1.8.2" +web3-eth-contract@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.9.0.tgz#00b7ac8314d562d10d7dd0c7d0f52555c3862995" + integrity sha512-+j26hpSaEtAdUed0TN5rnc+YZOcjPxMjFX4ZBKatvFkImdbVv/tzTvcHlltubSpgb2ZLyZ89lSL6phKYwd2zNQ== + dependencies: + "@types/bn.js" "^5.1.1" + web3-core "1.9.0" + web3-core-helpers "1.9.0" + web3-core-method "1.9.0" + web3-core-promievent "1.9.0" + web3-core-subscriptions "1.9.0" + web3-eth-abi "1.9.0" + web3-utils "1.9.0" + web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -26286,34 +25324,6 @@ web3-eth-ens@1.3.6: web3-eth-contract "1.3.6" web3-utils "1.3.6" -web3-eth-ens@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.7.4.tgz#346720305379c0a539e226141a9602f1da7bc0c8" - integrity sha512-Gw5CVU1+bFXP5RVXTCqJOmHn71X2ghNk9VcEH+9PchLr0PrKbHTA3hySpsPco1WJAyK4t8SNQVlNr3+bJ6/WZA== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - web3-core "1.7.4" - web3-core-helpers "1.7.4" - web3-core-promievent "1.7.4" - web3-eth-abi "1.7.4" - web3-eth-contract "1.7.4" - web3-utils "1.7.4" - -web3-eth-ens@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.7.5.tgz#fa0e287f5e6fae20531117b7467e21b482d58cab" - integrity sha512-k1Q0msdRv/wac2egpZBIwG3n/sa/KdrVmVJvFm471gLTL4xfUizV5qJjkDVf+ikf9JyDvWJTs5eWNUUbOFIw/A== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - web3-core "1.7.5" - web3-core-helpers "1.7.5" - web3-core-promievent "1.7.5" - web3-eth-abi "1.7.5" - web3-eth-contract "1.7.5" - web3-utils "1.7.5" - web3-eth-ens@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.8.1.tgz#e78a9651fea8282abe8565b001819e2d645e5929" @@ -26342,6 +25352,20 @@ web3-eth-ens@1.8.2: web3-eth-contract "1.8.2" web3-utils "1.8.2" +web3-eth-ens@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.9.0.tgz#2014b16e1116be5ab34404a8db29ad1d8632ced0" + integrity sha512-LOJZeN+AGe9arhuExnrPPFYQr4WSxXEkpvYIlst/joOEUNLDwfndHnJIK6PI5mXaYSROBtTx6erv+HupzGo7vA== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.9.0" + web3-core-helpers "1.9.0" + web3-core-promievent "1.9.0" + web3-eth-abi "1.9.0" + web3-eth-contract "1.9.0" + web3-utils "1.9.0" + web3-eth-iban@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.55.tgz#15146a69de21addc99e7dbfb2920555b1e729637" @@ -26367,22 +25391,6 @@ web3-eth-iban@1.3.6: bn.js "^4.11.9" web3-utils "1.3.6" -web3-eth-iban@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.7.4.tgz#711fb2547fdf0f988060027331b2b6c430505753" - integrity sha512-XyrsgWlZQMv5gRcjXMsNvAoCRvV5wN7YCfFV5+tHUCqN8g9T/o4XUS20vDWD0k4HNiAcWGFqT1nrls02MGZ08w== - dependencies: - bn.js "^5.2.1" - web3-utils "1.7.4" - -web3-eth-iban@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.7.5.tgz#1a50efa42cabf1b731396d38bef6a8bf92b5ee1f" - integrity sha512-mn2W5t/1IpL8OZvzAabLKT4kvwRnZSJ9K0tctndl9sDNWkfITYQibEEhUaNNA50Q5fJKgVudHI/m0gwIVTyG8Q== - dependencies: - bn.js "^5.2.1" - web3-utils "1.7.5" - web3-eth-iban@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.8.1.tgz#c6484e5d68ca644aa78431301e7acd5df24598d1" @@ -26399,6 +25407,14 @@ web3-eth-iban@1.8.2: bn.js "^5.2.1" web3-utils "1.8.2" +web3-eth-iban@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.9.0.tgz#a8f838e42c20d49ff58aaa9f67ece47a968e40b1" + integrity sha512-jPAm77PuEs1kE/UrrBFJdPD2PN42pwfXA0gFuuw35bZezhskYML9W4QCxcqnUtceyEA4FUn7K2qTMuCk+23fog== + dependencies: + bn.js "^5.2.1" + web3-utils "1.9.0" + web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -26423,30 +25439,6 @@ web3-eth-personal@1.3.6: web3-net "1.3.6" web3-utils "1.3.6" -web3-eth-personal@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.7.4.tgz#22c399794cb828a75703df8bb4b3c1331b471546" - integrity sha512-O10C1Hln5wvLQsDhlhmV58RhXo+GPZ5+W76frSsyIrkJWLtYQTCr5WxHtRC9sMD1idXLqODKKgI2DL+7xeZ0/g== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.7.4" - web3-core-helpers "1.7.4" - web3-core-method "1.7.4" - web3-net "1.7.4" - web3-utils "1.7.4" - -web3-eth-personal@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.7.5.tgz#615a3ddcf97aeea93e2a4569753c033fd7a495c5" - integrity sha512-txh2P/eN8I4AOUKFi9++KKddoD0tWfCuu9Y1Kc41jSRbk6smO88Fum0KWNmYFYhSCX2qiknS1DfqsONl3igoKQ== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.7.5" - web3-core-helpers "1.7.5" - web3-core-method "1.7.5" - web3-net "1.7.5" - web3-utils "1.7.5" - web3-eth-personal@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.8.1.tgz#00b5ff1898b62044d25ed5fddd8486168d4827cf" @@ -26471,6 +25463,18 @@ web3-eth-personal@1.8.2: web3-net "1.8.2" web3-utils "1.8.2" +web3-eth-personal@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.9.0.tgz#f5092bcb2688979dd7778d5a56ae6922c341ce52" + integrity sha512-r9Ldo/luBqJlv1vCUEQnUS+C3a3ZdbYxVHyfDkj6RWMyCqqo8JE41HWE+pfa0RmB1xnGL2g8TbYcHcqItck/qg== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.9.0" + web3-core-helpers "1.9.0" + web3-core-method "1.9.0" + web3-net "1.9.0" + web3-utils "1.9.0" + web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -26509,42 +25513,6 @@ web3-eth@1.3.6: web3-net "1.3.6" web3-utils "1.3.6" -web3-eth@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.7.4.tgz#a7c1d3ccdbba4de4a82df7e3c4db716e4a944bf2" - integrity sha512-JG0tTMv0Ijj039emXNHi07jLb0OiWSA9O24MRSk5vToTQyDNXihdF2oyq85LfHuF690lXZaAXrjhtLNlYqb7Ug== - dependencies: - web3-core "1.7.4" - web3-core-helpers "1.7.4" - web3-core-method "1.7.4" - web3-core-subscriptions "1.7.4" - web3-eth-abi "1.7.4" - web3-eth-accounts "1.7.4" - web3-eth-contract "1.7.4" - web3-eth-ens "1.7.4" - web3-eth-iban "1.7.4" - web3-eth-personal "1.7.4" - web3-net "1.7.4" - web3-utils "1.7.4" - -web3-eth@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.7.5.tgz#36906f50a6c35570cbc08871a33caa83dc131c9c" - integrity sha512-BucjvqZyDWYkGlsFX+OnOBub0YutlC1KZiNGibdmvtNX0NQK+8iw1uzAoL9yTTwCSszL7lnkFe8N+HCOl9B4Dw== - dependencies: - web3-core "1.7.5" - web3-core-helpers "1.7.5" - web3-core-method "1.7.5" - web3-core-subscriptions "1.7.5" - web3-eth-abi "1.7.5" - web3-eth-accounts "1.7.5" - web3-eth-contract "1.7.5" - web3-eth-ens "1.7.5" - web3-eth-iban "1.7.5" - web3-eth-personal "1.7.5" - web3-net "1.7.5" - web3-utils "1.7.5" - web3-eth@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.8.1.tgz#395f6cd56edaac5dbb23e8cec9886c3fd32c430e" @@ -26581,6 +25549,24 @@ web3-eth@1.8.2: web3-net "1.8.2" web3-utils "1.8.2" +web3-eth@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.9.0.tgz#1fe82ba429a44b1aa0a3b95de3e79e6c5a9eb00c" + integrity sha512-c5gSWk9bLNr6VPATHmZ1n7LTIefIZQnJMzfnvkoBcIFGKJbGmsuRhv6lEXsKdAO/FlqYnSbaw3fOq1fVFiIOFQ== + dependencies: + web3-core "1.9.0" + web3-core-helpers "1.9.0" + web3-core-method "1.9.0" + web3-core-subscriptions "1.9.0" + web3-eth-abi "1.9.0" + web3-eth-accounts "1.9.0" + web3-eth-contract "1.9.0" + web3-eth-ens "1.9.0" + web3-eth-iban "1.9.0" + web3-eth-personal "1.9.0" + web3-net "1.9.0" + web3-utils "1.9.0" + web3-net@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.55.tgz#daf24323df16a890a0bac6c6eda48b6e8c7e96ef" @@ -26612,24 +25598,6 @@ web3-net@1.3.6: web3-core-method "1.3.6" web3-utils "1.3.6" -web3-net@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.7.4.tgz#3153dfd3423262dd6fbec7aae5467202c4cad431" - integrity sha512-d2Gj+DIARHvwIdmxFQ4PwAAXZVxYCR2lET0cxz4KXbE5Og3DNjJi+MoPkX+WqoUXqimu/EOd4Cd+7gefqVAFDg== - dependencies: - web3-core "1.7.4" - web3-core-method "1.7.4" - web3-utils "1.7.4" - -web3-net@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.7.5.tgz#87fbc00a9ca40515bf60c847c0092498887cfdc8" - integrity sha512-xwuCb2YWw49PmW81AJQ/G+Xi2ikRsYyZXSgyPt4LmZuKjiqg/6kSdK8lZvUi3Pi3wM+QDBXbpr73M/WEkW0KvA== - dependencies: - web3-core "1.7.5" - web3-core-method "1.7.5" - web3-utils "1.7.5" - web3-net@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.8.1.tgz#2bed4d4b93166724129ec33d0e5dea98880285f4" @@ -26648,6 +25616,15 @@ web3-net@1.8.2: web3-core-method "1.8.2" web3-utils "1.8.2" +web3-net@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.9.0.tgz#ee8799bf766039aa5b157d6db0be5ffdecd39d64" + integrity sha512-L+fDZFgrLM5Y15aonl2q6L+RvfaImAngmC0Jv45hV2FJ5IfRT0/2ob9etxZmvEBWvOpbqSvghfOhJIT3XZ37Pg== + dependencies: + web3-core "1.9.0" + web3-core-method "1.9.0" + web3-utils "1.9.0" + web3-provider-engine@16.0.4: version "16.0.4" resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-16.0.4.tgz#a6565d85f3cfdc2da68f141af8728f90ad198f3f" @@ -26738,24 +25715,6 @@ web3-providers-http@1.3.6: web3-core-helpers "1.3.6" xhr2-cookies "1.1.0" -web3-providers-http@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.7.4.tgz#8209cdcb115db5ccae1f550d1c4e3005e7538d02" - integrity sha512-AU+/S+49rcogUER99TlhW+UBMk0N2DxvN54CJ2pK7alc2TQ7+cprNPLHJu4KREe8ndV0fT6JtWUfOMyTvl+FRA== - dependencies: - web3-core-helpers "1.7.4" - xhr2-cookies "1.1.0" - -web3-providers-http@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.7.5.tgz#144bb0c29007d1b766bafb0e20f80be050c7aa80" - integrity sha512-vPgr4Kzy0M3CHtoP/Bh7qwK/D9h2fhjpoqctdMWVJseOfeTgfOphCKN0uwV8w2VpZgDPXA8aeTdBx5OjmDdStA== - dependencies: - abortcontroller-polyfill "^1.7.3" - cross-fetch "^3.1.4" - es6-promise "^4.2.8" - web3-core-helpers "1.7.5" - web3-providers-http@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.8.1.tgz#8aa89c11a9272f11ddb74b871273c92225faa28d" @@ -26776,6 +25735,16 @@ web3-providers-http@1.8.2: es6-promise "^4.2.8" web3-core-helpers "1.8.2" +web3-providers-http@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.9.0.tgz#93cd3eb42fff974c9f7634ede1a9795d6435c3fe" + integrity sha512-5+dMNDAE0rRFz6SJpfnBqlVi2J5bB/Ivr2SanMt2YUrkxW5t8betZbzVwRkTbwtUvkqgj3xeUQzqpOttiv+IqQ== + dependencies: + abortcontroller-polyfill "^1.7.3" + cross-fetch "^3.1.4" + es6-promise "^4.2.8" + web3-core-helpers "1.9.0" + web3-providers-ipc@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" @@ -26794,22 +25763,6 @@ web3-providers-ipc@1.3.6: underscore "1.12.1" web3-core-helpers "1.3.6" -web3-providers-ipc@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.7.4.tgz#02e85e99e48f432c9d34cee7d786c3685ec9fcfa" - integrity sha512-jhArOZ235dZy8fS8090t60nTxbd1ap92ibQw5xIrAQ9m7LcZKNfmLAQUVsD+3dTFvadRMi6z1vCO7zRi84gWHw== - dependencies: - oboe "2.1.5" - web3-core-helpers "1.7.4" - -web3-providers-ipc@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.7.5.tgz#5b0f9b4f7340416953b8816d2e42e3f548d47372" - integrity sha512-aNHx+RAROzO+apDEzy8Zncj78iqWBadIXtpmFDg7uiTn8i+oO+IcP1Yni7jyzkltsysVJHgHWG4kPx50ANCK3Q== - dependencies: - oboe "2.1.5" - web3-core-helpers "1.7.5" - web3-providers-ipc@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.8.1.tgz#6128a3a3a824d06bf0efcfe86325401f8691a5ca" @@ -26826,6 +25779,14 @@ web3-providers-ipc@1.8.2: oboe "2.1.5" web3-core-helpers "1.8.2" +web3-providers-ipc@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.9.0.tgz#db486cb0dde9062ac6055478861e3d37535924d2" + integrity sha512-cPXU93Du40HCylvjaa5x62DbnGqH+86HpK/+kMcFIzF6sDUBhKpag2tSbYhGbj7GMpfkmDTUiiMLdWnFV6+uBA== + dependencies: + oboe "2.1.5" + web3-core-helpers "1.9.0" + web3-providers-ws@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" @@ -26845,24 +25806,6 @@ web3-providers-ws@1.3.6: web3-core-helpers "1.3.6" websocket "^1.0.32" -web3-providers-ws@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.7.4.tgz#6e60bcefb456f569a3e766e386d7807a96f90595" - integrity sha512-g72X77nrcHMFU8hRzQJzfgi/072n8dHwRCoTw+WQrGp+XCQ71fsk2qIu3Tp+nlp5BPn8bRudQbPblVm2uT4myQ== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.7.4" - websocket "^1.0.32" - -web3-providers-ws@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.7.5.tgz#196b9e56a4a48f9bee54def56875ea53dec7c711" - integrity sha512-9uJNVVkIGC8PmM9kNbgPth56HDMSSsxZh3ZEENdwO3LNWemaADiQYUDCsD/dMVkn0xsGLHP5dgAy4Q5msqySLg== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.7.5" - websocket "^1.0.32" - web3-providers-ws@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.8.1.tgz#5e5370e07eb8c615ed298ebc8602b283c7b7d649" @@ -26881,6 +25824,15 @@ web3-providers-ws@1.8.2: web3-core-helpers "1.8.2" websocket "^1.0.32" +web3-providers-ws@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.9.0.tgz#568330766e8abbb6eb43e1153a72fb24398fcb7e" + integrity sha512-JRVsnQZ7j2k1a2yzBNHe39xqk1ijOv01dfIBFw52VeEkSRzvrOcsPIM/ttSyBuJqt70ntMxXY0ekCrqfleKH/w== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.9.0" + websocket "^1.0.32" + web3-providers@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-providers/-/web3-providers-1.0.0-beta.55.tgz#639503517741b69baaa82f1f940630df6a25992b" @@ -26918,26 +25870,6 @@ web3-shh@1.3.6: web3-core-subscriptions "1.3.6" web3-net "1.3.6" -web3-shh@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.7.4.tgz#bee91cce2737c529fd347274010b548b6ea060f1" - integrity sha512-mlSZxSYcMkuMCxqhTYnZkUdahZ11h+bBv/8TlkXp/IHpEe4/Gg+KAbmfudakq3EzG/04z70XQmPgWcUPrsEJ+A== - dependencies: - web3-core "1.7.4" - web3-core-method "1.7.4" - web3-core-subscriptions "1.7.4" - web3-net "1.7.4" - -web3-shh@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.7.5.tgz#742e27f5c44bea6d7adef3a49b085e0fcd6aa621" - integrity sha512-aCIWJyLMH5H76OybU4ZpUCJ93yNOPATGhJ+KboRPU8QZDzS2CcVhtEzyl27bbvw+rSnVroMLqBgTXBB4mmKI7A== - dependencies: - web3-core "1.7.5" - web3-core-method "1.7.5" - web3-core-subscriptions "1.7.5" - web3-net "1.7.5" - web3-shh@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.8.1.tgz#028a95cf9d3a36020380938b9a127610efbb9be7" @@ -26958,6 +25890,16 @@ web3-shh@1.8.2: web3-core-subscriptions "1.8.2" web3-net "1.8.2" +web3-shh@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.9.0.tgz#75a37cd9f78d485ee5f018e2e66853e1e1c6ce4f" + integrity sha512-bIBZlralgz4ICCrwkefB2nPPJWfx28NuHIpjB7d9ADKynElubQuqudYhKtSEkKXACuME/BJm0pIFJcJs/gDnMg== + dependencies: + web3-core "1.9.0" + web3-core-method "1.9.0" + web3-core-subscriptions "1.9.0" + web3-net "1.9.0" + web3-utils@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.55.tgz#beb40926b7c04208b752d36a9bc959d27a04b308" @@ -27015,23 +25957,10 @@ web3-utils@1.3.6: underscore "1.12.1" utf8 "3.0.0" -web3-utils@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.7.4.tgz#eb6fa3706b058602747228234453811bbee017f5" - integrity sha512-acBdm6Evd0TEZRnChM/MCvGsMwYKmSh7OaUfNf5OKG0CIeGWD/6gqLOWIwmwSnre/2WrA1nKGId5uW2e5EfluA== - dependencies: - bn.js "^5.2.1" - ethereum-bloom-filters "^1.0.6" - ethereumjs-util "^7.1.0" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - utf8 "3.0.0" - -web3-utils@1.7.5, web3-utils@^1.0.0-beta.31: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.7.5.tgz#081a952ac6e0322e25ac97b37358a43c7372ef6a" - integrity sha512-9AqNOziQky4wNQadEwEfHiBdOZqopIHzQQVzmvvv6fJwDSMhP+khqmAZC7YTiGjs0MboyZ8tWNivqSO1699XQw== +web3-utils@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.1.tgz#f2f7ca7eb65e6feb9f3d61056d0de6bbd57125ff" + integrity sha512-LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ== dependencies: bn.js "^5.2.1" ethereum-bloom-filters "^1.0.6" @@ -27041,10 +25970,10 @@ web3-utils@1.7.5, web3-utils@^1.0.0-beta.31: randombytes "^2.1.0" utf8 "3.0.0" -web3-utils@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.1.tgz#f2f7ca7eb65e6feb9f3d61056d0de6bbd57125ff" - integrity sha512-LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ== +web3-utils@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.2.tgz#c32dec5e9b955acbab220eefd7715bc540b75cc9" + integrity sha512-v7j6xhfLQfY7xQDrUP0BKbaNrmZ2/+egbqP9q3KYmOiPpnvAfol+32slgL0WX/5n8VPvKCK5EZ1HGrAVICSToA== dependencies: bn.js "^5.2.1" ethereum-bloom-filters "^1.0.6" @@ -27054,10 +25983,10 @@ web3-utils@1.8.1: randombytes "^2.1.0" utf8 "3.0.0" -web3-utils@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.2.tgz#c32dec5e9b955acbab220eefd7715bc540b75cc9" - integrity sha512-v7j6xhfLQfY7xQDrUP0BKbaNrmZ2/+egbqP9q3KYmOiPpnvAfol+32slgL0WX/5n8VPvKCK5EZ1HGrAVICSToA== +web3-utils@1.9.0, web3-utils@^1.0.0-beta.31: + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.9.0.tgz#7c5775a47586cefb4ad488831be8f6627be9283d" + integrity sha512-p++69rCNNfu2jM9n5+VD/g26l+qkEOQ1m6cfRQCbH8ZRrtquTmrirJMgTmyOoax5a5XRYOuws14aypCOs51pdQ== dependencies: bn.js "^5.2.1" ethereum-bloom-filters "^1.0.6" @@ -27068,17 +25997,17 @@ web3-utils@1.8.2: utf8 "3.0.0" web3@*, web3@^1.2.4: - version "1.7.5" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.7.5.tgz#4e185d2058195b5775109b3f27cdea65a34a036e" - integrity sha512-3jHZTWyXt975AOXgnZKayiSWDLpoSKk9fZtLk1hURQtt7AdSbXPT8AK9ooBCm0Dt3GYaOeNcHGaiHC3gtyqhLg== + version "1.9.0" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.9.0.tgz#4fde5d134f8ee11355ed5bfa1bb41f8bc58e23f3" + integrity sha512-E9IvVy/d2ozfQQsCiV+zh/LmlZGv9fQxI0UedDVjm87yOKf4AYbBNEn1iWtHveiGzAk2CEMZMUzAZzaQNSSYog== dependencies: - web3-bzz "1.7.5" - web3-core "1.7.5" - web3-eth "1.7.5" - web3-eth-personal "1.7.5" - web3-net "1.7.5" - web3-shh "1.7.5" - web3-utils "1.7.5" + web3-bzz "1.9.0" + web3-core "1.9.0" + web3-eth "1.9.0" + web3-eth-personal "1.9.0" + web3-net "1.9.0" + web3-shh "1.9.0" + web3-utils "1.9.0" web3@1.2.2: version "1.2.2" @@ -27107,19 +26036,6 @@ web3@1.3.6: web3-shh "1.3.6" web3-utils "1.3.6" -web3@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.7.4.tgz#00c9aef8e13ade92fd773d845fff250535828e93" - integrity sha512-iFGK5jO32vnXM/ASaJBaI0+gVR6uHozvYdxkdhaeOCD6HIQ4iIXadbO2atVpE9oc/H8l2MovJ4LtPhG7lIBN8A== - dependencies: - web3-bzz "1.7.4" - web3-core "1.7.4" - web3-eth "1.7.4" - web3-eth-personal "1.7.4" - web3-net "1.7.4" - web3-shh "1.7.4" - web3-utils "1.7.4" - web3@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3/-/web3-1.8.1.tgz#8ea67215ef5f3a6f6d3381800b527242ea22885a" @@ -27298,23 +26214,11 @@ which-module@^1.0.0: integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ== which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== - -which-typed-array@^1.1.2: - version "1.1.8" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" - integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.9" + version "2.0.1" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.9: +which-typed-array@^1.1.2, which-typed-array@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== @@ -27395,11 +26299,11 @@ winston-transport@^4.4.0, winston-transport@^4.5.0: triple-beam "^1.3.0" winston@2.x: - version "2.4.6" - resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.6.tgz#da616f332928f70aac482f59b43d62228f29e478" - integrity sha512-J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w== + version "2.4.7" + resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.7.tgz#5791fe08ea7e90db090f1cb31ef98f32531062f1" + integrity sha512-vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg== dependencies: - async "^3.2.3" + async "^2.6.4" colors "1.0.x" cycle "1.0.x" eyes "0.1.x" @@ -27653,18 +26557,10 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== -xml2js@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" - integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== - dependencies: - sax ">=0.6.0" - xmlbuilder "~9.0.1" - -xml2js@^0.4.19: - version "0.4.23" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" - integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== +xml2js@0.5.0, xml2js@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" + integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== dependencies: sax ">=0.6.0" xmlbuilder "~11.0.0" @@ -27679,11 +26575,6 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= - xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" @@ -27749,7 +26640,7 @@ yallist@^2.0.0, yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -27777,10 +26668,10 @@ yargs-parser@20.2.4: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs-parser@21.0.1: - version "21.0.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" - integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== +yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== yargs-parser@^15.0.1: version "15.0.3" @@ -27811,11 +26702,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^21.0.0, yargs-parser@^21.0.1, yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" @@ -27940,20 +26826,7 @@ yargs@^15.3.1, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^17.3.1, yargs@^17.4.0: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== - dependencies: - cliui "^7.0.2" - 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.0.0" - -yargs@^17.5.1: +yargs@^17.3.1, yargs@^17.5.1, yargs@^17.6.2: version "17.7.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== From 65e88fa8616ad5e870171b8906afe18f28221a44 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 22 Apr 2023 19:26:03 -0400 Subject: [PATCH 026/184] built using latest web3 --- packages/celotool/package.json | 5 +- .../celotool/src/e2e-tests/cip35_tests.ts | 8 +-- .../celotool/src/e2e-tests/replica_tests.ts | 11 +-- packages/cli/package.json | 4 +- .../cli/src/commands/account/claim-keybase.ts | 2 +- packages/cli/src/commands/account/new.ts | 2 +- .../cli/src/commands/account/recover-old.ts | 2 +- .../cli/src/commands/governance/approve.ts | 2 +- .../src/commands/governance/preparehotfix.ts | 2 +- packages/cli/src/commands/governance/show.ts | 2 +- .../commands/governance/whitelisthotfix.ts | 2 +- packages/cli/src/utils/identity.ts | 2 +- packages/dev-utils/package.json | 6 +- packages/env-tests/package.json | 2 +- packages/metadata-crawler/package.json | 2 +- .../phone-number-privacy/common/package.json | 2 +- packages/sdk/base/package.json | 2 +- packages/sdk/connect/package.json | 14 ++-- .../sdk/connect/src/celo-provider.test.ts | 1 + packages/sdk/connect/src/celo-provider.ts | 9 ++- packages/sdk/connect/src/types.ts | 33 ++++++++- .../sdk/connect/src/utils/rpc-caller.test.ts | 2 +- packages/sdk/connect/src/utils/rpc-caller.ts | 72 +++++++++++++++++-- packages/sdk/contractkit/package.json | 6 +- packages/sdk/contractkit/src/kit.test.ts | 4 +- .../contractkit/src/wrappers/Election.test.ts | 2 +- packages/sdk/cryptographic-utils/package.json | 4 +- .../sdk/cryptographic-utils/src/account.ts | 6 +- packages/sdk/cryptographic-utils/src/bls.ts | 2 +- packages/sdk/explorer/package.json | 2 +- packages/sdk/governance/package.json | 12 ++-- packages/sdk/governance/src/proposals.ts | 5 +- packages/sdk/identity/package.json | 1 + packages/sdk/identity/src/offchain/utils.ts | 5 +- packages/sdk/keystores/package.json | 1 - packages/sdk/phone-utils/package.json | 7 +- packages/sdk/wallets/wallet-base/package.json | 11 ++- .../wallets/wallet-base/src/signing-utils.ts | 4 +- .../wallets/wallet-base/src/wallet-base.ts | 6 +- .../sdk/wallets/wallet-hsm-aws/package.json | 6 +- .../wallet-hsm-aws/src/aws-hsm-signer.ts | 2 +- .../wallet-hsm-aws/src/aws-hsm-wallet.test.ts | 2 +- .../sdk/wallets/wallet-hsm-azure/package.json | 6 +- .../wallet-hsm-azure/src/azure-hsm-signer.ts | 2 +- .../src/azure-hsm-wallet.test.ts | 4 +- .../sdk/wallets/wallet-hsm-gcp/package.json | 6 +- .../wallet-hsm-gcp/src/gcp-hsm-signer.ts | 2 +- .../wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts | 2 +- packages/sdk/wallets/wallet-hsm/package.json | 4 +- .../wallets/wallet-hsm/src/signature-utils.ts | 2 +- .../sdk/wallets/wallet-ledger/package.json | 14 ++-- .../wallet-ledger/src/ledger-signer.ts | 2 +- .../wallet-ledger/src/ledger-wallet.test.ts | 7 +- .../sdk/wallets/wallet-local/package.json | 9 ++- .../wallets/wallet-local/src/local-signer.ts | 8 +-- .../sdk/wallets/wallet-remote/package.json | 9 ++- packages/sdk/wallets/wallet-rpc/package.json | 2 +- .../wallets/wallet-rpc/src/rpc-wallet.test.ts | 4 -- yarn.lock | 7 ++ 59 files changed, 237 insertions(+), 130 deletions(-) diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 52451b361aa..593d042486d 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -11,7 +11,6 @@ "@celo/cryptographic-utils": "4.0.1-dev", "@celo/contractkit": "4.0.1-dev", "@celo/env-tests": "1.0.0", - "@types/ethereumjs-util": "^5.2.0", "@celo/explorer": "4.0.1-dev", "@celo/governance": "4.0.1-dev", "@celo/identity": "4.0.1-dev", @@ -40,7 +39,7 @@ "sleep-promise": "^8.0.1", "string-hash": "^1.1.3", "tiny-secp256k1": "2.2.1", - "web3": "1.3.6", + "web3": "1.8.2", "web3-eth-admin": "1.0.0-beta.55", "yargs": "14.0.0" }, @@ -58,7 +57,7 @@ "@types/yargs": "^13.0.2", "chai": "^4.1.2", "mocha": "^7.1.1", - "web3-core": "1.3.6" + "web3-core": "1.8.2" }, "scripts": { "cli": "TS_NODE_FILES=true ts-node -r tsconfig-paths/register src/cli.ts", diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index 5dc71e6d747..d444ff624be 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -246,7 +246,7 @@ class TestEnv { async generateUnprotectedTransaction(ethCompatible: boolean): Promise { const encode = (ejsUtil as any).rlp.encode // the typescript typings are incomplete - const numToHex = (x: number | BigNumber) => ejsUtil.bufferToHex(ejsUtil.toBuffer(x)) + const numToHex = (x: number | BigNumber) => ejsUtil.bufferToHex(ejsUtil.toBuffer(Number(x))) const nonce = await this.kit.connection.nonce(validatorAddress) const celoOnlyFields = ethCompatible ? [] : ['0x', '0x', '0x'] const arr = [ @@ -262,9 +262,9 @@ class TestEnv { const pk = ejsUtil.addHexPrefix(validatorPrivateKey) const sig = ejsUtil.ecsign(signingHash, ejsUtil.toBuffer(pk)) arr.push( - ejsUtil.bufferToHex(stripZeros(sig.v)), - ejsUtil.bufferToHex(stripZeros(sig.r)), - ejsUtil.bufferToHex(stripZeros(sig.s)) + ejsUtil.bufferToHex(stripZeros(sig.v) as Buffer), + ejsUtil.bufferToHex(stripZeros(sig.r) as Buffer), + ejsUtil.bufferToHex(stripZeros(sig.s) as Buffer) ) return ejsUtil.bufferToHex(encode(arr)) } diff --git a/packages/celotool/src/e2e-tests/replica_tests.ts b/packages/celotool/src/e2e-tests/replica_tests.ts index 476a419026d..3a46da9beed 100644 --- a/packages/celotool/src/e2e-tests/replica_tests.ts +++ b/packages/celotool/src/e2e-tests/replica_tests.ts @@ -1,5 +1,5 @@ import { BlockHeader } from '@celo/connect' -import { DefaultRpcCaller, RpcCaller } from '@celo/connect/lib/utils/rpc-caller' +import { HttpRpcCaller, RpcCaller } from '@celo/connect/lib/utils/rpc-caller' import { privateKeyToAddress } from '@celo/utils/lib/address' import { bitIsSet, parseBlockExtraData } from '@celo/utils/lib/istanbul' import { assert } from 'chai' @@ -169,9 +169,12 @@ describe('replica swap tests', () => { const validatorWSWeb3Url = 'ws://localhost:8544' const validatorWSWeb3 = new Web3(validatorWSWeb3Url) - validatoRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8545')) - proxyRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8546')) - replicaRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8555')) + // validatoRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8545')) + // proxyRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8546')) + // replicaRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8555')) + validatoRPC = new HttpRpcCaller(new Web3.providers.HttpProvider('http://localhost:8545')) + proxyRPC = new HttpRpcCaller(new Web3.providers.HttpProvider('http://localhost:8546')) + replicaRPC = new HttpRpcCaller(new Web3.providers.HttpProvider('http://localhost:8555')) const handled: any = {} let errorMsg = '' diff --git a/packages/cli/package.json b/packages/cli/package.json index 19c42fc59c6..fb711df191a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -53,6 +53,7 @@ "@oclif/plugin-help": "^1.2.4", "@oclif/plugin-not-found": "^1.2.4", "@oclif/plugin-warn-if-update-available": "^1.7.0", + "@ethereumjs/util": "8.0.5", "@types/command-exists": "^1.2.0", "@oclif/plugin-plugins": "^1.9.4", "bip32": "3.1.0", @@ -63,7 +64,6 @@ "cli-ux": "^5.4.9", "command-exists": "^1.2.9", "debug": "^4.1.1", - "ethereumjs-util": "^5.2.0", "events": "^3.0.0", "firebase": "^7.2.2", "fs-extra": "^8.1.0", @@ -74,7 +74,7 @@ "randombytes": "^2.0.1", "save": "^2.4.0", "tslib": "^1", - "web3": "1.3.6" + "web3": "1.8.2" }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", diff --git a/packages/cli/src/commands/account/claim-keybase.ts b/packages/cli/src/commands/account/claim-keybase.ts index 79193312746..21ca7dafb57 100644 --- a/packages/cli/src/commands/account/claim-keybase.ts +++ b/packages/cli/src/commands/account/claim-keybase.ts @@ -7,9 +7,9 @@ import { verifyKeybaseClaim, } from '@celo/contractkit/lib/identity/claims/keybase' import { sleep } from '@celo/utils/lib/async' +import { toChecksumAddress } from '@ethereumjs/util' import { flags } from '@oclif/command' import { cli } from 'cli-ux' -import { toChecksumAddress } from 'ethereumjs-util' import { writeFileSync } from 'fs' import { tmpdir } from 'os' import { binaryPrompt } from '../../utils/cli' diff --git a/packages/cli/src/commands/account/new.ts b/packages/cli/src/commands/account/new.ts index 7fd3a839f1d..5fceae05def 100644 --- a/packages/cli/src/commands/account/new.ts +++ b/packages/cli/src/commands/account/new.ts @@ -7,8 +7,8 @@ import { validateMnemonic, } from '@celo/cryptographic-utils/lib/account' import { privateKeyToAddress } from '@celo/utils/lib/address' +import { toChecksumAddress } from '@ethereumjs/util' import { flags } from '@oclif/command' -import { toChecksumAddress } from 'ethereumjs-util' import * as fs from 'fs-extra' import { BaseCommand } from '../../base' import { printValueMap } from '../../utils/cli' diff --git a/packages/cli/src/commands/account/recover-old.ts b/packages/cli/src/commands/account/recover-old.ts index c215c9528b7..d43ccf2df26 100644 --- a/packages/cli/src/commands/account/recover-old.ts +++ b/packages/cli/src/commands/account/recover-old.ts @@ -5,8 +5,8 @@ import { validateMnemonic, } from '@celo/cryptographic-utils/lib/account' import { privateKeyToAddress } from '@celo/utils/lib/address' +import { toChecksumAddress } from '@ethereumjs/util' import { flags } from '@oclif/command' -import { toChecksumAddress } from 'ethereumjs-util' import { printValueMap } from '../../utils/cli' import NewAccount from './new' diff --git a/packages/cli/src/commands/governance/approve.ts b/packages/cli/src/commands/governance/approve.ts index 35459b0244e..5affb43a02a 100644 --- a/packages/cli/src/commands/governance/approve.ts +++ b/packages/cli/src/commands/governance/approve.ts @@ -1,6 +1,6 @@ import { CeloTransactionObject } from '@celo/connect' +import { toBuffer } from '@ethereumjs/util' import { flags } from '@oclif/command' -import { toBuffer } from 'ethereumjs-util' import { BaseCommand } from '../../base' import { newCheckBuilder } from '../../utils/checks' import { displaySendTx, failWith } from '../../utils/cli' diff --git a/packages/cli/src/commands/governance/preparehotfix.ts b/packages/cli/src/commands/governance/preparehotfix.ts index 704a116345a..3bc9c02b106 100644 --- a/packages/cli/src/commands/governance/preparehotfix.ts +++ b/packages/cli/src/commands/governance/preparehotfix.ts @@ -1,5 +1,5 @@ +import { toBuffer } from '@ethereumjs/util' import { flags } from '@oclif/command' -import { toBuffer } from 'ethereumjs-util' import { BaseCommand } from '../../base' import { newCheckBuilder } from '../../utils/checks' import { displaySendTx } from '../../utils/cli' diff --git a/packages/cli/src/commands/governance/show.ts b/packages/cli/src/commands/governance/show.ts index 4eb3dc29a53..0da14c7bc1c 100644 --- a/packages/cli/src/commands/governance/show.ts +++ b/packages/cli/src/commands/governance/show.ts @@ -1,8 +1,8 @@ import { ProposalBuilder, proposalToJSON } from '@celo/governance' import { concurrentMap } from '@celo/utils/lib/async' +import { toBuffer } from '@ethereumjs/util' import { flags } from '@oclif/command' import chalk from 'chalk' -import { toBuffer } from 'ethereumjs-util' import { writeFileSync } from 'fs' import { BaseCommand } from '../../base' import { newCheckBuilder } from '../../utils/checks' diff --git a/packages/cli/src/commands/governance/whitelisthotfix.ts b/packages/cli/src/commands/governance/whitelisthotfix.ts index 2ce7db8f06e..ac56dd0f76f 100644 --- a/packages/cli/src/commands/governance/whitelisthotfix.ts +++ b/packages/cli/src/commands/governance/whitelisthotfix.ts @@ -1,5 +1,5 @@ +import { toBuffer } from '@ethereumjs/util' import { flags } from '@oclif/command' -import { toBuffer } from 'ethereumjs-util' import { BaseCommand } from '../../base' import { newCheckBuilder } from '../../utils/checks' import { displaySendTx } from '../../utils/cli' diff --git a/packages/cli/src/utils/identity.ts b/packages/cli/src/utils/identity.ts index 0148d83e549..939bb044df8 100644 --- a/packages/cli/src/utils/identity.ts +++ b/packages/cli/src/utils/identity.ts @@ -6,8 +6,8 @@ import { verifyClaim } from '@celo/contractkit/lib/identity/claims/verify' import { eqAddress } from '@celo/utils/lib/address' import { concurrentMap } from '@celo/utils/lib/async' import { NativeSigner } from '@celo/utils/lib/signatureUtils' +import { toChecksumAddress } from '@ethereumjs/util' import { cli } from 'cli-ux' -import { toChecksumAddress } from 'ethereumjs-util' import { writeFileSync } from 'fs' import moment from 'moment' import { BaseCommand } from '../base' diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index be0f6de963b..a95c6211552 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -17,8 +17,8 @@ }, "dependencies": { "bignumber.js": "^9.0.0", - "web3": "1.3.6", - "web3-core-helpers": "1.3.6", + "web3": "1.8.2", + "web3-core-helpers": "1.8.2", "tmp": "^0.1.0", "targz": "^1.0.1", "fs-extra": "^8.1.0" @@ -28,6 +28,6 @@ "@types/targz": "1.0.0" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } } \ No newline at end of file diff --git a/packages/env-tests/package.json b/packages/env-tests/package.json index be9b76b0c55..b8c5a2f464b 100644 --- a/packages/env-tests/package.json +++ b/packages/env-tests/package.json @@ -18,7 +18,7 @@ "dotenv": "8.2.0", "jest": "26.6.3", "moment": "^2.29.0", - "web3": "1.3.6" + "web3": "1.8.2" }, "scripts": { "clean": "tsc -b . --clean", diff --git a/packages/metadata-crawler/package.json b/packages/metadata-crawler/package.json index 296a81e2e63..39fbb32cf08 100644 --- a/packages/metadata-crawler/package.json +++ b/packages/metadata-crawler/package.json @@ -20,7 +20,7 @@ "googleapis": "^39.2.0", "pg": "^7.18.0", "ts-node": "^8.5.4", - "web3": "1.3.6" + "web3": "1.8.2" }, "devDependencies": { "@types/bunyan": "1.8.8", diff --git a/packages/phone-number-privacy/common/package.json b/packages/phone-number-privacy/common/package.json index 3b06b87b215..0a9948da3d6 100644 --- a/packages/phone-number-privacy/common/package.json +++ b/packages/phone-number-privacy/common/package.json @@ -38,7 +38,7 @@ "@types/elliptic": "^6.4.12", "@types/express": "^4.17.6", "@types/is-base64": "^1.1.0", - "web3": "1.3.6" + "web3": "1.8.2" }, "engines": { "node": ">=10" diff --git a/packages/sdk/base/package.json b/packages/sdk/base/package.json index c4173492d97..8181f8b86dd 100644 --- a/packages/sdk/base/package.json +++ b/packages/sdk/base/package.json @@ -27,6 +27,6 @@ "@celo/typescript": "0.0.1", "bignumber.js": "^9.0.0", "elliptic": "^6.5.4", - "web3-utils": "1.3.6" + "web3-utils": "1.8.2" } } \ No newline at end of file diff --git a/packages/sdk/connect/package.json b/packages/sdk/connect/package.json index d7433e7bc80..819342b2e95 100644 --- a/packages/sdk/connect/package.json +++ b/packages/sdk/connect/package.json @@ -32,16 +32,16 @@ }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", - "web3": "1.3.6", - "web3-core": "1.3.6", - "web3-eth": "1.3.6", - "web3-eth-abi": "1.3.6", - "web3-eth-contract": "1.3.6" + "web3": "1.8.2", + "web3-core": "1.8.2", + "web3-eth": "1.8.2", + "web3-eth-abi": "1.8.2", + "web3-eth-contract": "1.8.2" }, "peerDependencies": { - "web3": "1.3.6" + "web3": "1.8.2" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } } \ No newline at end of file diff --git a/packages/sdk/connect/src/celo-provider.test.ts b/packages/sdk/connect/src/celo-provider.test.ts index f86a9d033d4..d0cac9826a4 100644 --- a/packages/sdk/connect/src/celo-provider.test.ts +++ b/packages/sdk/connect/src/celo-provider.test.ts @@ -6,6 +6,7 @@ import { Callback, CeloTx, EncodedTransaction, + Error, JsonRpcPayload, JsonRpcResponse, Provider, diff --git a/packages/sdk/connect/src/celo-provider.ts b/packages/sdk/connect/src/celo-provider.ts index 8f17cd0d60b..d17b8d07388 100644 --- a/packages/sdk/connect/src/celo-provider.ts +++ b/packages/sdk/connect/src/celo-provider.ts @@ -1,7 +1,14 @@ import { Lock } from '@celo/base/lib/lock' import debugFactory from 'debug' import { Connection } from './connection' -import { Callback, EncodedTransaction, JsonRpcPayload, JsonRpcResponse, Provider } from './types' +import { + Callback, + EncodedTransaction, + Error, + JsonRpcPayload, + JsonRpcResponse, + Provider, +} from './types' import { hasProperty, stopProvider } from './utils/provider-utils' import { rpcCallHandler } from './utils/rpc-caller' diff --git a/packages/sdk/connect/src/types.ts b/packages/sdk/connect/src/types.ts index 743593da5ca..d3b23b02cea 100644 --- a/packages/sdk/connect/src/types.ts +++ b/packages/sdk/connect/src/types.ts @@ -48,11 +48,22 @@ export type CeloTxReceipt = TransactionReceipt & Partial export type Callback = (error: Error | null, result?: T) => void +// export interface JsonRpcResponse { +// jsonrpc: string +// id: string | number +// result?: any +// error?: string | { message: string; code: number } +// } + export interface JsonRpcResponse { jsonrpc: string - id: number + id: string | number result?: any - error?: string | { message: string; code: number } + error?: { + readonly code?: number + readonly data?: unknown + readonly message: string + } } export interface JsonRpcPayload { @@ -63,7 +74,23 @@ export interface JsonRpcPayload { } export interface Provider { - send(payload: JsonRpcPayload, callback: Callback): void + send( + payload: JsonRpcPayload, + callback: (error: Error | null, result?: JsonRpcResponse) => void + ): void +} + +export interface Error { + readonly code?: number + readonly data?: unknown + readonly message: string +} + +export interface HttpProvider { + send( + payload: JsonRpcPayload, + callback: (error: Error | null, result?: JsonRpcResponse) => void + ): void } export interface RLPEncodedTx { diff --git a/packages/sdk/connect/src/utils/rpc-caller.test.ts b/packages/sdk/connect/src/utils/rpc-caller.test.ts index 6bfb507a7a1..dc1bf32966a 100644 --- a/packages/sdk/connect/src/utils/rpc-caller.test.ts +++ b/packages/sdk/connect/src/utils/rpc-caller.test.ts @@ -1,4 +1,4 @@ -import { Callback, JsonRpcPayload, JsonRpcResponse, Provider } from '../types' +import { Callback, Error, JsonRpcPayload, JsonRpcResponse, Provider } from '../types' import { DefaultRpcCaller, RpcCaller, rpcCallHandler } from './rpc-caller' const mockProvider: Provider = { diff --git a/packages/sdk/connect/src/utils/rpc-caller.ts b/packages/sdk/connect/src/utils/rpc-caller.ts index cf87a13dc91..251a92b3aa3 100644 --- a/packages/sdk/connect/src/utils/rpc-caller.ts +++ b/packages/sdk/connect/src/utils/rpc-caller.ts @@ -1,5 +1,5 @@ import debugFactory from 'debug' -import { Callback, JsonRpcPayload, JsonRpcResponse, Provider } from '../types' +import { Callback, Error, HttpProvider, JsonRpcPayload, JsonRpcResponse, Provider } from '../types' const debugRpcPayload = debugFactory('rpc:payload') const debugRpcResponse = debugFactory('rpc:response') @@ -53,7 +53,7 @@ function toRPCResponse(payload: JsonRpcPayload, result: any, error?: Error): Jso if (error != null) { response.error = { - message: error.message || error.stack || error.toString(), + message: error.message || error.toString(), code: -32000, } } @@ -62,7 +62,10 @@ function toRPCResponse(payload: JsonRpcPayload, result: any, error?: Error): Jso export interface RpcCaller { call: (method: string, params: any[]) => Promise - send: (payload: JsonRpcPayload, callback: Callback) => void + send: ( + payload: JsonRpcPayload, + callback: (error: Error | null, result?: JsonRpcResponse) => void + ) => void } export class DefaultRpcCaller implements RpcCaller { constructor(readonly defaultProvider: Provider, readonly jsonrpcVersion: string = '2.0') {} @@ -85,7 +88,68 @@ export class DefaultRpcCaller implements RpcCaller { }) } - public send(payload: JsonRpcPayload, callback: Callback) { + public send( + payload: JsonRpcPayload, + callback: (error: Error | null, result?: JsonRpcResponse) => void + ): void { + debugRpcPayload('%O', payload) + + const decoratedCallback: Callback = ( + error: Error | null, + result?: JsonRpcResponse + ): void => { + let err: Error | null = null + // error could be false + if (error) { + err = error + } + debugRpcResponse('%O', result) + // The provider send call will not provide an error to the callback if + // the result itself specifies an error. Here, we extract the error in the + // result. + if ( + result && + result.error != null && + typeof result.error !== 'string' && + result.error.message != null + ) { + err = new Error(result.error.message) + } + callback(err, result) + } + + if (this.defaultProvider && typeof this.defaultProvider !== 'string') { + this.defaultProvider.send!(payload, decoratedCallback) + } + } +} + +// TODO: @soloseng de-duplicate code by extending DefaultRpcCaller +export class HttpRpcCaller implements RpcCaller { + constructor(readonly defaultProvider: HttpProvider, readonly jsonrpcVersion: string = '2.0') {} + + public async call(method: string, params: any[]): Promise { + return new Promise((resolve, reject) => { + const payload: JsonRpcPayload = { + id: getRandomId(), + jsonrpc: this.jsonrpcVersion, + method, + params, + } + this.send(payload, (err: any, response?: JsonRpcResponse) => { + if (err != null || !response) { + reject(err) + } else { + resolve(response) + } + }) + }) + } + + public send( + payload: JsonRpcPayload, + callback: (error: Error | null, result?: JsonRpcResponse) => void + ): void { debugRpcPayload('%O', payload) const decoratedCallback: Callback = ( diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 245800da17a..851ace23242 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -36,12 +36,12 @@ "@types/bn.js": "^5.1.0", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", - "cross-fetch": "^3.0.6", + "cross-fetch": "3.0.6", "debug": "^4.1.1", "fp-ts": "2.1.1", "io-ts": "2.0.1", "semver": "^7.3.5", - "web3": "1.3.6" + "web3": "1.8.2" }, "devDependencies": { "@celo/phone-utils": "4.0.1-dev", @@ -61,7 +61,7 @@ "**/elliptic": "^6.5.4" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" }, "browser": { "child_process": false diff --git a/packages/sdk/contractkit/src/kit.test.ts b/packages/sdk/contractkit/src/kit.test.ts index 4d369431ee5..0cc3a43baaf 100644 --- a/packages/sdk/contractkit/src/kit.test.ts +++ b/packages/sdk/contractkit/src/kit.test.ts @@ -121,7 +121,9 @@ describe('newKitWithApiKey()', () => { method: '', params: [], } - httpProvider.send(rpcPayload, (error: Error | null) => expect(error).toBeNull()) + httpProvider.send(rpcPayload, (error: Error | null) => + expect(error?.message).toContain("Couldn't connect to node http://") + ) // Api Key should be set in the request header expect(mockSetRequestHeader).toBeCalledTimes(2) diff --git a/packages/sdk/contractkit/src/wrappers/Election.test.ts b/packages/sdk/contractkit/src/wrappers/Election.test.ts index d01fb6f74c0..6391de2bee6 100644 --- a/packages/sdk/contractkit/src/wrappers/Election.test.ts +++ b/packages/sdk/contractkit/src/wrappers/Election.test.ts @@ -5,7 +5,7 @@ import BigNumber from 'bignumber.js' import Web3 from 'web3' import { mineToNextEpoch } from '../test-utils/utils' -import { zeroAddress } from 'ethereumjs-util' +import { zeroAddress } from '@ethereumjs/util' import { newKitFromWeb3 } from '../kit' import { AccountsWrapper } from './Accounts' import { ElectionWrapper } from './Election' diff --git a/packages/sdk/cryptographic-utils/package.json b/packages/sdk/cryptographic-utils/package.json index a67c8b475c9..238560b3d50 100644 --- a/packages/sdk/cryptographic-utils/package.json +++ b/packages/sdk/cryptographic-utils/package.json @@ -25,9 +25,9 @@ "@celo/utils": "4.0.1-dev", "@celo/bls12377js": "0.1.1", "@celo/base": "4.0.1-dev", + "@ethereumjs/util": "8.0.5", "@types/bn.js": "^5.1.0", "@types/elliptic": "^6.4.9", - "@types/ethereumjs-util": "^5.2.0", "@types/node": "^18.7.16", "@types/randombytes": "^2.0.0", "bigi": "^1.4.2", @@ -35,7 +35,7 @@ "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2", "buffer-reverse": "^1.0.1", "elliptic": "^6.5.4", - "ethereumjs-util": "^5.2.0", + "ethereum-cryptography": "1.2.0", "tiny-secp256k1": "2.2.1" }, "devDependencies": { diff --git a/packages/sdk/cryptographic-utils/src/account.ts b/packages/sdk/cryptographic-utils/src/account.ts index 9b9d9a851cc..eae2973f3f4 100644 --- a/packages/sdk/cryptographic-utils/src/account.ts +++ b/packages/sdk/cryptographic-utils/src/account.ts @@ -10,7 +10,8 @@ import { privateKeyToAddress } from '@celo/utils/lib/address' import { levenshteinDistance } from '@celo/utils/lib/levenshtein' import BIP32Factory from 'bip32' import * as bip39 from 'bip39' -import { keccak256 } from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' +import { utf8ToBytes } from 'ethereum-cryptography/utils' import randomBytes from 'randombytes' import * as ecc from 'tiny-secp256k1' // Exports moved to @celo/base, forwarding them @@ -411,6 +412,7 @@ export async function generateKeys( return generateKeysFromSeed(seed, changeIndex, addressIndex, derivationPath) } +// XXX: (@soloseng) no test for this function? export function generateDeterministicInviteCode( recipientPhoneHash: string, recipientPepper: string, @@ -418,7 +420,7 @@ export function generateDeterministicInviteCode( changeIndex: number = 0, derivationPath: string = CELO_DERIVATION_PATH_BASE ): { privateKey: string; publicKey: string } { - const seed = keccak256(recipientPhoneHash + recipientPepper) as Buffer + const seed = keccak256(utf8ToBytes(recipientPhoneHash + recipientPepper)) as Buffer return generateKeysFromSeed(seed, changeIndex, addressIndex, derivationPath) } diff --git a/packages/sdk/cryptographic-utils/src/bls.ts b/packages/sdk/cryptographic-utils/src/bls.ts index 15c9b87d10c..2c1f15192e4 100644 --- a/packages/sdk/cryptographic-utils/src/bls.ts +++ b/packages/sdk/cryptographic-utils/src/bls.ts @@ -1,7 +1,7 @@ import { BLS } from '@celo/bls12377js' // this is an implementation of a subset of BLS12-377 import { isValidAddress } from '@celo/utils/lib/address' -import { keccak256 } from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' const BigInteger = require('bigi') const reverse = require('buffer-reverse') diff --git a/packages/sdk/explorer/package.json b/packages/sdk/explorer/package.json index 957d40194f4..a3bb53f9dc0 100644 --- a/packages/sdk/explorer/package.json +++ b/packages/sdk/explorer/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@types/fetch-mock": "^7.3.5", "fetch-mock": "^9.11.0", - "web3": "1.3.6" + "web3": "1.8.2" }, "engines": { "node": ">=8.13.0" diff --git a/packages/sdk/governance/package.json b/packages/sdk/governance/package.json index 7ec52533858..bf6a1395b22 100644 --- a/packages/sdk/governance/package.json +++ b/packages/sdk/governance/package.json @@ -26,14 +26,14 @@ "@celo/connect": "4.0.1-dev", "@celo/contractkit": "4.0.1-dev", "@celo/explorer": "4.0.1-dev", + "@ethereumjs/util": "8.0.5", "@types/debug": "^4.1.5", "@types/inquirer": "^6.5.0", - "@types/ethereumjs-util": "^5.2.0", - "ethereumjs-util": "^5.2.0", - "inquirer": "^7.0.5", - "debug": "^4.1.1" + "debug": "^4.1.1", + "ethereum-cryptography": "1.2.0", + "inquirer": "^7.0.5" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } -} \ No newline at end of file +} diff --git a/packages/sdk/governance/src/proposals.ts b/packages/sdk/governance/src/proposals.ts index 042ad549e4b..c1329e17f51 100644 --- a/packages/sdk/governance/src/proposals.ts +++ b/packages/sdk/governance/src/proposals.ts @@ -40,7 +40,8 @@ import { isValidAddress } from '@celo/utils/lib/address' import { fromFixed } from '@celo/utils/lib/fixidity' import { BigNumber } from 'bignumber.js' import debugFactory from 'debug' -import { keccak256 } from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' +import { utf8ToBytes } from 'ethereum-cryptography/utils' import * as inquirer from 'inquirer' const debug = debugFactory('governance:proposals') @@ -54,7 +55,7 @@ export const hotfixToEncodedParams = (kit: ContractKit, proposal: Proposal, salt ) export const hotfixToHash = (kit: ContractKit, proposal: Proposal, salt: Buffer) => - keccak256(hotfixToEncodedParams(kit, proposal, salt)) as Buffer + keccak256(utf8ToBytes(hotfixToEncodedParams(kit, proposal, salt))) as Buffer /** * JSON encoding of a proposal transaction. diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json index 289c652e3e5..59499cfe3b2 100644 --- a/packages/sdk/identity/package.json +++ b/packages/sdk/identity/package.json @@ -35,6 +35,7 @@ "cross-fetch": "3.0.4", "debug": "^4.1.1", "elliptic": "^6.5.4", + "ethereum-cryptography": "1.2.0", "fp-ts": "2.1.1", "io-ts": "2.0.1" }, diff --git a/packages/sdk/identity/src/offchain/utils.ts b/packages/sdk/identity/src/offchain/utils.ts index 53c8bfadab9..26623679631 100644 --- a/packages/sdk/identity/src/offchain/utils.ts +++ b/packages/sdk/identity/src/offchain/utils.ts @@ -3,8 +3,9 @@ import { Address, publicKeyToAddress } from '@celo/utils/lib/address' import { ensureCompressed, ensureUncompressed, trimUncompressedPrefix } from '@celo/utils/lib/ecdh' import { AES128Decrypt, AES128Encrypt, Encrypt, IV_LENGTH } from '@celo/utils/lib/ecies' import { EIP712Object, EIP712TypedData } from '@celo/utils/lib/sign-typed-data-utils' +import { bufferToHex, toBuffer } from '@ethereumjs/util' import { createHmac, randomBytes } from 'crypto' -import { keccak256 } from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' import { isLeft } from 'fp-ts/lib/Either' import * as t from 'io-ts' import { join, sep } from 'path' @@ -316,7 +317,7 @@ export const buildEIP712TypedData = async ( ], } message = { - hash: keccak256(data).toString('hex'), + hash: bufferToHex(toBuffer(keccak256(data))), } } else { const Claim = buildEIP712Schema(type!) diff --git a/packages/sdk/keystores/package.json b/packages/sdk/keystores/package.json index 7c0df5e3565..785d18468c8 100644 --- a/packages/sdk/keystores/package.json +++ b/packages/sdk/keystores/package.json @@ -24,7 +24,6 @@ "dependencies": { "@celo/utils": "4.0.1-dev", "@celo/wallet-local": "4.0.1-dev", - "@types/ethereumjs-util": "^5.2.0", "ethereumjs-wallet": "^1.0.1" }, "devDependencies": { diff --git a/packages/sdk/phone-utils/package.json b/packages/sdk/phone-utils/package.json index 9c2a7cdb572..c53a3649012 100644 --- a/packages/sdk/phone-utils/package.json +++ b/packages/sdk/phone-utils/package.json @@ -25,16 +25,15 @@ "@celo/base": "4.0.1-dev", "@celo/utils": "4.0.1-dev", "@types/country-data": "^0.0.0", - "@types/ethereumjs-util": "^5.2.0", "@types/google-libphonenumber": "^7.4.23", "@types/node": "^10.12.18", "country-data": "^0.0.31", "fp-ts": "2.1.1", - "io-ts": "2.0.1", - "google-libphonenumber": "^3.2.27" + "google-libphonenumber": "^3.2.27", + "io-ts": "2.0.1" }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", "@celo/typescript": "0.0.1" } -} \ No newline at end of file +} diff --git a/packages/sdk/wallets/wallet-base/package.json b/packages/sdk/wallets/wallet-base/package.json index e1ee677cb9b..43d53a06ffb 100644 --- a/packages/sdk/wallets/wallet-base/package.json +++ b/packages/sdk/wallets/wallet-base/package.json @@ -25,14 +25,13 @@ "@celo/connect": "4.0.1-dev", "@celo/base": "4.0.1-dev", "@celo/utils": "4.0.1-dev", - "@types/ethereumjs-util": "^5.2.0", + "@ethereumjs/util": "8.0.5", "@types/debug": "^4.1.5", "bignumber.js": "^9.0.0", - "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0", - "debug": "^4.1.1" + "debug": "^4.1.1", + "eth-lib": "^0.2.8" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } -} \ No newline at end of file +} diff --git a/packages/sdk/wallets/wallet-base/src/signing-utils.ts b/packages/sdk/wallets/wallet-base/src/signing-utils.ts index a5cb35e9068..3cb597f8a74 100644 --- a/packages/sdk/wallets/wallet-base/src/signing-utils.ts +++ b/packages/sdk/wallets/wallet-base/src/signing-utils.ts @@ -3,11 +3,11 @@ import { CeloTx, EncodedTransaction, RLPEncodedTx } from '@celo/connect' import { inputCeloTxFormatter } from '@celo/connect/lib/utils/formatter' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' +import * as ethUtil from '@ethereumjs/util' import { bufferToHex } from '@ethereumjs/util' import debugFactory from 'debug' -// @ts-ignore-next-line +// @ts-ignore-next-line eth-lib types not found import { account as Account, bytes as Bytes, hash as Hash, RLP } from 'eth-lib' -import * as ethUtil from 'ethereumjs-util' const debug = debugFactory('wallet-base:tx:sign') diff --git a/packages/sdk/wallets/wallet-base/src/wallet-base.ts b/packages/sdk/wallets/wallet-base/src/wallet-base.ts index 80a0d310584..9d0cd2575aa 100644 --- a/packages/sdk/wallets/wallet-base/src/wallet-base.ts +++ b/packages/sdk/wallets/wallet-base/src/wallet-base.ts @@ -1,7 +1,7 @@ import { isHexString, normalizeAddressWith0x } from '@celo/base/lib/address' import { Address, CeloTx, EncodedTransaction, ReadOnlyWallet, Signer } from '@celo/connect' import { EIP712TypedData } from '@celo/utils/lib/sign-typed-data-utils' -import * as ethUtil from 'ethereumjs-util' +import * as ethUtil from '@ethereumjs/util' import { chainIdTransformationForSigning, encodeTransaction, rlpEncodedTx } from './signing-utils' type addInMemoryAccount = (privateKey: string) => void @@ -101,7 +101,7 @@ export abstract class WalletBase implements ReadOnlyWall const signer = this.getSigner(address) const sig = await signer.signPersonalMessage(data) - return ethUtil.toRpcSig(sig.v, sig.r, sig.s) + return ethUtil.toRpcSig(BigInt(sig.v), sig.r, sig.s) } /** @@ -118,7 +118,7 @@ export abstract class WalletBase implements ReadOnlyWall const signer = this.getSigner(address) const sig = await signer.signTypedData(typedData) - return ethUtil.toRpcSig(sig.v, sig.r, sig.s) + return ethUtil.toRpcSig(BigInt(sig.v), sig.r, sig.s) } protected getSigner(address: string): TSigner { diff --git a/packages/sdk/wallets/wallet-hsm-aws/package.json b/packages/sdk/wallets/wallet-hsm-aws/package.json index 6129d8511e7..3f7eccbd685 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/package.json +++ b/packages/sdk/wallets/wallet-hsm-aws/package.json @@ -30,7 +30,7 @@ "@types/secp256k1": "^4.0.0", "aws-sdk": "^2.705.0", "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0", + "@ethereumjs/util": "8.0.5", "bignumber.js": "^9.0.0", "debug": "^4.1.1", "secp256k1": "^4.0.0" @@ -38,10 +38,10 @@ "devDependencies": { "@celo/connect": "4.0.1-dev", "elliptic": "^6.5.4", - "web3": "1.3.6" + "web3": "1.8.2" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" }, "resolutions": { "secp256k1": "^4.0.0" diff --git a/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-signer.ts b/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-signer.ts index 9d81de7f84a..4264a8c89c2 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-signer.ts +++ b/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-signer.ts @@ -12,9 +12,9 @@ import { sixtyFour, thirtyTwo, } from '@celo/wallet-hsm' +import * as ethUtil from '@ethereumjs/util' import { KMS } from 'aws-sdk' import { BigNumber } from 'bignumber.js' -import * as ethUtil from 'ethereumjs-util' const SigningAlgorithm = 'ECDSA_SHA_256' diff --git a/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts b/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts index 7052c9f427f..20532907712 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts +++ b/packages/sdk/wallets/wallet-hsm-aws/src/aws-hsm-wallet.test.ts @@ -8,8 +8,8 @@ import { import { verifySignature } from '@celo/utils/lib/signatureUtils' import { recoverTransaction, verifyEIP712TypedDataSigner } from '@celo/wallet-base' import { asn1FromPublicKey } from '@celo/wallet-hsm' +import * as ethUtil from '@ethereumjs/util' import { BigNumber } from 'bignumber.js' -import * as ethUtil from 'ethereumjs-util' import Web3 from 'web3' import { AwsHsmWallet } from './aws-hsm-wallet' require('dotenv').config() diff --git a/packages/sdk/wallets/wallet-hsm-azure/package.json b/packages/sdk/wallets/wallet-hsm-azure/package.json index 407450eac4a..4eab1df92f2 100644 --- a/packages/sdk/wallets/wallet-hsm-azure/package.json +++ b/packages/sdk/wallets/wallet-hsm-azure/package.json @@ -32,7 +32,7 @@ "@celo/connect": "4.0.1-dev", "@types/secp256k1": "^4.0.0", "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0", + "@ethereumjs/util": "8.0.5", "bignumber.js": "^9.0.0", "debug": "^4.1.1", "secp256k1": "^4.0.0" @@ -40,9 +40,9 @@ "devDependencies": { "dotenv": "^8.2.0", "elliptic": "^6.5.4", - "web3": "1.3.6" + "web3": "1.8.2" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } } \ No newline at end of file diff --git a/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-signer.ts b/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-signer.ts index ed60e1e84f3..b26486dc205 100644 --- a/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-signer.ts +++ b/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-signer.ts @@ -2,7 +2,7 @@ import { ensureLeading0x, trimLeading0x } from '@celo/base/lib/address' import { RLPEncodedTx, Signer } from '@celo/connect' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' import { getHashFromEncoded } from '@celo/wallet-base' -import * as ethUtil from 'ethereumjs-util' +import * as ethUtil from '@ethereumjs/util' import { AzureKeyVaultClient } from './azure-key-vault-client' /** diff --git a/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-wallet.test.ts b/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-wallet.test.ts index eaaab7afe5a..36c39eaa0a4 100644 --- a/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-wallet.test.ts +++ b/packages/sdk/wallets/wallet-hsm-azure/src/azure-hsm-wallet.test.ts @@ -9,8 +9,8 @@ import { import { verifySignature } from '@celo/utils/lib/signatureUtils' import { recoverTransaction, verifyEIP712TypedDataSigner } from '@celo/wallet-base' import { publicKeyPrefix, Signature } from '@celo/wallet-hsm' +import * as ethUtil from '@ethereumjs/util' import { BigNumber } from 'bignumber.js' -import * as ethUtil from 'ethereumjs-util' import Web3 from 'web3' import { AzureHSMWallet } from './azure-hsm-wallet' @@ -131,7 +131,7 @@ describe('AzureHSMWallet class', () => { const signature = ethUtil.ecsign(message, pkBuffer) // Azure HSM doesn't add the byte prefix (+27) while ecsign does // Subtract 27 to properly mock the HSM signer - return new Signature(signature.v - 27, signature.r, signature.s) + return new Signature(Number(signature.v) - 27, signature.r, signature.s) } throw new Error(`Unable to locate key: ${keyName}`) }, diff --git a/packages/sdk/wallets/wallet-hsm-gcp/package.json b/packages/sdk/wallets/wallet-hsm-gcp/package.json index 2c7dc3800bb..cbb0e70a5c2 100644 --- a/packages/sdk/wallets/wallet-hsm-gcp/package.json +++ b/packages/sdk/wallets/wallet-hsm-gcp/package.json @@ -28,7 +28,7 @@ "@types/debug": "^4.1.5", "@types/secp256k1": "^4.0.0", "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0", + "@ethereumjs/util": "8.0.5", "bignumber.js": "^9.0.0", "debug": "^4.1.1", "secp256k1": "^4.0.0" @@ -36,10 +36,10 @@ "devDependencies": { "@celo/connect": "4.0.1-dev", "elliptic": "^6.5.4", - "web3": "1.3.6" + "web3": "1.8.2" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" }, "resolutions": { "secp256k1": "^4.0.0" diff --git a/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts index 6c0bfe0ed7e..99fb4fa0a64 100644 --- a/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts +++ b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-signer.ts @@ -12,9 +12,9 @@ import { sixtyFour, thirtyTwo, } from '@celo/wallet-hsm' +import * as ethUtil from '@ethereumjs/util' import { KeyManagementServiceClient } from '@google-cloud/kms' import { BigNumber } from 'bignumber.js' -import * as ethUtil from 'ethereumjs-util' export class GcpHsmSigner implements Signer { private client: KeyManagementServiceClient diff --git a/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts index de12b30b415..cc8f7b84e1f 100644 --- a/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts +++ b/packages/sdk/wallets/wallet-hsm-gcp/src/gcp-hsm-wallet.test.ts @@ -8,12 +8,12 @@ import { import { verifySignature } from '@celo/utils/lib/signatureUtils' import { recoverTransaction, verifyEIP712TypedDataSigner } from '@celo/wallet-base' import { asn1FromPublicKey } from '@celo/wallet-hsm' +import * as ethUtil from '@ethereumjs/util' import { BigNumber } from 'bignumber.js' // NOTE: elliptic is disabled elsewhere in this library to prevent // accidental signing of truncated messages. // tslint:disable-next-line:import-blacklist import { ec as EC } from 'elliptic' -import * as ethUtil from 'ethereumjs-util' import Web3 from 'web3' import { GcpHsmWallet } from './gcp-hsm-wallet' require('dotenv').config() diff --git a/packages/sdk/wallets/wallet-hsm/package.json b/packages/sdk/wallets/wallet-hsm/package.json index f170f56aec8..fc404c53738 100644 --- a/packages/sdk/wallets/wallet-hsm/package.json +++ b/packages/sdk/wallets/wallet-hsm/package.json @@ -27,12 +27,12 @@ "@types/secp256k1": "^4.0.0", "@types/debug": "^4.1.5", "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0", + "@ethereumjs/util": "8.0.5", "asn1js": "^2.0.26", "elliptic": "^6.5.4", "secp256k1": "^4.0.0" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } } \ No newline at end of file diff --git a/packages/sdk/wallets/wallet-hsm/src/signature-utils.ts b/packages/sdk/wallets/wallet-hsm/src/signature-utils.ts index 24cc68afd82..fdcbb2c6073 100644 --- a/packages/sdk/wallets/wallet-hsm/src/signature-utils.ts +++ b/packages/sdk/wallets/wallet-hsm/src/signature-utils.ts @@ -1,6 +1,6 @@ import { Address, ensureLeading0x } from '@celo/base/lib/address' +import * as ethUtil from '@ethereumjs/util' import { BigNumber } from 'bignumber.js' -import * as ethUtil from 'ethereumjs-util' import { ecdsaRecover } from 'secp256k1' // 0x04 prefix indicates that the key is not compressed diff --git a/packages/sdk/wallets/wallet-ledger/package.json b/packages/sdk/wallets/wallet-ledger/package.json index 31a3240c00d..ed408e50251 100644 --- a/packages/sdk/wallets/wallet-ledger/package.json +++ b/packages/sdk/wallets/wallet-ledger/package.json @@ -26,14 +26,14 @@ "@celo/wallet-base": "4.0.1-dev", "@celo/wallet-remote": "4.0.1-dev", "@celo/connect": "4.0.1-dev", - "@types/ethereumjs-util": "^5.2.0", - "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0", - "debug": "^4.1.1", + "@ethereumjs/util": "8.0.5", "@ledgerhq/hw-app-eth": "~5.11.0", - "@ledgerhq/hw-transport": "~5.11.0" + "@ledgerhq/hw-transport": "~5.11.0", + "debug": "^4.1.1", + "eth-lib": "^0.2.8", + "ethereum-cryptography": "1.2.0" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } -} \ No newline at end of file +} diff --git a/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts b/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts index 66e785a70e8..a49f39223d8 100644 --- a/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts +++ b/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts @@ -1,9 +1,9 @@ import { ensureLeading0x, trimLeading0x } from '@celo/base/lib/address' import { RLPEncodedTx, Signer } from '@celo/connect' import { EIP712TypedData, structHash } from '@celo/utils/lib/sign-typed-data-utils' +import * as ethUtil from '@ethereumjs/util' import { TransportStatusError } from '@ledgerhq/errors' import debugFactory from 'debug' -import * as ethUtil from 'ethereumjs-util' import { transportErrorFriendlyMessage } from './ledger-utils' import { AddressValidation } from './ledger-wallet' import { compareLedgerAppVersions, tokenInfoByAddressAndChainId } from './tokens' diff --git a/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts b/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts index 61df2835f08..92990b483ed 100644 --- a/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts +++ b/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts @@ -8,10 +8,11 @@ import { recoverTransaction, verifyEIP712TypedDataSigner, } from '@celo/wallet-base' +import * as ethUtil from '@ethereumjs/util' import TransportNodeHid from '@ledgerhq/hw-transport-node-hid' -// @ts-ignore-next-line +import { keccak256 } from 'ethereum-cryptography/keccak' +// @ts-ignore-next-line eth-lib types not found import { account as Account } from 'eth-lib' -import * as ethUtil from 'ethereumjs-util' import Web3 from 'web3' import { AddressValidation, LedgerWallet } from './ledger-wallet' @@ -143,7 +144,7 @@ function mockLedger(wallet: LedgerWallet, mockForceValidation: () => void) { domainSeparator: Buffer, structHash: Buffer ) => { - const messageHash = ethUtil.sha3( + const messageHash = keccak256( Buffer.concat([Buffer.from('1901', 'hex'), domainSeparator, structHash]) ) as Buffer diff --git a/packages/sdk/wallets/wallet-local/package.json b/packages/sdk/wallets/wallet-local/package.json index e92bda1ac35..0cd20da9b31 100644 --- a/packages/sdk/wallets/wallet-local/package.json +++ b/packages/sdk/wallets/wallet-local/package.json @@ -25,14 +25,13 @@ "@celo/utils": "4.0.1-dev", "@celo/connect": "4.0.1-dev", "@celo/wallet-base": "4.0.1-dev", - "@types/ethereumjs-util": "^5.2.0", "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0" + "@ethereumjs/util": "8.0.5" }, "devDependencies": { - "web3": "1.3.6" + "web3": "1.8.2" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } -} \ No newline at end of file +} diff --git a/packages/sdk/wallets/wallet-local/src/local-signer.ts b/packages/sdk/wallets/wallet-local/src/local-signer.ts index 02e70e5e828..0f24c8241a3 100644 --- a/packages/sdk/wallets/wallet-local/src/local-signer.ts +++ b/packages/sdk/wallets/wallet-local/src/local-signer.ts @@ -4,9 +4,9 @@ import { computeSharedSecret as computeECDHSecret } from '@celo/utils/lib/ecdh' import { Decrypt } from '@celo/utils/lib/ecies' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' import { decodeSig, getHashFromEncoded } from '@celo/wallet-base' -// @ts-ignore +import * as ethUtil from '@ethereumjs/util' +// @ts-ignore eth-lib types not found import { account as Account } from 'eth-lib' -import * as ethUtil from 'ethereumjs-util' /** * Signs the EVM transaction using the provided private key @@ -41,7 +41,7 @@ export class LocalSigner implements Signer { const sig = ethUtil.ecsign(msgHashBuff, pkBuffer) return { - v: parseInt(sig.v, 10), + v: Number(sig.v), r: Buffer.from(sig.r), s: Buffer.from(sig.s), } @@ -54,7 +54,7 @@ export class LocalSigner implements Signer { const sig = ethUtil.ecsign(dataBuff, pkBuffer) return { - v: parseInt(sig.v, 10), + v: Number(sig.v), r: Buffer.from(sig.r), s: Buffer.from(sig.s), } diff --git a/packages/sdk/wallets/wallet-remote/package.json b/packages/sdk/wallets/wallet-remote/package.json index 9916ec83bd4..e883e6e5128 100644 --- a/packages/sdk/wallets/wallet-remote/package.json +++ b/packages/sdk/wallets/wallet-remote/package.json @@ -25,13 +25,12 @@ "@celo/connect": "4.0.1-dev", "@celo/utils": "4.0.1-dev", "@celo/wallet-base": "4.0.1-dev", - "@types/ethereumjs-util": "^5.2.0", + "@ethereumjs/util": "8.0.5", "@types/debug": "^4.1.5", - "eth-lib": "^0.2.8", - "ethereumjs-util": "^5.2.0" + "eth-lib": "^0.2.8" }, "devDependencies": {}, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } -} \ No newline at end of file +} diff --git a/packages/sdk/wallets/wallet-rpc/package.json b/packages/sdk/wallets/wallet-rpc/package.json index 43f174a19f4..b0131b237ea 100644 --- a/packages/sdk/wallets/wallet-rpc/package.json +++ b/packages/sdk/wallets/wallet-rpc/package.json @@ -34,6 +34,6 @@ "@celo/contractkit": "4.0.1-dev" }, "engines": { - "node": ">=8.13.0" + "node": ">=8.14.2" } } \ No newline at end of file diff --git a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts index de6b627c540..dc1d2320741 100644 --- a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts +++ b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts @@ -64,20 +64,16 @@ describe.skip('rpc-wallet', () => { const ipcProvider = new Web3.providers.IpcProvider(ipcUrl, net) const wallet = new RpcWallet(ipcProvider) await wallet.init() - const account = await wallet.addAccount(PRIVATE_KEY1, PASSPHRASE) await wallet.unlockAccount(account, PASSPHRASE, DURATION) - const tx = { from: ACCOUNT_ADDRESS1, to: ACCOUNT_ADDRESS2, value: 1000, } - const result = await wallet.signTransaction(tx) // tslint:disable:no-console console.log(result) - const connection = new Connection(new Web3(ipcUrl), wallet) const txResult = await connection.sendSignedTransaction(result.raw) // tslint:disable:no-console diff --git a/yarn.lock b/yarn.lock index e8747a77c0d..a3c7cad0089 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9428,6 +9428,13 @@ cross-fetch@3.0.4: node-fetch "2.6.0" whatwg-fetch "3.0.0" +cross-fetch@3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c" + integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ== + dependencies: + node-fetch "2.6.1" + cross-fetch@^3.0.6, cross-fetch@^3.1.4, cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" From 609116ab9dd36136fdc8f14d6548d5e8fd8aeb3a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 25 Apr 2023 18:09:11 -0400 Subject: [PATCH 027/184] Updated ganache config --- packages/dev-utils/src/ganache-setup.ts | 4 ++-- packages/protocol/scripts/devchain.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/dev-utils/src/ganache-setup.ts b/packages/dev-utils/src/ganache-setup.ts index 7b40e82c2b0..bcb9cca6eb4 100644 --- a/packages/dev-utils/src/ganache-setup.ts +++ b/packages/dev-utils/src/ganache-setup.ts @@ -70,8 +70,8 @@ async function launchServer(opts: { verbose?: boolean; from_targz?: boolean }, c wallet: { mnemonic: MNEMONIC, defaultBalance: 1000000 }, logging: { logger: { log: logFn } }, database: { dbPath: chain }, - miner: { blockGasLimit: 20000000 }, - chain: { networkId: 1101, allowUnlimitedContractSize: true, hardfork: 'istanbul' }, + miner: { blockGasLimit: 20000000, defaultGasPrice: 0 }, + chain: { networkId: 1101, chainId: 1, allowUnlimitedContractSize: true, hardfork: 'istanbul' }, }) server.listen(8545, async (err: any) => { diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 3dc809df74b..4bda356b7db 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -123,7 +123,7 @@ async function startGanache(datadir: string, opts: { verbose?: boolean }) { database: { dbPath: datadir }, wallet: { mnemonic: MNEMONIC, defaultBalance: 200000000 }, miner: { blockGasLimit: gasLimit }, - chain: { networkId: 1101, allowUnlimitedContractSize: true, hardfork: 'istanbul' }, + chain: { networkId: 1101, chainId: 1, allowUnlimitedContractSize: true, hardfork: 'istanbul' }, }) server.listen(8545, async (err) => { From 6693173c8cb05efc8a76c4637300ee0e676180f1 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 25 Apr 2023 18:09:46 -0400 Subject: [PATCH 028/184] Specify gas and await tx receipt --- .../contractkit/src/identity/claims/account.test.ts | 8 +++++--- .../sdk/contractkit/src/identity/metadata.test.ts | 11 ++++++++--- .../sdk/contractkit/src/wrappers/GoldToken.test.ts | 5 ++--- .../sdk/contractkit/src/wrappers/StableToken.test.ts | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/packages/sdk/contractkit/src/identity/claims/account.test.ts b/packages/sdk/contractkit/src/identity/claims/account.test.ts index a8e744e2243..d9f0a72696b 100644 --- a/packages/sdk/contractkit/src/identity/claims/account.test.ts +++ b/packages/sdk/contractkit/src/identity/claims/account.test.ts @@ -65,9 +65,9 @@ testWithGanache('Account claims', (web3) => { const myUrl = 'https://www.test.com/' const accounts = await kit.contracts.getAccounts() await accounts.createAccount().send({ from: address }) - await accounts.setMetadataURL(myUrl).send({ from: address }) + await accounts.setMetadataURL(myUrl).sendAndWaitForReceipt({ from: address, gas: 0 }) await accounts.createAccount().send({ from: otherAddress }) - await accounts.setMetadataURL(myUrl).send({ from: otherAddress }) + await accounts.setMetadataURL(myUrl).sendAndWaitForReceipt({ from: otherAddress, gas: 0 }) IdentityMetadataWrapper.fetchFromURL = () => Promise.resolve(otherMetadata) @@ -82,7 +82,9 @@ testWithGanache('Account claims', (web3) => { describe('when the metadata URL of the other account has not been set', () => { beforeEach(async () => { - await (await kit.contracts.getAccounts()).setMetadataURL('').send({ from: otherAddress }) + await (await kit.contracts.getAccounts()) + .setMetadataURL('') + .sendAndWaitForReceipt({ from: otherAddress, gas: 0 }) }) it('indicates that the metadata url could not be retrieved', async () => { diff --git a/packages/sdk/contractkit/src/identity/metadata.test.ts b/packages/sdk/contractkit/src/identity/metadata.test.ts index f75fe02e83b..934aaecff06 100644 --- a/packages/sdk/contractkit/src/identity/metadata.test.ts +++ b/packages/sdk/contractkit/src/identity/metadata.test.ts @@ -43,15 +43,20 @@ testWithGanache('Metadata', (web3) => { ) => { const pop = await accounts.generateProofOfKeyPossession(address, signer) if (action === 'vote') { - await (await accounts.authorizeVoteSigner(signer, pop)).send({ from: address }) + await ( + await accounts.authorizeVoteSigner(signer, pop) + ).sendAndWaitForReceipt({ from: address, gas: 19000000 }) } else if (action === 'validator') { await ( await accounts.authorizeValidatorSigner(signer, pop, validator) - ).send({ + ).sendAndWaitForReceipt({ from: address, + gas: 19000000, }) } else if (action === 'attestation') { - await (await accounts.authorizeAttestationSigner(signer, pop)).send({ from: address }) + await ( + await accounts.authorizeAttestationSigner(signer, pop) + ).sendAndWaitForReceipt({ from: address, gas: 19000000 }) } await metadata.addClaim(createNameClaim(name), NativeSigner(kit.connection.sign, signer)) const serializedMetadata = metadata.toString() diff --git a/packages/sdk/contractkit/src/wrappers/GoldToken.test.ts b/packages/sdk/contractkit/src/wrappers/GoldToken.test.ts index d2b3f8a960b..00a6b35e93f 100644 --- a/packages/sdk/contractkit/src/wrappers/GoldToken.test.ts +++ b/packages/sdk/contractkit/src/wrappers/GoldToken.test.ts @@ -35,7 +35,7 @@ testWithGanache('GoldToken Wrapper', (web3) => { const before = await goldToken.allowance(accounts[0], accounts[1]) expect(before).toEqBigNumber(0) - await goldToken.approve(accounts[1], ONE_GOLD).send() + await goldToken.approve(accounts[1], ONE_GOLD).sendAndWaitForReceipt() const after = await goldToken.allowance(accounts[0], accounts[1]) expect(after).toEqBigNumber(ONE_GOLD) }) @@ -43,8 +43,7 @@ testWithGanache('GoldToken Wrapper', (web3) => { test('SBAT tranfer from', async () => { const before = await goldToken.balanceOf(accounts[3]) // account1 approves account0 - await goldToken.approve(accounts[0], ONE_GOLD).send({ from: accounts[1] }) - + await goldToken.approve(accounts[0], ONE_GOLD).sendAndWaitForReceipt({ from: accounts[1] }) const tx = await goldToken.transferFrom(accounts[1], accounts[3], ONE_GOLD).send() await tx.waitReceipt() const after = await goldToken.balanceOf(accounts[3]) diff --git a/packages/sdk/contractkit/src/wrappers/StableToken.test.ts b/packages/sdk/contractkit/src/wrappers/StableToken.test.ts index aac8bcbc688..6393503af46 100644 --- a/packages/sdk/contractkit/src/wrappers/StableToken.test.ts +++ b/packages/sdk/contractkit/src/wrappers/StableToken.test.ts @@ -82,7 +82,7 @@ export function testStableToken( const before = await stableToken.allowance(accounts[0], accounts[1]) expect(before).toEqBigNumber(0) - await stableToken.approve(accounts[1], ONE_STABLE).send() + await stableToken.approve(accounts[1], ONE_STABLE).sendAndWaitForReceipt() const after = await stableToken.allowance(accounts[0], accounts[1]) expect(after).toEqBigNumber(ONE_STABLE) }) @@ -90,7 +90,7 @@ export function testStableToken( test('SBAT tranfer from', async () => { const before = await stableToken.balanceOf(accounts[3]) // account1 approves account0 - await stableToken.approve(accounts[1], ONE_STABLE).send({ from: accounts[0] }) + await stableToken.approve(accounts[1], ONE_STABLE).sendAndWaitForReceipt({ from: accounts[0] }) const tx = await stableToken .transferFrom(accounts[0], accounts[3], ONE_STABLE) From 8d703152193706d373803c66cd4e67fba5d1b59e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 25 Apr 2023 19:31:19 -0400 Subject: [PATCH 029/184] updated dependencies to fix cross-fecth bind error --- packages/sdk/explorer/package.json | 2 +- packages/sdk/transactions-uri/package.json | 4 +-- yarn.lock | 42 +++++++++++----------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/packages/sdk/explorer/package.json b/packages/sdk/explorer/package.json index a3bb53f9dc0..56aa017880e 100644 --- a/packages/sdk/explorer/package.json +++ b/packages/sdk/explorer/package.json @@ -27,7 +27,7 @@ "@celo/contractkit": "4.0.1-dev", "@celo/utils": "4.0.1-dev", "@types/debug": "^4.1.5", - "cross-fetch": "^3.1.5", + "cross-fetch": "3.0.6", "debug": "^4.1.1" }, "devDependencies": { diff --git a/packages/sdk/transactions-uri/package.json b/packages/sdk/transactions-uri/package.json index 94424429479..25000a9ad3e 100644 --- a/packages/sdk/transactions-uri/package.json +++ b/packages/sdk/transactions-uri/package.json @@ -29,8 +29,8 @@ "@celo/base": "4.0.1-dev", "@celo/connect": "4.0.1-dev", "bn.js": "4.11.9", - "qrcode": "^1.4.4", - "web3-eth-abi": "1.3.6" + "qrcode": "1.4.4", + "web3-eth-abi": "1.8.2" }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", diff --git a/yarn.lock b/yarn.lock index a3c7cad0089..a8f5d618021 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7835,7 +7835,7 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== -buffer-from@1.1.2, buffer-from@^1.0.0: +buffer-from@1.1.2, buffer-from@^1.0.0, buffer-from@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== @@ -7889,7 +7889,7 @@ buffer@6.0.3, buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -buffer@^5.0.5, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0: +buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -9435,7 +9435,7 @@ cross-fetch@3.0.6: dependencies: node-fetch "2.6.1" -cross-fetch@^3.0.6, cross-fetch@^3.1.4, cross-fetch@^3.1.5: +cross-fetch@^3.0.6, cross-fetch@^3.1.4: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== @@ -10432,11 +10432,6 @@ enabled@2.0.x: resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== -encode-utf8@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-2.0.0.tgz#c6abd75e6962cde0eb5ef82890515ef6b635cde6" - integrity sha512-3EyMFxZj1/7oMotElDQUEQcP7N4TIe1aJ0m1uBDoyQ8I2LBHhBsXx8P3KsPbqNlGzG+NYxFwEauUwMPHZg3YDQ== - encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -14975,7 +14970,7 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -isarray@^2.0.5: +isarray@^2.0.1, isarray@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== @@ -19971,10 +19966,10 @@ pluralize@^8.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== -pngjs@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb" - integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw== +pngjs@^3.3.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" + integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== popper.js@1.14.3: version "1.14.3" @@ -20753,15 +20748,18 @@ qqjs@^0.3.10: tmp "^0.1.0" write-json-file "^4.1.1" -qrcode@^1.4.4: - version "1.5.2" - resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.2.tgz#ac86a8e548edd04e513a7c50734b1fde9d50377b" - integrity sha512-aX3t2vLTDIGhqJujaQkw8SA+D38gcQ/ayPF4187OHMl+1ARZ/2UlBbNTnA2iTOte+QP88K8xY+XNXrR7H9z6fA== +qrcode@1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83" + integrity sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q== dependencies: + buffer "^5.4.3" + buffer-alloc "^1.2.0" + buffer-from "^1.1.1" dijkstrajs "^1.0.1" - encode-utf8 "^2.0.0" - pngjs "^5.0.0" - yargs "^15.3.1" + isarray "^2.0.1" + pngjs "^3.3.0" + yargs "^13.2.4" qs@6.11.0: version "6.11.0" @@ -26735,7 +26733,7 @@ yargs-unparser@2.0.0, yargs-unparser@^2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@13.3.2, yargs@^13.3.0: +yargs@13.3.2, yargs@^13.2.4, yargs@^13.3.0: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== @@ -26816,7 +26814,7 @@ yargs@^14.0.0: y18n "^4.0.0" yargs-parser "^15.0.1" -yargs@^15.3.1, yargs@^15.4.1: +yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== From 4ba5ca8ed141c270d83c4328e0ed27943cfd1963 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:13:10 -0400 Subject: [PATCH 030/184] updated yarn.lock --- yarn.lock | 310 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 197 insertions(+), 113 deletions(-) diff --git a/yarn.lock b/yarn.lock index 67cc6cd7c07..31bbc9bb52f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2382,6 +2382,14 @@ protobufjs "^7.0.0" yargs "^16.2.0" +"@gulp-sourcemaps/map-sources@1.X": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda" + integrity sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A== + dependencies: + normalize-path "^2.0.1" + through2 "^2.0.3" + "@hutson/parse-repository-url@^3.0.0": version "3.0.2" resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" @@ -6322,7 +6330,7 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.2.0: +acorn-walk@^8.1.1: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -6332,11 +6340,6 @@ acorn@4.X: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c= -"acorn@>= 2.5.2 <= 5.7.3": - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== - acorn@^6.0.7: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" @@ -6347,7 +6350,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.7.0: +acorn@^8.2.4, acorn@^8.4.1: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -8800,7 +8803,12 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clone@^1.0.2: +clone-stats@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" + integrity sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA== + +clone@^1.0.0, clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== @@ -9270,7 +9278,7 @@ conventional-recommended-bump@^6.1.0: meow "^8.0.0" q "^1.5.1" -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@1.X, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== @@ -9539,6 +9547,16 @@ css-what@^6.1.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== +css@2.X: + version "2.2.4" + resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" + integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw== + dependencies: + inherits "^2.0.3" + source-map "^0.6.1" + source-map-resolve "^0.5.2" + urix "^0.1.0" + cssfilter@0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" @@ -9659,7 +9677,16 @@ debounce-fn@^4.0.0: dependencies: mimic-fn "^3.0.0" -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: +debug-fabulous@0.0.X: + version "0.0.4" + resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.0.4.tgz#fa071c5d87484685424807421ca4b16b0b1a0763" + integrity sha512-mmVKpY/O4UIl6ZDn5Owf8jEauO6uQiuF4Jz9iTuflSmvqNm6/64xARk/qCq5ZJxu141Ic2lCmL1TSMHIYoyiTw== + dependencies: + debug "2.X" + lazy-debug-legacy "0.0.X" + object-assign "4.1.0" + +debug@2.6.9, debug@2.X, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -10034,6 +10061,11 @@ detect-libc@^2.0.0: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== +detect-newline@2.X: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" + integrity sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg== + detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -10317,7 +10349,7 @@ duplexer@^0.1.1, duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@^3.5.0, duplexify@^3.6.0: +duplexify@^3.2.0, duplexify@^3.5.0, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== @@ -12252,6 +12284,11 @@ firebase@^7.2.2: "@firebase/storage" "0.3.43" "@firebase/util" "0.3.2" +first-chunk-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" + integrity sha512-ArRi5axuv66gEsyl3UuK80CzW7t56hem73YGNYxNWTGNKFJUadSb9Gu9SHijYEUi8ulQMf1bJomYNwSCPHhtTQ== + flat-arguments@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/flat-arguments/-/flat-arguments-1.0.2.tgz#9baa780adf0501f282d726c9c6a038dba44ea76f" @@ -13012,7 +13049,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob-parent@^3.1.0: +glob-parent@^3.0.0, glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA== @@ -13041,6 +13078,20 @@ glob-slasher@^1.0.1: lodash.isobject "^2.4.1" toxic "^1.0.0" +glob-stream@^5.3.2: + version "5.3.5" + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22" + integrity sha512-piN8XVAO2sNxwVLokL4PswgJvK/uQ6+awwXUVRTGF+rRfgCZpn4hOqxiRuTEbU/k3qgKl0DACYQ/0Sge54UMQg== + dependencies: + extend "^3.0.0" + glob "^5.0.3" + glob-parent "^3.0.0" + micromatch "^2.3.7" + ordered-read-streams "^0.3.0" + through2 "^0.6.0" + to-absolute-glob "^0.1.1" + unique-stream "^2.0.2" + glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" @@ -13111,7 +13162,7 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^5.0.15: +glob@^5.0.15, glob@^5.0.3: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA== @@ -13499,7 +13550,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -13578,6 +13629,23 @@ gtoken@^5.0.4: google-p12-pem "^3.1.3" jws "^4.0.0" +gulp-sourcemaps@^1.5.2: + version "1.12.1" + resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.12.1.tgz#b437d1f3d980cf26e81184823718ce15ae6597b6" + integrity sha512-2NYnMpB67LJhc36sEv+hNY05UOy1lD9DPtLi+en4hbGH+085G9Zzh3cet2VEqrDlQrLk9Eho0MM9dZ3Z+dL0XA== + dependencies: + "@gulp-sourcemaps/map-sources" "1.X" + acorn "4.X" + convert-source-map "1.X" + css "2.X" + debug-fabulous "0.0.X" + detect-newline "2.X" + graceful-fs "4.X" + source-map "~0.6.0" + strip-bom "2.X" + through2 "2.X" + vinyl "1.X" + handlebars@^4.0.1, handlebars@^4.7.6, handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" @@ -14920,6 +14988,11 @@ is-utf8@^0.2.0: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== +is-valid-glob@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" + integrity sha512-CvG8EtJZ8FyzVOGPzrDorzyN65W1Ld8BVnqshRCah6pFIsprGx3dKgFtjLn/Vw9kGqR4OlR84U7yhT9ZVTyWIQ== + is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -16488,6 +16561,11 @@ lazy-cache@^1.0.3: resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" integrity sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ== +lazy-debug-legacy@0.0.X: + version "0.0.1" + resolved "https://registry.yarnpkg.com/lazy-debug-legacy/-/lazy-debug-legacy-0.0.1.tgz#537716c0776e4cf79e3ed1b621f7658c2911b1b1" + integrity sha512-GFWaIBcBjxWWKI5OghwYEsPOR8JFh2xEcc3ZFV0ONYL0oHz0PHINJCfxJyztUq2XzcHncyO7fsRR550Gtfnk6g== + lazystream@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" @@ -16999,7 +17077,7 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg== -lodash.isequal@^4.5.0: +lodash.isequal@^4.0.0, lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== @@ -17544,6 +17622,13 @@ merge-descriptors@1.0.1, merge-descriptors@~1.0.0: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== +merge-stream@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" + integrity sha512-e6RM36aegd4f+r8BZCcYXlO2P3H6xbUM6ktL2Xmf45GAOit9bI4z6/3VU7JwllVO1L7u0UDSg/EhzQ5lmMLolA== + dependencies: + readable-stream "^2.0.1" + merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -17950,7 +18035,7 @@ mkdirp@0.5.5: dependencies: minimist "^1.2.5" -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -18940,12 +19025,17 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== +object-assign@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" + integrity sha512-Lbc7GfN7XFaK30bzUN3cDYLOkT0dH05S0ax1QikylHUD9+Z9PRF3G1iYwX3kcz+6AlzTFGkUgMxz6l3aUwbwTA== + object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" integrity sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ== -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -19233,6 +19323,14 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" +ordered-read-streams@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b" + integrity sha512-xQvd8qvx9U1iYY9aVqPpoF5V9uaWJKV6ZGljkh/jkiNX0DiQsjbWvRumbh10QTMDE8DheaOEU8xi0szbrgjzcw== + dependencies: + is-stream "^1.0.1" + readable-stream "^2.0.1" + original-require@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" @@ -21016,7 +21114,17 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.15: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -21034,16 +21142,6 @@ readable-stream@~0.0.2: resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw== -readable-stream@~1.0.15: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" @@ -21242,6 +21340,11 @@ repeat-string@^1.5.2, repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== +replace-ext@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" + integrity sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ== + req-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/req-cwd/-/req-cwd-2.0.0.tgz#d4082b4d44598036640fb73ddea01ed53db49ebc" @@ -22333,7 +22436,7 @@ sort-keys@^4.0.0: dependencies: is-plain-obj "^2.0.0" -source-map-resolve@^0.5.0: +source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== @@ -22370,7 +22473,7 @@ source-map@^0.5.6: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -22726,7 +22829,15 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-bom@^2.0.0: +strip-bom-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" + integrity sha512-7jfJB9YpI2Z0aH3wu10ZqitvYJaE0s5IzFuWE+0pbb4Q/armTloEUShymkDO47YSLnjAW52mlXT//hs9wXNNJQ== + dependencies: + first-chunk-stream "^1.0.0" + strip-bom "^2.0.0" + +strip-bom@2.X, strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g== @@ -23314,6 +23425,22 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== +through2-filter@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec" + integrity sha512-miwWajb1B80NvIVKXFPN/o7+vJc4jYUvnZCwvhicRAoTxdD9wbcjri70j+BenCrN/JXEPKDjhpw4iY7yiNsCGg== + dependencies: + through2 "~2.0.0" + xtend "~4.0.0" + +through2-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" + integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== + dependencies: + through2 "~2.0.0" + xtend "~4.0.0" + through2@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9" @@ -23322,6 +23449,14 @@ through2@2.0.1: readable-stream "~2.0.0" xtend "~4.0.0" +through2@2.X, through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + through2@3.0.2, through2@^3.0.0, through2@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" @@ -23330,13 +23465,13 @@ through2@3.0.2, through2@^3.0.0, through2@^3.0.1: inherits "^2.0.4" readable-stream "2 || 3" -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== +through2@^0.6.0: + version "0.6.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" + integrity sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg== dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" + readable-stream ">=1.0.33-1 <1.1.0-0" + xtend ">=4.0.0 <4.1.0-0" through2@^4.0.0: version "4.0.2" @@ -23437,6 +23572,13 @@ tmpl@1.0.5: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== +to-absolute-glob@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" + integrity sha512-Vvl5x6zNf9iVG1QTWeknmWrKzZxaeKfIDRibrZCR3b2V/2NlFJuD2HV7P7AVjaKLZNqLPHqyr0jGrW0fTcxCPQ== + dependencies: + extend-shallow "^2.0.1" + to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" @@ -24192,6 +24334,14 @@ unique-slug@^3.0.0: dependencies: imurmurhash "^0.1.4" +unique-stream@^2.0.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" + integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== + dependencies: + json-stable-stringify-without-jsonify "^1.0.1" + through2-filter "^3.0.0" + unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" @@ -24561,6 +24711,11 @@ v8-to-istanbul@^9.0.1: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" +vali-date@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6" + integrity sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg== + valid-url@^1, valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" @@ -24617,65 +24772,6 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vm2@^3.9.11: - version "3.9.17" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" - integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== - dependencies: - duplexify "^3.2.0" - glob-stream "^5.3.2" - graceful-fs "^4.0.0" - gulp-sourcemaps "^1.5.2" - is-valid-glob "^0.3.0" - lazystream "^1.0.0" - lodash.isequal "^4.0.0" - merge-stream "^1.0.0" - mkdirp "^0.5.0" - object-assign "^4.0.0" - readable-stream "^2.0.4" - strip-bom "^2.0.0" - strip-bom-stream "^1.0.0" - through2 "^2.0.0" - through2-filter "^2.0.0" - vali-date "^1.0.0" - vinyl "^1.0.0" - -vinyl-fs@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" - integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng== - dependencies: - fs-mkdirp-stream "^1.0.0" - glob-stream "^6.1.0" - graceful-fs "^4.0.0" - is-valid-glob "^1.0.0" - lazystream "^1.0.0" - lead "^1.0.0" - object.assign "^4.0.4" - pumpify "^1.3.5" - readable-stream "^2.3.3" - remove-bom-buffer "^3.0.0" - remove-bom-stream "^1.2.0" - resolve-options "^1.1.0" - through2 "^2.0.0" - to-through "^2.0.0" - value-or-function "^3.0.0" - vinyl "^2.0.0" - vinyl-sourcemap "^1.1.0" - -vinyl-sourcemap@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" - integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY= - dependencies: - append-buffer "^1.0.2" - convert-source-map "^1.5.0" - graceful-fs "^4.1.6" - normalize-path "^2.1.1" - now-and-later "^2.0.0" - remove-bom-buffer "^3.0.0" - vinyl "^2.0.0" - vinyl@1.X, vinyl@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" @@ -24685,22 +24781,10 @@ vinyl@1.X, vinyl@^1.0.0: clone-stats "^0.0.1" replace-ext "0.0.1" -vinyl@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" - integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -vm2@^3.9.3: - version "3.9.13" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" - integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== +vm2@^3.9.11: + version "3.9.17" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" + integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" @@ -26693,7 +26777,7 @@ xss@^1.0.8: commander "^2.20.3" cssfilter "0.0.10" -xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From e09b884c197cd2b3016cda823dcad1f5910ca598 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:50:49 -0400 Subject: [PATCH 031/184] updated node version in circleci docker file --- dockerfiles/circleci/circleci-node18/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile index 4c925c6affa..38f21bf8f9c 100644 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/node:18.9 +FROM cimg/node:18.14.2 RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y From 3388635e59111489e2ac5e17ba8b8c9bbaec684e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 14:11:50 -0400 Subject: [PATCH 032/184] updated expected error message --- packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts index dc1d2320741..f013d9323ed 100644 --- a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts +++ b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts @@ -103,7 +103,7 @@ testWithGanache('rpc-wallet', (web3) => { await rpcWallet.addAccount('this is not a valid private key', PASSPHRASE) throw new Error('Expected exception to be thrown') } catch (e: any) { - expect(e.message).toBe('Expected private key to be an Uint8Array with length 32') + expect(e.message).toBe('Expected 32 bytes of private key') } }) @@ -138,7 +138,7 @@ testWithGanache('rpc-wallet', (web3) => { try { await rpcWallet.unlockAccount(ACCOUNT_ADDRESS1, 'wrong_passphrase', DURATION) } catch (e: any) { - expect(e.message).toContain('Invalid password') + expect(e.message).toContain('could not decrypt key with given passphrase') } }) From b4b0c701760e34a2b7ed76ade47904516e822a28 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 14:12:16 -0400 Subject: [PATCH 033/184] ensure leading 0x instead of trimming --- packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts b/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts index be0968f3c98..2e6cca39f0f 100644 --- a/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts +++ b/packages/sdk/wallets/wallet-rpc/src/rpc-signer.ts @@ -73,7 +73,7 @@ export class RpcSigner implements Signer { init = (privateKey: string, passphrase: string) => this.callAndCheckResponse(RpcSignerEndpoint.ImportAccount, [ - trimLeading0x(privateKey), + ensureLeading0x(privateKey), passphrase, ]) From 228ba70a023cd6f4b354282102d0ae32ba196d1e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 14:48:27 -0400 Subject: [PATCH 034/184] increased jest version --- packages/env-tests/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/env-tests/package.json b/packages/env-tests/package.json index b8c5a2f464b..05592ccf5e4 100644 --- a/packages/env-tests/package.json +++ b/packages/env-tests/package.json @@ -16,7 +16,7 @@ "bunyan-gke-stackdriver": "0.1.2", "bunyan-debug-stream": "2.0.0", "dotenv": "8.2.0", - "jest": "26.6.3", + "jest": "^29.0.2", "moment": "^2.29.0", "web3": "1.8.2" }, From aefc17f27fe64dd5045355929008a070c587a4aa Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Wed, 26 Apr 2023 13:03:01 -0600 Subject: [PATCH 035/184] Node 18.16.0 --- .nvmrc | 2 +- README-dev.md | 2 +- .../circleci/circleci-node18/Dockerfile | 2 +- yarn.lock | 240 +++--------------- 4 files changed, 36 insertions(+), 210 deletions(-) diff --git a/.nvmrc b/.nvmrc index f7e67778bb4..6d80269a4f0 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.9.0 +18.16.0 diff --git a/README-dev.md b/README-dev.md index 4ffc9d6cfb6..dc5870349c3 100644 --- a/README-dev.md +++ b/README-dev.md @@ -105,7 +105,7 @@ circleci@7040a7660754:/tmp/tmp1$ ./node_modules/.bin/celocli CLI Tool for transacting with the Celo protocol VERSION - @celo/celocli/1.6.3 linux-x64 node-v18.9.0 + @celo/celocli/1.6.3 linux-x64 node-v18.16.0 USAGE $ celocli [COMMAND] diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile index 38f21bf8f9c..be9283cb6ad 100644 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/node:18.14.2 +FROM cimg/node:18.16.0 RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y diff --git a/yarn.lock b/yarn.lock index 31bbc9bb52f..e8747a77c0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2382,14 +2382,6 @@ protobufjs "^7.0.0" yargs "^16.2.0" -"@gulp-sourcemaps/map-sources@1.X": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda" - integrity sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A== - dependencies: - normalize-path "^2.0.1" - through2 "^2.0.3" - "@hutson/parse-repository-url@^3.0.0": version "3.0.2" resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" @@ -6330,16 +6322,11 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1: +acorn-walk@^8.1.1, acorn-walk@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@4.X: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c= - acorn@^6.0.7: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" @@ -6350,7 +6337,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1: +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -8803,12 +8790,7 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - integrity sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA== - -clone@^1.0.0, clone@^1.0.2: +clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== @@ -9278,7 +9260,7 @@ conventional-recommended-bump@^6.1.0: meow "^8.0.0" q "^1.5.1" -convert-source-map@1.X, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== @@ -9547,16 +9529,6 @@ css-what@^6.1.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== -css@2.X: - version "2.2.4" - resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" - integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw== - dependencies: - inherits "^2.0.3" - source-map "^0.6.1" - source-map-resolve "^0.5.2" - urix "^0.1.0" - cssfilter@0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" @@ -9677,16 +9649,7 @@ debounce-fn@^4.0.0: dependencies: mimic-fn "^3.0.0" -debug-fabulous@0.0.X: - version "0.0.4" - resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.0.4.tgz#fa071c5d87484685424807421ca4b16b0b1a0763" - integrity sha512-mmVKpY/O4UIl6ZDn5Owf8jEauO6uQiuF4Jz9iTuflSmvqNm6/64xARk/qCq5ZJxu141Ic2lCmL1TSMHIYoyiTw== - dependencies: - debug "2.X" - lazy-debug-legacy "0.0.X" - object-assign "4.1.0" - -debug@2.6.9, debug@2.X, debug@^2.2.0, debug@^2.3.3: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -10061,11 +10024,6 @@ detect-libc@^2.0.0: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== -detect-newline@2.X: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" - integrity sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg== - detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -10349,7 +10307,7 @@ duplexer@^0.1.1, duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@^3.2.0, duplexify@^3.5.0, duplexify@^3.6.0: +duplexify@^3.5.0, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== @@ -12284,11 +12242,6 @@ firebase@^7.2.2: "@firebase/storage" "0.3.43" "@firebase/util" "0.3.2" -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - integrity sha512-ArRi5axuv66gEsyl3UuK80CzW7t56hem73YGNYxNWTGNKFJUadSb9Gu9SHijYEUi8ulQMf1bJomYNwSCPHhtTQ== - flat-arguments@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/flat-arguments/-/flat-arguments-1.0.2.tgz#9baa780adf0501f282d726c9c6a038dba44ea76f" @@ -13049,7 +13002,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob-parent@^3.0.0, glob-parent@^3.1.0: +glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA== @@ -13078,20 +13031,6 @@ glob-slasher@^1.0.1: lodash.isobject "^2.4.1" toxic "^1.0.0" -glob-stream@^5.3.2: - version "5.3.5" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22" - integrity sha512-piN8XVAO2sNxwVLokL4PswgJvK/uQ6+awwXUVRTGF+rRfgCZpn4hOqxiRuTEbU/k3qgKl0DACYQ/0Sge54UMQg== - dependencies: - extend "^3.0.0" - glob "^5.0.3" - glob-parent "^3.0.0" - micromatch "^2.3.7" - ordered-read-streams "^0.3.0" - through2 "^0.6.0" - to-absolute-glob "^0.1.1" - unique-stream "^2.0.2" - glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" @@ -13162,7 +13101,7 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^5.0.15, glob@^5.0.3: +glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA== @@ -13550,7 +13489,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -13629,23 +13568,6 @@ gtoken@^5.0.4: google-p12-pem "^3.1.3" jws "^4.0.0" -gulp-sourcemaps@^1.5.2: - version "1.12.1" - resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.12.1.tgz#b437d1f3d980cf26e81184823718ce15ae6597b6" - integrity sha512-2NYnMpB67LJhc36sEv+hNY05UOy1lD9DPtLi+en4hbGH+085G9Zzh3cet2VEqrDlQrLk9Eho0MM9dZ3Z+dL0XA== - dependencies: - "@gulp-sourcemaps/map-sources" "1.X" - acorn "4.X" - convert-source-map "1.X" - css "2.X" - debug-fabulous "0.0.X" - detect-newline "2.X" - graceful-fs "4.X" - source-map "~0.6.0" - strip-bom "2.X" - through2 "2.X" - vinyl "1.X" - handlebars@^4.0.1, handlebars@^4.7.6, handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" @@ -14988,11 +14910,6 @@ is-utf8@^0.2.0: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== -is-valid-glob@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" - integrity sha512-CvG8EtJZ8FyzVOGPzrDorzyN65W1Ld8BVnqshRCah6pFIsprGx3dKgFtjLn/Vw9kGqR4OlR84U7yhT9ZVTyWIQ== - is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -16561,11 +16478,6 @@ lazy-cache@^1.0.3: resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" integrity sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ== -lazy-debug-legacy@0.0.X: - version "0.0.1" - resolved "https://registry.yarnpkg.com/lazy-debug-legacy/-/lazy-debug-legacy-0.0.1.tgz#537716c0776e4cf79e3ed1b621f7658c2911b1b1" - integrity sha512-GFWaIBcBjxWWKI5OghwYEsPOR8JFh2xEcc3ZFV0ONYL0oHz0PHINJCfxJyztUq2XzcHncyO7fsRR550Gtfnk6g== - lazystream@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" @@ -17077,7 +16989,7 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg== -lodash.isequal@^4.0.0, lodash.isequal@^4.5.0: +lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== @@ -17622,13 +17534,6 @@ merge-descriptors@1.0.1, merge-descriptors@~1.0.0: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== -merge-stream@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - integrity sha512-e6RM36aegd4f+r8BZCcYXlO2P3H6xbUM6ktL2Xmf45GAOit9bI4z6/3VU7JwllVO1L7u0UDSg/EhzQ5lmMLolA== - dependencies: - readable-stream "^2.0.1" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -18035,7 +17940,7 @@ mkdirp@0.5.5: dependencies: minimist "^1.2.5" -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -19025,17 +18930,12 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" - integrity sha512-Lbc7GfN7XFaK30bzUN3cDYLOkT0dH05S0ax1QikylHUD9+Z9PRF3G1iYwX3kcz+6AlzTFGkUgMxz6l3aUwbwTA== - object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" integrity sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ== -object-assign@^4, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -19323,14 +19223,6 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ordered-read-streams@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b" - integrity sha512-xQvd8qvx9U1iYY9aVqPpoF5V9uaWJKV6ZGljkh/jkiNX0DiQsjbWvRumbh10QTMDE8DheaOEU8xi0szbrgjzcw== - dependencies: - is-stream "^1.0.1" - readable-stream "^2.0.1" - original-require@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" @@ -21114,17 +21006,7 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: string_decoder "^1.1.1" util-deprecate "^1.0.1" -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.15: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -21142,6 +21024,16 @@ readable-stream@~0.0.2: resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw== +readable-stream@~1.0.15: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" @@ -21340,11 +21232,6 @@ repeat-string@^1.5.2, repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - integrity sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ== - req-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/req-cwd/-/req-cwd-2.0.0.tgz#d4082b4d44598036640fb73ddea01ed53db49ebc" @@ -22436,7 +22323,7 @@ sort-keys@^4.0.0: dependencies: is-plain-obj "^2.0.0" -source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: +source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== @@ -22473,7 +22360,7 @@ source-map@^0.5.6: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -22829,15 +22716,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-bom-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" - integrity sha512-7jfJB9YpI2Z0aH3wu10ZqitvYJaE0s5IzFuWE+0pbb4Q/armTloEUShymkDO47YSLnjAW52mlXT//hs9wXNNJQ== - dependencies: - first-chunk-stream "^1.0.0" - strip-bom "^2.0.0" - -strip-bom@2.X, strip-bom@^2.0.0: +strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g== @@ -23425,22 +23304,6 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -through2-filter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec" - integrity sha512-miwWajb1B80NvIVKXFPN/o7+vJc4jYUvnZCwvhicRAoTxdD9wbcjri70j+BenCrN/JXEPKDjhpw4iY7yiNsCGg== - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - -through2-filter@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" - integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - through2@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9" @@ -23449,14 +23312,6 @@ through2@2.0.1: readable-stream "~2.0.0" xtend "~4.0.0" -through2@2.X, through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - through2@3.0.2, through2@^3.0.0, through2@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" @@ -23465,13 +23320,13 @@ through2@3.0.2, through2@^3.0.0, through2@^3.0.1: inherits "^2.0.4" readable-stream "2 || 3" -through2@^0.6.0: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg== +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" + readable-stream "~2.3.6" + xtend "~4.0.1" through2@^4.0.0: version "4.0.2" @@ -23572,13 +23427,6 @@ tmpl@1.0.5: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== -to-absolute-glob@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" - integrity sha512-Vvl5x6zNf9iVG1QTWeknmWrKzZxaeKfIDRibrZCR3b2V/2NlFJuD2HV7P7AVjaKLZNqLPHqyr0jGrW0fTcxCPQ== - dependencies: - extend-shallow "^2.0.1" - to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" @@ -24334,14 +24182,6 @@ unique-slug@^3.0.0: dependencies: imurmurhash "^0.1.4" -unique-stream@^2.0.2: - version "2.3.1" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" - integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== - dependencies: - json-stable-stringify-without-jsonify "^1.0.1" - through2-filter "^3.0.0" - unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" @@ -24711,11 +24551,6 @@ v8-to-istanbul@^9.0.1: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" -vali-date@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6" - integrity sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg== - valid-url@^1, valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" @@ -24772,15 +24607,6 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vinyl@1.X, vinyl@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" - integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - vm2@^3.9.11: version "3.9.17" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" @@ -26777,7 +26603,7 @@ xss@^1.0.8: commander "^2.20.3" cssfilter "0.0.10" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From db11b4142b4927689d77e88af77fcffeefe14289 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 16:35:52 -0400 Subject: [PATCH 036/184] - update node-fetch - manage migrations folder during build and clean --- packages/celotool/package.json | 2 +- packages/phone-number-privacy/combiner/package.json | 2 +- packages/protocol/package.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 593d042486d..1d27942e651 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -33,7 +33,7 @@ "js-yaml": "^3.13.1", "lodash": "^4.17.21", "moment": "^2.29.0", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.9", "prompts": "1.2.0", "read-last-lines": "^1.7.2", "sleep-promise": "^8.0.1", diff --git a/packages/phone-number-privacy/combiner/package.json b/packages/phone-number-privacy/combiner/package.json index fe2af577483..66d936f44a7 100644 --- a/packages/phone-number-privacy/combiner/package.json +++ b/packages/phone-number-privacy/combiner/package.json @@ -41,7 +41,7 @@ "firebase-admin": "^9.12.0", "firebase-functions": "^3.15.7", "knex": "^2.1.0", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.9", "pg": "^8.2.1", "uuid": "^7.0.3" }, diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 9983025c760..8ad40b56632 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -9,7 +9,7 @@ "lint:ts": "tslint -c tslint.json --project tsconfig.json", "lint:sol": "solhint './contracts/**/*.sol'", "lint": "yarn run lint:ts && yarn run lint:sol", - "clean": "rm -rf ./types/typechain && rm -rf build/* && rm -rf .0x-artifacts/* && rm -rf migrations/*.js* && rm -rf test/**/*.js* && rm -f lib/*.js* && rm -f lib/**/*.js* && rm -f scripts/*.js*", + "clean": "rm -rf ./types/typechain && rm -rf build/* && rm -rf .0x-artifacts/* && rm -rf migrations/*.js* && rm -rf migrations_/*.js* && rm -rf test/**/*.js* && rm -f lib/*.js* && rm -f lib/**/*.js* && rm -f scripts/*.js*", "test": "rm test/**/*.js ; node runTests.js", "quicktest": "./scripts/bash/quicktest.sh", "test:coverage": "yarn run test --coverage", @@ -18,7 +18,7 @@ "test:generate-old-devchain-and-build": "./scripts/bash/generate-old-devchain-and-build.sh", "build:ts": "rm -f migrations/*.js* && ts-node ./scripts/build.ts --truffleTypes ./types/typechain && tsc -b && mv migrations_ts/*js migrations", "gas": "yarn run test --gas", - "build:sol": "ts-node ./scripts/build.ts --solidity ${BUILD_DIR:-./build}", + "build:sol": "mkdir -p migrations && ts-node ./scripts/build.ts --solidity ${BUILD_DIR:-./build}", "build": "yarn build:sol && yarn build:ts", "sourcify-publish": "ts-node ./scripts/sourcify-publish.ts", "migrate": "./scripts/bash/migrate.sh", @@ -79,7 +79,7 @@ "j6": "^1.0.2", "lodash": "^4.17.21", "mathjs": "^5.0.4", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.9", "openzeppelin-solidity": "^2.5.0", "prompts": "^2.0.1", "solhint": "^2.3.1", From e4d7a0471575c2577e69c878f4e5048ff3e2c25d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 16:55:23 -0400 Subject: [PATCH 037/184] yarn installed using node 18.16.0 --- yarn.lock | 1051 ++--------------------------------------------------- 1 file changed, 27 insertions(+), 1024 deletions(-) diff --git a/yarn.lock b/yarn.lock index a8f5d618021..4174bd42214 100644 --- a/yarn.lock +++ b/yarn.lock @@ -608,7 +608,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== -"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4": +"@babel/core@^7.0.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.8.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== @@ -886,7 +886,7 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.7.2": +"@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.7.2": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== @@ -1088,14 +1088,6 @@ "@chainsafe/persistent-merkle-tree" "^0.4.2" case "^1.6.3" -"@cnakazawa/watch@^1.0.3": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" - integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ== - dependencies: - exec-sh "^0.3.2" - minimist "^1.2.0" - "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" @@ -2408,18 +2400,6 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" - integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g== - dependencies: - "@jest/types" "^26.6.2" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^26.6.2" - jest-util "^26.6.2" - slash "^3.0.0" - "@jest/console@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.5.0.tgz#593a6c5c0d3f75689835f1b3b4688c4f8544cb57" @@ -2432,40 +2412,6 @@ jest-util "^29.5.0" slash "^3.0.0" -"@jest/core@^26.6.3": - version "26.6.3" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" - integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== - dependencies: - "@jest/console" "^26.6.2" - "@jest/reporters" "^26.6.2" - "@jest/test-result" "^26.6.2" - "@jest/transform" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.4" - jest-changed-files "^26.6.2" - jest-config "^26.6.3" - jest-haste-map "^26.6.2" - jest-message-util "^26.6.2" - jest-regex-util "^26.0.0" - jest-resolve "^26.6.2" - jest-resolve-dependencies "^26.6.3" - jest-runner "^26.6.3" - jest-runtime "^26.6.3" - jest-snapshot "^26.6.2" - jest-util "^26.6.2" - jest-validate "^26.6.2" - jest-watcher "^26.6.2" - micromatch "^4.0.2" - p-each-series "^2.1.0" - rimraf "^3.0.0" - slash "^3.0.0" - strip-ansi "^6.0.0" - "@jest/core@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03" @@ -2500,16 +2446,6 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" - integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA== - dependencies: - "@jest/fake-timers" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/node" "*" - jest-mock "^26.6.2" - "@jest/environment@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65" @@ -2535,18 +2471,6 @@ expect "^29.5.0" jest-snapshot "^29.5.0" -"@jest/fake-timers@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" - integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA== - dependencies: - "@jest/types" "^26.6.2" - "@sinonjs/fake-timers" "^6.0.1" - "@types/node" "*" - jest-message-util "^26.6.2" - jest-mock "^26.6.2" - jest-util "^26.6.2" - "@jest/fake-timers@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.5.0.tgz#d4d09ec3286b3d90c60bdcd66ed28d35f1b4dc2c" @@ -2559,15 +2483,6 @@ jest-mock "^29.5.0" jest-util "^29.5.0" -"@jest/globals@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" - integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA== - dependencies: - "@jest/environment" "^26.6.2" - "@jest/types" "^26.6.2" - expect "^26.6.2" - "@jest/globals@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.5.0.tgz#6166c0bfc374c58268677539d0c181f9c1833298" @@ -2578,38 +2493,6 @@ "@jest/types" "^29.5.0" jest-mock "^29.5.0" -"@jest/reporters@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" - integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw== - dependencies: - "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^26.6.2" - "@jest/test-result" "^26.6.2" - "@jest/transform" "^26.6.2" - "@jest/types" "^26.6.2" - chalk "^4.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.2" - graceful-fs "^4.2.4" - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^4.0.3" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.0.2" - jest-haste-map "^26.6.2" - jest-resolve "^26.6.2" - jest-util "^26.6.2" - jest-worker "^26.6.2" - slash "^3.0.0" - source-map "^0.6.0" - string-length "^4.0.1" - terminal-link "^2.0.0" - v8-to-istanbul "^7.0.0" - optionalDependencies: - node-notifier "^8.0.0" - "@jest/reporters@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.5.0.tgz#985dfd91290cd78ddae4914ba7921bcbabe8ac9b" @@ -2647,15 +2530,6 @@ dependencies: "@sinclair/typebox" "^0.25.16" -"@jest/source-map@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" - integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.2.4" - source-map "^0.6.0" - "@jest/source-map@^29.4.3": version "29.4.3" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.3.tgz#ff8d05cbfff875d4a791ab679b4333df47951d20" @@ -2665,16 +2539,6 @@ callsites "^3.0.0" graceful-fs "^4.2.9" -"@jest/test-result@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" - integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ== - dependencies: - "@jest/console" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - "@jest/test-result@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408" @@ -2685,17 +2549,6 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^26.6.3": - version "26.6.3" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" - integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== - dependencies: - "@jest/test-result" "^26.6.2" - graceful-fs "^4.2.4" - jest-haste-map "^26.6.2" - jest-runner "^26.6.3" - jest-runtime "^26.6.3" - "@jest/test-sequencer@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz#34d7d82d3081abd523dbddc038a3ddcb9f6d3cc4" @@ -2706,27 +2559,6 @@ jest-haste-map "^29.5.0" slash "^3.0.0" -"@jest/transform@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" - integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA== - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^26.6.2" - babel-plugin-istanbul "^6.0.0" - chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.4" - jest-haste-map "^26.6.2" - jest-regex-util "^26.0.0" - jest-util "^26.6.2" - micromatch "^4.0.2" - pirates "^4.0.1" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" - "@jest/transform@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9" @@ -2748,17 +2580,6 @@ slash "^3.0.0" write-file-atomic "^4.0.2" -"@jest/types@^26.6.2": - version "26.6.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" - integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^15.0.0" - chalk "^4.0.0" - "@jest/types@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" @@ -4650,13 +4471,6 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== -"@sinonjs/commons@^1.7.0": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" - integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== - dependencies: - type-detect "4.0.8" - "@sinonjs/commons@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3" @@ -4671,13 +4485,6 @@ dependencies: "@sinonjs/commons" "^2.0.0" -"@sinonjs/fake-timers@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" - integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== - dependencies: - "@sinonjs/commons" "^1.7.0" - "@solidity-parser/parser@^0.14.0", "@solidity-parser/parser@^0.14.1": version "0.14.5" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.5.tgz#87bc3cc7b068e08195c219c91cd8ddff5ef1a804" @@ -5299,7 +5106,7 @@ dependencies: "@types/pvutils" "*" -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7": +"@types/babel__core@^7.1.14": version "7.20.0" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== @@ -5325,7 +5132,7 @@ "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": version "7.18.3" resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== @@ -5572,7 +5379,7 @@ resolved "https://registry.yarnpkg.com/@types/google-libphonenumber/-/google-libphonenumber-7.4.23.tgz#c44c9125d45f042943694d605fd8d8d796cafc3b" integrity sha512-C3ydakLTQa8HxtYf9ge4q6uT9krDX8smSIxmmW3oACFi5g5vv6T068PRExF7UyWbWpuYiDG8Nm24q2X5XhcZWw== -"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3": +"@types/graceful-fs@^4.1.3": version "4.1.6" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== @@ -5854,7 +5661,7 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== -"@types/prettier@^2.0.0", "@types/prettier@^2.1.5": +"@types/prettier@^2.1.5": version "2.7.2" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== @@ -6131,13 +5938,6 @@ dependencies: "@types/yargs-parser" "*" -"@types/yargs@^15.0.0": - version "15.0.15" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158" - integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg== - dependencies: - "@types/yargs-parser" "*" - "@types/yargs@^17.0.8": version "17.0.24" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" @@ -6178,11 +5978,6 @@ JSONStream@^1.0.4, JSONStream@^1.2.1: jsonparse "^1.2.0" through ">=2.2.7 <3" -abab@^2.0.3, abab@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - abbrev@1, abbrev@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -6304,24 +6099,11 @@ accepts@^1.3.5, accepts@~1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - acorn-jsx@^5.0.0: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^7.1.1: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - acorn-walk@^8.1.1, acorn-walk@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" @@ -6332,12 +6114,7 @@ acorn@^6.0.7: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^7.1.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0: +acorn@^8.4.1, acorn@^8.7.0: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -6490,7 +6267,7 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== -ansi-regex@^5.0.0, ansi-regex@^5.0.1: +ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -6551,14 +6328,6 @@ any-promise@1.3.0, any-promise@^1.0.0: resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -7139,20 +6908,6 @@ axios@^1.0.0: form-data "^4.0.0" proxy-from-env "^1.1.0" -babel-jest@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" - integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA== - dependencies: - "@jest/transform" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/babel__core" "^7.1.7" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.6.2" - chalk "^4.0.0" - graceful-fs "^4.2.4" - slash "^3.0.0" - babel-jest@^29.1.2, babel-jest@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5" @@ -7166,7 +6921,7 @@ babel-jest@^29.1.2, babel-jest@^29.5.0: graceful-fs "^4.2.9" slash "^3.0.0" -babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1: +babel-plugin-istanbul@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== @@ -7177,16 +6932,6 @@ babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d" - integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.0.0" - "@types/babel__traverse" "^7.0.6" - babel-plugin-jest-hoist@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a" @@ -7239,14 +6984,6 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" - integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ== - dependencies: - babel-plugin-jest-hoist "^26.6.2" - babel-preset-current-node-syntax "^1.0.0" - babel-preset-jest@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2" @@ -7693,11 +7430,6 @@ browser-level@^1.0.1: module-error "^1.0.2" run-parallel-limit "^1.1.0" -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - browser-stdout@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" @@ -8187,13 +7919,6 @@ caniuse-lite@^1.0.30001449: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912" integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ== -capture-exit@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" - integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g== - dependencies: - rsvp "^4.8.4" - cardinal@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" @@ -8494,11 +8219,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -cjs-module-lexer@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" - integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== - cjs-module-lexer@^1.0.0: version "1.2.2" resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" @@ -8742,15 +8462,6 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" -cliui@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" - integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^6.2.0" - cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -9260,7 +8971,7 @@ conventional-recommended-bump@^6.1.0: meow "^8.0.0" q "^1.5.1" -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== @@ -9541,23 +9252,6 @@ cssfilter@0.0.10: resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw== -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== - -cssom@~0.3.6: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssstyle@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" - integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - dependencies: - cssom "~0.3.6" - csstype@^3.0.2: version "3.1.2" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" @@ -9620,15 +9314,6 @@ data-uri-to-buffer@3: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== - dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - dataloader@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" @@ -9726,7 +9411,7 @@ decimal.js@10.2.0: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231" integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw== -decimal.js@^10.0.0, decimal.js@^10.2.1: +decimal.js@^10.0.0: version "10.4.3" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== @@ -10085,11 +9770,6 @@ dicer@^0.3.0: dependencies: streamsearch "^1.1.0" -diff-sequences@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" - integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== - diff-sequences@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2" @@ -10188,13 +9868,6 @@ domelementtype@^2.3.0: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== - dependencies: - webidl-conversions "^5.0.0" - domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" @@ -10412,11 +10085,6 @@ emittery@^0.4.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.4.1.tgz#abe9d3297389ba424ac87e53d1c701962ce7433d" integrity sha512-r4eRSeStEGf6M5SKdrQhhLK5bOwOBxQhIE3YSTnZE3GpKiLfnnhE+tPtrJE79+eDJgm39BM6LSoI8SCx4HbwlQ== -emittery@^0.7.1: - version "0.7.2" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" - integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== - emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -10715,18 +10383,6 @@ escodegen@^1.8.1: optionalDependencies: source-map "~0.6.1" -escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - eslint-scope@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" @@ -11434,11 +11090,6 @@ exception-formatter@^1.0.4: dependencies: colors "^1.0.3" -exec-sh@^0.3.2: - version "0.3.6" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" - integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== - execa@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" @@ -11480,21 +11131,6 @@ execa@^2.1.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - execa@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" @@ -11595,18 +11231,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" - integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA== - dependencies: - "@jest/types" "^26.6.2" - ansi-styles "^4.0.0" - jest-get-type "^26.3.0" - jest-matcher-utils "^26.6.2" - jest-message-util "^26.6.2" - jest-regex-util "^26.0.0" - expect@^29.0.0, expect@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7" @@ -12528,7 +12152,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2: +fsevents@^2.3.2, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -13491,7 +13115,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -13525,11 +13149,6 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -growly@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" - integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw== - grpc-gcp@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/grpc-gcp/-/grpc-gcp-0.1.1.tgz#a11be8a7e7a6edf5f636b44a6a24fb4cc028f71f" @@ -13844,13 +13463,6 @@ hosted-git-info@^5.0.0: dependencies: lru-cache "^7.5.1" -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== - dependencies: - whatwg-encoding "^1.0.5" - html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" @@ -13991,11 +13603,6 @@ https-proxy-agent@^2.2.1: agent-base "^4.3.0" debug "^3.1.0" -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -14762,11 +14369,6 @@ is-posix-bracket@^0.1.0: resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" integrity sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ== -is-potential-custom-element-name@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" - integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== - is-primitive@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" @@ -15028,16 +14630,6 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== -istanbul-lib-instrument@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" - integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== - dependencies: - "@babel/core" "^7.7.5" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.0.0" - semver "^6.3.0" - istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: version "5.2.1" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" @@ -15067,7 +14659,7 @@ istanbul-lib-source-maps@^4.0.0: istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^3.0.2, istanbul-reports@^3.1.3: +istanbul-reports@^3.1.3: version "3.1.5" resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== @@ -15166,15 +14758,6 @@ javascript-natural-sort@0.7.1: resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== -jest-changed-files@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" - integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ== - dependencies: - "@jest/types" "^26.6.2" - execa "^4.0.0" - throat "^5.0.0" - jest-changed-files@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e" @@ -15209,25 +14792,6 @@ jest-circus@^29.0.2, jest-circus@^29.5.0: slash "^3.0.0" stack-utils "^2.0.3" -jest-cli@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a" - integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== - dependencies: - "@jest/core" "^26.6.3" - "@jest/test-result" "^26.6.2" - "@jest/types" "^26.6.2" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.4" - import-local "^3.0.2" - is-ci "^2.0.0" - jest-config "^26.6.3" - jest-util "^26.6.2" - jest-validate "^26.6.2" - prompts "^2.0.1" - yargs "^15.4.1" - jest-cli@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67" @@ -15246,30 +14810,6 @@ jest-cli@^29.5.0: prompts "^2.0.1" yargs "^17.3.1" -jest-config@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" - integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== - dependencies: - "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.6.3" - "@jest/types" "^26.6.2" - babel-jest "^26.6.3" - chalk "^4.0.0" - deepmerge "^4.2.2" - glob "^7.1.1" - graceful-fs "^4.2.4" - jest-environment-jsdom "^26.6.2" - jest-environment-node "^26.6.2" - jest-get-type "^26.3.0" - jest-jasmine2 "^26.6.3" - jest-regex-util "^26.0.0" - jest-resolve "^26.6.2" - jest-util "^26.6.2" - jest-validate "^26.6.2" - micromatch "^4.0.2" - pretty-format "^26.6.2" - jest-config@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.5.0.tgz#3cc972faec8c8aaea9ae158c694541b79f3748da" @@ -15298,16 +14838,6 @@ jest-config@^29.5.0: slash "^3.0.0" strip-json-comments "^3.1.1" -jest-diff@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" - integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== - dependencies: - chalk "^4.0.0" - diff-sequences "^26.6.2" - jest-get-type "^26.3.0" - pretty-format "^26.6.2" - jest-diff@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" @@ -15318,13 +14848,6 @@ jest-diff@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-docblock@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" - integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== - dependencies: - detect-newline "^3.0.0" - jest-docblock@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.3.tgz#90505aa89514a1c7dceeac1123df79e414636ea8" @@ -15332,17 +14855,6 @@ jest-docblock@^29.4.3: dependencies: detect-newline "^3.0.0" -jest-each@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" - integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A== - dependencies: - "@jest/types" "^26.6.2" - chalk "^4.0.0" - jest-get-type "^26.3.0" - jest-util "^26.6.2" - pretty-format "^26.6.2" - jest-each@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06" @@ -15354,31 +14866,6 @@ jest-each@^29.5.0: jest-util "^29.5.0" pretty-format "^29.5.0" -jest-environment-jsdom@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" - integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== - dependencies: - "@jest/environment" "^26.6.2" - "@jest/fake-timers" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/node" "*" - jest-mock "^26.6.2" - jest-util "^26.6.2" - jsdom "^16.4.0" - -jest-environment-node@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c" - integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag== - dependencies: - "@jest/environment" "^26.6.2" - "@jest/fake-timers" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/node" "*" - jest-mock "^26.6.2" - jest-util "^26.6.2" - jest-environment-node@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.5.0.tgz#f17219d0f0cc0e68e0727c58b792c040e332c967" @@ -15391,37 +14878,11 @@ jest-environment-node@^29.5.0: jest-mock "^29.5.0" jest-util "^29.5.0" -jest-get-type@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" - integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== - jest-get-type@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg== -jest-haste-map@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" - integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== - dependencies: - "@jest/types" "^26.6.2" - "@types/graceful-fs" "^4.1.2" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.4" - jest-regex-util "^26.0.0" - jest-serializer "^26.6.2" - jest-util "^26.6.2" - jest-worker "^26.6.2" - micromatch "^4.0.2" - sane "^4.0.3" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.1.2" - jest-haste-map@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de" @@ -15441,30 +14902,6 @@ jest-haste-map@^29.5.0: optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" - integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== - dependencies: - "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.6.2" - "@jest/source-map" "^26.6.2" - "@jest/test-result" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - expect "^26.6.2" - is-generator-fn "^2.0.0" - jest-each "^26.6.2" - jest-matcher-utils "^26.6.2" - jest-message-util "^26.6.2" - jest-runtime "^26.6.3" - jest-snapshot "^26.6.2" - jest-util "^26.6.2" - pretty-format "^26.6.2" - throat "^5.0.0" - jest-junit@^14.0.1: version "14.0.1" resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-14.0.1.tgz#5b357d6f5d333459585d628a24cd48b5bbc92ba2" @@ -15475,14 +14912,6 @@ jest-junit@^14.0.1: uuid "^8.3.2" xml "^1.0.1" -jest-leak-detector@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af" - integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg== - dependencies: - jest-get-type "^26.3.0" - pretty-format "^26.6.2" - jest-leak-detector@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz#cf4bdea9615c72bac4a3a7ba7e7930f9c0610c8c" @@ -15491,16 +14920,6 @@ jest-leak-detector@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-matcher-utils@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" - integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw== - dependencies: - chalk "^4.0.0" - jest-diff "^26.6.2" - jest-get-type "^26.3.0" - pretty-format "^26.6.2" - jest-matcher-utils@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5" @@ -15511,21 +14930,6 @@ jest-matcher-utils@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-message-util@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" - integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA== - dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.6.2" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.4" - micromatch "^4.0.2" - pretty-format "^26.6.2" - slash "^3.0.0" - stack-utils "^2.0.2" - jest-message-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e" @@ -15541,14 +14945,6 @@ jest-message-util@^29.5.0: slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" - integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew== - dependencies: - "@jest/types" "^26.6.2" - "@types/node" "*" - jest-mock@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.5.0.tgz#26e2172bcc71d8b0195081ff1f146ac7e1518aed" @@ -15563,25 +14959,11 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== -jest-regex-util@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" - integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== - jest-regex-util@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8" integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg== -jest-resolve-dependencies@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" - integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg== - dependencies: - "@jest/types" "^26.6.2" - jest-regex-util "^26.0.0" - jest-snapshot "^26.6.2" - jest-resolve-dependencies@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz#f0ea29955996f49788bf70996052aa98e7befee4" @@ -15590,20 +14972,6 @@ jest-resolve-dependencies@^29.5.0: jest-regex-util "^29.4.3" jest-snapshot "^29.5.0" -jest-resolve@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" - integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ== - dependencies: - "@jest/types" "^26.6.2" - chalk "^4.0.0" - graceful-fs "^4.2.4" - jest-pnp-resolver "^1.2.2" - jest-util "^26.6.2" - read-pkg-up "^7.0.1" - resolve "^1.18.1" - slash "^3.0.0" - jest-resolve@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.5.0.tgz#b053cc95ad1d5f6327f0ac8aae9f98795475ecdc" @@ -15619,32 +14987,6 @@ jest-resolve@^29.5.0: resolve.exports "^2.0.0" slash "^3.0.0" -jest-runner@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" - integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== - dependencies: - "@jest/console" "^26.6.2" - "@jest/environment" "^26.6.2" - "@jest/test-result" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/node" "*" - chalk "^4.0.0" - emittery "^0.7.1" - exit "^0.1.2" - graceful-fs "^4.2.4" - jest-config "^26.6.3" - jest-docblock "^26.0.0" - jest-haste-map "^26.6.2" - jest-leak-detector "^26.6.2" - jest-message-util "^26.6.2" - jest-resolve "^26.6.2" - jest-runtime "^26.6.3" - jest-util "^26.6.2" - jest-worker "^26.6.2" - source-map-support "^0.5.6" - throat "^5.0.0" - jest-runner@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.5.0.tgz#6a57c282eb0ef749778d444c1d758c6a7693b6f8" @@ -15672,39 +15014,6 @@ jest-runner@^29.5.0: p-limit "^3.1.0" source-map-support "0.5.13" -jest-runtime@^26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" - integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== - dependencies: - "@jest/console" "^26.6.2" - "@jest/environment" "^26.6.2" - "@jest/fake-timers" "^26.6.2" - "@jest/globals" "^26.6.2" - "@jest/source-map" "^26.6.2" - "@jest/test-result" "^26.6.2" - "@jest/transform" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/yargs" "^15.0.0" - chalk "^4.0.0" - cjs-module-lexer "^0.6.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.3" - graceful-fs "^4.2.4" - jest-config "^26.6.3" - jest-haste-map "^26.6.2" - jest-message-util "^26.6.2" - jest-mock "^26.6.2" - jest-regex-util "^26.0.0" - jest-resolve "^26.6.2" - jest-snapshot "^26.6.2" - jest-util "^26.6.2" - jest-validate "^26.6.2" - slash "^3.0.0" - strip-bom "^4.0.0" - yargs "^15.4.1" - jest-runtime@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420" @@ -15733,36 +15042,6 @@ jest-runtime@^29.5.0: slash "^3.0.0" strip-bom "^4.0.0" -jest-serializer@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1" - integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g== - dependencies: - "@types/node" "*" - graceful-fs "^4.2.4" - -jest-snapshot@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" - integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== - dependencies: - "@babel/types" "^7.0.0" - "@jest/types" "^26.6.2" - "@types/babel__traverse" "^7.0.4" - "@types/prettier" "^2.0.0" - chalk "^4.0.0" - expect "^26.6.2" - graceful-fs "^4.2.4" - jest-diff "^26.6.2" - jest-get-type "^26.3.0" - jest-haste-map "^26.6.2" - jest-matcher-utils "^26.6.2" - jest-message-util "^26.6.2" - jest-resolve "^26.6.2" - natural-compare "^1.4.0" - pretty-format "^26.6.2" - semver "^7.3.2" - jest-snapshot@^29.0.2, jest-snapshot@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce" @@ -15792,18 +15071,6 @@ jest-snapshot@^29.0.2, jest-snapshot@^29.5.0: pretty-format "^29.5.0" semver "^7.3.5" -jest-util@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" - integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== - dependencies: - "@jest/types" "^26.6.2" - "@types/node" "*" - chalk "^4.0.0" - graceful-fs "^4.2.4" - is-ci "^2.0.0" - micromatch "^4.0.2" - jest-util@^29.0.0, jest-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" @@ -15816,18 +15083,6 @@ jest-util@^29.0.0, jest-util@^29.5.0: graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" - integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ== - dependencies: - "@jest/types" "^26.6.2" - camelcase "^6.0.0" - chalk "^4.0.0" - jest-get-type "^26.3.0" - leven "^3.1.0" - pretty-format "^26.6.2" - jest-validate@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.5.0.tgz#8e5a8f36178d40e47138dc00866a5f3bd9916ffc" @@ -15840,19 +15095,6 @@ jest-validate@^29.5.0: leven "^3.1.0" pretty-format "^29.5.0" -jest-watcher@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" - integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ== - dependencies: - "@jest/test-result" "^26.6.2" - "@jest/types" "^26.6.2" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - jest-util "^26.6.2" - string-length "^4.0.1" - jest-watcher@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.5.0.tgz#cf7f0f949828ba65ddbbb45c743a382a4d911363" @@ -15867,15 +15109,6 @@ jest-watcher@^29.5.0: jest-util "^29.5.0" string-length "^4.0.1" -jest-worker@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" - integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - jest-worker@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" @@ -15886,15 +15119,6 @@ jest-worker@^29.5.0: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@26.6.3: - version "26.6.3" - resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" - integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== - dependencies: - "@jest/core" "^26.6.3" - import-local "^3.0.2" - jest-cli "^26.6.3" - jest@^29.0.2: version "29.5.0" resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e" @@ -15989,39 +15213,6 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== -jsdom@^16.4.0: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== - dependencies: - abab "^2.0.5" - acorn "^8.2.4" - acorn-globals "^6.0.0" - cssom "^0.4.4" - cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" - escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" - symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -17099,7 +16290,7 @@ lodash.values@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q== -lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -17597,7 +16788,7 @@ micromatch@^2.3.11, micromatch@^2.3.7: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.1.10: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -17781,7 +16972,7 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q== -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.7: +minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -18503,7 +17694,7 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: +node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== @@ -18602,18 +17793,6 @@ node-interval-tree@^1.3.3: dependencies: shallowequal "^1.0.2" -node-notifier@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" - integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== - dependencies: - growly "^1.3.0" - is-wsl "^2.2.0" - semver "^7.3.2" - shellwords "^0.1.1" - uuid "^8.3.0" - which "^2.0.2" - node-releases@^2.0.8: version "2.0.10" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" @@ -18804,7 +17983,7 @@ npm-run-path@^3.0.0: dependencies: path-key "^3.0.0" -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -18871,11 +18050,6 @@ numeric@^1.2.6: resolved "https://registry.yarnpkg.com/numeric/-/numeric-1.2.6.tgz#765b02bef97988fcf880d4eb3f36b80fa31335aa" integrity sha512-avBiDAP8siMa7AfJgYyuxw1oyII4z2sswS23+O+ZfV28KrtNzy0wxUFwi4f3RyM4eeeXNs1CThxR7pb5QQcMiw== -nwsapi@^2.2.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" - integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== - nx@15.9.2, "nx@>=14.8.1 < 16": version "15.9.2" resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.2.tgz#d7ace1e5ae64a47f1b553dc5da08dbdd858bde96" @@ -19286,11 +18460,6 @@ p-defer@^3.0.0: resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== -p-each-series@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" - integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== - p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" @@ -19610,11 +18779,6 @@ parse5-htmlparser2-tree-adapter@^7.0.0: domhandler "^5.0.2" parse5 "^7.0.0" -parse5@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - parse5@^7.0.0: version "7.1.2" resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" @@ -19923,7 +19087,7 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== -pirates@^4.0.1, pirates@^4.0.4: +pirates@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== @@ -20307,16 +19471,6 @@ prettier@^2.7.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450" integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw== -pretty-format@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" - integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== - dependencies: - "@jest/types" "^26.6.2" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^17.0.1" - pretty-format@^29.0.0, pretty-format@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a" @@ -20892,11 +20046,6 @@ re2@^1.15.8: nan "^2.17.0" node-gyp "^9.3.0" -react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - react-is@^18.0.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" @@ -21405,7 +20554,7 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1, resolve@~1.22.1: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1, resolve@~1.22.1: version "1.22.2" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== @@ -21545,7 +20694,7 @@ router@^1.3.1: setprototypeof "1.2.0" utils-merge "1.0.1" -rsvp@^4.8.4, rsvp@^4.8.5: +rsvp@^4.8.5: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== @@ -21651,21 +20800,6 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sane@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" - integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA== - dependencies: - "@cnakazawa/watch" "^1.0.3" - anymatch "^2.0.0" - capture-exit "^2.0.0" - exec-sh "^0.3.2" - execa "^1.0.0" - fb-watchman "^2.0.0" - micromatch "^3.1.4" - minimist "^1.1.1" - walker "~1.0.5" - sanitize-filename@^1.6.1: version "1.6.3" resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" @@ -21693,13 +20827,6 @@ sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== - dependencies: - xmlchars "^2.2.0" - scrypt-js@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" @@ -22030,11 +21157,6 @@ shelljs@^0.8.4: interpret "^1.0.0" rechoir "^0.6.2" -shellwords@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" - integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -22370,11 +21492,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" @@ -22515,7 +21632,7 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== -stack-utils@^2.0.2, stack-utils@^2.0.3: +stack-utils@^2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== @@ -22936,7 +22053,7 @@ supports-hyperlinks@^1.0.1: has-flag "^2.0.0" supports-color "^5.0.0" -supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.1.0: +supports-hyperlinks@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== @@ -22997,11 +22114,6 @@ symbol-observable@^1.0.3: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -symbol-tree@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" - integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== - sync-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.1.0.tgz#e96217565b5e50bbffe179868ba75532fb597e68" @@ -23228,14 +22340,6 @@ term-size@^2.1.0: resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== - dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" - test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -23304,11 +22408,6 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -throat@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" - integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== - through2@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9" @@ -23492,7 +22591,7 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0: +"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0": version "4.1.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== @@ -23525,13 +22624,6 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -tr46@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" - integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== - dependencies: - punycode "^2.1.1" - tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -24538,15 +23630,6 @@ v8-compile-cache@2.3.0: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" - integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - source-map "^0.7.3" - v8-to-istanbul@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265" @@ -24656,20 +23739,6 @@ vuvuzela@1.0.3: resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" integrity sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ== -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== - dependencies: - browser-process-hrtime "^1.0.0" - -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== - dependencies: - xml-name-validator "^3.0.0" - walk-up-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" @@ -24680,7 +23749,7 @@ walkdir@^0.3.0, walkdir@^0.3.2: resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.3.2.tgz#ac8437a288c295656848ebc19981ebc677a5f590" integrity sha512-0Twghia4Z5wDGDYWURlhZmI47GvERMCsXIu0QZWVVZyW9ZjpbbZvD9Zy9M6cWiQQRRbAcYajIyKNavaZZDt1Uw== -walker@^1.0.7, walker@^1.0.8, walker@~1.0.5: +walker@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== @@ -26098,16 +25167,6 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - -webidl-conversions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== - websocket-driver@>=0.5.1: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" @@ -26144,13 +25203,6 @@ websocket@^1.0.28, websocket@^1.0.32: typedarray-to-buffer "^3.1.5" yaeti "^0.0.6" -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== - dependencies: - iconv-lite "0.4.24" - whatwg-fetch@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" @@ -26166,11 +25218,6 @@ whatwg-fetch@>=0.10.0, whatwg-fetch@^3.4.1: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== - whatwg-mimetype@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" @@ -26193,15 +25240,6 @@ whatwg-url@^6.5.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" - integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== - dependencies: - lodash "^4.7.0" - tr46 "^2.1.0" - webidl-conversions "^6.1.0" - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -26500,7 +25538,7 @@ ws@^5.1.1: dependencies: async-limiter "~1.0.0" -ws@^7.2.0, ws@^7.2.3, ws@^7.4.6: +ws@^7.2.0, ws@^7.2.3: version "7.5.9" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== @@ -26557,11 +25595,6 @@ xhr@^2.0.4, xhr@^2.2.0, xhr@^2.3.3: parse-headers "^2.0.0" xtend "^4.0.0" -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== - xml2js@0.5.0, xml2js@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" @@ -26580,11 +25613,6 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlchars@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== - xmlhttprequest@*, xmlhttprequest@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" @@ -26686,14 +25714,6 @@ yargs-parser@^15.0.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^18.1.2: - version "18.1.3" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" - integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" @@ -26814,23 +25834,6 @@ yargs@^14.0.0: y18n "^4.0.0" yargs-parser "^15.0.1" -yargs@^15.4.1: - version "15.4.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" - integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== - dependencies: - cliui "^6.0.0" - decamelize "^1.2.0" - find-up "^4.1.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^4.2.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^18.1.2" - yargs@^17.3.1, yargs@^17.5.1, yargs@^17.6.2: version "17.7.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" From db592cad4c6589a8ebbe09bdbf56b5b9bb7f47fe Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 18:50:39 -0400 Subject: [PATCH 038/184] Appease linter --- packages/celotool/src/lib/generate_utils.ts | 2 +- packages/cli/src/commands/network/contracts.ts | 2 +- packages/dev-utils/src/ganache-setup.ts | 4 +++- packages/phone-number-privacy/combiner/src/server.ts | 1 + packages/protocol/lib/test-utils.ts | 1 + packages/protocol/scripts/truffle/make-release.ts | 8 +++++--- packages/protocol/test/common/feeburner.ts | 4 +++- packages/protocol/test/common/proxy.ts | 1 - packages/protocol/test/customHooks.ts | 2 +- packages/protocol/test/governance/network/governance.ts | 8 ++++---- packages/protocol/test/governance/voting/release_gold.ts | 1 + packages/protocol/test/identity/attestations.ts | 2 +- packages/sdk/base/src/signatureUtils.ts | 2 +- packages/sdk/explorer/src/sourcify.test.ts | 1 + packages/sdk/wallets/wallet-base/src/signing-utils.ts | 1 - .../sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts | 2 +- 16 files changed, 25 insertions(+), 17 deletions(-) diff --git a/packages/celotool/src/lib/generate_utils.ts b/packages/celotool/src/lib/generate_utils.ts index 9df5242b2a2..8478ec28c2c 100644 --- a/packages/celotool/src/lib/generate_utils.ts +++ b/packages/celotool/src/lib/generate_utils.ts @@ -3,7 +3,6 @@ import * as bls12377js from '@celo/bls12377js' import { blsPrivateKeyToProcessedPrivateKey } from '@celo/cryptographic-utils/lib/bls' import BigNumber from 'bignumber.js' import { BIP32Factory, BIP32Interface } from 'bip32' -import * as ecc from 'tiny-secp256k1' import * as bip39 from 'bip39' import fs from 'fs' import { merge, range, repeat } from 'lodash' @@ -12,6 +11,7 @@ import path from 'path' import * as rlp from 'rlp' import { MyceloGenesisConfig } from 'src/lib/interfaces/mycelo-genesis-config' import { CurrencyPair } from 'src/lib/k8s-oracle/base' +import * as ecc from 'tiny-secp256k1' import Web3 from 'web3' import { spawnCmd, spawnCmdWithExitOnFailure } from './cmd-utils' import { envVar, fetchEnv, fetchEnvOrFallback, monorepoRoot } from './env-utils' diff --git a/packages/cli/src/commands/network/contracts.ts b/packages/cli/src/commands/network/contracts.ts index 73968d6cb31..3aa67d373af 100644 --- a/packages/cli/src/commands/network/contracts.ts +++ b/packages/cli/src/commands/network/contracts.ts @@ -57,7 +57,7 @@ export default class Contracts extends BaseCommand { } ) - const tokenBalanceColumns: table.Columns = {} + const tokenBalanceColumns: table.Columns<(typeof contractInfo)[number]> = {} await this.kit.celoTokens.forEachCeloToken( (token) => (tokenBalanceColumns[token.symbol] = { diff --git a/packages/dev-utils/src/ganache-setup.ts b/packages/dev-utils/src/ganache-setup.ts index bcb9cca6eb4..23a746ce6f9 100644 --- a/packages/dev-utils/src/ganache-setup.ts +++ b/packages/dev-utils/src/ganache-setup.ts @@ -75,7 +75,9 @@ async function launchServer(opts: { verbose?: boolean; from_targz?: boolean }, c }) server.listen(8545, async (err: any) => { - if (err) throw err + if (err) { + throw err + } }) return async () => { diff --git a/packages/phone-number-privacy/combiner/src/server.ts b/packages/phone-number-privacy/combiner/src/server.ts index 617a2c51a34..19ad593db14 100644 --- a/packages/phone-number-privacy/combiner/src/server.ts +++ b/packages/phone-number-privacy/combiner/src/server.ts @@ -9,6 +9,7 @@ import { } from '@celo/phone-number-privacy-common' import Logger from 'bunyan' import express, { Request, RequestHandler, Response } from 'express' +// tslint:disable-next-line: ordered-imports import { PerformanceObserver, performance } from 'perf_hooks' import { Controller } from './common/controller' import { CombinerConfig, getCombinerVersion } from './config' diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 92e9c1ed7de..aebe06069fd 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -8,6 +8,7 @@ import assert from 'assert'; import BigNumber from 'bignumber.js'; import chai from 'chai'; import chaiSubset from 'chai-subset'; +// tslint:disable-next-line: ordered-imports import { SpawnOptions, spawn } from 'child_process'; import { keccak256 } from 'ethereum-cryptography/keccak'; import { diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index e35355da41d..c3b8fd45014 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -4,10 +4,12 @@ import { LibraryAddresses } from '@celo/protocol/lib/bytecode' import { ASTDetailedVersionedReport } from '@celo/protocol/lib/compatibility/report' import { getCeloContractDependencies } from '@celo/protocol/lib/contract-dependencies' import { CeloContractName, celoRegistryAddress } from '@celo/protocol/lib/registry-utils' -import { Address, eqAddress, NULL_ADDRESS } from '@celo/utils/lib/address' -import { readdirSync, readJsonSync, writeJsonSync } from 'fs-extra' -import { basename, join } from 'path' +// tslint:disable-next-line: ordered-imports +import { Address, NULL_ADDRESS, eqAddress } from '@celo/utils/lib/address' import { TruffleContract } from '@truffle/contract' +// tslint:disable-next-line: ordered-imports +import { readJsonSync, readdirSync, writeJsonSync } from 'fs-extra' +import { basename, join } from 'path' import { RegistryInstance } from 'types' /* diff --git a/packages/protocol/test/common/feeburner.ts b/packages/protocol/test/common/feeburner.ts index aaa40d6a5b6..0771623e033 100644 --- a/packages/protocol/test/common/feeburner.ts +++ b/packages/protocol/test/common/feeburner.ts @@ -266,8 +266,10 @@ contract('FeeBurner', (accounts: string[]) => { }) it("doesn't remove if the indexes doesn't match", async () => { - await assertTXRevertWithReason(feeBurner.removeRouter(tokenA.address, exchange.address, 0)), + await assertTXRevertWithReason( + feeBurner.removeRouter(tokenA.address, exchange.address, 0), 'Index does not match' + ) }) }) diff --git a/packages/protocol/test/common/proxy.ts b/packages/protocol/test/common/proxy.ts index 98d2966b75b..30b630c36b0 100644 --- a/packages/protocol/test/common/proxy.ts +++ b/packages/protocol/test/common/proxy.ts @@ -230,7 +230,6 @@ contract('Proxy', (accounts: string[]) => { }) it('recovers funds from an incorrectly intialized implementation', async () => { - //TODO: (soloseng) gasprice = 0 issue const Freezer: FreezerContract = artifacts.require('Freezer') const GoldToken: GoldTokenContract = artifacts.require('GoldToken') // @ts-ignore diff --git a/packages/protocol/test/customHooks.ts b/packages/protocol/test/customHooks.ts index 7d16f055ffb..690f54b23e0 100644 --- a/packages/protocol/test/customHooks.ts +++ b/packages/protocol/test/customHooks.ts @@ -1,4 +1,4 @@ -//TODO: (soloseng) fix: Argument of type 'string' is not assignable to parameter of type 'ProvidesHookCallback'. +// TODO: (soloseng) fix: Argument of type 'string' is not assignable to parameter of type 'ProvidesHookCallback'. import { retryAsync } from '@celo/utils/lib/async' diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index a86144375b2..31c6f5d5218 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -175,7 +175,7 @@ contract('Governance', (accounts: string[]) => { ), } salt = '0x657ed9d64e84fa3d1af43b3a307db22aba2d90a158015df1c588c02e24ca08f0' - const encoded_param = web3.eth.abi.encodeParameters( + const encodedParam = web3.eth.abi.encodeParameters( ['uint256[]', 'address[]', 'bytes', 'uint256[]', 'bytes32'], [ [String(transactionSuccess1.value)], @@ -186,7 +186,7 @@ contract('Governance', (accounts: string[]) => { ] ) - hotfixHash = toBuffer(keccak256(hexToBytes(trimLeading0x(encoded_param)))) + hotfixHash = toBuffer(keccak256(hexToBytes(trimLeading0x(encodedParam)))) hotfixHashStr = bufferToHex(hotfixHash) }) @@ -3164,7 +3164,7 @@ contract('Governance', (accounts: string[]) => { ) beforeEach(async () => { - for (let validator of validators) { + for (const validator of validators) { await accountsInstance.createAccount({ from: validator.account }) const sig = await getParsedSignatureOfAddress(web3, validator.account, validator.signer) await accountsInstance.authorizeValidatorSigner(validator.signer, sig.v, sig.r, sig.s, { @@ -3175,7 +3175,7 @@ contract('Governance', (accounts: string[]) => { } }) - const whitelistFrom = (t: keyof typeof validators[0]) => + const whitelistFrom = (t: keyof (typeof validators)[0]) => concurrentMap(5, validators, (v) => governance.whitelistHotfix(newHotfixHash, { from: v[t] })) const checkTally = async () => { diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index bb549746224..6987e1fb5c4 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -10,6 +10,7 @@ import { assertTXRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' +// tslint:disable-next-line: ordered-imports import { Signature, addressToPublicKey } from '@celo/utils/lib/signatureUtils' import { BigNumber } from 'bignumber.js' import _ from 'lodash' diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index aab4ea41dcd..bde4e8f6b42 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -96,7 +96,7 @@ contract('Attestations', (accounts: string[]) => { await accountsInstance.initialize(registry.address) await registry.setAddressFor(CeloContractName.Validators, mockValidators.address) const tokenBalance = web3.utils.toWei('10', 'ether').toString() - for (let account of accounts) { + for (const account of accounts) { await mockERC20Token.mint(account, tokenBalance) await otherMockERC20Token.mint(account, tokenBalance) await accountsInstance.createAccount({ from: account }) diff --git a/packages/sdk/base/src/signatureUtils.ts b/packages/sdk/base/src/signatureUtils.ts index fac9f529d56..28b885e4dfd 100644 --- a/packages/sdk/base/src/signatureUtils.ts +++ b/packages/sdk/base/src/signatureUtils.ts @@ -17,7 +17,7 @@ export function NativeSigner( } export interface Signature { - //TODO: (soloseng) should this be converted to Bigint? + // TODO: (soloseng) should this be converted to Bigint? v: number r: string s: string diff --git a/packages/sdk/explorer/src/sourcify.test.ts b/packages/sdk/explorer/src/sourcify.test.ts index 08d0cf481fd..8ae32ca8c0c 100644 --- a/packages/sdk/explorer/src/sourcify.test.ts +++ b/packages/sdk/explorer/src/sourcify.test.ts @@ -7,6 +7,7 @@ import { Provider, } from '@celo/connect' import Web3 from 'web3' +// tslint:disable-next-line: ordered-imports import { Metadata, fetchMetadata, tryGetProxyImplementation } from './sourcify' // This is taken from protocol/contracts/build/Account.json diff --git a/packages/sdk/wallets/wallet-base/src/signing-utils.ts b/packages/sdk/wallets/wallet-base/src/signing-utils.ts index 3cb597f8a74..d4f3fa9d729 100644 --- a/packages/sdk/wallets/wallet-base/src/signing-utils.ts +++ b/packages/sdk/wallets/wallet-base/src/signing-utils.ts @@ -4,7 +4,6 @@ import { inputCeloTxFormatter } from '@celo/connect/lib/utils/formatter' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' import { parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' import * as ethUtil from '@ethereumjs/util' -import { bufferToHex } from '@ethereumjs/util' import debugFactory from 'debug' // @ts-ignore-next-line eth-lib types not found import { account as Account, bytes as Bytes, hash as Hash, RLP } from 'eth-lib' diff --git a/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts b/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts index 92990b483ed..9bd6b4aeeda 100644 --- a/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts +++ b/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts @@ -10,9 +10,9 @@ import { } from '@celo/wallet-base' import * as ethUtil from '@ethereumjs/util' import TransportNodeHid from '@ledgerhq/hw-transport-node-hid' -import { keccak256 } from 'ethereum-cryptography/keccak' // @ts-ignore-next-line eth-lib types not found import { account as Account } from 'eth-lib' +import { keccak256 } from 'ethereum-cryptography/keccak' import Web3 from 'web3' import { AddressValidation, LedgerWallet } from './ledger-wallet' From 4fb40d0cc115f234fff88b4c97e9b0ffc0481c96 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 19:11:31 -0400 Subject: [PATCH 039/184] fixed import issue --- packages/sdk/wallets/wallet-base/src/signing-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sdk/wallets/wallet-base/src/signing-utils.ts b/packages/sdk/wallets/wallet-base/src/signing-utils.ts index d4f3fa9d729..c711de1195b 100644 --- a/packages/sdk/wallets/wallet-base/src/signing-utils.ts +++ b/packages/sdk/wallets/wallet-base/src/signing-utils.ts @@ -217,7 +217,7 @@ export function verifyEIP712TypedDataSigner( signedData: string, expectedAddress: string ): boolean { - const dataHex = bufferToHex(generateTypedDataHash(typedData)) + const dataHex = ethUtil.bufferToHex(generateTypedDataHash(typedData)) return verifySignatureWithoutPrefix(dataHex, signedData, expectedAddress) } From e6d8842ad7c4cef94ddb3bb1973d77e77e77bd7f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 26 Apr 2023 20:28:07 -0400 Subject: [PATCH 040/184] use devchain chain copy --- packages/protocol/scripts/devchain.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 4bda356b7db..3a5f238878b 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -110,7 +110,11 @@ yargs (args) => exitOnError(compressChain(args.datadir, args.filename)) ).argv -async function startGanache(datadir: string, opts: { verbose?: boolean }) { +async function startGanache( + datadir: string, + opts: { verbose?: boolean }, + chainCopy?: tmp.DirResult +) { const logFn = opts.verbose ? // tslint:disable-next-line: no-console (...args: any[]) => console.log(...args) @@ -127,14 +131,20 @@ async function startGanache(datadir: string, opts: { verbose?: boolean }) { }) server.listen(8545, async (err) => { - if (err) throw err - + if (err) { + throw err + } + // tslint:disable-next-line: no-console console.log(chalk.red('Ganache STARTED')) }) return async () => { try { await server.close() + if (chainCopy) { + chainCopy.removeCallback() + } + // tslint:disable-next-line: no-console console.log(chalk.red('GANACHE server closed')) } catch (e) { throw e @@ -231,7 +241,7 @@ async function runDevChainFromTar(filename: string) { await decompressChain(filename, chainCopy.name) - const stopGanache = await startGanache(chainCopy.name, { verbose: true }) + const stopGanache = await startGanache(chainCopy.name, { verbose: true }, chainCopy) return stopGanache } From ce9f73fa89aa9ef3a5609dfa51e6e66b08695219 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:07:53 -0400 Subject: [PATCH 041/184] using fixed jest version --- package.json | 6 +- packages/env-tests/package.json | 2 +- packages/sdk/contractkit/package.json | 2 +- yarn.lock | 107 +++++++++++++++++++------- 4 files changed, 86 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 6b1c52f5091..d149e758aff 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,10 @@ "codecov": "^3.6.5", "colors": "1.4.0", "husky": "^3.1.0", - "jest": "^29.0.2", - "jest-circus": "^29.0.2", + "jest": "29.0.2", + "jest-circus": "29.0.2", "jest-junit": "^14.0.1", - "jest-snapshot": "^29.0.2", + "jest-snapshot": "29.0.2", "lerna": "^5.5.0", "patch-package": "^6.2.2", "prettier": "^2.7.1", diff --git a/packages/env-tests/package.json b/packages/env-tests/package.json index 05592ccf5e4..a9d2ece4a2b 100644 --- a/packages/env-tests/package.json +++ b/packages/env-tests/package.json @@ -16,7 +16,7 @@ "bunyan-gke-stackdriver": "0.1.2", "bunyan-debug-stream": "2.0.0", "dotenv": "8.2.0", - "jest": "^29.0.2", + "jest": "29.0.2", "moment": "^2.29.0", "web3": "1.8.2" }, diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 851ace23242..2e99938b72d 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -51,7 +51,7 @@ "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", - "jest": "^29.0.2", + "jest": "29.0.2", "ts-node": "8.3.0", "typedoc": "^0.19.2", "typedoc-plugin-markdown": "^2.2.16", diff --git a/yarn.lock b/yarn.lock index 4174bd42214..b2f389a7dc8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2412,7 +2412,7 @@ jest-util "^29.5.0" slash "^3.0.0" -"@jest/core@^29.5.0": +"@jest/core@^29.0.2", "@jest/core@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03" integrity sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ== @@ -2446,7 +2446,7 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^29.5.0": +"@jest/environment@^29.0.2", "@jest/environment@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65" integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ== @@ -2456,14 +2456,14 @@ "@types/node" "*" jest-mock "^29.5.0" -"@jest/expect-utils@^29.5.0": +"@jest/expect-utils@^29.0.2", "@jest/expect-utils@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036" integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg== dependencies: jest-get-type "^29.4.3" -"@jest/expect@^29.5.0": +"@jest/expect@^29.0.2", "@jest/expect@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba" integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g== @@ -2539,7 +2539,7 @@ callsites "^3.0.0" graceful-fs "^4.2.9" -"@jest/test-result@^29.5.0": +"@jest/test-result@^29.0.2", "@jest/test-result@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408" integrity sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ== @@ -2559,7 +2559,7 @@ jest-haste-map "^29.5.0" slash "^3.0.0" -"@jest/transform@^29.5.0": +"@jest/transform@^29.0.2", "@jest/transform@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9" integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw== @@ -2580,7 +2580,7 @@ slash "^3.0.0" write-file-atomic "^4.0.2" -"@jest/types@^29.5.0": +"@jest/types@^29.0.2", "@jest/types@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog== @@ -11231,7 +11231,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^29.0.0, expect@^29.5.0: +expect@^29.0.0, expect@^29.0.2, expect@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7" integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg== @@ -14766,7 +14766,32 @@ jest-changed-files@^29.5.0: execa "^5.0.0" p-limit "^3.1.0" -jest-circus@^29.0.2, jest-circus@^29.5.0: +jest-circus@29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.0.2.tgz#7dda94888a8d47edb58e85a8e5f688f9da6657a3" + integrity sha512-YTPEsoE1P1X0bcyDQi3QIkpt2Wl9om9k2DQRuLFdS5x8VvAKSdYAVJufgvudhnKgM8WHvvAzhBE+1DRQB8x1CQ== + dependencies: + "@jest/environment" "^29.0.2" + "@jest/expect" "^29.0.2" + "@jest/test-result" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + dedent "^0.7.0" + is-generator-fn "^2.0.0" + jest-each "^29.0.2" + jest-matcher-utils "^29.0.2" + jest-message-util "^29.0.2" + jest-runtime "^29.0.2" + jest-snapshot "^29.0.2" + jest-util "^29.0.2" + p-limit "^3.1.0" + pretty-format "^29.0.2" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-circus@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317" integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA== @@ -14792,7 +14817,7 @@ jest-circus@^29.0.2, jest-circus@^29.5.0: slash "^3.0.0" stack-utils "^2.0.3" -jest-cli@^29.5.0: +jest-cli@^29.0.2: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67" integrity sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw== @@ -14838,7 +14863,7 @@ jest-config@^29.5.0: slash "^3.0.0" strip-json-comments "^3.1.1" -jest-diff@^29.5.0: +jest-diff@^29.0.2, jest-diff@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw== @@ -14855,7 +14880,7 @@ jest-docblock@^29.4.3: dependencies: detect-newline "^3.0.0" -jest-each@^29.5.0: +jest-each@^29.0.2, jest-each@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06" integrity sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA== @@ -14878,12 +14903,12 @@ jest-environment-node@^29.5.0: jest-mock "^29.5.0" jest-util "^29.5.0" -jest-get-type@^29.4.3: +jest-get-type@^29.0.0, jest-get-type@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg== -jest-haste-map@^29.5.0: +jest-haste-map@^29.0.2, jest-haste-map@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de" integrity sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA== @@ -14920,7 +14945,7 @@ jest-leak-detector@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-matcher-utils@^29.5.0: +jest-matcher-utils@^29.0.2, jest-matcher-utils@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5" integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw== @@ -14930,7 +14955,7 @@ jest-matcher-utils@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-message-util@^29.5.0: +jest-message-util@^29.0.2, jest-message-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e" integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA== @@ -15014,7 +15039,7 @@ jest-runner@^29.5.0: p-limit "^3.1.0" source-map-support "0.5.13" -jest-runtime@^29.5.0: +jest-runtime@^29.0.2, jest-runtime@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420" integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw== @@ -15042,6 +15067,36 @@ jest-runtime@^29.5.0: slash "^3.0.0" strip-bom "^4.0.0" +jest-snapshot@29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.0.2.tgz#5017d54db8369f01900d11e179513fa5839fb5ac" + integrity sha512-26C4PzGKaX5gkoKg8UzYGVy2HPVcTaROSkf0gwnHu3lGeTB7bAIJBovvVPZoiJ20IximJELQs/r8WSDRCuGX2A== + dependencies: + "@babel/core" "^7.11.6" + "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-jsx" "^7.7.2" + "@babel/plugin-syntax-typescript" "^7.7.2" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^29.0.2" + "@jest/transform" "^29.0.2" + "@jest/types" "^29.0.2" + "@types/babel__traverse" "^7.0.6" + "@types/prettier" "^2.1.5" + babel-preset-current-node-syntax "^1.0.0" + chalk "^4.0.0" + expect "^29.0.2" + graceful-fs "^4.2.9" + jest-diff "^29.0.2" + jest-get-type "^29.0.0" + jest-haste-map "^29.0.2" + jest-matcher-utils "^29.0.2" + jest-message-util "^29.0.2" + jest-util "^29.0.2" + natural-compare "^1.4.0" + pretty-format "^29.0.2" + semver "^7.3.5" + jest-snapshot@^29.0.2, jest-snapshot@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce" @@ -15071,7 +15126,7 @@ jest-snapshot@^29.0.2, jest-snapshot@^29.5.0: pretty-format "^29.5.0" semver "^7.3.5" -jest-util@^29.0.0, jest-util@^29.5.0: +jest-util@^29.0.0, jest-util@^29.0.2, jest-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== @@ -15119,15 +15174,15 @@ jest-worker@^29.5.0: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^29.0.2: - version "29.5.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e" - integrity sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ== +jest@29.0.2: + version "29.0.2" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.0.2.tgz#16e20003dbf8fb9ed7e6ab801579a77084e13fba" + integrity sha512-enziNbNUmXTcTaTP/Uq5rV91r0Yqy2UKzLUIabxMpGm9YHz8qpbJhiRnNVNvm6vzWfzt/0o97NEHH8/3udoClA== dependencies: - "@jest/core" "^29.5.0" - "@jest/types" "^29.5.0" + "@jest/core" "^29.0.2" + "@jest/types" "^29.0.2" import-local "^3.0.2" - jest-cli "^29.5.0" + jest-cli "^29.0.2" jju@^1.1.0: version "1.4.0" @@ -19471,7 +19526,7 @@ prettier@^2.7.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450" integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw== -pretty-format@^29.0.0, pretty-format@^29.5.0: +pretty-format@^29.0.0, pretty-format@^29.0.2, pretty-format@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a" integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw== From 4a699c55671e398aa610879698dffb93a122069f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 15:29:54 -0400 Subject: [PATCH 042/184] disabled flake-traker --- package.json | 6 +- packages/env-tests/package.json | 2 +- packages/flake-tracker/src/config.js | 10 +-- packages/sdk/contractkit/package.json | 2 +- yarn.lock | 107 +++++++------------------- 5 files changed, 36 insertions(+), 91 deletions(-) diff --git a/package.json b/package.json index d149e758aff..6b1c52f5091 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,10 @@ "codecov": "^3.6.5", "colors": "1.4.0", "husky": "^3.1.0", - "jest": "29.0.2", - "jest-circus": "29.0.2", + "jest": "^29.0.2", + "jest-circus": "^29.0.2", "jest-junit": "^14.0.1", - "jest-snapshot": "29.0.2", + "jest-snapshot": "^29.0.2", "lerna": "^5.5.0", "patch-package": "^6.2.2", "prettier": "^2.7.1", diff --git a/packages/env-tests/package.json b/packages/env-tests/package.json index a9d2ece4a2b..05592ccf5e4 100644 --- a/packages/env-tests/package.json +++ b/packages/env-tests/package.json @@ -16,7 +16,7 @@ "bunyan-gke-stackdriver": "0.1.2", "bunyan-debug-stream": "2.0.0", "dotenv": "8.2.0", - "jest": "29.0.2", + "jest": "^29.0.2", "moment": "^2.29.0", "web3": "1.8.2" }, diff --git a/packages/flake-tracker/src/config.js b/packages/flake-tracker/src/config.js index 50b9eada7f0..b3390e7c2dd 100644 --- a/packages/flake-tracker/src/config.js +++ b/packages/flake-tracker/src/config.js @@ -26,11 +26,11 @@ const flakeTrackerID = 71131 // This is the FlakeTracker GitHub App ID. // - If true, new flakey tests will be reported as 'failures' on GitHub Checks. Note this does not affect the CI workflow. // shouldTrackFlakes => tests are retried `numRetries` times and flakey results are logged w/ test output -const shouldTrackFlakes = - (process.env.CIRCLECI && - process.env.CIRCLE_PROJECT_REPONAME !== 'celo-blockchain' && - process.env.FLAKEY !== 'false') || - process.env.FLAKEY === 'true' +const shouldTrackFlakes = false // disabling to skip flaker test on CI +// (process.env.CIRCLECI && +// process.env.CIRCLE_PROJECT_REPONAME !== 'celo-blockchain' && +// process.env.FLAKEY !== 'false') || +// process.env.FLAKEY === 'true' // shouldLogRetryErrorsOnFailure => log raw test error immediately after every retry. const shouldLogRetryErrorsOnFailure = shouldTrackFlakes && process.env.LOG_ALL_RETRY_ERRORS diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 2e99938b72d..851ace23242 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -51,7 +51,7 @@ "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", - "jest": "29.0.2", + "jest": "^29.0.2", "ts-node": "8.3.0", "typedoc": "^0.19.2", "typedoc-plugin-markdown": "^2.2.16", diff --git a/yarn.lock b/yarn.lock index b2f389a7dc8..4174bd42214 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2412,7 +2412,7 @@ jest-util "^29.5.0" slash "^3.0.0" -"@jest/core@^29.0.2", "@jest/core@^29.5.0": +"@jest/core@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03" integrity sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ== @@ -2446,7 +2446,7 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^29.0.2", "@jest/environment@^29.5.0": +"@jest/environment@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65" integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ== @@ -2456,14 +2456,14 @@ "@types/node" "*" jest-mock "^29.5.0" -"@jest/expect-utils@^29.0.2", "@jest/expect-utils@^29.5.0": +"@jest/expect-utils@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036" integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg== dependencies: jest-get-type "^29.4.3" -"@jest/expect@^29.0.2", "@jest/expect@^29.5.0": +"@jest/expect@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba" integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g== @@ -2539,7 +2539,7 @@ callsites "^3.0.0" graceful-fs "^4.2.9" -"@jest/test-result@^29.0.2", "@jest/test-result@^29.5.0": +"@jest/test-result@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408" integrity sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ== @@ -2559,7 +2559,7 @@ jest-haste-map "^29.5.0" slash "^3.0.0" -"@jest/transform@^29.0.2", "@jest/transform@^29.5.0": +"@jest/transform@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9" integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw== @@ -2580,7 +2580,7 @@ slash "^3.0.0" write-file-atomic "^4.0.2" -"@jest/types@^29.0.2", "@jest/types@^29.5.0": +"@jest/types@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog== @@ -11231,7 +11231,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^29.0.0, expect@^29.0.2, expect@^29.5.0: +expect@^29.0.0, expect@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7" integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg== @@ -14766,32 +14766,7 @@ jest-changed-files@^29.5.0: execa "^5.0.0" p-limit "^3.1.0" -jest-circus@29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.0.2.tgz#7dda94888a8d47edb58e85a8e5f688f9da6657a3" - integrity sha512-YTPEsoE1P1X0bcyDQi3QIkpt2Wl9om9k2DQRuLFdS5x8VvAKSdYAVJufgvudhnKgM8WHvvAzhBE+1DRQB8x1CQ== - dependencies: - "@jest/environment" "^29.0.2" - "@jest/expect" "^29.0.2" - "@jest/test-result" "^29.0.2" - "@jest/types" "^29.0.2" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - dedent "^0.7.0" - is-generator-fn "^2.0.0" - jest-each "^29.0.2" - jest-matcher-utils "^29.0.2" - jest-message-util "^29.0.2" - jest-runtime "^29.0.2" - jest-snapshot "^29.0.2" - jest-util "^29.0.2" - p-limit "^3.1.0" - pretty-format "^29.0.2" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-circus@^29.5.0: +jest-circus@^29.0.2, jest-circus@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317" integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA== @@ -14817,7 +14792,7 @@ jest-circus@^29.5.0: slash "^3.0.0" stack-utils "^2.0.3" -jest-cli@^29.0.2: +jest-cli@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67" integrity sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw== @@ -14863,7 +14838,7 @@ jest-config@^29.5.0: slash "^3.0.0" strip-json-comments "^3.1.1" -jest-diff@^29.0.2, jest-diff@^29.5.0: +jest-diff@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw== @@ -14880,7 +14855,7 @@ jest-docblock@^29.4.3: dependencies: detect-newline "^3.0.0" -jest-each@^29.0.2, jest-each@^29.5.0: +jest-each@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06" integrity sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA== @@ -14903,12 +14878,12 @@ jest-environment-node@^29.5.0: jest-mock "^29.5.0" jest-util "^29.5.0" -jest-get-type@^29.0.0, jest-get-type@^29.4.3: +jest-get-type@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg== -jest-haste-map@^29.0.2, jest-haste-map@^29.5.0: +jest-haste-map@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de" integrity sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA== @@ -14945,7 +14920,7 @@ jest-leak-detector@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-matcher-utils@^29.0.2, jest-matcher-utils@^29.5.0: +jest-matcher-utils@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5" integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw== @@ -14955,7 +14930,7 @@ jest-matcher-utils@^29.0.2, jest-matcher-utils@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-message-util@^29.0.2, jest-message-util@^29.5.0: +jest-message-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e" integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA== @@ -15039,7 +15014,7 @@ jest-runner@^29.5.0: p-limit "^3.1.0" source-map-support "0.5.13" -jest-runtime@^29.0.2, jest-runtime@^29.5.0: +jest-runtime@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420" integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw== @@ -15067,36 +15042,6 @@ jest-runtime@^29.0.2, jest-runtime@^29.5.0: slash "^3.0.0" strip-bom "^4.0.0" -jest-snapshot@29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.0.2.tgz#5017d54db8369f01900d11e179513fa5839fb5ac" - integrity sha512-26C4PzGKaX5gkoKg8UzYGVy2HPVcTaROSkf0gwnHu3lGeTB7bAIJBovvVPZoiJ20IximJELQs/r8WSDRCuGX2A== - dependencies: - "@babel/core" "^7.11.6" - "@babel/generator" "^7.7.2" - "@babel/plugin-syntax-jsx" "^7.7.2" - "@babel/plugin-syntax-typescript" "^7.7.2" - "@babel/traverse" "^7.7.2" - "@babel/types" "^7.3.3" - "@jest/expect-utils" "^29.0.2" - "@jest/transform" "^29.0.2" - "@jest/types" "^29.0.2" - "@types/babel__traverse" "^7.0.6" - "@types/prettier" "^2.1.5" - babel-preset-current-node-syntax "^1.0.0" - chalk "^4.0.0" - expect "^29.0.2" - graceful-fs "^4.2.9" - jest-diff "^29.0.2" - jest-get-type "^29.0.0" - jest-haste-map "^29.0.2" - jest-matcher-utils "^29.0.2" - jest-message-util "^29.0.2" - jest-util "^29.0.2" - natural-compare "^1.4.0" - pretty-format "^29.0.2" - semver "^7.3.5" - jest-snapshot@^29.0.2, jest-snapshot@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce" @@ -15126,7 +15071,7 @@ jest-snapshot@^29.0.2, jest-snapshot@^29.5.0: pretty-format "^29.5.0" semver "^7.3.5" -jest-util@^29.0.0, jest-util@^29.0.2, jest-util@^29.5.0: +jest-util@^29.0.0, jest-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== @@ -15174,15 +15119,15 @@ jest-worker@^29.5.0: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/jest/-/jest-29.0.2.tgz#16e20003dbf8fb9ed7e6ab801579a77084e13fba" - integrity sha512-enziNbNUmXTcTaTP/Uq5rV91r0Yqy2UKzLUIabxMpGm9YHz8qpbJhiRnNVNvm6vzWfzt/0o97NEHH8/3udoClA== +jest@^29.0.2: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e" + integrity sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ== dependencies: - "@jest/core" "^29.0.2" - "@jest/types" "^29.0.2" + "@jest/core" "^29.5.0" + "@jest/types" "^29.5.0" import-local "^3.0.2" - jest-cli "^29.0.2" + jest-cli "^29.5.0" jju@^1.1.0: version "1.4.0" @@ -19526,7 +19471,7 @@ prettier@^2.7.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450" integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw== -pretty-format@^29.0.0, pretty-format@^29.0.2, pretty-format@^29.5.0: +pretty-format@^29.0.0, pretty-format@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a" integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw== From c8da898eefd8df1bf0cf436d1fce48aad098acc6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 15:44:07 -0400 Subject: [PATCH 043/184] generated CLI docs --- .../docs/command-line-interface/plugins.md | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/packages/docs/command-line-interface/plugins.md b/packages/docs/command-line-interface/plugins.md index 274da3bc1b2..4c38e9ee002 100644 --- a/packages/docs/command-line-interface/plugins.md +++ b/packages/docs/command-line-interface/plugins.md @@ -20,7 +20,30 @@ EXAMPLE $ celocli plugins ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.9.5/src/commands/plugins/index.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.10.11/src/commands/plugins/index.ts)_ + +## `celocli plugins:inspect PLUGIN...` + +displays installation properties of a plugin + +``` +displays installation properties of a plugin + +USAGE + $ celocli plugins:inspect PLUGIN... + +ARGUMENTS + PLUGIN [default: .] plugin to inspect + +OPTIONS + -h, --help show CLI help + -v, --verbose + +EXAMPLE + $ celocli plugins:inspect myplugin +``` + +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.10.11/src/commands/plugins/inspect.ts)_ ## `celocli plugins:install PLUGIN...` @@ -68,7 +91,7 @@ EXAMPLES $ celocli plugins:install someuser/someplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.9.5/src/commands/plugins/install.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.10.11/src/commands/plugins/install.ts)_ ## `celocli plugins:link PLUGIN` @@ -103,7 +126,7 @@ EXAMPLE $ celocli plugins:link myplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.9.5/src/commands/plugins/link.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.10.11/src/commands/plugins/link.ts)_ ## `celocli plugins:uninstall PLUGIN...` @@ -127,7 +150,7 @@ ALIASES $ celocli plugins:remove ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.9.5/src/commands/plugins/uninstall.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.10.11/src/commands/plugins/uninstall.ts)_ ## `celocli plugins:update` @@ -144,4 +167,4 @@ OPTIONS -v, --verbose ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.9.5/src/commands/plugins/update.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v1.10.11/src/commands/plugins/update.ts)_ From 96103b01dbfaa07c42a00eb81090b63a89edde34 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:17:24 -0400 Subject: [PATCH 044/184] buypass jest_setup in phone-number-privacy/combiner --- packages/phone-number-privacy/combiner/jest.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/phone-number-privacy/combiner/jest.config.js b/packages/phone-number-privacy/combiner/jest.config.js index 60af40428ce..6c79c8222c0 100644 --- a/packages/phone-number-privacy/combiner/jest.config.js +++ b/packages/phone-number-privacy/combiner/jest.config.js @@ -3,7 +3,8 @@ const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') module.exports = { preset: 'ts-jest', ...nodeFlakeTracking, - setupFilesAfterEnv: ['/jest_setup.ts', ...nodeFlakeTracking.setupFilesAfterEnv], + setupFilesAfterEnv: [...nodeFlakeTracking.setupFilesAfterEnv], + // setupFilesAfterEnv: ['/jest_setup.ts', ...nodeFlakeTracking.setupFilesAfterEnv], coverageReporters: [['lcov', { projectRoot: '../../../' }], 'text'], collectCoverageFrom: ['./src/**'], coverageThreshold: { From 2fc8f2ba46e9be0f3fba84e89719e46cc4cf6141 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:23:48 -0400 Subject: [PATCH 045/184] ignored ts error due to properties mismatch --- .../combiner/test/unit/domain-response-logger.test.ts | 2 ++ .../combiner/test/unit/domain-threshold-state.test.ts | 2 ++ .../combiner/test/unit/pnp-response-logger.test.ts | 2 ++ .../combiner/test/unit/pnp-threshold-state.test.ts | 3 +++ 4 files changed, 9 insertions(+) diff --git a/packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts b/packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts index 990b18a5971..c97f661c38a 100644 --- a/packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts +++ b/packages/phone-number-privacy/combiner/test/unit/domain-response-logger.test.ts @@ -28,6 +28,8 @@ describe('domain response logger', () => { const mockRequest = { body: {}, } as Request + + // @ts-ignore: missing some properties const mockResponse = { locals: { logger: rootLogger(config.serviceName), diff --git a/packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts b/packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts index a6d62da8e3b..9deec258d61 100644 --- a/packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts +++ b/packages/phone-number-privacy/combiner/test/unit/domain-threshold-state.test.ts @@ -26,6 +26,8 @@ describe('domain threshold state', () => { const mockRequest = { body: {}, } as Request + + // @ts-ignore: missing some properties const mockResponse = { locals: { logger: new Logger({ name: 'logger' }), diff --git a/packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts b/packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts index 690cff4d959..51f17c32fc4 100644 --- a/packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts +++ b/packages/phone-number-privacy/combiner/test/unit/pnp-response-logger.test.ts @@ -31,6 +31,8 @@ describe('pnp response logger', () => { const mockRequest = { body: {}, } as Request + + // @ts-ignore: missing some properties const mockResponse = { locals: { logger: rootLogger(config.serviceName), diff --git a/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts b/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts index 6d959b94fa5..3b7b470a9ce 100644 --- a/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts +++ b/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts @@ -28,11 +28,14 @@ describe('pnp threshold state', () => { const mockRequest = { body: {}, } as Request + + // @ts-ignore: missing some properties const mockResponse = { locals: { logger: rootLogger, }, } as Response + const session = new Session( mockRequest, mockResponse, From cf71f6624fa523e2d4c1952d653a91a150f08db7 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:39:41 -0400 Subject: [PATCH 046/184] ++ @types/node-fetch --- packages/phone-number-privacy/common/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/phone-number-privacy/common/package.json b/packages/phone-number-privacy/common/package.json index 0a9948da3d6..426b7377d05 100644 --- a/packages/phone-number-privacy/common/package.json +++ b/packages/phone-number-privacy/common/package.json @@ -38,6 +38,7 @@ "@types/elliptic": "^6.4.12", "@types/express": "^4.17.6", "@types/is-base64": "^1.1.0", + "@types/node-fetch": "^2.5.7", "web3": "1.8.2" }, "engines": { From 12b2ae48d5ee6b20528cd54a486f792d381d44a3 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:48:55 -0400 Subject: [PATCH 047/184] yarn.lock --- yarn.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yarn.lock b/yarn.lock index 4174bd42214..255abe318a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5573,6 +5573,14 @@ "@types/node" "*" form-data "^3.0.0" +"@types/node-fetch@^2.5.7": + version "2.6.3" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.3.tgz#175d977f5e24d93ad0f57602693c435c57ad7e80" + integrity sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node-hid@*": version "1.3.1" resolved "https://registry.yarnpkg.com/@types/node-hid/-/node-hid-1.3.1.tgz#e84507a35a6f3ece3f6324c21ba9252405758b65" From 9310a3d941db1696594d34ec69a06bcf538d676c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:57:51 -0400 Subject: [PATCH 048/184] using same @types/node-fetch where applicable --- packages/celotool/package.json | 2 +- yarn.lock | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 1d27942e651..77cd734588a 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -51,7 +51,7 @@ "@types/chai": "^4.1.3", "@types/dotenv": "^8.2.0", "@types/mocha": "^7.0.2", - "@types/node-fetch": "2.5.7", + "@types/node-fetch": "^2.5.7", "@types/prompts": "^1.1.1", "@types/string-hash": "^1.1.1", "@types/yargs": "^13.0.2", diff --git a/yarn.lock b/yarn.lock index 255abe318a9..09e37497fd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5565,14 +5565,6 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c" - integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw== - dependencies: - "@types/node" "*" - form-data "^3.0.0" - "@types/node-fetch@^2.5.7": version "2.6.3" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.3.tgz#175d977f5e24d93ad0f57602693c435c57ad7e80" From c021735911e11e57ee662b68b523b5ae5e691d17 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:31:35 -0400 Subject: [PATCH 049/184] ts-ignored for abort-controller --- packages/phone-number-privacy/combiner/src/common/io.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/phone-number-privacy/combiner/src/common/io.ts b/packages/phone-number-privacy/combiner/src/common/io.ts index db175e48a84..89545648e2f 100644 --- a/packages/phone-number-privacy/combiner/src/common/io.ts +++ b/packages/phone-number-privacy/combiner/src/common/io.ts @@ -146,6 +146,7 @@ export abstract class IO { [KEY_VERSION_HEADER]: session.keyVersionInfo.keyVersion.toString() }, body: JSON.stringify(request.body), + // @ts-ignore: missing property `reason` signal: abort.signal, }) } From 6f776b7136f3a9aa725b83ec0fc763eb0c9496a3 Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Tue, 2 May 2023 13:24:35 -0600 Subject: [PATCH 050/184] Fix broken kit headers test --- packages/sdk/contractkit/src/kit.test.ts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/sdk/contractkit/src/kit.test.ts b/packages/sdk/contractkit/src/kit.test.ts index 0cc3a43baaf..951e7fd056a 100644 --- a/packages/sdk/contractkit/src/kit.test.ts +++ b/packages/sdk/contractkit/src/kit.test.ts @@ -2,8 +2,7 @@ import { CeloTx, CeloTxObject, CeloTxReceipt, JsonRpcPayload, PromiEvent } from import { BigNumber } from 'bignumber.js' import Web3 from 'web3' import { HttpProvider } from 'web3-core' -import { XMLHttpRequest } from 'xhr2-cookies' -import { API_KEY_HEADER_KEY, newKitFromWeb3 as newFullKitFromWeb3, newKitWithApiKey } from './kit' +import { newKitFromWeb3 as newFullKitFromWeb3, newKitWithApiKey } from './kit' import { newKitFromWeb3 as newMiniKitFromWeb3 } from './mini-kit' import { promiEventSpy } from './test-utils/PromiEventStub' @@ -110,9 +109,11 @@ test('should retrieve currency gasPrice with feeCurrency', async () => { describe('newKitWithApiKey()', () => { const kit = newKitWithApiKey('http://', 'key') - const mockSetRequestHeader = jest.fn() - XMLHttpRequest.prototype.setRequestHeader = mockSetRequestHeader - XMLHttpRequest.prototype.send = jest.fn() + const fetchSpy = jest.spyOn(global, 'fetch') + + afterEach(() => { + jest.restoreAllMocks() + }) test('should set apiKey in request header', async () => { const httpProvider = kit.web3.currentProvider as HttpProvider @@ -124,9 +125,14 @@ describe('newKitWithApiKey()', () => { httpProvider.send(rpcPayload, (error: Error | null) => expect(error?.message).toContain("Couldn't connect to node http://") ) + const headers: any = fetchSpy.mock.calls[0]?.[1]?.headers + if (headers.apiKey) { + // Api Key should be set in the request header of fetch + expect(headers.apiKey).toBe('key') + } else { + throw new Error('apiKey not set in request header') + } - // Api Key should be set in the request header - expect(mockSetRequestHeader).toBeCalledTimes(2) - expect(mockSetRequestHeader).toBeCalledWith(API_KEY_HEADER_KEY, 'key') + expect(fetchSpy).toHaveBeenCalled() }) }) From d752f6934557b07527931c8d83fb6caacaf392e4 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 3 May 2023 12:39:26 -0400 Subject: [PATCH 051/184] temp force exit on contractkit test --- packages/sdk/contractkit/package.json | 2 +- packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 851ace23242..8fe199e4403 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -25,7 +25,7 @@ "docs": "typedoc", "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 27", "test:livechain": "yarn --cwd ../../protocol devchain run-tar .tmp/devchain.tar.gz", - "test": "jest --runInBand", + "test": "jest --runInBand --detectOpenHandles --forceExit", "lint": "tslint -c tslint.json --project ." }, "dependencies": { diff --git a/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts b/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts index 7237d3bf774..f456ccd048b 100644 --- a/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts +++ b/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts @@ -56,6 +56,8 @@ testWithGanache('SortedOracles Wrapper', (web3) => { await reportAsOracles(sortedOracles, target, freshOracles) } + // TODO (soloseng): this function causes test to hang after completion. + // used --forceExit flag to exit test. /** * When testing with a custom token pair we can't use the * already deployed SortedOracles because that's managed From cfe94ea61260310aa6b97749b6bbf839bc20f6ee Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 3 May 2023 15:08:15 -0400 Subject: [PATCH 052/184] no detectOpenHandles --- packages/sdk/contractkit/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 8fe199e4403..7265a0cac6f 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -25,7 +25,7 @@ "docs": "typedoc", "test:reset": "yarn --cwd ../../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../../dev-utils/src/migration-override.json --upto 27", "test:livechain": "yarn --cwd ../../protocol devchain run-tar .tmp/devchain.tar.gz", - "test": "jest --runInBand --detectOpenHandles --forceExit", + "test": "jest --runInBand --forceExit", "lint": "tslint -c tslint.json --project ." }, "dependencies": { From d28cf49bc54557cc93f94d8274f8f0b05c39da95 Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Fri, 5 May 2023 12:23:29 -0600 Subject: [PATCH 053/184] Fix cross-fetch jest mocking issues --- packages/sdk/identity/jest.config.js | 13 +++++-------- packages/sdk/identity/jestSetup.ts | 5 ----- packages/sdk/identity/src/__mocks__/cross-fetch.ts | 3 +++ packages/sdk/identity/src/globals.d.ts | 1 - .../sdk/identity/src/odis/circuit-breaker.mock.ts | 1 + .../sdk/identity/src/odis/circuit-breaker.test.ts | 1 + .../odis/identifier-backwards-compatibility.test.ts | 1 + packages/sdk/identity/src/odis/identifier.test.ts | 1 + .../src/odis/phone-number-identifier.test.ts | 1 + packages/sdk/identity/src/odis/quota.test.ts | 1 + .../sdk/identity/src/offchain-data-wrapper.test.ts | 1 + packages/sdk/identity/tsconfig.json | 2 +- 12 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 packages/sdk/identity/jestSetup.ts create mode 100644 packages/sdk/identity/src/__mocks__/cross-fetch.ts delete mode 100644 packages/sdk/identity/src/globals.d.ts diff --git a/packages/sdk/identity/jest.config.js b/packages/sdk/identity/jest.config.js index d68feae834d..eadc69611a1 100644 --- a/packages/sdk/identity/jest.config.js +++ b/packages/sdk/identity/jest.config.js @@ -3,13 +3,10 @@ const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') module.exports = { preset: 'ts-jest', ...nodeFlakeTracking, - testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: [ - '@celo/dev-utils/lib/matchers', - '/jestSetup.ts', - ...nodeFlakeTracking.setupFilesAfterEnv, - ], - globalSetup: '/src/test-utils/setup.global.ts', - globalTeardown: '/src/test-utils/teardown.global.ts', + rootDir: './src/', + testMatch: ['/**/?(*.)+(spec|test).ts?(x)'], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', ...nodeFlakeTracking.setupFilesAfterEnv], + globalSetup: '/test-utils/setup.global.ts', + globalTeardown: '/test-utils/teardown.global.ts', verbose: true, } diff --git a/packages/sdk/identity/jestSetup.ts b/packages/sdk/identity/jestSetup.ts deleted file mode 100644 index 3bc66344853..00000000000 --- a/packages/sdk/identity/jestSetup.ts +++ /dev/null @@ -1,5 +0,0 @@ -const fetchMockSandbox = require('fetch-mock').sandbox() -jest.mock('cross-fetch', () => fetchMockSandbox) - -// @ts-ignore -global.fetchMock = fetchMockSandbox diff --git a/packages/sdk/identity/src/__mocks__/cross-fetch.ts b/packages/sdk/identity/src/__mocks__/cross-fetch.ts new file mode 100644 index 00000000000..7435c07d5eb --- /dev/null +++ b/packages/sdk/identity/src/__mocks__/cross-fetch.ts @@ -0,0 +1,3 @@ +const fetchMockSandbox = require('fetch-mock').sandbox() + +export default fetchMockSandbox diff --git a/packages/sdk/identity/src/globals.d.ts b/packages/sdk/identity/src/globals.d.ts deleted file mode 100644 index 0318570a84f..00000000000 --- a/packages/sdk/identity/src/globals.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare const fetchMock diff --git a/packages/sdk/identity/src/odis/circuit-breaker.mock.ts b/packages/sdk/identity/src/odis/circuit-breaker.mock.ts index a4629f3f166..23d330c8ac9 100644 --- a/packages/sdk/identity/src/odis/circuit-breaker.mock.ts +++ b/packages/sdk/identity/src/odis/circuit-breaker.mock.ts @@ -9,6 +9,7 @@ import { CircuitBreakerUnwrapKeyRequest, CircuitBreakerUnwrapKeyResponse, } from './circuit-breaker' +import fetchMock from '../__mocks__/cross-fetch' const debug = debugFactory('kit:identity:odis:circuit-breaker:mock') diff --git a/packages/sdk/identity/src/odis/circuit-breaker.test.ts b/packages/sdk/identity/src/odis/circuit-breaker.test.ts index 5fc2bf40f3a..11ef00efdbb 100644 --- a/packages/sdk/identity/src/odis/circuit-breaker.test.ts +++ b/packages/sdk/identity/src/odis/circuit-breaker.test.ts @@ -5,6 +5,7 @@ import { CircuitBreakerKeyStatus, } from './circuit-breaker' import { MockCircuitBreaker } from './circuit-breaker.mock' +import fetchMock from '../__mocks__/cross-fetch' describe('CircuitBreakerClient', () => { const client = new CircuitBreakerClient(MockCircuitBreaker.environment) diff --git a/packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts b/packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts index 19aff1cc449..5e7d4f455ef 100644 --- a/packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts +++ b/packages/sdk/identity/src/odis/identifier-backwards-compatibility.test.ts @@ -4,6 +4,7 @@ import { OdisUtils as OdisUtilsOld } from 'old-identity-sdk' import { OdisUtils } from '../../lib' import { WasmBlsBlindingClient } from './bls-blinding-client' import { AuthenticationMethod, AuthSigner, getServiceContext, OdisContextName } from './query' +import fetchMock from '../__mocks__/cross-fetch' const { getBlindedIdentifier, getIdentifierHash, getObfuscatedIdentifier, IdentifierPrefix } = OdisUtils.Identifier diff --git a/packages/sdk/identity/src/odis/identifier.test.ts b/packages/sdk/identity/src/odis/identifier.test.ts index 945c0000c3e..16ea0ce6575 100644 --- a/packages/sdk/identity/src/odis/identifier.test.ts +++ b/packages/sdk/identity/src/odis/identifier.test.ts @@ -9,6 +9,7 @@ import { IdentifierPrefix, } from './identifier' import { AuthenticationMethod, EncryptionKeySigner, ErrorMessages, ServiceContext } from './query' +import fetchMock from '../__mocks__/cross-fetch' jest.mock('./bls-blinding-client', () => { // tslint:disable-next-line:no-shadowed-variable diff --git a/packages/sdk/identity/src/odis/phone-number-identifier.test.ts b/packages/sdk/identity/src/odis/phone-number-identifier.test.ts index 52774707502..c3418ff0fef 100644 --- a/packages/sdk/identity/src/odis/phone-number-identifier.test.ts +++ b/packages/sdk/identity/src/odis/phone-number-identifier.test.ts @@ -8,6 +8,7 @@ import { isBalanceSufficientForSigRetrieval, } from './phone-number-identifier' import { AuthenticationMethod, EncryptionKeySigner, ErrorMessages, ServiceContext } from './query' +import fetchMock from '../__mocks__/cross-fetch' jest.mock('./bls-blinding-client', () => { // tslint:disable-next-line:no-shadowed-variable diff --git a/packages/sdk/identity/src/odis/quota.test.ts b/packages/sdk/identity/src/odis/quota.test.ts index 7bafddbf022..1e568a19897 100644 --- a/packages/sdk/identity/src/odis/quota.test.ts +++ b/packages/sdk/identity/src/odis/quota.test.ts @@ -1,6 +1,7 @@ import { AuthenticationMethod, CombinerEndpoint } from '@celo/phone-number-privacy-common' import { EncryptionKeySigner, ServiceContext } from './query' import { getPnpQuotaStatus, PnpClientQuotaStatus } from './quota' +import fetchMock from '../__mocks__/cross-fetch' const mockAccount = '0x0000000000000000000000000000000000007E57' const serviceContext: ServiceContext = { diff --git a/packages/sdk/identity/src/offchain-data-wrapper.test.ts b/packages/sdk/identity/src/offchain-data-wrapper.test.ts index a76de4365ce..aa26010c45b 100644 --- a/packages/sdk/identity/src/offchain-data-wrapper.test.ts +++ b/packages/sdk/identity/src/offchain-data-wrapper.test.ts @@ -21,6 +21,7 @@ import { AuthorizedSignerAccessor } from './offchain/accessors/authorized-signer import { SchemaErrors, SchemaErrorTypes } from './offchain/accessors/errors' import { PrivateNameAccessor, PublicNameAccessor } from './offchain/accessors/name' import { MockStorageWriter } from './offchain/storage-writers' +import fetchMock from './__mocks__/cross-fetch' const testname = 'test' const testPayload = { name: testname } diff --git a/packages/sdk/identity/tsconfig.json b/packages/sdk/identity/tsconfig.json index fd7a09875b5..b15de292905 100644 --- a/packages/sdk/identity/tsconfig.json +++ b/packages/sdk/identity/tsconfig.json @@ -6,4 +6,4 @@ }, "include": ["src/**/*", "types/**/*"], "exclude": ["**/*.test.ts"] -} \ No newline at end of file +} From 24a5f2c14124044f6ecffcb67d009b65cf4701dc Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 5 May 2023 16:55:36 -0400 Subject: [PATCH 054/184] lint fix --- packages/sdk/identity/src/odis/circuit-breaker.mock.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sdk/identity/src/odis/circuit-breaker.mock.ts b/packages/sdk/identity/src/odis/circuit-breaker.mock.ts index 23d330c8ac9..cc08051b777 100644 --- a/packages/sdk/identity/src/odis/circuit-breaker.mock.ts +++ b/packages/sdk/identity/src/odis/circuit-breaker.mock.ts @@ -1,5 +1,6 @@ import * as crypto from 'crypto' import debugFactory from 'debug' +import fetchMock from '../__mocks__/cross-fetch' import { BASE64_REGEXP, CircuitBreakerEndpoints, @@ -9,7 +10,6 @@ import { CircuitBreakerUnwrapKeyRequest, CircuitBreakerUnwrapKeyResponse, } from './circuit-breaker' -import fetchMock from '../__mocks__/cross-fetch' const debug = debugFactory('kit:identity:odis:circuit-breaker:mock') From b1175ec25749f561f25c5f5dfdde1e4e091d71e4 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:13:51 -0400 Subject: [PATCH 055/184] disabled verbose logs during testing --- packages/protocol/scripts/devchain.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 3a5f238878b..c06519f5cbd 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -241,7 +241,7 @@ async function runDevChainFromTar(filename: string) { await decompressChain(filename, chainCopy.name) - const stopGanache = await startGanache(chainCopy.name, { verbose: true }, chainCopy) + const stopGanache = await startGanache(chainCopy.name, { verbose: false }, chainCopy) return stopGanache } @@ -277,7 +277,7 @@ async function runDevChain( await resetDir(datadir) } createDirIfMissing(datadir) - const stopGanache = await startGanache(datadir, { verbose: true }) + const stopGanache = await startGanache(datadir, { verbose: false }) if (opts.reset || opts.runMigrations) { const code = await runMigrations({ upto: opts.upto, migrationOverride: opts.migrationOverride }) if (code !== 0) { From 02fef9f67981245478ee9dfc177638afb8ddb8ca Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:31:17 -0400 Subject: [PATCH 056/184] disabled rpc log in protocol test --- packages/protocol/runTests.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index 28ab1156487..a1c4149847c 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -14,6 +14,7 @@ const isCI = process.env.CI === 'true' async function startGanache() { const server = ganache.server({ + logging: { quiet: true }, wallet: { mnemonic: network.mnemonic, defaultBalance: network.defaultBalance }, miner: { blockGasLimit: 20000000, From e750d57cecd304eb45c8831423c0091c1399de1d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:48:52 -0400 Subject: [PATCH 057/184] Disabled: - pre-protocol-test-release - protocol-test-release --- .circleci/config.yml | 105 ++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 52 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c4926607311..6975b4a9135 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,6 @@ version: 2.1 - parameters: # When you need to force a rebuild of the node modules cache then bump this version node-modules-cache-version: @@ -130,7 +129,6 @@ jobs: # Source: https://circleci.com/docs/2.0/configuration-reference/#resource_class resource_class: large steps: - - restore_cache: keys: - source-v1-{{ .Branch }}-{{ .Revision }} @@ -236,57 +234,60 @@ jobs: # crashes on the second re-install. # This pre script, generates the build and devchain, and adds it to the workspace to be used for the # other script - pre-protocol-test-release: - <<: *contract-defaults - resource_class: large - steps: - - attach_workspace: - at: ~/app - - run: - name: Check if the test should run - command: | - ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol - - run: - name: Opcode tests - command: yarn --cwd packages/protocol check-opcodes - - run: - name: Generate devchain of previous release - command: | - mkdir -p ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts - echo "Comparing against $RELEASE_TAG" - # Github has phased out the git protocol so we ensure that we use - # https for all git operations that yarn may perform. - git config --global url."https://github.com".insteadOf git://github.com - yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout -g scripts/truffle/releaseGoldExampleConfigs.json - - persist_to_workspace: - root: . - paths: - - 'packages/protocol/.tmp/released_chain/*' - protocol-test-release: - <<: *contract-defaults - resource_class: large - steps: - - attach_workspace: - at: ~/app - - run: - name: Check if the test should run - command: | - ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol - - run: - name: Copy DevChain and Build generated from released tag - command: | - BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) - (cp -r packages/protocol/.tmp/released_chain packages/protocol/$BUILD_AND_DEVCHAIN_DIR) - - run: - name: Test against current release - command: | - mkdir -p ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts - echo "Comparing against $RELEASE_TAG" - BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) - yarn --cwd packages/protocol test:devchain-release -b $RELEASE_TAG -d $BUILD_AND_DEVCHAIN_DIR -l /dev/stdout + #XXX (soloseng): disabled due to node incompatibility in the RELEASE_TAG commit. + # (soloseng): Could use nvm to change version only for this build? This would require re-installing dependencies -_- + # pre-protocol-test-release: + # <<: *contract-defaults + # resource_class: large + # steps: + # - attach_workspace: + # at: ~/app + # - run: + # name: Check if the test should run + # command: | + # ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol + # - run: + # name: Opcode tests + # command: yarn --cwd packages/protocol check-opcodes + # - run: + # name: Generate devchain of previous release + # command: | + # mkdir -p ~/.ssh + # ssh-keyscan github.com >> ~/.ssh/known_hosts + # echo "Comparing against $RELEASE_TAG" + # # Github has phased out the git protocol so we ensure that we use + # # https for all git operations that yarn may perform. + # git config --global url."https://github.com".insteadOf git://github.com + # yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout -g scripts/truffle/releaseGoldExampleConfigs.json + # - persist_to_workspace: + # root: . + # paths: + # - 'packages/protocol/.tmp/released_chain/*' + + # protocol-test-release: + # <<: *contract-defaults + # resource_class: large + # steps: + # - attach_workspace: + # at: ~/app + # - run: + # name: Check if the test should run + # command: | + # ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol + # - run: + # name: Copy DevChain and Build generated from released tag + # command: | + # BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) + # (cp -r packages/protocol/.tmp/released_chain packages/protocol/$BUILD_AND_DEVCHAIN_DIR) + # - run: + # name: Test against current release + # command: | + # mkdir -p ~/.ssh + # ssh-keyscan github.com >> ~/.ssh/known_hosts + # echo "Comparing against $RELEASE_TAG" + # BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) + # yarn --cwd packages/protocol test:devchain-release -b $RELEASE_TAG -d $BUILD_AND_DEVCHAIN_DIR -l /dev/stdout protocol-test-release-snapshots: <<: *contract-defaults From 1ce3a12154f51958f5dbcb12cdfa3994b44b27d1 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:48:53 -0400 Subject: [PATCH 058/184] removed disabled jobs from workflow --- .circleci/config.yml | 115 ++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6975b4a9135..90dcc59d9a0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -237,57 +237,58 @@ jobs: #XXX (soloseng): disabled due to node incompatibility in the RELEASE_TAG commit. # (soloseng): Could use nvm to change version only for this build? This would require re-installing dependencies -_- - # pre-protocol-test-release: - # <<: *contract-defaults - # resource_class: large - # steps: - # - attach_workspace: - # at: ~/app - # - run: - # name: Check if the test should run - # command: | - # ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol - # - run: - # name: Opcode tests - # command: yarn --cwd packages/protocol check-opcodes - # - run: - # name: Generate devchain of previous release - # command: | - # mkdir -p ~/.ssh - # ssh-keyscan github.com >> ~/.ssh/known_hosts - # echo "Comparing against $RELEASE_TAG" - # # Github has phased out the git protocol so we ensure that we use - # # https for all git operations that yarn may perform. - # git config --global url."https://github.com".insteadOf git://github.com - # yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout -g scripts/truffle/releaseGoldExampleConfigs.json - # - persist_to_workspace: - # root: . - # paths: - # - 'packages/protocol/.tmp/released_chain/*' + pre-protocol-test-release: + <<: *contract-defaults + resource_class: large + steps: + - attach_workspace: + at: ~/app + - run: + name: Check if the test should run + command: | + ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol + - run: + name: Opcode tests + command: yarn --cwd packages/protocol check-opcodes + - run: + name: Generate devchain of previous release + command: | + mkdir -p ~/.ssh + ssh-keyscan github.com >> ~/.ssh/known_hosts + echo "Comparing against $RELEASE_TAG" + # Github has phased out the git protocol so we ensure that we use + # https for all git operations that yarn may perform. + git config --global url."https://github.com".insteadOf git://github.com + yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout -g scripts/truffle/releaseGoldExampleConfigs.json + - persist_to_workspace: + root: . + paths: + - 'packages/protocol/.tmp/released_chain/*' + #XXX (soloseng): disabled blocked by pre-protocol-test-release - # protocol-test-release: - # <<: *contract-defaults - # resource_class: large - # steps: - # - attach_workspace: - # at: ~/app - # - run: - # name: Check if the test should run - # command: | - # ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol - # - run: - # name: Copy DevChain and Build generated from released tag - # command: | - # BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) - # (cp -r packages/protocol/.tmp/released_chain packages/protocol/$BUILD_AND_DEVCHAIN_DIR) - # - run: - # name: Test against current release - # command: | - # mkdir -p ~/.ssh - # ssh-keyscan github.com >> ~/.ssh/known_hosts - # echo "Comparing against $RELEASE_TAG" - # BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) - # yarn --cwd packages/protocol test:devchain-release -b $RELEASE_TAG -d $BUILD_AND_DEVCHAIN_DIR -l /dev/stdout + protocol-test-release: + <<: *contract-defaults + resource_class: large + steps: + - attach_workspace: + at: ~/app + - run: + name: Check if the test should run + command: | + ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol + - run: + name: Copy DevChain and Build generated from released tag + command: | + BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) + (cp -r packages/protocol/.tmp/released_chain packages/protocol/$BUILD_AND_DEVCHAIN_DIR) + - run: + name: Test against current release + command: | + mkdir -p ~/.ssh + ssh-keyscan github.com >> ~/.ssh/known_hosts + echo "Comparing against $RELEASE_TAG" + BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) + yarn --cwd packages/protocol test:devchain-release -b $RELEASE_TAG -d $BUILD_AND_DEVCHAIN_DIR -l /dev/stdout protocol-test-release-snapshots: <<: *contract-defaults @@ -920,13 +921,13 @@ workflows: - transactions-uri-tests: requires: - contractkit-test - - pre-protocol-test-release: - requires: - - lint-checks - - protocol-test-release: - requires: - - lint-checks - - pre-protocol-test-release + # - pre-protocol-test-release: + # requires: + # - lint-checks + # - protocol-test-release: + # requires: + # - lint-checks + # - pre-protocol-test-release - protocol-test-release-snapshots: requires: - lint-checks From ad03f4cba3db4b9b5dd07e52a0f4829aacc6b9a5 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:48:53 -0400 Subject: [PATCH 059/184] supress test logs --- packages/phone-number-privacy/combiner/.env | 2 +- packages/phone-number-privacy/monitor/.env | 2 +- packages/phone-number-privacy/signer/.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/phone-number-privacy/combiner/.env b/packages/phone-number-privacy/combiner/.env index 14bedd678cf..a98dfb3f96e 100644 --- a/packages/phone-number-privacy/combiner/.env +++ b/packages/phone-number-privacy/combiner/.env @@ -1,7 +1,7 @@ # Options: json, human (default), stackdriver LOG_FORMAT=stackdriver # Options: fatal, error, warn, info (default), debug, trace -LOG_LEVEL=trace +LOG_LEVEL=fatal SERVICE_NAME='odis-combiner' # For e2e Tests ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org diff --git a/packages/phone-number-privacy/monitor/.env b/packages/phone-number-privacy/monitor/.env index 7d00d584c40..2ce02a3fc3b 100644 --- a/packages/phone-number-privacy/monitor/.env +++ b/packages/phone-number-privacy/monitor/.env @@ -5,7 +5,7 @@ PRIVATE_KEY='0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' # Options: json, human (default), stackdriver LOG_FORMAT=stackdriver # Options: fatal, error, warn, info (default), debug, trace -LOG_LEVEL=info +LOG_LEVEL=fatal SERVICE_NAME='odis-monitor' BLOCKCHAIN_PROVIDER="https://alfajores-forno.celo-testnet.org" diff --git a/packages/phone-number-privacy/signer/.env b/packages/phone-number-privacy/signer/.env index 7625631db3a..6432afa907f 100644 --- a/packages/phone-number-privacy/signer/.env +++ b/packages/phone-number-privacy/signer/.env @@ -22,7 +22,7 @@ KEYSTORE_GOOGLE_PROJECT_ID=mockProjectId # Options: json, human (default), stackdriver LOG_FORMAT=stackdriver # Options: fatal, error, warn, info (default), debug, trace -LOG_LEVEL=info +LOG_LEVEL=fatal SERVICE_NAME='odis-signer' # For e2e Tests From 42952af5e17b36604be9a93145e7b50bcce0e47d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:48:53 -0400 Subject: [PATCH 060/184] disabled protocol test --- .circleci/config.yml | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90dcc59d9a0..63fbbbdd5bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -264,8 +264,8 @@ jobs: root: . paths: - 'packages/protocol/.tmp/released_chain/*' + #XXX (soloseng): disabled blocked by pre-protocol-test-release - protocol-test-release: <<: *contract-defaults resource_class: large @@ -928,30 +928,30 @@ workflows: # requires: # - lint-checks # - pre-protocol-test-release - - protocol-test-release-snapshots: - requires: - - lint-checks - - protocol-test-common: - requires: - - lint-checks - - protocol-test-compatibility: - requires: - - lint-checks - - protocol-test-governance-network: - requires: - - lint-checks - - protocol-test-governance-validators: - requires: - - lint-checks - - protocol-test-governance-voting: - requires: - - lint-checks - - protocol-test-identity: - requires: - - lint-checks - - protocol-test-stability: - requires: - - lint-checks + # - protocol-test-release-snapshots: + # requires: + # - lint-checks + # - protocol-test-common: + # requires: + # - lint-checks + # - protocol-test-compatibility: + # requires: + # - lint-checks + # - protocol-test-governance-network: + # requires: + # - lint-checks + # - protocol-test-governance-validators: + # requires: + # - lint-checks + # - protocol-test-governance-voting: + # requires: + # - lint-checks + # - protocol-test-identity: + # requires: + # - lint-checks + # - protocol-test-stability: + # requires: + # - lint-checks - typescript-test: requires: - install_dependencies From ba1fa96076ec1dc2db128a8786ab5ea39ab12bca Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:48:53 -0400 Subject: [PATCH 061/184] disabling flakey summary --- .circleci/config.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63fbbbdd5bd..0b4c6953801 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -996,24 +996,24 @@ workflows: - odis-test: requires: - lint-checks - - flakey-test-summary: - requires: - - protocol-test-common - - protocol-test-compatibility - - protocol-test-governance-network - - protocol-test-governance-validators - - protocol-test-governance-voting - - protocol-test-identity - - protocol-test-stability - - end-to-end-geth-transfer-test - - end-to-end-geth-blockchain-parameters-test - - end-to-end-geth-slashing-test - - end-to-end-geth-governance-test - - end-to-end-geth-replica-test - - end-to-end-geth-sync-test - - end-to-end-geth-validator-order-test - - end-to-end-cip35-eth-compatibility-test - - odis-test + # - flakey-test-summary: + # requires: + # - protocol-test-common + # - protocol-test-compatibility + # - protocol-test-governance-network + # - protocol-test-governance-validators + # - protocol-test-governance-voting + # - protocol-test-identity + # - protocol-test-stability + # - end-to-end-geth-transfer-test + # - end-to-end-geth-blockchain-parameters-test + # - end-to-end-geth-slashing-test + # - end-to-end-geth-governance-test + # - end-to-end-geth-replica-test + # - end-to-end-geth-sync-test + # - end-to-end-geth-validator-order-test + # - end-to-end-cip35-eth-compatibility-test + # - odis-test npm-install-testing-cron-workflow: triggers: - schedule: From 9069cd5b2b4e39471bc7f849b7398110ebdc8f0a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:48:54 -0400 Subject: [PATCH 062/184] disabled odis test --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b4c6953801..f64abcdac8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -993,9 +993,9 @@ workflows: requires: - lint-checks - contractkit-test - - odis-test: - requires: - - lint-checks + # - odis-test: + # requires: + # - lint-checks # - flakey-test-summary: # requires: # - protocol-test-common From 9c80542d1fa280523f88538c108d9f619ce71893 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:48:54 -0400 Subject: [PATCH 063/184] increased resource class to xlarge --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f64abcdac8a..636a51f699e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -197,7 +197,7 @@ jobs: general-test: <<: *defaults - resource_class: large + resource_class: xlarge steps: - attach_workspace: at: ~/app From 8431cc462a07a2c58900a00e5a2876f00d9a28a6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 6 May 2023 20:52:40 -0400 Subject: [PATCH 064/184] enaled protocol and odis CI test --- .circleci/config.yml | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 636a51f699e..470ba1222f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -928,30 +928,30 @@ workflows: # requires: # - lint-checks # - pre-protocol-test-release - # - protocol-test-release-snapshots: - # requires: - # - lint-checks - # - protocol-test-common: - # requires: - # - lint-checks - # - protocol-test-compatibility: - # requires: - # - lint-checks - # - protocol-test-governance-network: - # requires: - # - lint-checks - # - protocol-test-governance-validators: - # requires: - # - lint-checks - # - protocol-test-governance-voting: - # requires: - # - lint-checks - # - protocol-test-identity: - # requires: - # - lint-checks - # - protocol-test-stability: - # requires: - # - lint-checks + - protocol-test-release-snapshots: + requires: + - lint-checks + - protocol-test-common: + requires: + - lint-checks + - protocol-test-compatibility: + requires: + - lint-checks + - protocol-test-governance-network: + requires: + - lint-checks + - protocol-test-governance-validators: + requires: + - lint-checks + - protocol-test-governance-voting: + requires: + - lint-checks + - protocol-test-identity: + requires: + - lint-checks + - protocol-test-stability: + requires: + - lint-checks - typescript-test: requires: - install_dependencies @@ -993,9 +993,9 @@ workflows: requires: - lint-checks - contractkit-test - # - odis-test: - # requires: - # - lint-checks + - odis-test: + requires: + - lint-checks # - flakey-test-summary: # requires: # - protocol-test-common From d12b281c4a64363ef9ab4960880fb2629ae9bc6a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 9 May 2023 10:35:55 -0400 Subject: [PATCH 065/184] re-enabled pre-protocol-test-release protocol-test-release --- .circleci/config.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 470ba1222f6..5aefed54fd1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -197,6 +197,7 @@ jobs: general-test: <<: *defaults + # XXX (soloseng): Increased size because this test was hitting the ram limit and failing resource_class: xlarge steps: - attach_workspace: @@ -235,8 +236,6 @@ jobs: # This pre script, generates the build and devchain, and adds it to the workspace to be used for the # other script - #XXX (soloseng): disabled due to node incompatibility in the RELEASE_TAG commit. - # (soloseng): Could use nvm to change version only for this build? This would require re-installing dependencies -_- pre-protocol-test-release: <<: *contract-defaults resource_class: large @@ -264,8 +263,6 @@ jobs: root: . paths: - 'packages/protocol/.tmp/released_chain/*' - - #XXX (soloseng): disabled blocked by pre-protocol-test-release protocol-test-release: <<: *contract-defaults resource_class: large @@ -921,13 +918,13 @@ workflows: - transactions-uri-tests: requires: - contractkit-test - # - pre-protocol-test-release: - # requires: - # - lint-checks - # - protocol-test-release: - # requires: - # - lint-checks - # - pre-protocol-test-release + - pre-protocol-test-release: + requires: + - lint-checks + - protocol-test-release: + requires: + - lint-checks + - pre-protocol-test-release - protocol-test-release-snapshots: requires: - lint-checks From 12ea5e954737788fbe6d7908e28bc438c3a30980 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 9 May 2023 11:18:15 -0400 Subject: [PATCH 066/184] enable phone-number-privacy test logs --- packages/phone-number-privacy/combiner/.env | 2 +- packages/phone-number-privacy/monitor/.env | 2 +- packages/phone-number-privacy/signer/.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/phone-number-privacy/combiner/.env b/packages/phone-number-privacy/combiner/.env index a98dfb3f96e..14bedd678cf 100644 --- a/packages/phone-number-privacy/combiner/.env +++ b/packages/phone-number-privacy/combiner/.env @@ -1,7 +1,7 @@ # Options: json, human (default), stackdriver LOG_FORMAT=stackdriver # Options: fatal, error, warn, info (default), debug, trace -LOG_LEVEL=fatal +LOG_LEVEL=trace SERVICE_NAME='odis-combiner' # For e2e Tests ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org diff --git a/packages/phone-number-privacy/monitor/.env b/packages/phone-number-privacy/monitor/.env index 2ce02a3fc3b..7d00d584c40 100644 --- a/packages/phone-number-privacy/monitor/.env +++ b/packages/phone-number-privacy/monitor/.env @@ -5,7 +5,7 @@ PRIVATE_KEY='0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' # Options: json, human (default), stackdriver LOG_FORMAT=stackdriver # Options: fatal, error, warn, info (default), debug, trace -LOG_LEVEL=fatal +LOG_LEVEL=info SERVICE_NAME='odis-monitor' BLOCKCHAIN_PROVIDER="https://alfajores-forno.celo-testnet.org" diff --git a/packages/phone-number-privacy/signer/.env b/packages/phone-number-privacy/signer/.env index 6432afa907f..7625631db3a 100644 --- a/packages/phone-number-privacy/signer/.env +++ b/packages/phone-number-privacy/signer/.env @@ -22,7 +22,7 @@ KEYSTORE_GOOGLE_PROJECT_ID=mockProjectId # Options: json, human (default), stackdriver LOG_FORMAT=stackdriver # Options: fatal, error, warn, info (default), debug, trace -LOG_LEVEL=fatal +LOG_LEVEL=info SERVICE_NAME='odis-signer' # For e2e Tests From d34d5d69494240073065640c46ab8cfd7c9a9647 Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Tue, 9 May 2023 13:09:08 -0600 Subject: [PATCH 067/184] Fixing mocha issues in celotool tests --- .../celotool/ci_test_blockchain_parameters.sh | 4 +-- packages/celotool/ci_test_cip35.sh | 4 +-- packages/celotool/ci_test_governance.sh | 4 +-- packages/celotool/ci_test_replicas.sh | 4 +-- packages/celotool/ci_test_slashing.sh | 4 +-- packages/celotool/ci_test_sync.sh | 4 +-- packages/celotool/ci_test_transfers.sh | 4 +-- packages/celotool/ci_test_validator_order.sh | 4 +-- packages/celotool/package.json | 14 ++++---- .../celotool/src/cmds/transactions/list.ts | 2 +- packages/celotool/src/lib/geth.ts | 2 +- yarn.lock | 36 +++++++++++++++++-- 12 files changed, 59 insertions(+), 27 deletions(-) diff --git a/packages/celotool/ci_test_blockchain_parameters.sh b/packages/celotool/ci_test_blockchain_parameters.sh index 7552b62124f..032c8fd7394 100755 --- a/packages/celotool/ci_test_blockchain_parameters.sh +++ b/packages/celotool/ci_test_blockchain_parameters.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/blockchain_parameters_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/blockchain_parameters_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/blockchain_parameters_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/blockchain_parameters_tests.ts --localgeth ${GETH_DIR} fi diff --git a/packages/celotool/ci_test_cip35.sh b/packages/celotool/ci_test_cip35.sh index a6c596109a3..7d2c8ff9d3a 100755 --- a/packages/celotool/ci_test_cip35.sh +++ b/packages/celotool/ci_test_cip35.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/cip35_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/cip35_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/cip35_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/cip35_tests.ts --localgeth ${GETH_DIR} fi diff --git a/packages/celotool/ci_test_governance.sh b/packages/celotool/ci_test_governance.sh index d4001523c7f..27cfd5bdfec 100755 --- a/packages/celotool/ci_test_governance.sh +++ b/packages/celotool/ci_test_governance.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/governance_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/governance_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/governance_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/governance_tests.ts --localgeth ${GETH_DIR} fi diff --git a/packages/celotool/ci_test_replicas.sh b/packages/celotool/ci_test_replicas.sh index c50358abddb..469c3bbed98 100755 --- a/packages/celotool/ci_test_replicas.sh +++ b/packages/celotool/ci_test_replicas.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/replica_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/replica_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/replica_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/replica_tests.ts --localgeth ${GETH_DIR} fi diff --git a/packages/celotool/ci_test_slashing.sh b/packages/celotool/ci_test_slashing.sh index b1e522fd869..e350181c958 100755 --- a/packages/celotool/ci_test_slashing.sh +++ b/packages/celotool/ci_test_slashing.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/slashing_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/slashing_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/slashing_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --localgeth ${GETH_DIR} --node-option loader=ts-node/esm,experimental-specifier-resolution=node ./src/e2e-tests/slashing_tests.ts fi diff --git a/packages/celotool/ci_test_sync.sh b/packages/celotool/ci_test_sync.sh index cf4ae0562fd..261e843bd63 100755 --- a/packages/celotool/ci_test_sync.sh +++ b/packages/celotool/ci_test_sync.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/sync_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/sync_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/sync_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/sync_tests.ts --localgeth ${GETH_DIR} fi diff --git a/packages/celotool/ci_test_transfers.sh b/packages/celotool/ci_test_transfers.sh index ea10bbeaaee..ab91e473489 100755 --- a/packages/celotool/ci_test_transfers.sh +++ b/packages/celotool/ci_test_transfers.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/transfer_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/transfer_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/transfer_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/transfer_tests.ts --localgeth ${GETH_DIR} fi diff --git a/packages/celotool/ci_test_validator_order.sh b/packages/celotool/ci_test_validator_order.sh index 73ebe913413..7a70bf2e889 100755 --- a/packages/celotool/ci_test_validator_order.sh +++ b/packages/celotool/ci_test_validator_order.sh @@ -13,9 +13,9 @@ if [ "${1}" == "checkout" ]; then # Test master by default. BRANCH_TO_TEST=${2:-"master"} echo "Checking out geth at branch ${BRANCH_TO_TEST}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/validator_order_tests.ts --branch ${BRANCH_TO_TEST} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/validator_order_tests.ts --branch ${BRANCH_TO_TEST} elif [ "${1}" == "local" ]; then export GETH_DIR="${2}" echo "Testing using local geth dir ${GETH_DIR}..." - ./node_modules/.bin/mocha -r ts-node/register src/e2e-tests/validator_order_tests.ts --localgeth ${GETH_DIR} + ./node_modules/.bin/mocha --node-option loader=ts-node/esm src/e2e-tests/validator_order_tests.ts --localgeth ${GETH_DIR} fi diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 77cd734588a..86fbac29960 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -26,14 +26,14 @@ "bunyan": "1.8.12", "bunyan-gke-stackdriver": "0.1.2", "compare-versions": "^3.5.1", - "dotenv": "^8.2.0", + "dotenv": "^16.0.3", "ecurve": "^1.0.6", - "ethereumjs-util": "^5.2.0", + "ethereumjs-util": "^7.1.5", "generate-password": "^1.5.1", "js-yaml": "^3.13.1", "lodash": "^4.17.21", "moment": "^2.29.0", - "node-fetch": "^2.6.9", + "node-fetch": "^2.6.7", "prompts": "1.2.0", "read-last-lines": "^1.7.2", "sleep-promise": "^8.0.1", @@ -50,13 +50,13 @@ "@types/bunyan": "1.8.8", "@types/chai": "^4.1.3", "@types/dotenv": "^8.2.0", - "@types/mocha": "^7.0.2", + "@types/mocha": "^10.0.1", "@types/node-fetch": "^2.5.7", "@types/prompts": "^1.1.1", "@types/string-hash": "^1.1.1", "@types/yargs": "^13.0.2", - "chai": "^4.1.2", - "mocha": "^7.1.1", + "chai": "^4.3.7", + "mocha": "^10.2.0", "web3-core": "1.8.2" }, "scripts": { @@ -65,4 +65,4 @@ "build": "tsc -b ." }, "private": true -} \ No newline at end of file +} diff --git a/packages/celotool/src/cmds/transactions/list.ts b/packages/celotool/src/cmds/transactions/list.ts index fc53b9baae3..930236e6b1d 100644 --- a/packages/celotool/src/cmds/transactions/list.ts +++ b/packages/celotool/src/cmds/transactions/list.ts @@ -42,7 +42,7 @@ export const handler = async (argv: ListArgv) => { const resp = await fetch( `${blockscoutURL}/api?module=account&action=txlist&address=${argv.address}&sort=desc` ) - const jsonResp = await resp.json() + const jsonResp = (await resp.json()) as any if (jsonResp.result === undefined) { return diff --git a/packages/celotool/src/lib/geth.ts b/packages/celotool/src/lib/geth.ts index c572e5efbfe..96881bdc036 100644 --- a/packages/celotool/src/lib/geth.ts +++ b/packages/celotool/src/lib/geth.ts @@ -262,7 +262,7 @@ const checkBlockscoutResponse = ( const fetchBlockscoutTxInfo = async (url: string, txHash: string) => { const response = await fetch(`${url}/api?module=transaction&action=gettxinfo&txhash=${txHash}`) - return response.json() + return response.json() as any } const validateBlockscout = async ( diff --git a/yarn.lock b/yarn.lock index 09e37497fd6..aa0dcca413b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5550,6 +5550,11 @@ dependencies: "@types/node" "*" +"@types/mocha@^10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.1.tgz#2f4f65bb08bc368ac39c96da7b2f09140b26851b" + integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q== + "@types/mocha@^5.2.5", "@types/mocha@^5.2.7": version "5.2.7" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea" @@ -7987,7 +7992,7 @@ chai-subset@^1.6.0: resolved "https://registry.yarnpkg.com/chai-subset/-/chai-subset-1.6.0.tgz#a5d0ca14e329a79596ed70058b6646bd6988cfe9" integrity sha512-K3d+KmqdS5XKW5DWPd5sgNffL3uxdDe+6GdnJh3AYPhwnBGRY5urfvfcbRtWIvvpz+KxkL9FeBB6MZewLUNwug== -chai@^4.0.1, chai@^4.1.2, chai@^4.2.0, chai@^4.3.6: +chai@^4.0.1, chai@^4.2.0, chai@^4.3.6, chai@^4.3.7: version "4.3.7" resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51" integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A== @@ -9917,7 +9922,7 @@ dotdir-regex@^0.1.0: resolved "https://registry.yarnpkg.com/dotdir-regex/-/dotdir-regex-0.1.0.tgz#d45df4c8863be6f5593d716914381767e938c0b6" integrity sha512-00odj/E9hnwoi/W0ZcudUwlR/OSjhMgcBgevA4G8tgSJdGy0cVIKrmKLkh97Kw6aXvE47islrIisBld19+X1AQ== -dotenv@*: +dotenv@*, dotenv@^16.0.3: version "16.0.3" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== @@ -17203,6 +17208,33 @@ mocha@8.0.1: yargs-parser "13.1.2" yargs-unparser "1.6.0" +mocha@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" + integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== + dependencies: + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + nanoid "3.3.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + mocha@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" From 821fb8fff66d370910b7aa3143eb94a87b39aea9 Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Wed, 10 May 2023 11:48:38 -0600 Subject: [PATCH 068/184] Change node to 18.14.0 --- .nvmrc | 2 +- README-dev.md | 2 +- dockerfiles/circleci/circleci-node18/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.nvmrc b/.nvmrc index 6d80269a4f0..e6db45a9079 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.16.0 +18.14.0 diff --git a/README-dev.md b/README-dev.md index dc5870349c3..5ccb45bdcc0 100644 --- a/README-dev.md +++ b/README-dev.md @@ -105,7 +105,7 @@ circleci@7040a7660754:/tmp/tmp1$ ./node_modules/.bin/celocli CLI Tool for transacting with the Celo protocol VERSION - @celo/celocli/1.6.3 linux-x64 node-v18.16.0 + @celo/celocli/1.6.3 linux-x64 node-v18.14.0 USAGE $ celocli [COMMAND] diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile index be9283cb6ad..39d47c97c7b 100644 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/node:18.16.0 +FROM cimg/node:18.14.0 RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y From 2b93a03910bfc945a039449ccb81af9c089371c6 Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Wed, 10 May 2023 13:26:10 -0600 Subject: [PATCH 069/184] Node 18.14.2 --- .nvmrc | 2 +- README-dev.md | 2 +- dockerfiles/circleci/circleci-node18/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.nvmrc b/.nvmrc index e6db45a9079..72e4a483c02 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.14.0 +18.14.2 diff --git a/README-dev.md b/README-dev.md index 5ccb45bdcc0..fede718068d 100644 --- a/README-dev.md +++ b/README-dev.md @@ -105,7 +105,7 @@ circleci@7040a7660754:/tmp/tmp1$ ./node_modules/.bin/celocli CLI Tool for transacting with the Celo protocol VERSION - @celo/celocli/1.6.3 linux-x64 node-v18.14.0 + @celo/celocli/1.6.3 linux-x64 node-v18.14.2 USAGE $ celocli [COMMAND] diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile index 39d47c97c7b..38f21bf8f9c 100644 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/node:18.14.0 +FROM cimg/node:18.14.2 RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y From e8a049911ea888e92779db62502320b7a4ef2f3b Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 10 May 2023 16:29:29 -0400 Subject: [PATCH 070/184] changed uniswap init code hash --- .../contracts/uniswap/test/libraries/UniswapV2Library.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol index 29c1ca8bab8..cf27ca67ecb 100644 --- a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol +++ b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol @@ -35,9 +35,9 @@ library UniswapV2Library { // This variable was hardcoded for Uniswap Eth Mainnet deployment // hex"96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f" // init code hash // Hash in the CI "bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" - //TODO:(soloseng) swicth back to this // hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" + hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" // hex"f0bd447d72bc4c5cd510462381a98e87f097a4d31106d6dd8b5922227696ef7a" - hex"a3cc3b88aa878e73a27f19b6bb136f2e229563b9b45b3d86ced9b3725dd480ed" + // hex"a3cc3b88aa878e73a27f19b6bb136f2e229563b9b45b3d86ced9b3725dd480ed" ) ) ) From f477d77f5bd055e1b1cfc0fe42c96e9376112bb8 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 10 May 2023 17:50:12 -0400 Subject: [PATCH 071/184] Revert "changed uniswap init code hash" This reverts commit e8a049911ea888e92779db62502320b7a4ef2f3b. --- .../contracts/uniswap/test/libraries/UniswapV2Library.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol index cf27ca67ecb..29c1ca8bab8 100644 --- a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol +++ b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol @@ -35,9 +35,9 @@ library UniswapV2Library { // This variable was hardcoded for Uniswap Eth Mainnet deployment // hex"96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f" // init code hash // Hash in the CI "bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" - hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" + //TODO:(soloseng) swicth back to this // hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" // hex"f0bd447d72bc4c5cd510462381a98e87f097a4d31106d6dd8b5922227696ef7a" - // hex"a3cc3b88aa878e73a27f19b6bb136f2e229563b9b45b3d86ced9b3725dd480ed" + hex"a3cc3b88aa878e73a27f19b6bb136f2e229563b9b45b3d86ced9b3725dd480ed" ) ) ) From 34861c1feb400673df10e5ffa103d94f2167806f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 11 May 2023 12:08:51 -0400 Subject: [PATCH 072/184] fix unicode char in datetime format --- .../src/wrappers/BaseWrapper.test.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/sdk/contractkit/src/wrappers/BaseWrapper.test.ts b/packages/sdk/contractkit/src/wrappers/BaseWrapper.test.ts index e644286bf01..e24bc768e8a 100644 --- a/packages/sdk/contractkit/src/wrappers/BaseWrapper.test.ts +++ b/packages/sdk/contractkit/src/wrappers/BaseWrapper.test.ts @@ -74,26 +74,35 @@ describe('unixSecondsTimestampToDateString()', () => { describe('when Brazil/East', () => { it('returns local time', () => { timezoneMock('Brazil/East') - expect(unixSecondsTimestampToDateString(date)).toEqual('Wed, Jul 28, 2021, 1:29 PM GMT-3') + let str = unixSecondsTimestampToDateString(date) + // due to behavior of node 18 https://github.com/nodejs/node/issues/46123 + str = str.replace(/[\u00A0\u1680​\u180e\u2000-\u2009\u200a​\u200b​\u202f\u205f​\u3000]/g, ' ') + expect(str).toEqual('Wed, Jul 28, 2021, 1:29 PM GMT-3') }) }) describe('when UTC', () => { it('returns utc time', () => { timezoneMock('UTC') - expect(unixSecondsTimestampToDateString(date)).toEqual('Wed, Jul 28, 2021, 4:29 PM UTC') + let str = unixSecondsTimestampToDateString(date) + str = str.replace(/[\u00A0\u1680​\u180e\u2000-\u2009\u200a​\u200b​\u202f\u205f​\u3000]/g, ' ') + expect(str).toEqual('Wed, Jul 28, 2021, 4:29 PM UTC') }) }) describe('when Australia/Adelaide', () => { it('returns local time', () => { timezoneMock('Australia/Adelaide') - expect(unixSecondsTimestampToDateString(date)).toEqual('Thu, Jul 29, 2021, 1:59 AM GMT+9:30') + let str = unixSecondsTimestampToDateString(date) + str = str.replace(/[\u00A0\u1680​\u180e\u2000-\u2009\u200a​\u200b​\u202f\u205f​\u3000]/g, ' ') + expect(str).toEqual('Thu, Jul 29, 2021, 1:59 AM GMT+9:30') }) }) describe('when Europe/London', () => { it('returns local time', () => { timezoneMock('Europe/London') - expect(unixSecondsTimestampToDateString(date)).toEqual('Wed, Jul 28, 2021, 5:29 PM GMT+1') + let str = unixSecondsTimestampToDateString(date) + str = str.replace(/[\u00A0\u1680​\u180e\u2000-\u2009\u200a​\u200b​\u202f\u205f​\u3000]/g, ' ') + expect(str).toEqual('Wed, Jul 28, 2021, 5:29 PM GMT+1') }) }) }) From a1e5c4c25bd47a2c716b309f8839f225ca27b2c2 Mon Sep 17 00:00:00 2001 From: Daniel Kesler Date: Thu, 11 May 2023 10:29:12 -0600 Subject: [PATCH 073/184] Update e2e test docker image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5aefed54fd1..af3237130cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ contract-defaults: &contract-defaults e2e-defaults: &e2e-defaults <<: *defaults docker: - - image: celohq/circleci:geth1.9-2 + - image: us-west1-docker.pkg.dev/devopsre/clabs-public-images/circleci:node18.14-go1.16 environment: CELO_BLOCKCHAIN_BRANCH_TO_TEST: master general: From 8acee1ac06da810d310a60c588212651bd8df8f6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 12 May 2023 13:13:53 -0400 Subject: [PATCH 074/184] verbose output --- packages/celotool/src/e2e-tests/cip35_tests.ts | 2 +- packages/celotool/src/e2e-tests/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index d444ff624be..cce89d3c26f 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -29,7 +29,7 @@ const gatewayFeeRecipientAddress = '0xc77538d1e30C0e4ec44B0DcaD97FD3dc63fcaCC4' const bytecode = '0x608060405260008055348015601357600080fd5b5060358060216000396000f3006080604052600080fd00a165627a7a72305820c7f3f7c299940bb1d9b122d25e8f288817e45bbdeaccdd2f6e8801677ed934e70029' -const verbose = false +const verbose = true ///////// Configurable values to run only some of the tests during development //////////////// // ReplayProtectionTests lets you skip or run only the replay-protection tests during dev diff --git a/packages/celotool/src/e2e-tests/utils.ts b/packages/celotool/src/e2e-tests/utils.ts index 6ad5f86913b..cc1ee8d4fa6 100644 --- a/packages/celotool/src/e2e-tests/utils.ts +++ b/packages/celotool/src/e2e-tests/utils.ts @@ -38,7 +38,7 @@ import { GethRunConfig } from '../lib/interfaces/geth-run-config' import { stringToBoolean } from '../lib/utils' const MonorepoRoot = resolvePath(joinPath(__dirname, '../..', '../..')) -const verboseOutput = false +const verboseOutput = true // The mnemonic used for the e2e tests export const mnemonic = 'jazz ripple brown cloth door bridge pen danger deer thumb cable prepare negative library vast' From 2620a2a5ecb214126ba97ea66b7fdec4c8c642a4 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 13 May 2023 13:11:38 -0400 Subject: [PATCH 075/184] Pre-review cleanup --- packages/celotool/src/e2e-tests/cip35_tests.ts | 4 ++-- packages/celotool/src/e2e-tests/replica_tests.ts | 3 --- packages/celotool/src/e2e-tests/utils.ts | 2 +- packages/flake-tracker/src/config.js | 4 +++- .../blockscout/values-rc1staging-blockscout.yaml | 11 ++++------- .../combiner/test/unit/pnp-threshold-state.test.ts | 1 - .../uniswap/test/libraries/UniswapV2Library.sol | 3 ++- packages/protocol/lib/fed-attestations-utils.ts | 2 +- packages/protocol/lib/meta-tx-utils.ts | 4 +++- packages/protocol/lib/test-utils.ts | 6 ------ packages/protocol/scripts/devchain.ts | 6 +++--- packages/sdk/connect/src/types.ts | 7 ------- .../src/wrappers/MetaTransactionWallet.test.ts | 2 +- packages/sdk/identity/src/offchain/utils.ts | 6 +++--- .../sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts | 4 ++++ 15 files changed, 27 insertions(+), 38 deletions(-) diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index cce89d3c26f..d1cdee682a8 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -29,7 +29,7 @@ const gatewayFeeRecipientAddress = '0xc77538d1e30C0e4ec44B0DcaD97FD3dc63fcaCC4' const bytecode = '0x608060405260008055348015601357600080fd5b5060358060216000396000f3006080604052600080fd00a165627a7a72305820c7f3f7c299940bb1d9b122d25e8f288817e45bbdeaccdd2f6e8801677ed934e70029' -const verbose = true +const verbose = true // TODO (soloseng): revert to false ///////// Configurable values to run only some of the tests during development //////////////// // ReplayProtectionTests lets you skip or run only the replay-protection tests during dev @@ -174,7 +174,7 @@ class TestEnv { replayProtectionIsNotMandatory: boolean hooks: ReturnType stableTokenAddr: string = '' - gasPrice: string = '' + gasPrice: string = '' //XXX this? // There are three cases: (a), (b), and (c) below. // And, for each of these three cases, we have one which connects to the validator and one which diff --git a/packages/celotool/src/e2e-tests/replica_tests.ts b/packages/celotool/src/e2e-tests/replica_tests.ts index 3a46da9beed..c29a2f3eef0 100644 --- a/packages/celotool/src/e2e-tests/replica_tests.ts +++ b/packages/celotool/src/e2e-tests/replica_tests.ts @@ -169,9 +169,6 @@ describe('replica swap tests', () => { const validatorWSWeb3Url = 'ws://localhost:8544' const validatorWSWeb3 = new Web3(validatorWSWeb3Url) - // validatoRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8545')) - // proxyRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8546')) - // replicaRPC = new DefaultRpcCaller(new Web3.providers.HttpProvider('http://localhost:8555')) validatoRPC = new HttpRpcCaller(new Web3.providers.HttpProvider('http://localhost:8545')) proxyRPC = new HttpRpcCaller(new Web3.providers.HttpProvider('http://localhost:8546')) replicaRPC = new HttpRpcCaller(new Web3.providers.HttpProvider('http://localhost:8555')) diff --git a/packages/celotool/src/e2e-tests/utils.ts b/packages/celotool/src/e2e-tests/utils.ts index cc1ee8d4fa6..260633962e0 100644 --- a/packages/celotool/src/e2e-tests/utils.ts +++ b/packages/celotool/src/e2e-tests/utils.ts @@ -38,7 +38,7 @@ import { GethRunConfig } from '../lib/interfaces/geth-run-config' import { stringToBoolean } from '../lib/utils' const MonorepoRoot = resolvePath(joinPath(__dirname, '../..', '../..')) -const verboseOutput = true +const verboseOutput = true // TODO (soloseng): revert to false // The mnemonic used for the e2e tests export const mnemonic = 'jazz ripple brown cloth door bridge pen danger deer thumb cable prepare negative library vast' diff --git a/packages/flake-tracker/src/config.js b/packages/flake-tracker/src/config.js index b3390e7c2dd..5bc313be88f 100644 --- a/packages/flake-tracker/src/config.js +++ b/packages/flake-tracker/src/config.js @@ -26,7 +26,9 @@ const flakeTrackerID = 71131 // This is the FlakeTracker GitHub App ID. // - If true, new flakey tests will be reported as 'failures' on GitHub Checks. Note this does not affect the CI workflow. // shouldTrackFlakes => tests are retried `numRetries` times and flakey results are logged w/ test output -const shouldTrackFlakes = false // disabling to skip flaker test on CI + +// XXX (soloseng): disabling to skip flaker test on CI +const shouldTrackFlakes = false // (process.env.CIRCLECI && // process.env.CIRCLE_PROJECT_REPONAME !== 'celo-blockchain' && // process.env.FLAKEY !== 'false') || diff --git a/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml b/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml index e182c0fe83d..4d2138e3464 100644 --- a/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml +++ b/packages/helm-charts/blockscout/values-rc1staging-blockscout.yaml @@ -2,9 +2,9 @@ blockscout: eventStream: replicas: 1 enableEventStream: true - beanstalkdPort: "11300" - beanstalkdHost: "rc1staging-webhooks-beanstalkd.webhooks.svc.cluster.local" - beanstalkdTube: "incoming" + beanstalkdPort: '11300' + beanstalkdHost: 'rc1staging-webhooks-beanstalkd.webhooks.svc.cluster.local' + beanstalkdTube: 'incoming' indexer: db: connectionName: celo-testnet-production:us-west1:rc1staging @@ -18,9 +18,6 @@ blockscout: requests: memory: 12Gi cpu: 5 - enableEventStream: true - beanstalkdPort: "11300" - beanstalkdHost: "rc1staging-governance-notifications-beanstalkd.event-notifications.svc.cluster.local" api: autoscaling: maxReplicas: 2 @@ -43,7 +40,7 @@ blockscout: host: rc1staging-blockscout.celo-testnet.org suffix: enabled: true - path: "rc1staging" + path: 'rc1staging' autoscaling: maxReplicas: 1 minReplicas: 1 diff --git a/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts b/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts index 3b7b470a9ce..d42a6e6a8e6 100644 --- a/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts +++ b/packages/phone-number-privacy/combiner/test/unit/pnp-threshold-state.test.ts @@ -35,7 +35,6 @@ describe('pnp threshold state', () => { logger: rootLogger, }, } as Response - const session = new Session( mockRequest, mockResponse, diff --git a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol index 29c1ca8bab8..fe938c55a13 100644 --- a/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol +++ b/packages/protocol/contracts/uniswap/test/libraries/UniswapV2Library.sol @@ -35,8 +35,9 @@ library UniswapV2Library { // This variable was hardcoded for Uniswap Eth Mainnet deployment // hex"96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f" // init code hash // Hash in the CI "bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" - //TODO:(soloseng) swicth back to this // hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" + // hex"bc307131606b79f0c50770dea78b35921ffca853421cbb031aa5a1ce5d6ea269" // hex"f0bd447d72bc4c5cd510462381a98e87f097a4d31106d6dd8b5922227696ef7a" + // the value of the hash is a function of the address it gets deployed to. hex"a3cc3b88aa878e73a27f19b6bb136f2e229563b9b45b3d86ced9b3725dd480ed" ) ) diff --git a/packages/protocol/lib/fed-attestations-utils.ts b/packages/protocol/lib/fed-attestations-utils.ts index 7ad9f5b5d70..605125afc66 100644 --- a/packages/protocol/lib/fed-attestations-utils.ts +++ b/packages/protocol/lib/fed-attestations-utils.ts @@ -40,5 +40,5 @@ export const getSignatureForAttestation = async ( export const getDomainDigest = (contractAddress: Address) => { const typedData = getTypedData(1, contractAddress) - return bufferToHex( structHash('EIP712Domain', typedData.domain, typedData.types)) + return bufferToHex(structHash('EIP712Domain', typedData.domain, typedData.types)) } \ No newline at end of file diff --git a/packages/protocol/lib/meta-tx-utils.ts b/packages/protocol/lib/meta-tx-utils.ts index 6e15bcb97ec..867e723397e 100644 --- a/packages/protocol/lib/meta-tx-utils.ts +++ b/packages/protocol/lib/meta-tx-utils.ts @@ -60,7 +60,9 @@ export const getSignatureForMetaTransaction = async ( ) => { const typedData = getTypedData(walletAddress, tx) - const signature= await web3.currentProvider.request({ method: 'eth_signTypedData',params: [signer, typedData],}) + const signature = await web3.currentProvider.request({ + method: 'eth_signTypedData',params: [signer, typedData], + }) const messageHash = constructMetaTransactionExecutionDigest(walletAddress, tx) const parsedSignature = parseSignatureWithoutPrefix(messageHash, signature, signer) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index aebe06069fd..5b3be25d18b 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -165,12 +165,6 @@ export async function assertRevertWithReason(promise: any, expectedRevertReason: // - satisfies all conditions set by Solidity `require` statements. // - does not trigger a Solidity `revert` statement.` // Therefore we try to parse the instance of `${revertMessage}`. - - // const foundRevertReason = error.message - // .split('. Reason given: ')[0] - // .split('Returned error: VM Exception while processing transaction: revert ')[1] - // assert.equal(foundRevertReason, expectedRevertReason, `Incorrect revert message: ${error.message} \n ${foundRevertReason}`) - const foundRevertReason = error.message .split(' Reason given: ')[1].split('.')[0] assert.strictEqual(foundRevertReason, expectedRevertReason, `Incorrect revert message: ${error.message} \n ${foundRevertReason}`) diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index c06519f5cbd..bf53ba13dab 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -145,7 +145,7 @@ async function startGanache( chainCopy.removeCallback() } // tslint:disable-next-line: no-console - console.log(chalk.red('GANACHE server closed')) + console.log(chalk.red('Ganache server CLOSED')) } catch (e) { throw e } @@ -241,7 +241,7 @@ async function runDevChainFromTar(filename: string) { await decompressChain(filename, chainCopy.name) - const stopGanache = await startGanache(chainCopy.name, { verbose: false }, chainCopy) + const stopGanache = await startGanache(chainCopy.name, { verbose: false }, chainCopy) // TODO (soloseng): revert to true return stopGanache } @@ -277,7 +277,7 @@ async function runDevChain( await resetDir(datadir) } createDirIfMissing(datadir) - const stopGanache = await startGanache(datadir, { verbose: false }) + const stopGanache = await startGanache(datadir, { verbose: false }) // TODO (soloseng): revert to true if (opts.reset || opts.runMigrations) { const code = await runMigrations({ upto: opts.upto, migrationOverride: opts.migrationOverride }) if (code !== 0) { diff --git a/packages/sdk/connect/src/types.ts b/packages/sdk/connect/src/types.ts index d3b23b02cea..4f3d4493d6a 100644 --- a/packages/sdk/connect/src/types.ts +++ b/packages/sdk/connect/src/types.ts @@ -48,13 +48,6 @@ export type CeloTxReceipt = TransactionReceipt & Partial export type Callback = (error: Error | null, result?: T) => void -// export interface JsonRpcResponse { -// jsonrpc: string -// id: string | number -// result?: any -// error?: string | { message: string; code: number } -// } - export interface JsonRpcResponse { jsonrpc: string id: string | number diff --git a/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts b/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts index 9278abd16c9..c0cb63ebd36 100644 --- a/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts +++ b/packages/sdk/contractkit/src/wrappers/MetaTransactionWallet.test.ts @@ -52,9 +52,9 @@ testWithGanache('MetaTransactionWallet Wrapper', (web3) => { // Ganache returns 1 in chainId assembly code // @ts-ignore wallet.chainId = () => Promise.resolve(chainId) + // Give the wallet some funds await gold.transfer(wallet.address, new BigNumber(20e18).toFixed()).sendAndWaitForReceipt() - // .sendAndWaitForReceipt({ gasPrice: 100 }) emptyAccounts = [0, 0, 0, 0, 0].map(() => web3.utils.randomHex(20)) }) diff --git a/packages/sdk/identity/src/offchain/utils.ts b/packages/sdk/identity/src/offchain/utils.ts index 26623679631..af8674bbdc3 100644 --- a/packages/sdk/identity/src/offchain/utils.ts +++ b/packages/sdk/identity/src/offchain/utils.ts @@ -1,11 +1,11 @@ -import { Err, Ok, parseJsonAsResult, Result, trimLeading0x } from '@celo/base' +import { ensureLeading0x, Err, Ok, parseJsonAsResult, Result, trimLeading0x } from '@celo/base' import { Address, publicKeyToAddress } from '@celo/utils/lib/address' import { ensureCompressed, ensureUncompressed, trimUncompressedPrefix } from '@celo/utils/lib/ecdh' import { AES128Decrypt, AES128Encrypt, Encrypt, IV_LENGTH } from '@celo/utils/lib/ecies' import { EIP712Object, EIP712TypedData } from '@celo/utils/lib/sign-typed-data-utils' -import { bufferToHex, toBuffer } from '@ethereumjs/util' import { createHmac, randomBytes } from 'crypto' import { keccak256 } from 'ethereum-cryptography/keccak' +import { toHex } from 'ethereum-cryptography/utils' import { isLeft } from 'fp-ts/lib/Either' import * as t from 'io-ts' import { join, sep } from 'path' @@ -317,7 +317,7 @@ export const buildEIP712TypedData = async ( ], } message = { - hash: bufferToHex(toBuffer(keccak256(data))), + hash: ensureLeading0x(toHex(keccak256(data))), } } else { const Claim = buildEIP712Schema(type!) diff --git a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts index f013d9323ed..cb23c4942ee 100644 --- a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts +++ b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.test.ts @@ -64,16 +64,20 @@ describe.skip('rpc-wallet', () => { const ipcProvider = new Web3.providers.IpcProvider(ipcUrl, net) const wallet = new RpcWallet(ipcProvider) await wallet.init() + const account = await wallet.addAccount(PRIVATE_KEY1, PASSPHRASE) await wallet.unlockAccount(account, PASSPHRASE, DURATION) + const tx = { from: ACCOUNT_ADDRESS1, to: ACCOUNT_ADDRESS2, value: 1000, } + const result = await wallet.signTransaction(tx) // tslint:disable:no-console console.log(result) + const connection = new Connection(new Web3(ipcUrl), wallet) const txResult = await connection.sendSignedTransaction(result.raw) // tslint:disable:no-console From 3b90f6d770943b5420cb3ef2609fd596360331e0 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 13 May 2023 13:26:36 -0400 Subject: [PATCH 076/184] appease linter --- packages/celotool/src/e2e-tests/cip35_tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index d1cdee682a8..9a18cd45fa7 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -174,7 +174,7 @@ class TestEnv { replayProtectionIsNotMandatory: boolean hooks: ReturnType stableTokenAddr: string = '' - gasPrice: string = '' //XXX this? + gasPrice: string = '' // There are three cases: (a), (b), and (c) below. // And, for each of these three cases, we have one which connects to the validator and one which From c63ffbed2ebf6c206ba10aeca3ab5e3e7d0aca9f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 13 May 2023 14:21:37 -0400 Subject: [PATCH 077/184] removed dead code comment cleanup --- packages/protocol/test/customHooks.ts | 2 -- packages/protocol/test/identity/attestations.ts | 1 - packages/sdk/explorer/src/block-explorer.ts | 2 -- 3 files changed, 5 deletions(-) diff --git a/packages/protocol/test/customHooks.ts b/packages/protocol/test/customHooks.ts index 690f54b23e0..1da6ba454b3 100644 --- a/packages/protocol/test/customHooks.ts +++ b/packages/protocol/test/customHooks.ts @@ -1,5 +1,3 @@ -// TODO: (soloseng) fix: Argument of type 'string' is not assignable to parameter of type 'ProvidesHookCallback'. - import { retryAsync } from '@celo/utils/lib/async' // Handles flakey `error: Invalid JSON RPC response: ""` error that seems to be caused by port exhaustion in CI. diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index bde4e8f6b42..3d906ffd473 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -82,7 +82,6 @@ contract('Attestations', (accounts: string[]) => { } beforeEach('Attestations setup', async () => { - // beforeEachWithRetries('Attestations setup', 3, 3000, async () => { accountsInstance = await Accounts.new(true) mockERC20Token = await MockERC20Token.new() otherMockERC20Token = await MockERC20Token.new() diff --git a/packages/sdk/explorer/src/block-explorer.ts b/packages/sdk/explorer/src/block-explorer.ts index a69d62ce154..8c612da6545 100644 --- a/packages/sdk/explorer/src/block-explorer.ts +++ b/packages/sdk/explorer/src/block-explorer.ts @@ -161,8 +161,6 @@ export class BlockExplorer { contractName: contractMapping.details.name, abi: methodAbi, } - - return null } /** From 6fa8c7f86e77680ad9bb6f1cc9305d6769a06435 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 16 May 2023 11:52:14 -0400 Subject: [PATCH 078/184] deprecate defaultRpcCaller for httpRpcCaller This allows compatibility with latest web3 --- packages/dev-utils/src/ganache-setup.ts | 2 +- packages/sdk/connect/src/connection.ts | 10 +-- .../sdk/connect/src/utils/rpc-caller.test.ts | 4 +- packages/sdk/connect/src/utils/rpc-caller.ts | 65 ++----------------- .../sdk/wallets/wallet-rpc/src/rpc-wallet.ts | 4 +- 5 files changed, 14 insertions(+), 71 deletions(-) diff --git a/packages/dev-utils/src/ganache-setup.ts b/packages/dev-utils/src/ganache-setup.ts index 23a746ce6f9..17b8fdd17c3 100644 --- a/packages/dev-utils/src/ganache-setup.ts +++ b/packages/dev-utils/src/ganache-setup.ts @@ -1,5 +1,5 @@ -// @ts-ignore import * as fs from 'fs-extra' +// @ts-ignore import * as ganache from 'ganache' import * as path from 'path' import * as targz from 'targz' diff --git a/packages/sdk/connect/src/connection.ts b/packages/sdk/connect/src/connection.ts index 6dfed026360..f8709de7714 100644 --- a/packages/sdk/connect/src/connection.ts +++ b/packages/sdk/connect/src/connection.ts @@ -1,11 +1,11 @@ import { ensureLeading0x, toChecksumAddress } from '@celo/utils/lib/address' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' -import { parseSignatureWithoutPrefix, Signature } from '@celo/utils/lib/signatureUtils' +import { Signature, parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' import { bufferToHex } from '@ethereumjs/util' import debugFactory from 'debug' import Web3 from 'web3' import { AbiCoder } from './abi-types' -import { assertIsCeloProvider, CeloProvider } from './celo-provider' +import { CeloProvider, assertIsCeloProvider } from './celo-provider' import { Address, Block, @@ -32,9 +32,9 @@ import { outputCeloTxReceiptFormatter, } from './utils/formatter' import { hasProperty } from './utils/provider-utils' -import { DefaultRpcCaller, getRandomId, RpcCaller } from './utils/rpc-caller' +import { HttpRpcCaller, RpcCaller, getRandomId } from './utils/rpc-caller' import { TxParamsNormalizer } from './utils/tx-params-normalizer' -import { toTxResult, TransactionResult } from './utils/tx-result' +import { TransactionResult, toTxResult } from './utils/tx-result' import { ReadOnlyWallet } from './wallet' const debugGasEstimation = debugFactory('connection:gas-estimation') @@ -84,7 +84,7 @@ export class Connection { } try { if (!(provider instanceof CeloProvider)) { - this.rpcCaller = new DefaultRpcCaller(provider) + this.rpcCaller = new HttpRpcCaller(provider) provider = new CeloProvider(provider, this) } this.web3.setProvider(provider as any) diff --git a/packages/sdk/connect/src/utils/rpc-caller.test.ts b/packages/sdk/connect/src/utils/rpc-caller.test.ts index dc1bf32966a..579d4cb1473 100644 --- a/packages/sdk/connect/src/utils/rpc-caller.test.ts +++ b/packages/sdk/connect/src/utils/rpc-caller.test.ts @@ -1,5 +1,5 @@ import { Callback, Error, JsonRpcPayload, JsonRpcResponse, Provider } from '../types' -import { DefaultRpcCaller, RpcCaller, rpcCallHandler } from './rpc-caller' +import { HttpRpcCaller, RpcCaller, rpcCallHandler } from './rpc-caller' const mockProvider: Provider = { send: (payload: JsonRpcPayload, callback: Callback): any => { @@ -29,7 +29,7 @@ describe('RPC Caller class', () => { let rpcCaller: RpcCaller beforeEach(async () => { - rpcCaller = new DefaultRpcCaller(mockProvider) + rpcCaller = new HttpRpcCaller(mockProvider) }) describe('when calling the provider', () => { diff --git a/packages/sdk/connect/src/utils/rpc-caller.ts b/packages/sdk/connect/src/utils/rpc-caller.ts index 251a92b3aa3..d7c5fb79427 100644 --- a/packages/sdk/connect/src/utils/rpc-caller.ts +++ b/packages/sdk/connect/src/utils/rpc-caller.ts @@ -1,5 +1,5 @@ import debugFactory from 'debug' -import { Callback, Error, HttpProvider, JsonRpcPayload, JsonRpcResponse, Provider } from '../types' +import { Callback, Error, HttpProvider, JsonRpcPayload, JsonRpcResponse } from '../types' const debugRpcPayload = debugFactory('rpc:payload') const debugRpcResponse = debugFactory('rpc:response') @@ -67,66 +67,9 @@ export interface RpcCaller { callback: (error: Error | null, result?: JsonRpcResponse) => void ) => void } -export class DefaultRpcCaller implements RpcCaller { - constructor(readonly defaultProvider: Provider, readonly jsonrpcVersion: string = '2.0') {} - public async call(method: string, params: any[]): Promise { - return new Promise((resolve, reject) => { - const payload: JsonRpcPayload = { - id: getRandomId(), - jsonrpc: this.jsonrpcVersion, - method, - params, - } - this.send(payload, (err: any, response?: JsonRpcResponse) => { - if (err != null || !response) { - reject(err) - } else { - resolve(response) - } - }) - }) - } - - public send( - payload: JsonRpcPayload, - callback: (error: Error | null, result?: JsonRpcResponse) => void - ): void { - debugRpcPayload('%O', payload) - - const decoratedCallback: Callback = ( - error: Error | null, - result?: JsonRpcResponse - ): void => { - let err: Error | null = null - // error could be false - if (error) { - err = error - } - debugRpcResponse('%O', result) - // The provider send call will not provide an error to the callback if - // the result itself specifies an error. Here, we extract the error in the - // result. - if ( - result && - result.error != null && - typeof result.error !== 'string' && - result.error.message != null - ) { - err = new Error(result.error.message) - } - callback(err, result) - } - - if (this.defaultProvider && typeof this.defaultProvider !== 'string') { - this.defaultProvider.send!(payload, decoratedCallback) - } - } -} - -// TODO: @soloseng de-duplicate code by extending DefaultRpcCaller export class HttpRpcCaller implements RpcCaller { - constructor(readonly defaultProvider: HttpProvider, readonly jsonrpcVersion: string = '2.0') {} + constructor(readonly httpProvider: HttpProvider, readonly jsonrpcVersion: string = '2.0') {} public async call(method: string, params: any[]): Promise { return new Promise((resolve, reject) => { @@ -176,8 +119,8 @@ export class HttpRpcCaller implements RpcCaller { callback(err, result) } - if (this.defaultProvider && typeof this.defaultProvider !== 'string') { - this.defaultProvider.send!(payload, decoratedCallback) + if (this.httpProvider && typeof this.httpProvider !== 'string') { + this.httpProvider.send!(payload, decoratedCallback) } } } diff --git a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.ts b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.ts index 35b2b460eb4..a12713c0765 100644 --- a/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.ts +++ b/packages/sdk/wallets/wallet-rpc/src/rpc-wallet.ts @@ -1,5 +1,5 @@ import { ensureLeading0x, normalizeAddressWith0x } from '@celo/base/lib/address' -import { CeloTx, DefaultRpcCaller, Provider, RpcCaller } from '@celo/connect' +import { CeloTx, HttpRpcCaller, Provider, RpcCaller } from '@celo/connect' import { privateKeyToAddress } from '@celo/utils/lib/address' import { UnlockableWallet } from '@celo/wallet-base' import { RemoteWallet } from '@celo/wallet-remote' @@ -19,7 +19,7 @@ export class RpcWallet extends RemoteWallet implements UnlockableWall constructor(protected _provider: Provider) { super() - this.rpc = new DefaultRpcCaller(_provider) + this.rpc = new HttpRpcCaller(_provider) } async loadAccountSigners(): Promise> { From b2fd653033b5ed608dcab94ce7e45e8f14888d89 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 16 May 2023 12:12:07 -0400 Subject: [PATCH 079/184] updated ganache-dev command --- packages/protocol/scripts/bash/ganache.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/protocol/scripts/bash/ganache.sh b/packages/protocol/scripts/bash/ganache.sh index 041428e2485..d3936fd2128 100755 --- a/packages/protocol/scripts/bash/ganache.sh +++ b/packages/protocol/scripts/bash/ganache.sh @@ -4,10 +4,10 @@ set -euo pipefail # Runs ganache with the mnemonic used in our tests. yarn run ganache \ - --deterministic \ - --mnemonic 'concert load couple harbor equip island argue ramp clarify fence smart topic' \ - --gasPrice 0 \ - --networkId 1101 \ - --gasLimit 20000000 \ - --defaultBalanceEther 200000000 \ - --allowUnlimitedContractSize + --wallet.mnemonic='concert load couple harbor equip island argue ramp clarify fence smart topic' \ + --miner.defaultGasPrice=0 \ + --chain.networkId=1101 \ + --miner.blockGasLimit=20000000 \ + --wallet.defaultBalance=200000000 \ + --chain.allowUnlimitedContractSize=true \ + --chain.hardfork='istanbul' From 680888406e18edb02187c9830fc3ffd2c3cb2737 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 16 May 2023 12:21:56 -0400 Subject: [PATCH 080/184] appease linter --- packages/sdk/connect/src/connection.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sdk/connect/src/connection.ts b/packages/sdk/connect/src/connection.ts index f8709de7714..2866055baee 100644 --- a/packages/sdk/connect/src/connection.ts +++ b/packages/sdk/connect/src/connection.ts @@ -1,11 +1,11 @@ import { ensureLeading0x, toChecksumAddress } from '@celo/utils/lib/address' import { EIP712TypedData, generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' -import { Signature, parseSignatureWithoutPrefix } from '@celo/utils/lib/signatureUtils' +import { parseSignatureWithoutPrefix, Signature } from '@celo/utils/lib/signatureUtils' import { bufferToHex } from '@ethereumjs/util' import debugFactory from 'debug' import Web3 from 'web3' import { AbiCoder } from './abi-types' -import { CeloProvider, assertIsCeloProvider } from './celo-provider' +import { assertIsCeloProvider, CeloProvider } from './celo-provider' import { Address, Block, @@ -32,9 +32,9 @@ import { outputCeloTxReceiptFormatter, } from './utils/formatter' import { hasProperty } from './utils/provider-utils' -import { HttpRpcCaller, RpcCaller, getRandomId } from './utils/rpc-caller' +import { getRandomId, HttpRpcCaller, RpcCaller } from './utils/rpc-caller' import { TxParamsNormalizer } from './utils/tx-params-normalizer' -import { TransactionResult, toTxResult } from './utils/tx-result' +import { toTxResult, TransactionResult } from './utils/tx-result' import { ReadOnlyWallet } from './wallet' const debugGasEstimation = debugFactory('connection:gas-estimation') From 0dcd40f8089f8baf40f7146d739e3c826022dae3 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 18 May 2023 11:19:28 -0400 Subject: [PATCH 081/184] updated revert assertion with message --- packages/protocol/lib/test-utils.ts | 22 +----------- packages/protocol/test/common/accounts.ts | 35 +++++++++---------- .../addresssortedlinkedlistwithmedian.ts | 18 +++++----- packages/protocol/test/common/feeburner.ts | 20 +++++------ .../test/common/feecurrencywhitelist.ts | 16 ++++----- .../protocol/test/common/gaspriceminimum.ts | 16 ++++----- packages/protocol/test/common/goldtoken.ts | 16 ++++----- packages/protocol/test/common/registry.ts | 6 ++-- .../test/governance/network/governance.ts | 10 +++--- .../test/governance/voting/release_gold.ts | 4 +-- packages/protocol/test/identity/escrow.ts | 5 ++- .../protocol/test/stability/grandamento.ts | 3 +- 12 files changed, 72 insertions(+), 99 deletions(-) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 5b3be25d18b..c2c7ea10777 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -132,7 +132,7 @@ export const assertThrowsAsync = async (promise: any, errorMessage: string = '') assert.equal(true, failed, errorMessage) } -export async function assertTXRevertWithReason(promise: any, expectedRevertReason: string = '') { +export async function assertRevertWithReason(promise: any, expectedRevertReason: string = '') { try { await promise assert.fail('Expected transaction to revert') @@ -143,7 +143,6 @@ export async function assertTXRevertWithReason(promise: any, expectedRevertReaso // When it's a transaction (eg a non-view send call), error.message has a shape like: // `Returned error: VM Exception while processing transaction: revert ${revertMessage} -- Reason given: ${revertMessage}.` // Therefore we try to parse the first instance of `${revertMessage}`. - const revertFound: boolean = error.message.search(expectedRevertReason) >= 0 const msg: string = @@ -151,25 +150,6 @@ export async function assertTXRevertWithReason(promise: any, expectedRevertReaso assert(revertFound, msg) } } -export async function assertRevertWithReason(promise: any, expectedRevertReason: string = '') { - try { - await promise - assert.fail('Expected transaction to revert') - } catch (error) { - // Only ever tested with ganache. - // When it's a view call, error.message has a shape like: - // `Returned error: VM Exception while processing transaction: revert ${revertMessage}` - // When it's a transaction (eg a non-view send call), error.message has a shape like: - // `Transaction: ${transactionHash} exited with an error (status 0). Reason given: ${revertMessage}. - // Please check that the transaction: - // - satisfies all conditions set by Solidity `require` statements. - // - does not trigger a Solidity `revert` statement.` - // Therefore we try to parse the instance of `${revertMessage}`. - const foundRevertReason = error.message - .split(' Reason given: ')[1].split('.')[0] - assert.strictEqual(foundRevertReason, expectedRevertReason, `Incorrect revert message: ${error.message} \n ${foundRevertReason}`) - } -} // TODO: Use assertRevert directly from openzeppelin-solidity // Note that errorMessage is not the expected revert message, but the diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index e184dd52cf6..1bdda360ffd 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -7,7 +7,6 @@ import { assertLogMatches2, assertRevert, assertRevertWithReason, - assertTXRevertWithReason, } from '@celo/protocol/lib/test-utils' import { toFixed } from '@celo/utils/lib/fixidity' import { parseSolidityStringArray } from '@celo/utils/lib/parsing' @@ -100,7 +99,7 @@ contract('Accounts', (accounts: string[]) => { }) it('should revert when the key is invalid', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setAccountDataEncryptionKey('0x32132931293'), 'data encryption key length <= 32' ) @@ -267,7 +266,7 @@ contract('Accounts', (accounts: string[]) => { it('should set a revert with the wrong signature for a different address', async () => { const sig = await getParsedSignatureOfAddress(web3, account, accounts[1]) - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setAccount(name, dataEncryptionKey, accounts[2], sig.v, sig.r, sig.s), 'Invalid signature' ) @@ -278,7 +277,7 @@ contract('Accounts', (accounts: string[]) => { describe('#setWalletAddress', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), 'Unknown account' ) @@ -321,7 +320,7 @@ contract('Accounts', (accounts: string[]) => { it('should set a revert with the wrong signature for a different address', async () => { const sig = await getParsedSignatureOfAddress(web3, account, accounts[1]) - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setWalletAddress(accounts[2], sig.v, sig.r, sig.s), 'Invalid signature' ) @@ -332,7 +331,7 @@ contract('Accounts', (accounts: string[]) => { describe('#setMetadataURL', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertTXRevertWithReason(accountsInstance.setMetadataURL(caller), 'Unknown account') + await assertRevertWithReason(accountsInstance.setMetadataURL(caller), 'Unknown account') }) }) @@ -382,7 +381,7 @@ contract('Accounts', (accounts: string[]) => { describe('#addStorageRoot', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.addStorageRoot(storageRoot), 'Unknown account' ) @@ -422,7 +421,7 @@ contract('Accounts', (accounts: string[]) => { describe('#removeStorageRoot', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertTXRevertWithReason(accountsInstance.removeStorageRoot(0), 'Unknown account') + await assertRevertWithReason(accountsInstance.removeStorageRoot(0), 'Unknown account') }) }) @@ -433,7 +432,7 @@ contract('Accounts', (accounts: string[]) => { describe('when there are no storage roots', async () => { it('should revert with message', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.removeStorageRoot(0), 'Invalid storage root index' ) @@ -477,7 +476,7 @@ contract('Accounts', (accounts: string[]) => { const badFraction = toFixed(1.2) it('should not be callable by a non-account', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setPaymentDelegation(beneficiary, fraction), 'Not an account' ) @@ -498,14 +497,14 @@ contract('Accounts', (accounts: string[]) => { }) it('should not allow a fraction greater than 1', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setPaymentDelegation(beneficiary, badFraction), 'Fraction must not be greater than 1' ) }) it('should not allow a beneficiary with address 0x0', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setPaymentDelegation(NULL_ADDRESS, fraction), 'Beneficiary cannot be address 0x0' ) @@ -558,7 +557,7 @@ contract('Accounts', (accounts: string[]) => { describe('#setName', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), 'Unknown account' ) @@ -641,7 +640,7 @@ contract('Accounts', (accounts: string[]) => { describe('smart contract signers', async () => { it("can't complete an authorization that hasn't been started", async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.completeSignerAuthorization(account, role, { from: signer }), 'Signer authorization not started' ) @@ -782,7 +781,7 @@ contract('Accounts', (accounts: string[]) => { assert.isFalse(await accountsInstance.hasDefaultSigner(account, role)) assert.equal(await accountsInstance.getDefaultSigner(account, role), account) - await assertTXRevertWithReason( + await assertRevertWithReason( accountsInstance.setIndexedSigner(signer, role), 'Must authorize signer before setting as default' ) @@ -926,7 +925,7 @@ contract('Accounts', (accounts: string[]) => { it(`should revert if the ${description} is an account`, async () => { await accountsInstance.createAccount({ from: authorized }) - await assertTXRevertWithReason( + await assertRevertWithReason( testInstance.fn(authorized, sig.v, sig.r, sig.s), 'Cannot re-authorize address or locked gold account for another account' ) @@ -939,7 +938,7 @@ contract('Accounts', (accounts: string[]) => { await testInstance.fn(authorized, otherSig.v, otherSig.r, otherSig.s, { from: otherAccount, }) - await assertTXRevertWithReason( + await assertRevertWithReason( testInstance.fn(authorized, sig.v, sig.r, sig.s), 'Cannot re-authorize address or locked gold account for another account' ) @@ -948,7 +947,7 @@ contract('Accounts', (accounts: string[]) => { it('should revert if the signature is incorrect', async () => { const nonVoter = accounts[3] const incorrectSig = await getSignature(account, nonVoter) - await assertTXRevertWithReason( + await assertRevertWithReason( testInstance.fn(authorized, incorrectSig.v, incorrectSig.r, incorrectSig.s), 'Invalid signature' ) diff --git a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts index 060b8105825..38eecd5f30b 100644 --- a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts +++ b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts @@ -1,5 +1,5 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' -import { assertSameAddress, assertTXRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertRevertWithReason, assertSameAddress } from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { AddressSortedLinkedListWithMedianTestContract, @@ -55,7 +55,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if key is 0', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.insert( NULL_ADDRESS, numerator, @@ -67,14 +67,14 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if lesser is equal to key', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.insert(key, numerator, key, NULL_ADDRESS), 'invalid key' ) }) it('should revert if greater is equal to key', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, key), 'invalid key' ) @@ -91,7 +91,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert when inserting an element already in the list', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, NULL_ADDRESS), 'invalid key' ) @@ -123,7 +123,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if the key is not in the list', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.update( accounts[8], newNumerator, @@ -135,14 +135,14 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if lesser is equal to key', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.update(key, newNumerator, key, NULL_ADDRESS), 'invalid key' ) }) it('should revert if greater is equal to key', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.update(key, newNumerator, NULL_ADDRESS, key), 'invalid key' ) @@ -182,7 +182,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if the key is not in the list', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( addressSortedLinkedListWithMedianTest.remove(accounts[8]), 'key not in list' ) diff --git a/packages/protocol/test/common/feeburner.ts b/packages/protocol/test/common/feeburner.ts index 0771623e033..377c697a7f2 100644 --- a/packages/protocol/test/common/feeburner.ts +++ b/packages/protocol/test/common/feeburner.ts @@ -3,7 +3,7 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { assertEqualBN, assertGtBN, - assertTXRevertWithReason, + assertRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { fixed1, toFixed } from '@celo/utils/lib/fixidity' @@ -202,7 +202,7 @@ contract('FeeBurner', (accounts: string[]) => { }) it('Only owner can take tokens out', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.transfer(tokenA.address, user, new BigNumber(1e18), { from: user }), 'Ownable: caller is not the owner' ) @@ -232,7 +232,7 @@ contract('FeeBurner', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.initialize(registry.address, [], [], [], [], { from: user }), 'contract already initialized' ) @@ -266,7 +266,7 @@ contract('FeeBurner', (accounts: string[]) => { }) it("doesn't remove if the indexes doesn't match", async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.removeRouter(tokenA.address, exchange.address, 0), 'Index does not match' ) @@ -275,7 +275,7 @@ contract('FeeBurner', (accounts: string[]) => { describe('#setDailyBurnLimit()', () => { it('should only be called by owner', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.setDailyBurnLimit(stableToken.address, goldAmountForRate, { from: user }), 'Ownable: caller is not the owner' ) @@ -284,7 +284,7 @@ contract('FeeBurner', (accounts: string[]) => { describe('#setMaxSplipagge()', () => { it('should only be called by owner', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.setMaxSplippage(stableToken.address, maxSlippage, { from: user }), 'Ownable: caller is not the owner' ) @@ -301,7 +301,7 @@ contract('FeeBurner', (accounts: string[]) => { it("Can't burn when frozen", async () => { await freezer.freeze(feeBurner.address) - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.burnMentoTokens(), "can't call when contract is frozen" ) @@ -347,7 +347,7 @@ contract('FeeBurner', (accounts: string[]) => { from: user, }) - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.burn(), 'Calculated buyAmount was less than specified minBuyAmount' ) @@ -416,7 +416,7 @@ contract('FeeBurner', (accounts: string[]) => { it("Can't burn when frozen", async () => { await freezer.freeze(feeBurner.address) - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.burnNonMentoTokens(), "can't call when contract is frozen" ) @@ -472,7 +472,7 @@ contract('FeeBurner', (accounts: string[]) => { it("Doesn't exchange non-Mento when slippage is too high", async () => { await feeBurner.setMaxSplippage(tokenA.address, maxSlippage) - await assertTXRevertWithReason( + await assertRevertWithReason( feeBurner.burnNonMentoTokens(), 'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT' ) diff --git a/packages/protocol/test/common/feecurrencywhitelist.ts b/packages/protocol/test/common/feecurrencywhitelist.ts index 7b0e2cb0a04..61ed1512657 100644 --- a/packages/protocol/test/common/feecurrencywhitelist.ts +++ b/packages/protocol/test/common/feecurrencywhitelist.ts @@ -1,4 +1,4 @@ -import { assertTXRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' import { FeeCurrencyWhitelistContract, FeeCurrencyWhitelistInstance } from 'types' const FeeCurrencyWhitelist: FeeCurrencyWhitelistContract = artifacts.require('FeeCurrencyWhitelist') @@ -22,7 +22,7 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeCurrencyWhitelist.initialize(), 'contract already initialized' ) @@ -37,7 +37,7 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -55,7 +55,7 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeCurrencyWhitelist.addNonMentoToken(aTokenAddress, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -76,14 +76,14 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it("Doesn't remove if the index is wrong", async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeCurrencyWhitelist.removeToken(accounts[0], 0), 'Index does not match' ) }) it('should not allow a non-owner to remove Mento token', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeCurrencyWhitelist.removeToken(accounts[0], 0, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -113,14 +113,14 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it("Doesn't remove if the index is wrong", async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1), 'Index does not match' ) }) it('should not allow a non-owner to remove non-Mento token', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1, { from: nonOwner }), 'Ownable: caller is not the owner' ) diff --git a/packages/protocol/test/common/gaspriceminimum.ts b/packages/protocol/test/common/gaspriceminimum.ts index fb95cb760bc..60f466ab523 100644 --- a/packages/protocol/test/common/gaspriceminimum.ts +++ b/packages/protocol/test/common/gaspriceminimum.ts @@ -2,7 +2,7 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { assertEqualBN, assertLogMatches2, - assertTXRevertWithReason, + assertRevertWithReason, } from '@celo/protocol/lib/test-utils' import { fromFixed, toFixed } from '@celo/utils/lib/fixidity' import BigNumber from 'bignumber.js' @@ -68,7 +68,7 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( gasPriceMinimum.initialize( registry.address, gasPriceMinimumFloor, @@ -102,14 +102,14 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided fraction is greater than one', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( gasPriceMinimum.setAdjustmentSpeed(toFixed(3 / 2)), 'adjustment speed must be smaller than 1' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( gasPriceMinimum.setAdjustmentSpeed(newAdjustmentSpeed, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -138,14 +138,14 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided fraction is greater than one', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( gasPriceMinimum.setTargetDensity(toFixed(3 / 2)), 'target density must be smaller than 1' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( gasPriceMinimum.setTargetDensity(newTargetDensity, { from: nonOwner, }), @@ -176,14 +176,14 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided floor is zero', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( gasPriceMinimum.setGasPriceMinimumFloor(0), 'gas price minimum floor must be greater than zero' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( gasPriceMinimum.setGasPriceMinimumFloor(newGasPriceMinFloor, { from: nonOwner, }), diff --git a/packages/protocol/test/common/goldtoken.ts b/packages/protocol/test/common/goldtoken.ts index 185db5e0f4b..ab1431a0241 100644 --- a/packages/protocol/test/common/goldtoken.ts +++ b/packages/protocol/test/common/goldtoken.ts @@ -1,10 +1,6 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { - assertBalance, - assertEqualBN, - assertTXRevertWithReason, -} from '@celo/protocol/lib/test-utils' +import { assertBalance, assertEqualBN, assertRevertWithReason } from '@celo/protocol/lib/test-utils' import { BigNumber } from 'bignumber.js' import _ from 'lodash' import { @@ -179,7 +175,7 @@ contract('GoldToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( goldToken.transfer(NULL_ADDRESS, ONE_GOLDTOKEN, { gasPrice: 0 }), 'transfer attempted to reserved address 0x0' ) @@ -191,7 +187,7 @@ contract('GoldToken', (accounts: string[]) => { const value = web3.utils.toBN( (await goldToken.balanceOf(sender)).plus(ONE_GOLDTOKEN.times(4)) ) - await assertTXRevertWithReason( + await assertRevertWithReason( goldToken.transfer(receiver, value), 'transfer value exceeded balance of sender' ) @@ -212,7 +208,7 @@ contract('GoldToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( goldToken.transferFrom(sender, NULL_ADDRESS, ONE_GOLDTOKEN, { from: receiver }), 'transfer attempted to reserved address 0x0' ) @@ -225,14 +221,14 @@ contract('GoldToken', (accounts: string[]) => { (await goldToken.balanceOf(sender)).plus(ONE_GOLDTOKEN.times(4)) ) await goldToken.approve(receiver, value) - await assertTXRevertWithReason( + await assertRevertWithReason( goldToken.transferFrom(sender, receiver, value, { from: receiver }), 'transfer value exceeded balance of sender' ) }) it('should not allow transferring more than the spender is allowed', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( goldToken.transferFrom(sender, receiver, ONE_GOLDTOKEN.plus(1), { from: receiver, }), diff --git a/packages/protocol/test/common/registry.ts b/packages/protocol/test/common/registry.ts index 16ab67a00ac..f61300e8a06 100644 --- a/packages/protocol/test/common/registry.ts +++ b/packages/protocol/test/common/registry.ts @@ -1,4 +1,4 @@ -import { assertRevert, assertTXRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertRevert, assertRevertWithReason } from '@celo/protocol/lib/test-utils' import { soliditySha3 } from '@celo/utils/lib/solidity' import { RegistryInstance } from 'types' @@ -24,7 +24,7 @@ contract('Registry', (accounts: any) => { }) it('should not be callable again', async () => { - await assertTXRevertWithReason(registry.initialize(), 'contract already initialized') + await assertRevertWithReason(registry.initialize(), 'contract already initialized') }) }) @@ -35,7 +35,7 @@ contract('Registry', (accounts: any) => { }) it('should not allow a different user to set an address', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( registry.setAddressFor(anIdentifier, anAddress, { from: accounts[1] }), 'Ownable: caller is not the owner' ) diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index 31c6f5d5218..3c1636ae8a5 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -6,7 +6,7 @@ import { assertEqualBN, assertLogMatches2, assertRevert, - assertTXRevertWithReason, + assertRevertWithReason, matchAny, mineToNextEpoch, stripHexEncoding, @@ -3302,13 +3302,13 @@ contract('Governance', (accounts: string[]) => { } it('should revert when hotfix not approved', async () => { - await assertTXRevertWithReason(executeHotfixTx(), 'hotfix not approved') + await assertRevertWithReason(executeHotfixTx(), 'hotfix not approved') }) it('should revert when hotfix not prepared for current epoch', async () => { await mineToNextEpoch(web3) await governance.approveHotfix(hotfixHashStr, { from: approver }) - await assertTXRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') + await assertRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') }) it('should revert when hotfix prepared but not for current epoch', async () => { @@ -3318,7 +3318,7 @@ contract('Governance', (accounts: string[]) => { await governance.whitelistHotfix(hotfixHashStr, { from: accounts[2] }) await governance.prepareHotfix(hotfixHashStr, { from: accounts[2] }) await mineToNextEpoch(web3) - await assertTXRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') + await assertRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') }) describe('when hotfix is approved and prepared for current epoch', () => { @@ -3357,7 +3357,7 @@ contract('Governance', (accounts: string[]) => { it('should not be executable again', async () => { await executeHotfixTx() - await assertTXRevertWithReason(executeHotfixTx(), 'hotfix already executed') + await assertRevertWithReason(executeHotfixTx(), 'hotfix already executed') }) }) }) diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index 6987e1fb5c4..1f19c102ab3 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -6,8 +6,8 @@ import { assertGteBN, assertLogMatches, assertRevert, + assertRevertWithReason, assertSameAddress, - assertTXRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' // tslint:disable-next-line: ordered-imports @@ -458,7 +458,7 @@ contract('ReleaseGold', (accounts: string[]) => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.numReleasePeriods = Number.MAX_SAFE_INTEGER releaseGoldSchedule.amountReleasedPerPeriod = new BigNumber(2).pow(300) - await assertTXRevertWithReason( + await assertRevertWithReason( createNewReleaseGoldInstance(releaseGoldSchedule, web3), 'value out-of-bounds' ) diff --git a/packages/protocol/test/identity/escrow.ts b/packages/protocol/test/identity/escrow.ts index 26a9e003277..04258989d7f 100644 --- a/packages/protocol/test/identity/escrow.ts +++ b/packages/protocol/test/identity/escrow.ts @@ -7,7 +7,6 @@ import { assertObjectWithBNEqual, assertRevert, assertRevertWithReason, - assertTXRevertWithReason, assumeOwnership, timeTravel, } from '@celo/protocol/lib/test-utils' @@ -180,7 +179,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow more trusted issuers to be added', async () => { - await assertTXRevertWithReason( + await assertRevertWithReason( escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: owner }), "defaultTrustedIssuers.length can't exceed allowed number of trustedIssuers" ) @@ -233,7 +232,7 @@ contract('Escrow', (accounts: string[]) => { it('should revert if trusted issuer does not match index', async () => { await assertRevertWithReason( escrow.removeDefaultTrustedIssuer(trustedIssuer2, 0, { from: owner }), - 'trustedIssuer does not match address found at defaultTrustedIssuers[index]' + 'trustedIssuer does not match address found at defaultTrustedIssuers' ) }) diff --git a/packages/protocol/test/stability/grandamento.ts b/packages/protocol/test/stability/grandamento.ts index efcf0e25958..c87a97e7a72 100644 --- a/packages/protocol/test/stability/grandamento.ts +++ b/packages/protocol/test/stability/grandamento.ts @@ -5,7 +5,6 @@ import { assertLogMatches2, assertRevert, assertRevertWithReason, - assertTXRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { fromFixed, reciprocal, toFixed } from '@celo/utils/lib/fixidity' @@ -1161,7 +1160,7 @@ contract('GrandaMento', (accounts: string[]) => { // Add an entry for StableTokenEUR so the tx doesn't revert // as a result of the registry lookup. await registry.setAddressFor(CeloContractName.StableTokenEUR, stableToken.address) - await assertTXRevertWithReason( + await assertRevertWithReason( grandaMento.getStableTokenExchangeLimits(CeloContractName.StableTokenEUR), 'Max stable token exchange amount must be defined' ) From 38685acb3ad25e58d3bf0c18455068a5813457b9 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 18 May 2023 17:53:33 -0400 Subject: [PATCH 082/184] downgraded truffle --- packages/protocol/package.json | 2 +- yarn.lock | 1092 +++----------------------------- 2 files changed, 77 insertions(+), 1017 deletions(-) diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 8ad40b56632..4ad7eee10d5 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -84,7 +84,7 @@ "prompts": "^2.0.1", "solhint": "^2.3.1", "solidity-bytes-utils": "0.0.7", - "truffle": "5.7.3", + "truffle": "5.1.18", "truffle-security": "^1.7.3", "weak-map": "^1.0.5", "web3": "1.8.2", diff --git a/yarn.lock b/yarn.lock index aa0dcca413b..3ed72fd1c12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -285,114 +285,6 @@ call-me-maybe "^1.0.1" js-yaml "^4.1.0" -"@apollo/protobufjs@1.2.6": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.6.tgz#d601e65211e06ae1432bf5993a1a0105f2862f27" - integrity sha512-Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.0" - "@types/node" "^10.1.0" - long "^4.0.0" - -"@apollo/protobufjs@1.2.7": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.7.tgz#3a8675512817e4a046a897e5f4f16415f16a7d8a" - integrity sha512-Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.0" - long "^4.0.0" - -"@apollo/usage-reporting-protobuf@^4.0.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.0.tgz#b54b8c32702bbe81aa0e399076ddabaf75a13f9b" - integrity sha512-hXouMuw5pQVkzi8dgMybmr6Y11+eRmMQVoB5TF0HyTwAg9SOq/v3OCuiYqcVUKdBcskU9Msp+XvjAk0GKpWCwQ== - dependencies: - "@apollo/protobufjs" "1.2.7" - -"@apollo/utils.dropunuseddefinitions@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929" - integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg== - -"@apollo/utils.keyvaluecache@^1.0.1": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz#2bfe358c4d82f3a0950518451996758c52613f57" - integrity sha512-p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg== - dependencies: - "@apollo/utils.logger" "^1.0.0" - lru-cache "7.10.1 - 7.13.1" - -"@apollo/utils.logger@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.1.tgz#aea0d1bb7ceb237f506c6bbf38f10a555b99a695" - integrity sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA== - -"@apollo/utils.printwithreducedwhitespace@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30" - integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q== - -"@apollo/utils.removealiases@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1" - integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A== - -"@apollo/utils.sortast@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07" - integrity sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA== - dependencies: - lodash.sortby "^4.7.0" - -"@apollo/utils.stripsensitiveliterals@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28" - integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w== - -"@apollo/utils.usagereporting@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz#3c70b49e554771659576fe35381c7a4b321d27fd" - integrity sha512-6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ== - dependencies: - "@apollo/usage-reporting-protobuf" "^4.0.0" - "@apollo/utils.dropunuseddefinitions" "^1.1.0" - "@apollo/utils.printwithreducedwhitespace" "^1.1.0" - "@apollo/utils.removealiases" "1.0.0" - "@apollo/utils.sortast" "^1.1.0" - "@apollo/utils.stripsensitiveliterals" "^1.2.0" - -"@apollographql/apollo-tools@^0.5.3": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c" - integrity sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw== - -"@apollographql/graphql-playground-html@1.6.29": - version "1.6.29" - resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" - integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA== - dependencies: - xss "^1.0.8" - "@azure/abort-controller@^1.0.0", "@azure/abort-controller@^1.0.4": version "1.1.0" resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249" @@ -870,7 +762,7 @@ babel-plugin-polyfill-regenerator "^0.4.1" semver "^6.3.0" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== @@ -2214,94 +2106,6 @@ uuid "^8.0.0" xdg-basedir "^4.0.0" -"@graphql-tools/batch-execute@8.5.1": - version "8.5.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.1.tgz#fa3321d58c64041650be44250b1ebc3aab0ba7a9" - integrity sha512-hRVDduX0UDEneVyEWtc2nu5H2PxpfSfM/riUlgZvo/a/nG475uyehxR5cFGvTEPEQUKY3vGIlqvtRigzqTfCew== - dependencies: - "@graphql-tools/utils" "8.9.0" - dataloader "2.1.0" - tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/delegate@^8.4.3": - version "8.8.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.8.1.tgz#0653a72f38947f38ab7917dfac50ebf6a6b883e9" - integrity sha512-NDcg3GEQmdEHlnF7QS8b4lM1PSF+DKeFcIlLEfZFBvVq84791UtJcDj8734sIHLukmyuAxXMfA1qLd2l4lZqzA== - dependencies: - "@graphql-tools/batch-execute" "8.5.1" - "@graphql-tools/schema" "8.5.1" - "@graphql-tools/utils" "8.9.0" - dataloader "2.1.0" - tslib "~2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/merge@8.3.1": - version "8.3.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.1.tgz#06121942ad28982a14635dbc87b5d488a041d722" - integrity sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg== - dependencies: - "@graphql-tools/utils" "8.9.0" - tslib "^2.4.0" - -"@graphql-tools/merge@^8.4.1": - version "8.4.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.1.tgz#52879e5f73565f504ceea04fcd9ef90a6e733c62" - integrity sha512-hssnPpZ818mxgl5+GfyOOSnnflAxiaTn1A1AojZcIbh4J52sS1Q0gSuBR5VrnUDjuxiqoCotpXdAQl+K+U6KLQ== - dependencies: - "@graphql-tools/utils" "^9.2.1" - tslib "^2.4.0" - -"@graphql-tools/mock@^8.1.2": - version "8.7.20" - resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.20.tgz#c83ae0f1940d194a3982120c9c85f3ac6b4f7f20" - integrity sha512-ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ== - dependencies: - "@graphql-tools/schema" "^9.0.18" - "@graphql-tools/utils" "^9.2.1" - fast-json-stable-stringify "^2.1.0" - tslib "^2.4.0" - -"@graphql-tools/schema@8.5.1", "@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.3.1": - version "8.5.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.5.1.tgz#c2f2ff1448380919a330312399c9471db2580b58" - integrity sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg== - dependencies: - "@graphql-tools/merge" "8.3.1" - "@graphql-tools/utils" "8.9.0" - tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/schema@^9.0.18": - version "9.0.18" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.18.tgz#f66dd5e76e1aba85904cb649fde88ae01718c45c" - integrity sha512-Kckb+qoo36o5RSIVfBNU5XR5fOg4adNa1xuhhUgbQejDaI684tIJbTWwYbrDPVEGL/dqJJX3rrsq7RLufjNFoQ== - dependencies: - "@graphql-tools/merge" "^8.4.1" - "@graphql-tools/utils" "^9.2.1" - tslib "^2.4.0" - value-or-promise "1.0.12" - -"@graphql-tools/utils@8.9.0": - version "8.9.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.9.0.tgz#c6aa5f651c9c99e1aca55510af21b56ec296cdb7" - integrity sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg== - dependencies: - tslib "^2.4.0" - -"@graphql-tools/utils@^9.2.1": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57" - integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A== - dependencies: - "@graphql-typed-document-node/core" "^3.1.1" - tslib "^2.4.0" - -"@graphql-typed-document-node/core@^3.1.1": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" - integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== - "@grpc/grpc-js@^0.3.0": version "0.3.6" resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-0.3.6.tgz#d9b52043907170d38e06711d9477fde29ab46fa8" @@ -2592,11 +2396,6 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@josephg/resolvable@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb" - integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== - "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -4351,50 +4150,6 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== -"@redux-saga/core@^1.0.0": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.2.3.tgz#882ed9ac58b5f42c6abb23349542315b871de305" - integrity sha512-U1JO6ncFBAklFTwoQ3mjAeQZ6QGutsJzwNBjgVLSWDpZTRhobUzuVDS1qH3SKGJD8fvqoaYOjp6XJ3gCmeZWgA== - dependencies: - "@babel/runtime" "^7.6.3" - "@redux-saga/deferred" "^1.2.1" - "@redux-saga/delay-p" "^1.2.1" - "@redux-saga/is" "^1.1.3" - "@redux-saga/symbols" "^1.1.3" - "@redux-saga/types" "^1.2.1" - redux "^4.0.4" - typescript-tuple "^2.2.1" - -"@redux-saga/deferred@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.2.1.tgz#aca373a08ccafd6f3481037f2f7ee97f2c87c3ec" - integrity sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g== - -"@redux-saga/delay-p@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.2.1.tgz#e72ac4731c5080a21f75b61bedc31cb639d9e446" - integrity sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w== - dependencies: - "@redux-saga/symbols" "^1.1.3" - -"@redux-saga/is@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.3.tgz#b333f31967e87e32b4e6b02c75b78d609dd4ad73" - integrity sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q== - dependencies: - "@redux-saga/symbols" "^1.1.3" - "@redux-saga/types" "^1.2.1" - -"@redux-saga/symbols@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.3.tgz#b731d56201719e96dc887dc3ae9016e761654367" - integrity sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg== - -"@redux-saga/types@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8" - integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA== - "@resolver-engine/core@^0.2.1": version "0.2.1" resolved "https://registry.yarnpkg.com/@resolver-engine/core/-/core-0.2.1.tgz#0d71803f6d3b8cb2e9ed481a1bf0ca5f5256d0c0" @@ -4602,13 +4357,6 @@ resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.7.tgz#cf7923a3ae5b591ae4c2a5ee45994a310ccaf1ee" integrity sha512-1nibqGjEHC7KAyDThEFvbm2+EO8zAHee/VjCtxkYBE3ySwP50joh0QCEBjy7K/9z+icpMoDucfxmgaKToBFUgQ== -"@truffle/code-utils@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@truffle/code-utils/-/code-utils-3.0.2.tgz#603b0662a1fc27d24a92aaf66417559a3f3e3915" - integrity sha512-Q4FyYIX9G4GyMa8RJDk19kvgiyGZ1CGEx2RmVcXoCDZqEyiHLzqjvCRp+/fuBz2fv7szO6d+60LO1gLCGS1drQ== - dependencies: - cbor "^5.2.0" - "@truffle/codec@^0.14.17": version "0.14.17" resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.17.tgz#4ab11fab335854dad0d4aef75db2960ebd76fcd8" @@ -4794,38 +4542,6 @@ resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-common/-/dashboard-message-bus-common-0.1.5.tgz#180c8c421b2836b7bd109944e7956f427236d8ab" integrity sha512-F4RfXi7ymNA3HFOlaujRJxAb3I8ciErCRQq+MZVaqjSPF9LSw23IizZsGpLaY43K2bGoBSxyNQRZWxsUEBujPQ== -"@truffle/db-loader@^0.2.12": - version "0.2.22" - resolved "https://registry.yarnpkg.com/@truffle/db-loader/-/db-loader-0.2.22.tgz#539af96de442d680244afbce7173125f0107a29a" - integrity sha512-Ws5zZQZdemLyc//dJR3w9U+i3TSb+8w/OExsQhadU/rpyZb1EBOazj7Zr8IkDJolhqZgWyVwshoRNULZ56NHhA== - optionalDependencies: - "@truffle/db" "^2.0.22" - -"@truffle/db@^2.0.12", "@truffle/db@^2.0.22": - version "2.0.22" - resolved "https://registry.yarnpkg.com/@truffle/db/-/db-2.0.22.tgz#c7156fb78cc356b35c20866a3540dab3e367cf71" - integrity sha512-Pn6zKfQMTNqYbcz7EEcagBoNOp1ORMVddocr2pIVPnzPyryhAkC/QJGK9HUazQues3QjzmKcCEMQqUfrFfRt1A== - dependencies: - "@graphql-tools/delegate" "^8.4.3" - "@graphql-tools/schema" "^8.3.1" - "@truffle/abi-utils" "^0.3.9" - "@truffle/code-utils" "^3.0.2" - "@truffle/config" "^1.3.55" - abstract-leveldown "^7.2.0" - apollo-server "^3.11.0" - debug "^4.3.1" - fs-extra "^9.1.0" - graphql "^15.3.0" - graphql-tag "^2.12.6" - json-stable-stringify "^1.0.1" - pascal-case "^2.0.1" - pluralize "^8.0.0" - pouchdb "7.3.0" - pouchdb-adapter-memory "^7.1.1" - pouchdb-debug "^7.1.1" - pouchdb-find "^7.0.0" - web3-utils "1.8.2" - "@truffle/debug-utils@^6.0.42", "@truffle/debug-utils@^6.0.48": version "6.0.48" resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.48.tgz#218caa0e00d95a03abadb05dfe63d621530e113a" @@ -4838,26 +4554,6 @@ debug "^4.3.1" highlightjs-solidity "^2.0.6" -"@truffle/debugger@^11.0.23": - version "11.0.33" - resolved "https://registry.yarnpkg.com/@truffle/debugger/-/debugger-11.0.33.tgz#2b929da8a09479fb0caef3a204cbbda17e2cebd3" - integrity sha512-4UJCvLRIiAg5jpPm5umCmoK/R50vYkRtZROQVn+spJE5CZFZVbrmwJBU5YvgXMMX4vkw3s77jENpOl6BhIpCUw== - dependencies: - "@truffle/abi-utils" "^0.3.9" - "@truffle/codec" "^0.14.17" - "@truffle/source-map-utils" "^1.3.110" - bn.js "^5.1.3" - debug "^4.3.1" - json-pointer "^0.6.1" - json-stable-stringify "^1.0.1" - lodash "^4.17.21" - redux "^3.7.2" - redux-saga "1.0.0" - reselect-tree "^1.3.7" - semver "7.3.7" - web3 "1.8.2" - web3-eth-abi "1.8.2" - "@truffle/error@0.0.7": version "0.0.7" resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.7.tgz#e9db39885575647ef08bf624b0c13fe46d41a209" @@ -4994,18 +4690,6 @@ source-map-support "^0.5.16" supports-color "^7.1.0" -"@truffle/source-map-utils@^1.3.110": - version "1.3.110" - resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.110.tgz#cc6729b4f9a407368ff20023e5197c4b31142cab" - integrity sha512-lkKWwLxGfQITRXjH9fWdy95jSIIzyfX+ggUi5rgkjz5rUUEXFaJ/YX3mxQLQJMi18kKn/yv0ZiGju84aMR3qoA== - dependencies: - "@truffle/code-utils" "^3.0.2" - "@truffle/codec" "^0.14.17" - debug "^4.3.1" - json-pointer "^0.6.1" - node-interval-tree "^1.3.3" - web3-utils "1.8.2" - "@truffle/spinners@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@truffle/spinners/-/spinners-0.2.3.tgz#5689d06ef16855a9f6b70dc0cd40188de54450ec" @@ -5085,13 +4769,6 @@ resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-7.2.1.tgz#bb16403c17754b0c4d5772d71d03b924a03d4c80" integrity sha512-YK8irIC+eMrrmtGx0H4ISn9GgzLd9dojZWJaMbjp1YHLl2VqqNFBNrL5Q3KjGf4VE3sf/4hmq6EhQZ7kZp1NoQ== -"@types/accepts@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" - integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== - dependencies: - "@types/node" "*" - "@types/archiver@^5.1.0": version "5.3.2" resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.3.2.tgz#a9f0bcb0f0b991400e7766d35f6e19d163bdadcc" @@ -5146,7 +4823,7 @@ dependencies: "@types/node" "*" -"@types/body-parser@*", "@types/body-parser@1.19.2": +"@types/body-parser@*": version "1.19.2" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== @@ -5232,11 +4909,6 @@ resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8" integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog== -"@types/cors@2.8.12": - version "2.8.12" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" - integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== - "@types/cors@^2.8.5": version "2.8.13" resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" @@ -5292,7 +4964,7 @@ "@types/bn.js" "*" "@types/node" "*" -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.33": +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": version "4.17.33" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== @@ -5301,25 +4973,6 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express-serve-static-core@4.17.31": - version "4.17.31" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" - integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@4.17.14": - version "4.17.14" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" - integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - "@types/express@4.17.3": version "4.17.3" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.3.tgz#38e4458ce2067873b09a73908df488870c303bd9" @@ -5610,7 +5263,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== -"@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": +"@types/node@^10.0.3", "@types/node@^10.12.18", "@types/node@^10.3.2": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== @@ -6009,13 +5662,6 @@ abi-to-sol@^0.6.6: prettier "^2.7.1" prettier-plugin-solidity "^1.0.0-dev.23" -abort-controller@3.0.0, abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - abort-controller@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-2.0.3.tgz#b174827a732efadff81227ed4b8d1cc569baf20a" @@ -6023,6 +5669,13 @@ abort-controller@^2.0.2: dependencies: event-target-shim "^5.0.0" +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + abortcontroller-polyfill@^1.1.9, abortcontroller-polyfill@^1.7.3: version "1.7.5" resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed" @@ -6085,7 +5738,7 @@ abstract-leveldown@~2.7.1: dependencies: xtend "~4.0.0" -abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3: +abstract-leveldown@~6.2.1: version "6.2.3" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz#036543d87e3710f2528e47040bc3261b77a9a8eb" integrity sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ== @@ -6096,7 +5749,7 @@ abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3: level-supports "~1.0.0" xtend "~4.0.0" -accepts@^1.3.5, accepts@~1.3.5, accepts@~1.3.8: +accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -6341,106 +5994,6 @@ anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apollo-datasource@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8" - integrity sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg== - dependencies: - "@apollo/utils.keyvaluecache" "^1.0.1" - apollo-server-env "^4.2.1" - -apollo-reporting-protobuf@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz#6edd31f09d4a3704d9e808d1db30eca2229ded26" - integrity sha512-h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog== - dependencies: - "@apollo/protobufjs" "1.2.6" - -apollo-server-core@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.12.0.tgz#8aa2a7329ce6fe1823290c45168c749db01548df" - integrity sha512-hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg== - dependencies: - "@apollo/utils.keyvaluecache" "^1.0.1" - "@apollo/utils.logger" "^1.0.0" - "@apollo/utils.usagereporting" "^1.0.0" - "@apollographql/apollo-tools" "^0.5.3" - "@apollographql/graphql-playground-html" "1.6.29" - "@graphql-tools/mock" "^8.1.2" - "@graphql-tools/schema" "^8.0.0" - "@josephg/resolvable" "^1.0.0" - apollo-datasource "^3.3.2" - apollo-reporting-protobuf "^3.4.0" - apollo-server-env "^4.2.1" - apollo-server-errors "^3.3.1" - apollo-server-plugin-base "^3.7.2" - apollo-server-types "^3.8.0" - async-retry "^1.2.1" - fast-json-stable-stringify "^2.1.0" - graphql-tag "^2.11.0" - loglevel "^1.6.8" - lru-cache "^6.0.0" - node-abort-controller "^3.0.1" - sha.js "^2.4.11" - uuid "^9.0.0" - whatwg-mimetype "^3.0.0" - -apollo-server-env@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.2.1.tgz#ea5b1944accdbdba311f179e4dfaeca482c20185" - integrity sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g== - dependencies: - node-fetch "^2.6.7" - -apollo-server-errors@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" - integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== - -apollo-server-express@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.12.0.tgz#a6e392bb0427544b8c7e5d841ef07f7691b0c105" - integrity sha512-m8FaGPUfDOEGSm7QRWRmUUGjG/vqvpQoorkId9/FXkC57fz/A59kEdrzkMt9538Xgsa5AV+X4MEWLJhTvlW3LQ== - dependencies: - "@types/accepts" "^1.3.5" - "@types/body-parser" "1.19.2" - "@types/cors" "2.8.12" - "@types/express" "4.17.14" - "@types/express-serve-static-core" "4.17.31" - accepts "^1.3.5" - apollo-server-core "^3.12.0" - apollo-server-types "^3.8.0" - body-parser "^1.19.0" - cors "^2.8.5" - parseurl "^1.3.3" - -apollo-server-plugin-base@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz#c19cd137bc4c993ba2490ba2b571b0f3ce60a0cd" - integrity sha512-wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw== - dependencies: - apollo-server-types "^3.8.0" - -apollo-server-types@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.8.0.tgz#d976b6967878681f715fe2b9e4dad9ba86b1346f" - integrity sha512-ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A== - dependencies: - "@apollo/utils.keyvaluecache" "^1.0.1" - "@apollo/utils.logger" "^1.0.0" - apollo-reporting-protobuf "^3.4.0" - apollo-server-env "^4.2.1" - -apollo-server@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-3.12.0.tgz#bd43d6dadb8cb16ed34edfc6ad97a81b1fab748a" - integrity sha512-wZHLgBoIdGxr/YpPTG5RwNnS+B2y70T/nCegCnU6Yl+H3PXB92OIguLMhdJIZVjukIOhiQT12dNIehqLQ+1hMQ== - dependencies: - "@types/express" "4.17.14" - apollo-server-core "^3.12.0" - apollo-server-express "^3.12.0" - express "^4.17.1" - app-module-path@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" @@ -6526,11 +6079,6 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -argsarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb" - integrity sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg== - argv@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab" @@ -6785,7 +6333,7 @@ async-mutex@^0.2.6: dependencies: tslib "^2.0.0" -async-retry@^1.2.1, async-retry@^1.3.3: +async-retry@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280" integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw== @@ -7572,7 +7120,7 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== -buffer-from@1.1.2, buffer-from@^1.0.0, buffer-from@^1.1.1: +buffer-from@^1.0.0, buffer-from@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== @@ -8485,11 +8033,6 @@ cliui@^8.0.1: strip-ansi "^6.0.1" wrap-ansi "^7.0.0" -clone-buffer@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== - clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -8687,7 +8230,7 @@ commander@3.0.2, commander@^3.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.12.1, commander@^2.20.3, commander@^2.8.1: +commander@^2.12.1, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -9252,11 +8795,6 @@ css-what@^6.1.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== -cssfilter@0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" - integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw== - csstype@^3.0.2: version "3.1.2" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" @@ -9319,11 +8857,6 @@ data-uri-to-buffer@3: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== -dataloader@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" - integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ== - date-and-time@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.6.3.tgz#2daee52df67c28bd93bce862756ac86b68cf4237" @@ -9954,11 +9487,6 @@ dotignore@~0.1.2: dependencies: minimatch "^3.0.4" -double-ended-queue@2.1.0-0: - version "2.1.0-0" - resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" - integrity sha512-+BNfZ+deCo8hMNpDqDnvT+c0XpJ5cUa6mqYq89bho2Ifze4URTqRkcwR399hWoTrTkbZ/XJYDgP6rc7pRgffEQ== - drbg.js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b" @@ -10145,13 +9673,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -end-stream@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/end-stream/-/end-stream-0.1.0.tgz#32003f3f438a2b0143168137f8fa6e9866c81ed5" - integrity sha512-Brl10T8kYnc75IepKizW6Y9liyW8ikz1B7n/xoHrJxoVSSjoqPn30sb7XVFfQERK4QfUMYRGs9dhWwtt2eu6uA== - dependencies: - write-stream "~0.4.3" - ends-with@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a" @@ -11518,13 +11039,6 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== -fetch-cookie@0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407" - integrity sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA== - dependencies: - tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0" - fetch-mock@9.10.4: version "9.10.4" resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-9.10.4.tgz#e5f98c7d56d57b29caec55d928930150f39519ba" @@ -11955,11 +11469,6 @@ for-own@^0.1.3, for-own@^0.1.4: dependencies: for-in "^1.0.1" -foreach@^2.0.4: - version "2.0.6" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.6.tgz#87bcc8a1a0e74000ff2bf9802110708cfb02eb6e" - integrity sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg== - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -12215,7 +11724,7 @@ funpermaproxy@^1.0.1: resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== -ganache@7.7.3, ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.8.0-beta.1": +ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.8.0-beta.1": version "7.8.0-beta.1" resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.8.0-beta.1.tgz#168d3c2f1ea05c350e972f227872d4a4b15e5f9e" integrity sha512-ptjs631aKpxG7xexDDyxh5NevKQaUcSfm3/Aeh0smJ/3xQgNrJ+st6CVYVbVbhGkgNcq9NIvCCaIgt0L64GOCA== @@ -13130,13 +12639,6 @@ grapheme-splitter@^1.0.4: resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== -graphql-tag@^2.11.0, graphql-tag@^2.12.6: - version "2.12.6" - resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" - integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== - dependencies: - tslib "^2.1.0" - graphql@^14.1.1: version "14.7.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz#7fa79a80a69be4a31c27dda824dc04dac2035a72" @@ -13144,11 +12646,6 @@ graphql@^14.1.1: dependencies: iterall "^1.2.2" -graphql@^15.3.0: - version "15.8.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" - integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== - growl@1.10.5: version "1.10.5" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" @@ -13719,7 +13216,7 @@ ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -immediate@3.3.0, immediate@^3.2.3: +immediate@^3.2.3: version "3.3.0" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== @@ -15264,13 +14761,6 @@ json-parse-helpfulerror@^1.0.3: dependencies: jju "^1.1.0" -json-pointer@^0.6.1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/json-pointer/-/json-pointer-0.6.2.tgz#f97bd7550be5e9ea901f8c9264c9d436a22a93cd" - integrity sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw== - dependencies: - foreach "^2.0.4" - json-ptr@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json-ptr/-/json-ptr-2.2.0.tgz#a4de4ed638cb23ae4cd4b51f8bf972a1c2293f1e" @@ -15726,7 +15216,7 @@ lerna@^5.5.0: nx ">=14.8.1 < 16" typescript "^3 || ^4" -level-codec@9.0.2, level-codec@^9.0.0: +level-codec@^9.0.0: version "9.0.2" resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc" integrity sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ== @@ -15799,16 +15289,6 @@ level-iterator-stream@~4.0.0: readable-stream "^3.4.0" xtend "^4.0.2" -level-js@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/level-js/-/level-js-5.0.2.tgz#5e280b8f93abd9ef3a305b13faf0b5397c969b55" - integrity sha512-SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg== - dependencies: - abstract-leveldown "~6.2.3" - buffer "^5.5.0" - inherits "^2.0.3" - ltgt "^2.1.2" - level-mem@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/level-mem/-/level-mem-3.0.1.tgz#7ce8cf256eac40f716eb6489654726247f5a89e5" @@ -15825,7 +15305,7 @@ level-mem@^5.0.1: level-packager "^5.0.3" memdown "^5.0.0" -level-packager@^5.0.3, level-packager@^5.1.0: +level-packager@^5.0.3: version "5.1.1" resolved "https://registry.yarnpkg.com/level-packager/-/level-packager-5.1.1.tgz#323ec842d6babe7336f70299c14df2e329c18939" integrity sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ== @@ -15866,13 +15346,6 @@ level-transcoder@^1.0.1: buffer "^6.0.3" module-error "^1.0.1" -level-write-stream@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/level-write-stream/-/level-write-stream-1.0.0.tgz#3f7fbb679a55137c0feb303dee766e12ee13c1dc" - integrity sha512-bBNKOEOMl8msO+uIM9YX/gUO6ckokZ/4pCwTm/lwvs46x6Xs8Zy0sn3Vh37eDqse4mhy4fOMIb/JsSM2nyQFtw== - dependencies: - end-stream "~0.1.0" - level-ws@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/level-ws/-/level-ws-0.0.0.tgz#372e512177924a00424b0b43aef2bb42496d228b" @@ -15890,15 +15363,6 @@ level-ws@^2.0.0: readable-stream "^3.1.0" xtend "^4.0.1" -level@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/level/-/level-6.0.1.tgz#dc34c5edb81846a6de5079eac15706334b0d7cd6" - integrity sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw== - dependencies: - level-js "^5.0.0" - level-packager "^5.1.0" - leveldown "^5.4.0" - level@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/level/-/level-8.0.0.tgz#41b4c515dabe28212a3e881b61c161ffead14394" @@ -15907,15 +15371,6 @@ level@^8.0.0: browser-level "^1.0.1" classic-level "^1.2.0" -leveldown@5.6.0, leveldown@^5.4.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" - integrity sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ== - dependencies: - abstract-leveldown "~6.2.1" - napi-macros "~2.0.0" - node-gyp-build "~4.1.0" - leveldown@6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee" @@ -15925,17 +15380,6 @@ leveldown@6.1.0: napi-macros "~2.0.0" node-gyp-build "^4.3.0" -levelup@4.4.0, levelup@^4.3.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" - integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ== - dependencies: - deferred-leveldown "~5.3.0" - level-errors "~2.0.0" - level-iterator-stream "~4.0.0" - level-supports "~1.0.0" - xtend "~4.0.0" - levelup@^1.2.1: version "1.3.9" resolved "https://registry.yarnpkg.com/levelup/-/levelup-1.3.9.tgz#2dbcae845b2bb2b6bea84df334c475533bbd82ab" @@ -15959,6 +15403,17 @@ levelup@^3.0.0: level-iterator-stream "~3.0.0" xtend "~4.0.0" +levelup@^4.3.2: + version "4.4.0" + resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" + integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ== + dependencies: + deferred-leveldown "~5.3.0" + level-errors "~2.0.0" + level-iterator-stream "~4.0.0" + level-supports "~1.0.0" + xtend "~4.0.0" + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -16085,11 +15540,6 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.2.1: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== - lodash._isnative@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c" @@ -16295,7 +15745,7 @@ lodash.values@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q== -lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -16334,7 +15784,7 @@ logform@^2.3.2, logform@^2.4.0: safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" -loglevel@^1.6.1, loglevel@^1.6.8: +loglevel@^1.6.1: version "1.8.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4" integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== @@ -16354,7 +15804,7 @@ long@~3: resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== -loose-envify@^1.0.0, loose-envify@^1.1.0: +loose-envify@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -16395,11 +15845,6 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== -"lru-cache@7.10.1 - 7.13.1": - version "7.13.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" - integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== - lru-cache@^4.0.1: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -16450,7 +15895,7 @@ lru-queue@^0.1.0: dependencies: es5-ext "~0.10.2" -ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0: +ltgt@~2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA== @@ -16646,7 +16091,7 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" -memdown@1.4.1, memdown@^1.0.0: +memdown@^1.0.0: version "1.4.1" resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215" integrity sha512-iVrGHZB8i4OQfM155xx8akvG9FIj+ht14DX5CQkCTG4EHzZ3d3sgckIf/Lm9ivZalEsFuEVnWv2B2WZvbrro2w== @@ -17150,32 +16595,22 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a" - integrity sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg== +mocha@5.2.0, mocha@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" + integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== dependencies: - ansi-colors "4.1.1" browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - nanoid "3.3.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" + commander "2.15.1" + debug "3.1.0" + diff "3.5.0" + escape-string-regexp "1.0.5" + glob "7.1.2" + growl "1.10.5" + he "1.1.1" + minimatch "3.0.4" + mkdirp "0.5.1" + supports-color "5.4.0" mocha@8.0.1: version "8.0.1" @@ -17235,23 +16670,6 @@ mocha@^10.2.0: yargs-parser "20.2.4" yargs-unparser "2.0.0" -mocha@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" - integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== - dependencies: - browser-stdout "1.3.1" - commander "2.15.1" - debug "3.1.0" - diff "3.5.0" - escape-string-regexp "1.0.5" - glob "7.1.2" - growl "1.10.5" - he "1.1.1" - minimatch "3.0.4" - mkdirp "0.5.1" - supports-color "5.4.0" - mocha@^6.2.2: version "6.2.3" resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912" @@ -17758,11 +17176,6 @@ node-gyp-build@^4.2.0, node-gyp-build@^4.3.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== -node-gyp-build@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb" - integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ== - node-gyp@8.x: version "8.4.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" @@ -17818,13 +17231,6 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-interval-tree@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/node-interval-tree/-/node-interval-tree-1.3.3.tgz#15ffb904cde08270214acace8dc7653e89ae32b7" - integrity sha512-K9vk96HdTK5fEipJwxSvIIqwTqr4e3HRJeJrNxBSeVMNSC/JWARRaX7etOLOuTmrRMeOI/K5TCJu3aWIwZiNTw== - dependencies: - shallowequal "^1.0.2" - node-releases@^2.0.8: version "2.0.10" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" @@ -18431,7 +17837,7 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" -original-require@^1.0.1: +original-require@1.0.1, original-require@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" integrity sha512-5vdKMbE58WaE61uVD+PKyh8xdM398UnjPBLotW2sjG5MzHARwta/+NtMBCBA0t2WQblGYBvq5vsiZpWokwno+A== @@ -18818,12 +18224,12 @@ parse5@^7.0.0: dependencies: entities "^4.4.0" -parseurl@^1.3.3, parseurl@~1.3.3: +parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascal-case@^2.0.0, pascal-case@^2.0.1: +pascal-case@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-2.0.1.tgz#2d578d3455f660da65eca18ef95b4e0de912761e" integrity sha512-qjS4s8rBOJa2Xm0jmxXiyh1+OFf6ekCWOvUaRgAQSktzlTbMotS0nmG9gyYAybCWBcuP4fsBeRCKNwGBnMe2OQ== @@ -19157,11 +18563,6 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== -pluralize@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" - integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== - pngjs@^3.3.0: version "3.4.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" @@ -19208,192 +18609,6 @@ postgres-interval@^1.1.0: dependencies: xtend "^4.0.0" -pouchdb-abstract-mapreduce@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.1.tgz#96ff4a0f41cbe273f3f52fde003b719005a2093c" - integrity sha512-0zKXVFBvrfc1KnN0ggrB762JDmZnUpePHywo9Bq3Jy+L1FnoG7fXM5luFfvv5/T0gEw+ZTIwoocZECMnESBI9w== - dependencies: - pouchdb-binary-utils "7.3.1" - pouchdb-collate "7.3.1" - pouchdb-collections "7.3.1" - pouchdb-errors "7.3.1" - pouchdb-fetch "7.3.1" - pouchdb-mapreduce-utils "7.3.1" - pouchdb-md5 "7.3.1" - pouchdb-utils "7.3.1" - -pouchdb-adapter-leveldb-core@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.3.1.tgz#3c71dce7ff06c2e483d873d7aabc1fded56372ca" - integrity sha512-mxShHlqLMPz2gChrgtA9okV1ogFmQrRAoM/O4EN0CrQWPLXqYtpL1f7sI2asIvFe7SmpnvbLx7kkZyFmLTfwjA== - dependencies: - argsarray "0.0.1" - buffer-from "1.1.2" - double-ended-queue "2.1.0-0" - levelup "4.4.0" - pouchdb-adapter-utils "7.3.1" - pouchdb-binary-utils "7.3.1" - pouchdb-collections "7.3.1" - pouchdb-errors "7.3.1" - pouchdb-json "7.3.1" - pouchdb-md5 "7.3.1" - pouchdb-merge "7.3.1" - pouchdb-utils "7.3.1" - sublevel-pouchdb "7.3.1" - through2 "3.0.2" - -pouchdb-adapter-memory@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-adapter-memory/-/pouchdb-adapter-memory-7.3.1.tgz#7be4b0601326cb93eb1141ed910fdfdf40c36616" - integrity sha512-iHdWGJAHONqQv0we3Oi1MYen69ZS8McLW9wUyaAYcWTJnAIIAr2ZM0/TeTDVSHfMUwYqEYk7X8jRtJZEMwLnwg== - dependencies: - memdown "1.4.1" - pouchdb-adapter-leveldb-core "7.3.1" - pouchdb-utils "7.3.1" - -pouchdb-adapter-utils@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.3.1.tgz#7237cb597f8d337057df15d4859bfe3c881d8832" - integrity sha512-uKLG6dClwTs/sLIJ4WkLAi9wlnDBpOnfyhpeAgOjlOGN/XLz5nKHrA4UJRnURDyc+uv79S9r/Unc4hVpmbSPUw== - dependencies: - pouchdb-binary-utils "7.3.1" - pouchdb-collections "7.3.1" - pouchdb-errors "7.3.1" - pouchdb-md5 "7.3.1" - pouchdb-merge "7.3.1" - pouchdb-utils "7.3.1" - -pouchdb-binary-utils@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.1.tgz#eea22d9a5f880fcd95062476f4f5484cdf61496f" - integrity sha512-crZJNfAEOnUoRk977Qtmk4cxEv6sNKllQ6vDDKgQrQLFjMUXma35EHzNyIJr1s76J77Q4sqKQAmxz9Y40yHGtw== - dependencies: - buffer-from "1.1.2" - -pouchdb-collate@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.3.1.tgz#19d7b87dd173d1c765da8cc9987c5aa9eb24f11f" - integrity sha512-o4gyGqDMLMSNzf6EDTr3eHaH/JRMoqRhdc+eV+oA8u00nTBtr9wD+jypVe2LbgKLJ4NWqx2qVkXiTiQdUFtsLQ== - -pouchdb-collections@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.3.1.tgz#4f1819cf4dd6936a422c29f7fa26a9b5dca428f5" - integrity sha512-yUyDqR+OJmtwgExOSJegpBJXDLAEC84TWnbAYycyh+DZoA51Yw0+XVQF5Vh8Ii90/Ut2xo88fmrmp0t6kqom8w== - -pouchdb-debug@^7.1.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/pouchdb-debug/-/pouchdb-debug-7.2.1.tgz#f5f869f6113c12ccb97cddf5b0a32b6e0e67e961" - integrity sha512-eP3ht/AKavLF2RjTzBM6S9gaI2/apcW6xvaKRQhEdOfiANqerFuksFqHCal3aikVQuDO+cB/cw+a4RyJn/glBw== - dependencies: - debug "3.1.0" - -pouchdb-errors@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.3.1.tgz#78be36721e2edc446fac158a236a9218c7bcdb14" - integrity sha512-Zktz4gnXEUcZcty8FmyvtYUYsHskoST05m6H5/E2gg/0mCfEXq/XeyyLkZHaZmqD0ZPS9yNmASB1VaFWEKEaDw== - dependencies: - inherits "2.0.4" - -pouchdb-fetch@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.3.1.tgz#d54b1807be0f0a5d4b6d06e416c7d54952bbc348" - integrity sha512-205xAtvdHRPQ4fp1h9+RmT9oQabo9gafuPmWsS9aEl3ER54WbY8Vaj1JHZGbU4KtMTYvW7H5088zLS7Nrusuag== - dependencies: - abort-controller "3.0.0" - fetch-cookie "0.11.0" - node-fetch "2.6.7" - -pouchdb-find@^7.0.0: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.3.1.tgz#07a633d5ee2bd731dae9f991281cd25212088d29" - integrity sha512-AeqUfAVY1c7IFaY36BRT0vIz9r4VTKq/YOWTmiqndOZUQ/pDGxyO2fNFal6NN3PyYww0JijlD377cPvhnrhJVA== - dependencies: - pouchdb-abstract-mapreduce "7.3.1" - pouchdb-collate "7.3.1" - pouchdb-errors "7.3.1" - pouchdb-fetch "7.3.1" - pouchdb-md5 "7.3.1" - pouchdb-selector-core "7.3.1" - pouchdb-utils "7.3.1" - -pouchdb-json@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.3.1.tgz#a80a3060aa2914959e4dca7a4e2022ab20c7119a" - integrity sha512-AyOKsmc85/GtHjMZyEacqzja8qLVfycS1hh1oskR+Bm5PIITX52Fb8zyi0hEetV6VC0yuGbn0RqiLjJxQePeqQ== - dependencies: - vuvuzela "1.0.3" - -pouchdb-mapreduce-utils@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.1.tgz#f0ac2c8400fbedb705e9226082453ac7d3f2a066" - integrity sha512-oUMcq82+4pTGQ6dtrhgORHOVHZSr6w/5tFIUGlv7RABIDvJarL4snMawADjlpiEwPdiQ/ESG8Fqt8cxqvqsIgg== - dependencies: - argsarray "0.0.1" - inherits "2.0.4" - pouchdb-collections "7.3.1" - pouchdb-utils "7.3.1" - -pouchdb-md5@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.3.1.tgz#70fae44f9d27eb4c6a8e7106156b4593d31c1762" - integrity sha512-aDV8ui/mprnL3xmt0gT/81DFtTtJiKyn+OxIAbwKPMfz/rDFdPYvF0BmDC9QxMMzGfkV+JJUjU6at0PPs2mRLg== - dependencies: - pouchdb-binary-utils "7.3.1" - spark-md5 "3.0.2" - -pouchdb-merge@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.3.1.tgz#97aae682d7d8499b62b6ce234dcb9527c7bf6f02" - integrity sha512-FeK3r35mKimokf2PQ2tUI523QWyZ4lYZ0Yd75FfSch/SPY6wIokz5XBZZ6PHdu5aOJsEKzoLUxr8CpSg9DhcAw== - -pouchdb-selector-core@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.3.1.tgz#08245662de3d61f16ab8dae2b56ef622935b3fb3" - integrity sha512-HBX+nNGXcaL9z0uNpwSMRq2GNZd3EZXW+fe9rJHS0hvJohjZL7aRJLoaXfEdHPRTNW+CpjM3Rny60eGekQdI/w== - dependencies: - pouchdb-collate "7.3.1" - pouchdb-utils "7.3.1" - -pouchdb-utils@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.3.1.tgz#d25f0a034427f388ba5ae37d9ae3fbed210e8720" - integrity sha512-R3hHBo1zTdTu/NFs3iqkcaQAPwhIH0gMIdfVKd5lbDYlmP26rCG5pdS+v7NuoSSFLJ4xxnaGV+Gjf4duYsJ8wQ== - dependencies: - argsarray "0.0.1" - clone-buffer "1.0.0" - immediate "3.3.0" - inherits "2.0.4" - pouchdb-collections "7.3.1" - pouchdb-errors "7.3.1" - pouchdb-md5 "7.3.1" - uuid "8.3.2" - -pouchdb@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.3.0.tgz#440fbef12dfd8f9002320802528665e883a3b7f8" - integrity sha512-OwsIQGXsfx3TrU1pLruj6PGSwFH+h5k4hGNxFkZ76Um7/ZI8F5TzUHFrpldVVIhfXYi2vP31q0q7ot1FSLFYOw== - dependencies: - abort-controller "3.0.0" - argsarray "0.0.1" - buffer-from "1.1.2" - clone-buffer "1.0.0" - double-ended-queue "2.1.0-0" - fetch-cookie "0.11.0" - immediate "3.3.0" - inherits "2.0.4" - level "6.0.1" - level-codec "9.0.2" - level-write-stream "1.0.0" - leveldown "5.6.0" - levelup "4.4.0" - ltgt "2.2.1" - node-fetch "2.6.7" - readable-stream "1.1.14" - spark-md5 "3.0.2" - through2 "3.0.2" - uuid "8.3.2" - vuvuzela "1.0.3" - prebuild-install@^6.0.0: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" @@ -19809,7 +19024,7 @@ pseudomap@^1.0.1, pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== -psl@^1.1.28, psl@^1.1.33: +psl@^1.1.28: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -19985,7 +19200,7 @@ querystring@^0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== -querystringify@^2.0.0, querystringify@^2.1.1: +querystringify@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== @@ -20173,7 +19388,7 @@ read@1, read@1.0.x, read@^1.0.7: dependencies: mute-stream "~0.0.4" -readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: +readable-stream@1.1.x, readable-stream@^1.0.33: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== @@ -20205,11 +19420,6 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@~0.0.2: - version "0.0.4" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" - integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw== - readable-stream@~1.0.15: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -20299,30 +19509,6 @@ redeyed@~2.1.0: dependencies: esprima "~4.0.0" -redux-saga@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.0.0.tgz#acb8b3ed9180fecbe75f342011d75af3ac11045b" - integrity sha512-GvJWs/SzMvEQgeaw6sRMXnS2FghlvEGsHiEtTLpJqc/FHF3I5EE/B+Hq5lyHZ8LSoT2r/X/46uWvkdCnK9WgHA== - dependencies: - "@redux-saga/core" "^1.0.0" - -redux@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" - integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== - dependencies: - lodash "^4.2.1" - lodash-es "^4.2.1" - loose-envify "^1.1.0" - symbol-observable "^1.0.3" - -redux@^4.0.4: - version "4.2.1" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" - integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== - dependencies: - "@babel/runtime" "^7.9.2" - regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" @@ -20514,20 +19700,6 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== -reselect-tree@^1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/reselect-tree/-/reselect-tree-1.3.7.tgz#c3eca58765d9df96bae0017f6ff3504c304cdea0" - integrity sha512-kZN+C1cVJ6fFN2smSb0l4UvYZlRzttgnu183svH4NrU22cBY++ikgr2QT75Uuk4MYpv5gXSVijw4c5U6cx6GKg== - dependencies: - debug "^3.1.0" - json-pointer "^0.6.1" - reselect "^4.0.0" - -reselect@^4.0.0: - version "4.1.8" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" - integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== - resolve-alpn@^1.0.0, resolve-alpn@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" @@ -21116,7 +20288,7 @@ setprototypeof@1.2.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== -sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: +sha.js@^2.4.0, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== @@ -21146,11 +20318,6 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" -shallowequal@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" - integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -21531,11 +20698,6 @@ source-map@~0.2.0: dependencies: amdefine ">=0.0.4" -spark-md5@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" - integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== - spdx-correct@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" @@ -21957,16 +21119,6 @@ stubs@^3.0.0: resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== -sublevel-pouchdb@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.3.1.tgz#c1cc03af45081345c7c82821d6dcaa74564ae2ef" - integrity sha512-n+4fK72F/ORdqPwoGgMGYeOrW2HaPpW9o9k80bT1B3Cim5BSvkKkr9WbWOWynni/GHkbCEdvLVFJL1ktosAdhQ== - dependencies: - inherits "2.0.4" - level-codec "9.0.2" - ltgt "2.2.1" - readable-stream "1.1.14" - superagent@^8.0.5: version "8.0.9" resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.9.tgz#2c6fda6fadb40516515f93e9098c0eb1602e0535" @@ -22141,11 +21293,6 @@ swarm-js@^0.1.40: tar "^4.0.2" xhr-request "^1.0.1" -symbol-observable@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - sync-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.1.0.tgz#e96217565b5e50bbffe179868ba75532fb597e68" @@ -22448,14 +21595,6 @@ through2@2.0.1: readable-stream "~2.0.0" xtend "~4.0.0" -through2@3.0.2, through2@^3.0.0, through2@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" - integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== - dependencies: - inherits "^2.0.4" - readable-stream "2 || 3" - through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -22464,6 +21603,14 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" +through2@^3.0.0, through2@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" + integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== + dependencies: + inherits "^2.0.4" + readable-stream "2 || 3" + through2@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" @@ -22623,16 +21770,6 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0": - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.2.0" - url-parse "^1.5.3" - tough-cookie@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" @@ -22749,19 +21886,14 @@ truffle-typings@^1.0.6: "@types/mocha" "^5.2.5" "@types/web3" "^1.0.18" -truffle@5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.7.3.tgz#89d75168cb3b77cf896b5252de21966c7ed2d222" - integrity sha512-NnffU0XMI9fEIEVcsYjcOL3ntneGdao+x0ZyJYdPe22fm8v1IlkyRYXtRLGSyJqFl0E76pUb5AbsRs12N8on1Q== +truffle@5.1.18: + version "5.1.18" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.18.tgz#2fefaed849698b7fb865b417a197d1b6d9229db3" + integrity sha512-9oxmLmyTXML5Auxl8adPd3kLcOZVhYNapCmPUcMnYCOXthxa3NEOW9y3PTcoDnwFyuIOETGIiJp4Ew9bmY8v6Q== dependencies: - "@truffle/db-loader" "^0.2.12" - "@truffle/debugger" "^11.0.23" app-module-path "^2.2.0" - ganache "7.7.3" - mocha "10.1.0" - original-require "^1.0.1" - optionalDependencies: - "@truffle/db" "^2.0.12" + mocha "5.2.0" + original-require "1.0.1" truncate-utf8-bytes@^1.0.0: version "1.0.2" @@ -22891,11 +22023,6 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3 resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== -tslib@~2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" - integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== - tslint-config-prettier@^1.18.0: version "1.18.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" @@ -23167,18 +22294,6 @@ typeforce@^1.11.5: resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc" integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g== -typescript-compare@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425" - integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA== - dependencies: - typescript-logic "^0.0.0" - -typescript-logic@^0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196" - integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q== - typescript-tslint-plugin@^0.5.4: version "0.5.5" resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c" @@ -23188,13 +22303,6 @@ typescript-tslint-plugin@^0.5.4: mock-require "^3.0.3" vscode-languageserver "^5.2.1" -typescript-tuple@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2" - integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q== - dependencies: - typescript-compare "^0.0.2" - typescript@4.4.3: version "4.4.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324" @@ -23344,11 +22452,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" - integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -23491,14 +22594,6 @@ url-parse@1.4.4: querystringify "^2.0.0" requires-port "^1.0.0" -url-parse@^1.5.3: - version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - url-set-query@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-set-query/-/url-set-query-1.0.0.tgz#016e8cfd7c20ee05cafe7795e892bd0702faa339" @@ -23632,11 +22727,6 @@ uuid@8.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== -uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" @@ -23647,6 +22737,11 @@ uuid@^7.0.3: resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== +uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" @@ -23698,16 +22793,6 @@ validate-npm-package-name@^4.0.0: dependencies: builtins "^5.0.0" -value-or-promise@1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" - integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== - -value-or-promise@1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" - integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== - varint@^5.0.0: version "5.0.2" resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4" @@ -23766,11 +22851,6 @@ vscode-uri@^1.0.6: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== -vuvuzela@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" - integrity sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ== - walk-up-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" @@ -25250,11 +24330,6 @@ whatwg-fetch@>=0.10.0, whatwg-fetch@^3.4.1: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== -whatwg-mimetype@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" - integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== - whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -25530,13 +24605,6 @@ write-pkg@^4.0.0: type-fest "^0.4.1" write-json-file "^3.2.0" -write-stream@~0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/write-stream/-/write-stream-0.4.3.tgz#83cc8c0347d0af6057a93862b4e3ae01de5c81c1" - integrity sha512-IJrvkhbAnj89W/GAVdVgbnPiVw5Ntg/B4tc/MUCIEwj/g6JIww1DWJyB/yBMT3yw2/TkT6IUZ0+IYef3flEw8A== - dependencies: - readable-stream "~0.0.2" - write@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" @@ -25660,14 +24728,6 @@ xregexp@2.0.0: resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA== -xss@^1.0.8: - version "1.0.14" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694" - integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw== - dependencies: - commander "^2.20.3" - cssfilter "0.0.10" - xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" From a9cac7f9cff9301929b1b183c57eb9fd9f27e591 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 19 May 2023 12:23:08 -0400 Subject: [PATCH 083/184] updated truffle version and config --- packages/protocol/package.json | 2 +- packages/protocol/runTests.js | 2 +- packages/protocol/truffle-config.js | 8 +- yarn.lock | 1417 +++++++++++++++++++++++++-- 4 files changed, 1349 insertions(+), 80 deletions(-) diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 4ad7eee10d5..80a50c5bb24 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -84,7 +84,7 @@ "prompts": "^2.0.1", "solhint": "^2.3.1", "solidity-bytes-utils": "0.0.7", - "truffle": "5.1.18", + "truffle": "5.9.0", "truffle-security": "^1.7.3", "weak-map": "^1.0.5", "web3": "1.8.2", diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index a1c4149847c..c978578d27f 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -18,7 +18,7 @@ async function startGanache() { wallet: { mnemonic: network.mnemonic, defaultBalance: network.defaultBalance }, miner: { blockGasLimit: 20000000, - defaultGasPrice: network.defaultGasPrice, + defaultGasPrice: network.gasPrice, }, chain: { networkId: network.network_id, diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index 4c9534f7381..f1c1662f023 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -46,8 +46,8 @@ const defaultConfig = { port: hostPort, network_id: 1101, from: OG_FROM, - blockGasLimit: gasLimit, - defaultGasPrice: 100000000000, + gas: gasLimit, + gasPrice: 100000000000, } const freeGasConfig = { ...defaultConfig, ...{ gasPrice: 0 } } @@ -67,8 +67,8 @@ const networks = { development: { ...defaultConfig, from: DEVELOPMENT_FROM, - defaultGasPrice: 0, - blockGasLimit: gasLimit, + gasPrice: 0, + gas: gasLimit, defaultBalance: 200000000, // maxFeePerGas: 875000000, mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic', diff --git a/yarn.lock b/yarn.lock index 3ed72fd1c12..0892a3fd123 100644 --- a/yarn.lock +++ b/yarn.lock @@ -285,6 +285,114 @@ call-me-maybe "^1.0.1" js-yaml "^4.1.0" +"@apollo/protobufjs@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.6.tgz#d601e65211e06ae1432bf5993a1a0105f2862f27" + integrity sha512-Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + "@types/node" "^10.1.0" + long "^4.0.0" + +"@apollo/protobufjs@1.2.7": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.7.tgz#3a8675512817e4a046a897e5f4f16415f16a7d8a" + integrity sha512-Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + long "^4.0.0" + +"@apollo/usage-reporting-protobuf@^4.0.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.0.tgz#b54b8c32702bbe81aa0e399076ddabaf75a13f9b" + integrity sha512-hXouMuw5pQVkzi8dgMybmr6Y11+eRmMQVoB5TF0HyTwAg9SOq/v3OCuiYqcVUKdBcskU9Msp+XvjAk0GKpWCwQ== + dependencies: + "@apollo/protobufjs" "1.2.7" + +"@apollo/utils.dropunuseddefinitions@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929" + integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg== + +"@apollo/utils.keyvaluecache@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz#2bfe358c4d82f3a0950518451996758c52613f57" + integrity sha512-p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg== + dependencies: + "@apollo/utils.logger" "^1.0.0" + lru-cache "7.10.1 - 7.13.1" + +"@apollo/utils.logger@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.1.tgz#aea0d1bb7ceb237f506c6bbf38f10a555b99a695" + integrity sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA== + +"@apollo/utils.printwithreducedwhitespace@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30" + integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q== + +"@apollo/utils.removealiases@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1" + integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A== + +"@apollo/utils.sortast@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07" + integrity sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA== + dependencies: + lodash.sortby "^4.7.0" + +"@apollo/utils.stripsensitiveliterals@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28" + integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w== + +"@apollo/utils.usagereporting@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz#3c70b49e554771659576fe35381c7a4b321d27fd" + integrity sha512-6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ== + dependencies: + "@apollo/usage-reporting-protobuf" "^4.0.0" + "@apollo/utils.dropunuseddefinitions" "^1.1.0" + "@apollo/utils.printwithreducedwhitespace" "^1.1.0" + "@apollo/utils.removealiases" "1.0.0" + "@apollo/utils.sortast" "^1.1.0" + "@apollo/utils.stripsensitiveliterals" "^1.2.0" + +"@apollographql/apollo-tools@^0.5.3": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c" + integrity sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw== + +"@apollographql/graphql-playground-html@1.6.29": + version "1.6.29" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" + integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA== + dependencies: + xss "^1.0.8" + "@azure/abort-controller@^1.0.0", "@azure/abort-controller@^1.0.4": version "1.1.0" resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249" @@ -769,6 +877,13 @@ dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@^7.6.3", "@babel/runtime@^7.9.2": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200" + integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q== + dependencies: + regenerator-runtime "^0.13.11" + "@babel/template@^7.20.7", "@babel/template@^7.3.3": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" @@ -2106,6 +2221,94 @@ uuid "^8.0.0" xdg-basedir "^4.0.0" +"@graphql-tools/batch-execute@8.5.1": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.1.tgz#fa3321d58c64041650be44250b1ebc3aab0ba7a9" + integrity sha512-hRVDduX0UDEneVyEWtc2nu5H2PxpfSfM/riUlgZvo/a/nG475uyehxR5cFGvTEPEQUKY3vGIlqvtRigzqTfCew== + dependencies: + "@graphql-tools/utils" "8.9.0" + dataloader "2.1.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/delegate@^8.4.3": + version "8.8.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.8.1.tgz#0653a72f38947f38ab7917dfac50ebf6a6b883e9" + integrity sha512-NDcg3GEQmdEHlnF7QS8b4lM1PSF+DKeFcIlLEfZFBvVq84791UtJcDj8734sIHLukmyuAxXMfA1qLd2l4lZqzA== + dependencies: + "@graphql-tools/batch-execute" "8.5.1" + "@graphql-tools/schema" "8.5.1" + "@graphql-tools/utils" "8.9.0" + dataloader "2.1.0" + tslib "~2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/merge@8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.1.tgz#06121942ad28982a14635dbc87b5d488a041d722" + integrity sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg== + dependencies: + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + +"@graphql-tools/merge@^8.4.1": + version "8.4.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.2.tgz#95778bbe26b635e8d2f60ce9856b388f11fe8288" + integrity sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw== + dependencies: + "@graphql-tools/utils" "^9.2.1" + tslib "^2.4.0" + +"@graphql-tools/mock@^8.1.2": + version "8.7.20" + resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.20.tgz#c83ae0f1940d194a3982120c9c85f3ac6b4f7f20" + integrity sha512-ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ== + dependencies: + "@graphql-tools/schema" "^9.0.18" + "@graphql-tools/utils" "^9.2.1" + fast-json-stable-stringify "^2.1.0" + tslib "^2.4.0" + +"@graphql-tools/schema@8.5.1", "@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.3.1": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.5.1.tgz#c2f2ff1448380919a330312399c9471db2580b58" + integrity sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg== + dependencies: + "@graphql-tools/merge" "8.3.1" + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/schema@^9.0.18": + version "9.0.19" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.19.tgz#c4ad373b5e1b8a0cf365163435b7d236ebdd06e7" + integrity sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w== + dependencies: + "@graphql-tools/merge" "^8.4.1" + "@graphql-tools/utils" "^9.2.1" + tslib "^2.4.0" + value-or-promise "^1.0.12" + +"@graphql-tools/utils@8.9.0": + version "8.9.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.9.0.tgz#c6aa5f651c9c99e1aca55510af21b56ec296cdb7" + integrity sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg== + dependencies: + tslib "^2.4.0" + +"@graphql-tools/utils@^9.2.1": + version "9.2.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57" + integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + tslib "^2.4.0" + +"@graphql-typed-document-node/core@^3.1.1": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" + integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== + "@grpc/grpc-js@^0.3.0": version "0.3.6" resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-0.3.6.tgz#d9b52043907170d38e06711d9477fde29ab46fa8" @@ -2396,6 +2599,11 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" +"@josephg/resolvable@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb" + integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== + "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -4150,6 +4358,50 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== +"@redux-saga/core@^1.0.0": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.2.3.tgz#882ed9ac58b5f42c6abb23349542315b871de305" + integrity sha512-U1JO6ncFBAklFTwoQ3mjAeQZ6QGutsJzwNBjgVLSWDpZTRhobUzuVDS1qH3SKGJD8fvqoaYOjp6XJ3gCmeZWgA== + dependencies: + "@babel/runtime" "^7.6.3" + "@redux-saga/deferred" "^1.2.1" + "@redux-saga/delay-p" "^1.2.1" + "@redux-saga/is" "^1.1.3" + "@redux-saga/symbols" "^1.1.3" + "@redux-saga/types" "^1.2.1" + redux "^4.0.4" + typescript-tuple "^2.2.1" + +"@redux-saga/deferred@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.2.1.tgz#aca373a08ccafd6f3481037f2f7ee97f2c87c3ec" + integrity sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g== + +"@redux-saga/delay-p@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.2.1.tgz#e72ac4731c5080a21f75b61bedc31cb639d9e446" + integrity sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w== + dependencies: + "@redux-saga/symbols" "^1.1.3" + +"@redux-saga/is@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.3.tgz#b333f31967e87e32b4e6b02c75b78d609dd4ad73" + integrity sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q== + dependencies: + "@redux-saga/symbols" "^1.1.3" + "@redux-saga/types" "^1.2.1" + +"@redux-saga/symbols@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.3.tgz#b731d56201719e96dc887dc3ae9016e761654367" + integrity sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg== + +"@redux-saga/types@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8" + integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA== + "@resolver-engine/core@^0.2.1": version "0.2.1" resolved "https://registry.yarnpkg.com/@resolver-engine/core/-/core-0.2.1.tgz#0d71803f6d3b8cb2e9ed481a1bf0ca5f5256d0c0" @@ -4334,6 +4586,15 @@ fast-check "3.1.1" web3-utils "1.8.2" +"@truffle/abi-utils@^0.3.10": + version "0.3.10" + resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.3.10.tgz#693684d6cd3e86bd48ddbf615cd159156fac1605" + integrity sha512-Q3TXsF0NIct3KFLL2giF/alfSoKf5axyw+4wQdDRlihFrG1nbTBzWq+Q0ya6oHffZDida0NSpnJIf5IhFMV+JQ== + dependencies: + change-case "3.0.2" + fast-check "3.1.1" + web3-utils "1.10.0" + "@truffle/artifactor@4.0.180": version "4.0.180" resolved "https://registry.yarnpkg.com/@truffle/artifactor/-/artifactor-4.0.180.tgz#5dded58d923d5c2e6442d09d4d3d3d9b10646c05" @@ -4357,6 +4618,13 @@ resolved "https://registry.yarnpkg.com/@truffle/blockchain-utils/-/blockchain-utils-0.1.7.tgz#cf7923a3ae5b591ae4c2a5ee45994a310ccaf1ee" integrity sha512-1nibqGjEHC7KAyDThEFvbm2+EO8zAHee/VjCtxkYBE3ySwP50joh0QCEBjy7K/9z+icpMoDucfxmgaKToBFUgQ== +"@truffle/code-utils@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@truffle/code-utils/-/code-utils-3.0.2.tgz#603b0662a1fc27d24a92aaf66417559a3f3e3915" + integrity sha512-Q4FyYIX9G4GyMa8RJDk19kvgiyGZ1CGEx2RmVcXoCDZqEyiHLzqjvCRp+/fuBz2fv7szO6d+60LO1gLCGS1drQ== + dependencies: + cbor "^5.2.0" + "@truffle/codec@^0.14.17": version "0.14.17" resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.14.17.tgz#4ab11fab335854dad0d4aef75db2960ebd76fcd8" @@ -4373,6 +4641,22 @@ utf8 "^3.0.0" web3-utils "1.8.2" +"@truffle/codec@^0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.15.0.tgz#c6dffe4c5f779dbc5187cc13aa99a5350377fe97" + integrity sha512-FEcwtDUuMr85a9u39eqvNgmUgXDvIkwhJjMCCi/bC4/GmLisOpih8vAidDgdYMJldukMPaOX5XIIgsG5k615YA== + dependencies: + "@truffle/abi-utils" "^0.3.10" + "@truffle/compile-common" "^0.9.4" + big.js "^6.0.3" + bn.js "^5.1.3" + cbor "^5.2.0" + debug "^4.3.1" + lodash "^4.17.21" + semver "7.3.7" + utf8 "^3.0.0" + web3-utils "1.10.0" + "@truffle/compile-common@^0.3.9": version "0.3.12" resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.3.12.tgz#73e3849aa61de1f98596b440f0bfce7e3063c2e4" @@ -4458,6 +4742,20 @@ lodash "^4.17.21" original-require "^1.0.1" +"@truffle/config@^1.3.56": + version "1.3.56" + resolved "https://registry.yarnpkg.com/@truffle/config/-/config-1.3.56.tgz#bb4e9c51fbcfb17117a9d6754b27f3a1491be888" + integrity sha512-2wg6zfaUlP3iZP9jHugx3WsyJ2dbIB+nEBULPK5YVbSkqBfXrzW0b9RJYQvyuk/AyFrp/7ycD4r5LnFLq1IHZA== + dependencies: + "@truffle/error" "^0.2.0" + "@truffle/events" "^0.1.23" + "@truffle/provider" "^0.3.9" + conf "^10.1.2" + debug "^4.3.1" + find-up "^2.1.0" + lodash "^4.17.21" + original-require "^1.0.1" + "@truffle/contract-schema@^3.2.5", "@truffle/contract-schema@^3.3.1", "@truffle/contract-schema@^3.4.11", "@truffle/contract-schema@^3.4.13": version "3.4.13" resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.4.13.tgz#48447673f29380830f5821e8139ceefbbd545aac" @@ -4542,6 +4840,38 @@ resolved "https://registry.yarnpkg.com/@truffle/dashboard-message-bus-common/-/dashboard-message-bus-common-0.1.5.tgz#180c8c421b2836b7bd109944e7956f427236d8ab" integrity sha512-F4RfXi7ymNA3HFOlaujRJxAb3I8ciErCRQq+MZVaqjSPF9LSw23IizZsGpLaY43K2bGoBSxyNQRZWxsUEBujPQ== +"@truffle/db-loader@^0.2.24": + version "0.2.24" + resolved "https://registry.yarnpkg.com/@truffle/db-loader/-/db-loader-0.2.24.tgz#a8df634755f49e9849374e0160f6a5e5912d0a65" + integrity sha512-ucnZqVb4Aw9fnsUnqwgKZiaDUcw2n6C4tuGyl2iVOr1Xpl+F5Cgrz1cfjJ1igdZrtZnmKl0tDvymt2YwPeeYgw== + optionalDependencies: + "@truffle/db" "^2.0.24" + +"@truffle/db@^2.0.24": + version "2.0.24" + resolved "https://registry.yarnpkg.com/@truffle/db/-/db-2.0.24.tgz#8c603c625b89b60ade0df405f684aba7b851b42c" + integrity sha512-p4UsUKd47/Iv2SJ2m24+ObIalb4Ljt7ysv3mY/gKvEIw3fKxSErPgxDKaC0l3kPOVaz8gfXkbWDGeuLf/f66+Q== + dependencies: + "@graphql-tools/delegate" "^8.4.3" + "@graphql-tools/schema" "^8.3.1" + "@truffle/abi-utils" "^0.3.10" + "@truffle/code-utils" "^3.0.2" + "@truffle/config" "^1.3.56" + abstract-leveldown "^7.2.0" + apollo-server "^3.11.0" + debug "^4.3.1" + fs-extra "^9.1.0" + graphql "^15.3.0" + graphql-tag "^2.12.6" + json-stable-stringify "^1.0.1" + pascal-case "^2.0.1" + pluralize "^8.0.0" + pouchdb "7.3.0" + pouchdb-adapter-memory "^7.1.1" + pouchdb-debug "^7.1.1" + pouchdb-find "^7.0.0" + web3-utils "1.10.0" + "@truffle/debug-utils@^6.0.42", "@truffle/debug-utils@^6.0.48": version "6.0.48" resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-6.0.48.tgz#218caa0e00d95a03abadb05dfe63d621530e113a" @@ -4554,6 +4884,27 @@ debug "^4.3.1" highlightjs-solidity "^2.0.6" +"@truffle/debugger@^11.1.0": + version "11.1.0" + resolved "https://registry.yarnpkg.com/@truffle/debugger/-/debugger-11.1.0.tgz#2668b50689c88bd93b8a6e44ef7691a9bd2cc216" + integrity sha512-ws3z3ktvW631W6zi9jd9O6+osF6jh+Z6naumIf9ySfAM1cdV4wTHd8iyYwEEc180pJinlc4oCZGvcr5cE97NVw== + dependencies: + "@ensdomains/ensjs" "^2.1.0" + "@truffle/abi-utils" "^0.3.10" + "@truffle/codec" "^0.15.0" + "@truffle/source-map-utils" "^1.3.111" + bn.js "^5.1.3" + debug "^4.3.1" + json-pointer "^0.6.1" + json-stable-stringify "^1.0.1" + lodash "^4.17.21" + redux "^3.7.2" + redux-saga "1.0.0" + reselect-tree "^1.3.7" + semver "7.3.7" + web3 "1.10.0" + web3-eth-abi "1.10.0" + "@truffle/error@0.0.7": version "0.0.7" resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.7.tgz#e9db39885575647ef08bf624b0c13fe46d41a209" @@ -4585,6 +4936,17 @@ emittery "^0.4.1" web3-utils "1.8.2" +"@truffle/events@^0.1.23": + version "0.1.23" + resolved "https://registry.yarnpkg.com/@truffle/events/-/events-0.1.23.tgz#26c5824623795724fb1bfbff12753a59c121587e" + integrity sha512-OIcOZXDCJPz9zzK4uTj0HxCqASNKVcs6g3Z9fT6sehGZRD4ubGHpQZoMchLBwXcggoDRApq2svTdghai624pLg== + dependencies: + "@truffle/dashboard-message-bus-client" "^0.1.10" + "@truffle/spinners" "^0.2.3" + debug "^4.3.1" + emittery "^0.4.1" + web3-utils "1.10.0" + "@truffle/expect@0.0.12": version "0.0.12" resolved "https://registry.yarnpkg.com/@truffle/expect/-/expect-0.0.12.tgz#ed609cc538753e79438eb5a9bda7c2fda8ec2535" @@ -4625,6 +4987,15 @@ ethers "^4.0.32" web3 "1.8.2" +"@truffle/interface-adapter@^0.5.33": + version "0.5.33" + resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.5.33.tgz#249c9a378a91e12c5e5e0657b419596a43caa088" + integrity sha512-vbVcH2I8hX+wM0Xj9uAjpgxMHqfT+y6m26zSkOVvZ2wo9Ez1slaOJkK1/TZK+7nJitGZSXeJeB4purMDuADvGA== + dependencies: + bn.js "^5.1.3" + ethers "^4.0.32" + web3 "1.10.0" + "@truffle/profiler@^0.1.47": version "0.1.47" resolved "https://registry.yarnpkg.com/@truffle/profiler/-/profiler-0.1.47.tgz#fee15be5ff2131115762f973228d64d960862f3c" @@ -4649,6 +5020,16 @@ debug "^4.3.1" web3 "1.8.2" +"@truffle/provider@^0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@truffle/provider/-/provider-0.3.9.tgz#d1e66dbeaa743ba4d3e67911f722f841fbd81d0b" + integrity sha512-6vVSpbP8b2SuNz1fE1KeeQHMBaQ7oD5Nf4CLikXNWrj3SVyMpN3PxsEnaHMnlslAfHICpLSOHpcIWETGxfOgbg== + dependencies: + "@truffle/error" "^0.2.0" + "@truffle/interface-adapter" "^0.5.33" + debug "^4.3.1" + web3 "1.10.0" + "@truffle/provisioner@^0.2.0", "@truffle/provisioner@^0.2.70": version "0.2.78" resolved "https://registry.yarnpkg.com/@truffle/provisioner/-/provisioner-0.2.78.tgz#4aad0b8b911bd5a182637504e9b629015150b1eb" @@ -4690,6 +5071,18 @@ source-map-support "^0.5.16" supports-color "^7.1.0" +"@truffle/source-map-utils@^1.3.111": + version "1.3.111" + resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.111.tgz#8ebc52f6a7f7f77f4ff302141c11e09dd7f8a220" + integrity sha512-/2kP4muycNMvMwar/QuzRdF8NE8LpQS1cRHF43XLx3b89D/upzqTylQwv3EDx/rcd7u6AQ/7lrUSmKlh0+k40Q== + dependencies: + "@truffle/code-utils" "^3.0.2" + "@truffle/codec" "^0.15.0" + debug "^4.3.1" + json-pointer "^0.6.1" + node-interval-tree "^1.3.3" + web3-utils "1.10.0" + "@truffle/spinners@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@truffle/spinners/-/spinners-0.2.3.tgz#5689d06ef16855a9f6b70dc0cd40188de54450ec" @@ -4769,6 +5162,13 @@ resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-7.2.1.tgz#bb16403c17754b0c4d5772d71d03b924a03d4c80" integrity sha512-YK8irIC+eMrrmtGx0H4ISn9GgzLd9dojZWJaMbjp1YHLl2VqqNFBNrL5Q3KjGf4VE3sf/4hmq6EhQZ7kZp1NoQ== +"@types/accepts@^1.3.5": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" + integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== + dependencies: + "@types/node" "*" + "@types/archiver@^5.1.0": version "5.3.2" resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.3.2.tgz#a9f0bcb0f0b991400e7766d35f6e19d163bdadcc" @@ -4823,7 +5223,7 @@ dependencies: "@types/node" "*" -"@types/body-parser@*": +"@types/body-parser@*", "@types/body-parser@1.19.2": version "1.19.2" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== @@ -4909,6 +5309,11 @@ resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8" integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog== +"@types/cors@2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== + "@types/cors@^2.8.5": version "2.8.13" resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" @@ -4973,6 +5378,35 @@ "@types/qs" "*" "@types/range-parser" "*" +"@types/express-serve-static-core@4.17.31": + version "4.17.31" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" + integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express-serve-static-core@^4.17.18": + version "4.17.35" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" + integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express@4.17.14": + version "4.17.14" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" + integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/express@4.17.3": version "4.17.3" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.3.tgz#38e4458ce2067873b09a73908df488870c303bd9" @@ -5181,6 +5615,11 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + "@types/minimatch@*", "@types/minimatch@^5.1.2": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" @@ -5263,7 +5702,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== -"@types/node@^10.0.3", "@types/node@^10.12.18", "@types/node@^10.3.2": +"@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== @@ -5454,6 +5893,14 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59" integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now== +"@types/send@*": + version "0.17.1" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301" + integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + "@types/serve-static@*": version "1.15.1" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d" @@ -5662,6 +6109,13 @@ abi-to-sol@^0.6.6: prettier "^2.7.1" prettier-plugin-solidity "^1.0.0-dev.23" +abort-controller@3.0.0, abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + abort-controller@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-2.0.3.tgz#b174827a732efadff81227ed4b8d1cc569baf20a" @@ -5669,13 +6123,6 @@ abort-controller@^2.0.2: dependencies: event-target-shim "^5.0.0" -abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - abortcontroller-polyfill@^1.1.9, abortcontroller-polyfill@^1.7.3: version "1.7.5" resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed" @@ -5738,7 +6185,7 @@ abstract-leveldown@~2.7.1: dependencies: xtend "~4.0.0" -abstract-leveldown@~6.2.1: +abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3: version "6.2.3" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz#036543d87e3710f2528e47040bc3261b77a9a8eb" integrity sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ== @@ -5749,7 +6196,7 @@ abstract-leveldown@~6.2.1: level-supports "~1.0.0" xtend "~4.0.0" -accepts@~1.3.5, accepts@~1.3.8: +accepts@^1.3.5, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -5994,6 +6441,106 @@ anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" +apollo-datasource@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8" + integrity sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + apollo-server-env "^4.2.1" + +apollo-reporting-protobuf@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz#6edd31f09d4a3704d9e808d1db30eca2229ded26" + integrity sha512-h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog== + dependencies: + "@apollo/protobufjs" "1.2.6" + +apollo-server-core@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.12.0.tgz#8aa2a7329ce6fe1823290c45168c749db01548df" + integrity sha512-hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + "@apollo/utils.usagereporting" "^1.0.0" + "@apollographql/apollo-tools" "^0.5.3" + "@apollographql/graphql-playground-html" "1.6.29" + "@graphql-tools/mock" "^8.1.2" + "@graphql-tools/schema" "^8.0.0" + "@josephg/resolvable" "^1.0.0" + apollo-datasource "^3.3.2" + apollo-reporting-protobuf "^3.4.0" + apollo-server-env "^4.2.1" + apollo-server-errors "^3.3.1" + apollo-server-plugin-base "^3.7.2" + apollo-server-types "^3.8.0" + async-retry "^1.2.1" + fast-json-stable-stringify "^2.1.0" + graphql-tag "^2.11.0" + loglevel "^1.6.8" + lru-cache "^6.0.0" + node-abort-controller "^3.0.1" + sha.js "^2.4.11" + uuid "^9.0.0" + whatwg-mimetype "^3.0.0" + +apollo-server-env@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.2.1.tgz#ea5b1944accdbdba311f179e4dfaeca482c20185" + integrity sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g== + dependencies: + node-fetch "^2.6.7" + +apollo-server-errors@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" + integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== + +apollo-server-express@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.12.0.tgz#a6e392bb0427544b8c7e5d841ef07f7691b0c105" + integrity sha512-m8FaGPUfDOEGSm7QRWRmUUGjG/vqvpQoorkId9/FXkC57fz/A59kEdrzkMt9538Xgsa5AV+X4MEWLJhTvlW3LQ== + dependencies: + "@types/accepts" "^1.3.5" + "@types/body-parser" "1.19.2" + "@types/cors" "2.8.12" + "@types/express" "4.17.14" + "@types/express-serve-static-core" "4.17.31" + accepts "^1.3.5" + apollo-server-core "^3.12.0" + apollo-server-types "^3.8.0" + body-parser "^1.19.0" + cors "^2.8.5" + parseurl "^1.3.3" + +apollo-server-plugin-base@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz#c19cd137bc4c993ba2490ba2b571b0f3ce60a0cd" + integrity sha512-wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw== + dependencies: + apollo-server-types "^3.8.0" + +apollo-server-types@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.8.0.tgz#d976b6967878681f715fe2b9e4dad9ba86b1346f" + integrity sha512-ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + apollo-reporting-protobuf "^3.4.0" + apollo-server-env "^4.2.1" + +apollo-server@^3.11.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-3.12.0.tgz#bd43d6dadb8cb16ed34edfc6ad97a81b1fab748a" + integrity sha512-wZHLgBoIdGxr/YpPTG5RwNnS+B2y70T/nCegCnU6Yl+H3PXB92OIguLMhdJIZVjukIOhiQT12dNIehqLQ+1hMQ== + dependencies: + "@types/express" "4.17.14" + apollo-server-core "^3.12.0" + apollo-server-express "^3.12.0" + express "^4.17.1" + app-module-path@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" @@ -6079,6 +6626,11 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== +argsarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb" + integrity sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg== + argv@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab" @@ -6333,7 +6885,7 @@ async-mutex@^0.2.6: dependencies: tslib "^2.0.0" -async-retry@^1.3.3: +async-retry@^1.2.1, async-retry@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280" integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw== @@ -7120,7 +7672,7 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== -buffer-from@^1.0.0, buffer-from@^1.1.1: +buffer-from@1.1.2, buffer-from@^1.0.0, buffer-from@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== @@ -8033,6 +8585,11 @@ cliui@^8.0.1: strip-ansi "^6.0.1" wrap-ansi "^7.0.0" +clone-buffer@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -8230,7 +8787,7 @@ commander@3.0.2, commander@^3.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.12.1, commander@^2.8.1: +commander@^2.12.1, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -8795,6 +9352,11 @@ css-what@^6.1.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== +cssfilter@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" + integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw== + csstype@^3.0.2: version "3.1.2" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" @@ -8857,6 +9419,11 @@ data-uri-to-buffer@3: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== +dataloader@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" + integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ== + date-and-time@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.6.3.tgz#2daee52df67c28bd93bce862756ac86b68cf4237" @@ -9487,6 +10054,11 @@ dotignore@~0.1.2: dependencies: minimatch "^3.0.4" +double-ended-queue@2.1.0-0: + version "2.1.0-0" + resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" + integrity sha512-+BNfZ+deCo8hMNpDqDnvT+c0XpJ5cUa6mqYq89bho2Ifze4URTqRkcwR399hWoTrTkbZ/XJYDgP6rc7pRgffEQ== + drbg.js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b" @@ -9673,6 +10245,13 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" +end-stream@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/end-stream/-/end-stream-0.1.0.tgz#32003f3f438a2b0143168137f8fa6e9866c81ed5" + integrity sha512-Brl10T8kYnc75IepKizW6Y9liyW8ikz1B7n/xoHrJxoVSSjoqPn30sb7XVFfQERK4QfUMYRGs9dhWwtt2eu6uA== + dependencies: + write-stream "~0.4.3" + ends-with@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a" @@ -11039,6 +11618,13 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== +fetch-cookie@0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407" + integrity sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA== + dependencies: + tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0" + fetch-mock@9.10.4: version "9.10.4" resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-9.10.4.tgz#e5f98c7d56d57b29caec55d928930150f39519ba" @@ -11469,6 +12055,11 @@ for-own@^0.1.3, for-own@^0.1.4: dependencies: for-in "^1.0.1" +foreach@^2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.6.tgz#87bcc8a1a0e74000ff2bf9802110708cfb02eb6e" + integrity sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg== + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -11724,7 +12315,7 @@ funpermaproxy@^1.0.1: resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== -ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.8.0-beta.1": +ganache@7.8.0, ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.8.0-beta.1": version "7.8.0-beta.1" resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.8.0-beta.1.tgz#168d3c2f1ea05c350e972f227872d4a4b15e5f9e" integrity sha512-ptjs631aKpxG7xexDDyxh5NevKQaUcSfm3/Aeh0smJ/3xQgNrJ+st6CVYVbVbhGkgNcq9NIvCCaIgt0L64GOCA== @@ -12639,6 +13230,13 @@ grapheme-splitter@^1.0.4: resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +graphql-tag@^2.11.0, graphql-tag@^2.12.6: + version "2.12.6" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" + integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== + dependencies: + tslib "^2.1.0" + graphql@^14.1.1: version "14.7.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz#7fa79a80a69be4a31c27dda824dc04dac2035a72" @@ -12646,6 +13244,11 @@ graphql@^14.1.1: dependencies: iterall "^1.2.2" +graphql@^15.3.0: + version "15.8.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" + integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== + growl@1.10.5: version "1.10.5" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" @@ -13216,7 +13819,7 @@ ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -immediate@^3.2.3: +immediate@3.3.0, immediate@^3.2.3: version "3.3.0" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== @@ -14761,6 +15364,13 @@ json-parse-helpfulerror@^1.0.3: dependencies: jju "^1.1.0" +json-pointer@^0.6.1: + version "0.6.2" + resolved "https://registry.yarnpkg.com/json-pointer/-/json-pointer-0.6.2.tgz#f97bd7550be5e9ea901f8c9264c9d436a22a93cd" + integrity sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw== + dependencies: + foreach "^2.0.4" + json-ptr@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json-ptr/-/json-ptr-2.2.0.tgz#a4de4ed638cb23ae4cd4b51f8bf972a1c2293f1e" @@ -15216,7 +15826,7 @@ lerna@^5.5.0: nx ">=14.8.1 < 16" typescript "^3 || ^4" -level-codec@^9.0.0: +level-codec@9.0.2, level-codec@^9.0.0: version "9.0.2" resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc" integrity sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ== @@ -15289,6 +15899,16 @@ level-iterator-stream@~4.0.0: readable-stream "^3.4.0" xtend "^4.0.2" +level-js@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/level-js/-/level-js-5.0.2.tgz#5e280b8f93abd9ef3a305b13faf0b5397c969b55" + integrity sha512-SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg== + dependencies: + abstract-leveldown "~6.2.3" + buffer "^5.5.0" + inherits "^2.0.3" + ltgt "^2.1.2" + level-mem@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/level-mem/-/level-mem-3.0.1.tgz#7ce8cf256eac40f716eb6489654726247f5a89e5" @@ -15305,7 +15925,7 @@ level-mem@^5.0.1: level-packager "^5.0.3" memdown "^5.0.0" -level-packager@^5.0.3: +level-packager@^5.0.3, level-packager@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/level-packager/-/level-packager-5.1.1.tgz#323ec842d6babe7336f70299c14df2e329c18939" integrity sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ== @@ -15346,6 +15966,13 @@ level-transcoder@^1.0.1: buffer "^6.0.3" module-error "^1.0.1" +level-write-stream@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/level-write-stream/-/level-write-stream-1.0.0.tgz#3f7fbb679a55137c0feb303dee766e12ee13c1dc" + integrity sha512-bBNKOEOMl8msO+uIM9YX/gUO6ckokZ/4pCwTm/lwvs46x6Xs8Zy0sn3Vh37eDqse4mhy4fOMIb/JsSM2nyQFtw== + dependencies: + end-stream "~0.1.0" + level-ws@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/level-ws/-/level-ws-0.0.0.tgz#372e512177924a00424b0b43aef2bb42496d228b" @@ -15363,6 +15990,15 @@ level-ws@^2.0.0: readable-stream "^3.1.0" xtend "^4.0.1" +level@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/level/-/level-6.0.1.tgz#dc34c5edb81846a6de5079eac15706334b0d7cd6" + integrity sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw== + dependencies: + level-js "^5.0.0" + level-packager "^5.1.0" + leveldown "^5.4.0" + level@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/level/-/level-8.0.0.tgz#41b4c515dabe28212a3e881b61c161ffead14394" @@ -15371,6 +16007,15 @@ level@^8.0.0: browser-level "^1.0.1" classic-level "^1.2.0" +leveldown@5.6.0, leveldown@^5.4.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" + integrity sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ== + dependencies: + abstract-leveldown "~6.2.1" + napi-macros "~2.0.0" + node-gyp-build "~4.1.0" + leveldown@6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee" @@ -15380,6 +16025,17 @@ leveldown@6.1.0: napi-macros "~2.0.0" node-gyp-build "^4.3.0" +levelup@4.4.0, levelup@^4.3.2: + version "4.4.0" + resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" + integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ== + dependencies: + deferred-leveldown "~5.3.0" + level-errors "~2.0.0" + level-iterator-stream "~4.0.0" + level-supports "~1.0.0" + xtend "~4.0.0" + levelup@^1.2.1: version "1.3.9" resolved "https://registry.yarnpkg.com/levelup/-/levelup-1.3.9.tgz#2dbcae845b2bb2b6bea84df334c475533bbd82ab" @@ -15403,17 +16059,6 @@ levelup@^3.0.0: level-iterator-stream "~3.0.0" xtend "~4.0.0" -levelup@^4.3.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" - integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ== - dependencies: - deferred-leveldown "~5.3.0" - level-errors "~2.0.0" - level-iterator-stream "~4.0.0" - level-supports "~1.0.0" - xtend "~4.0.0" - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -15540,6 +16185,11 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash-es@^4.2.1: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + lodash._isnative@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c" @@ -15745,7 +16395,7 @@ lodash.values@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q== -lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@~4.17.19: +lodash@4.17.21, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -15784,7 +16434,7 @@ logform@^2.3.2, logform@^2.4.0: safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" -loglevel@^1.6.1: +loglevel@^1.6.1, loglevel@^1.6.8: version "1.8.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4" integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== @@ -15804,7 +16454,7 @@ long@~3: resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== -loose-envify@^1.0.0: +loose-envify@^1.0.0, loose-envify@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -15845,6 +16495,11 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== +"lru-cache@7.10.1 - 7.13.1": + version "7.13.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" + integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== + lru-cache@^4.0.1: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -15895,7 +16550,7 @@ lru-queue@^0.1.0: dependencies: es5-ext "~0.10.2" -ltgt@~2.2.0: +ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA== @@ -16091,7 +16746,7 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" -memdown@^1.0.0: +memdown@1.4.1, memdown@^1.0.0: version "1.4.1" resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215" integrity sha512-iVrGHZB8i4OQfM155xx8akvG9FIj+ht14DX5CQkCTG4EHzZ3d3sgckIf/Lm9ivZalEsFuEVnWv2B2WZvbrro2w== @@ -16595,22 +17250,32 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@5.2.0, mocha@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" - integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== +mocha@10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a" + integrity sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg== dependencies: + ansi-colors "4.1.1" browser-stdout "1.3.1" - commander "2.15.1" - debug "3.1.0" - diff "3.5.0" - escape-string-regexp "1.0.5" - glob "7.1.2" - growl "1.10.5" - he "1.1.1" - minimatch "3.0.4" - mkdirp "0.5.1" - supports-color "5.4.0" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + nanoid "3.3.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" mocha@8.0.1: version "8.0.1" @@ -16670,6 +17335,23 @@ mocha@^10.2.0: yargs-parser "20.2.4" yargs-unparser "2.0.0" +mocha@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" + integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== + dependencies: + browser-stdout "1.3.1" + commander "2.15.1" + debug "3.1.0" + diff "3.5.0" + escape-string-regexp "1.0.5" + glob "7.1.2" + growl "1.10.5" + he "1.1.1" + minimatch "3.0.4" + mkdirp "0.5.1" + supports-color "5.4.0" + mocha@^6.2.2: version "6.2.3" resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912" @@ -17176,6 +17858,11 @@ node-gyp-build@^4.2.0, node-gyp-build@^4.3.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== +node-gyp-build@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb" + integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ== + node-gyp@8.x: version "8.4.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" @@ -17231,6 +17918,13 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== +node-interval-tree@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/node-interval-tree/-/node-interval-tree-1.3.3.tgz#15ffb904cde08270214acace8dc7653e89ae32b7" + integrity sha512-K9vk96HdTK5fEipJwxSvIIqwTqr4e3HRJeJrNxBSeVMNSC/JWARRaX7etOLOuTmrRMeOI/K5TCJu3aWIwZiNTw== + dependencies: + shallowequal "^1.0.2" + node-releases@^2.0.8: version "2.0.10" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" @@ -17837,7 +18531,7 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" -original-require@1.0.1, original-require@^1.0.1: +original-require@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" integrity sha512-5vdKMbE58WaE61uVD+PKyh8xdM398UnjPBLotW2sjG5MzHARwta/+NtMBCBA0t2WQblGYBvq5vsiZpWokwno+A== @@ -18224,12 +18918,12 @@ parse5@^7.0.0: dependencies: entities "^4.4.0" -parseurl@~1.3.3: +parseurl@^1.3.3, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascal-case@^2.0.0: +pascal-case@^2.0.0, pascal-case@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-2.0.1.tgz#2d578d3455f660da65eca18ef95b4e0de912761e" integrity sha512-qjS4s8rBOJa2Xm0jmxXiyh1+OFf6ekCWOvUaRgAQSktzlTbMotS0nmG9gyYAybCWBcuP4fsBeRCKNwGBnMe2OQ== @@ -18563,6 +19257,11 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== +pluralize@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" + integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== + pngjs@^3.3.0: version "3.4.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" @@ -18609,6 +19308,192 @@ postgres-interval@^1.1.0: dependencies: xtend "^4.0.0" +pouchdb-abstract-mapreduce@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.1.tgz#96ff4a0f41cbe273f3f52fde003b719005a2093c" + integrity sha512-0zKXVFBvrfc1KnN0ggrB762JDmZnUpePHywo9Bq3Jy+L1FnoG7fXM5luFfvv5/T0gEw+ZTIwoocZECMnESBI9w== + dependencies: + pouchdb-binary-utils "7.3.1" + pouchdb-collate "7.3.1" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-fetch "7.3.1" + pouchdb-mapreduce-utils "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-adapter-leveldb-core@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.3.1.tgz#3c71dce7ff06c2e483d873d7aabc1fded56372ca" + integrity sha512-mxShHlqLMPz2gChrgtA9okV1ogFmQrRAoM/O4EN0CrQWPLXqYtpL1f7sI2asIvFe7SmpnvbLx7kkZyFmLTfwjA== + dependencies: + argsarray "0.0.1" + buffer-from "1.1.2" + double-ended-queue "2.1.0-0" + levelup "4.4.0" + pouchdb-adapter-utils "7.3.1" + pouchdb-binary-utils "7.3.1" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-json "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-merge "7.3.1" + pouchdb-utils "7.3.1" + sublevel-pouchdb "7.3.1" + through2 "3.0.2" + +pouchdb-adapter-memory@^7.1.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-memory/-/pouchdb-adapter-memory-7.3.1.tgz#7be4b0601326cb93eb1141ed910fdfdf40c36616" + integrity sha512-iHdWGJAHONqQv0we3Oi1MYen69ZS8McLW9wUyaAYcWTJnAIIAr2ZM0/TeTDVSHfMUwYqEYk7X8jRtJZEMwLnwg== + dependencies: + memdown "1.4.1" + pouchdb-adapter-leveldb-core "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-adapter-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.3.1.tgz#7237cb597f8d337057df15d4859bfe3c881d8832" + integrity sha512-uKLG6dClwTs/sLIJ4WkLAi9wlnDBpOnfyhpeAgOjlOGN/XLz5nKHrA4UJRnURDyc+uv79S9r/Unc4hVpmbSPUw== + dependencies: + pouchdb-binary-utils "7.3.1" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-merge "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-binary-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.1.tgz#eea22d9a5f880fcd95062476f4f5484cdf61496f" + integrity sha512-crZJNfAEOnUoRk977Qtmk4cxEv6sNKllQ6vDDKgQrQLFjMUXma35EHzNyIJr1s76J77Q4sqKQAmxz9Y40yHGtw== + dependencies: + buffer-from "1.1.2" + +pouchdb-collate@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.3.1.tgz#19d7b87dd173d1c765da8cc9987c5aa9eb24f11f" + integrity sha512-o4gyGqDMLMSNzf6EDTr3eHaH/JRMoqRhdc+eV+oA8u00nTBtr9wD+jypVe2LbgKLJ4NWqx2qVkXiTiQdUFtsLQ== + +pouchdb-collections@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.3.1.tgz#4f1819cf4dd6936a422c29f7fa26a9b5dca428f5" + integrity sha512-yUyDqR+OJmtwgExOSJegpBJXDLAEC84TWnbAYycyh+DZoA51Yw0+XVQF5Vh8Ii90/Ut2xo88fmrmp0t6kqom8w== + +pouchdb-debug@^7.1.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/pouchdb-debug/-/pouchdb-debug-7.2.1.tgz#f5f869f6113c12ccb97cddf5b0a32b6e0e67e961" + integrity sha512-eP3ht/AKavLF2RjTzBM6S9gaI2/apcW6xvaKRQhEdOfiANqerFuksFqHCal3aikVQuDO+cB/cw+a4RyJn/glBw== + dependencies: + debug "3.1.0" + +pouchdb-errors@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.3.1.tgz#78be36721e2edc446fac158a236a9218c7bcdb14" + integrity sha512-Zktz4gnXEUcZcty8FmyvtYUYsHskoST05m6H5/E2gg/0mCfEXq/XeyyLkZHaZmqD0ZPS9yNmASB1VaFWEKEaDw== + dependencies: + inherits "2.0.4" + +pouchdb-fetch@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.3.1.tgz#d54b1807be0f0a5d4b6d06e416c7d54952bbc348" + integrity sha512-205xAtvdHRPQ4fp1h9+RmT9oQabo9gafuPmWsS9aEl3ER54WbY8Vaj1JHZGbU4KtMTYvW7H5088zLS7Nrusuag== + dependencies: + abort-controller "3.0.0" + fetch-cookie "0.11.0" + node-fetch "2.6.7" + +pouchdb-find@^7.0.0: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.3.1.tgz#07a633d5ee2bd731dae9f991281cd25212088d29" + integrity sha512-AeqUfAVY1c7IFaY36BRT0vIz9r4VTKq/YOWTmiqndOZUQ/pDGxyO2fNFal6NN3PyYww0JijlD377cPvhnrhJVA== + dependencies: + pouchdb-abstract-mapreduce "7.3.1" + pouchdb-collate "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-fetch "7.3.1" + pouchdb-md5 "7.3.1" + pouchdb-selector-core "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-json@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.3.1.tgz#a80a3060aa2914959e4dca7a4e2022ab20c7119a" + integrity sha512-AyOKsmc85/GtHjMZyEacqzja8qLVfycS1hh1oskR+Bm5PIITX52Fb8zyi0hEetV6VC0yuGbn0RqiLjJxQePeqQ== + dependencies: + vuvuzela "1.0.3" + +pouchdb-mapreduce-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.1.tgz#f0ac2c8400fbedb705e9226082453ac7d3f2a066" + integrity sha512-oUMcq82+4pTGQ6dtrhgORHOVHZSr6w/5tFIUGlv7RABIDvJarL4snMawADjlpiEwPdiQ/ESG8Fqt8cxqvqsIgg== + dependencies: + argsarray "0.0.1" + inherits "2.0.4" + pouchdb-collections "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-md5@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.3.1.tgz#70fae44f9d27eb4c6a8e7106156b4593d31c1762" + integrity sha512-aDV8ui/mprnL3xmt0gT/81DFtTtJiKyn+OxIAbwKPMfz/rDFdPYvF0BmDC9QxMMzGfkV+JJUjU6at0PPs2mRLg== + dependencies: + pouchdb-binary-utils "7.3.1" + spark-md5 "3.0.2" + +pouchdb-merge@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.3.1.tgz#97aae682d7d8499b62b6ce234dcb9527c7bf6f02" + integrity sha512-FeK3r35mKimokf2PQ2tUI523QWyZ4lYZ0Yd75FfSch/SPY6wIokz5XBZZ6PHdu5aOJsEKzoLUxr8CpSg9DhcAw== + +pouchdb-selector-core@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.3.1.tgz#08245662de3d61f16ab8dae2b56ef622935b3fb3" + integrity sha512-HBX+nNGXcaL9z0uNpwSMRq2GNZd3EZXW+fe9rJHS0hvJohjZL7aRJLoaXfEdHPRTNW+CpjM3Rny60eGekQdI/w== + dependencies: + pouchdb-collate "7.3.1" + pouchdb-utils "7.3.1" + +pouchdb-utils@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.3.1.tgz#d25f0a034427f388ba5ae37d9ae3fbed210e8720" + integrity sha512-R3hHBo1zTdTu/NFs3iqkcaQAPwhIH0gMIdfVKd5lbDYlmP26rCG5pdS+v7NuoSSFLJ4xxnaGV+Gjf4duYsJ8wQ== + dependencies: + argsarray "0.0.1" + clone-buffer "1.0.0" + immediate "3.3.0" + inherits "2.0.4" + pouchdb-collections "7.3.1" + pouchdb-errors "7.3.1" + pouchdb-md5 "7.3.1" + uuid "8.3.2" + +pouchdb@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.3.0.tgz#440fbef12dfd8f9002320802528665e883a3b7f8" + integrity sha512-OwsIQGXsfx3TrU1pLruj6PGSwFH+h5k4hGNxFkZ76Um7/ZI8F5TzUHFrpldVVIhfXYi2vP31q0q7ot1FSLFYOw== + dependencies: + abort-controller "3.0.0" + argsarray "0.0.1" + buffer-from "1.1.2" + clone-buffer "1.0.0" + double-ended-queue "2.1.0-0" + fetch-cookie "0.11.0" + immediate "3.3.0" + inherits "2.0.4" + level "6.0.1" + level-codec "9.0.2" + level-write-stream "1.0.0" + leveldown "5.6.0" + levelup "4.4.0" + ltgt "2.2.1" + node-fetch "2.6.7" + readable-stream "1.1.14" + spark-md5 "3.0.2" + through2 "3.0.2" + uuid "8.3.2" + vuvuzela "1.0.3" + prebuild-install@^6.0.0: version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" @@ -19024,7 +19909,7 @@ pseudomap@^1.0.1, pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -19200,7 +20085,7 @@ querystring@^0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== -querystringify@^2.0.0: +querystringify@^2.0.0, querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== @@ -19388,7 +20273,7 @@ read@1, read@1.0.x, read@^1.0.7: dependencies: mute-stream "~0.0.4" -readable-stream@1.1.x, readable-stream@^1.0.33: +readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== @@ -19420,6 +20305,11 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@~0.0.2: + version "0.0.4" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" + integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw== + readable-stream@~1.0.15: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -19509,6 +20399,30 @@ redeyed@~2.1.0: dependencies: esprima "~4.0.0" +redux-saga@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.0.0.tgz#acb8b3ed9180fecbe75f342011d75af3ac11045b" + integrity sha512-GvJWs/SzMvEQgeaw6sRMXnS2FghlvEGsHiEtTLpJqc/FHF3I5EE/B+Hq5lyHZ8LSoT2r/X/46uWvkdCnK9WgHA== + dependencies: + "@redux-saga/core" "^1.0.0" + +redux@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" + integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== + dependencies: + lodash "^4.2.1" + lodash-es "^4.2.1" + loose-envify "^1.1.0" + symbol-observable "^1.0.3" + +redux@^4.0.4: + version "4.2.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" + integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== + dependencies: + "@babel/runtime" "^7.9.2" + regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" @@ -19700,6 +20614,20 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== +reselect-tree@^1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/reselect-tree/-/reselect-tree-1.3.7.tgz#c3eca58765d9df96bae0017f6ff3504c304cdea0" + integrity sha512-kZN+C1cVJ6fFN2smSb0l4UvYZlRzttgnu183svH4NrU22cBY++ikgr2QT75Uuk4MYpv5gXSVijw4c5U6cx6GKg== + dependencies: + debug "^3.1.0" + json-pointer "^0.6.1" + reselect "^4.0.0" + +reselect@^4.0.0: + version "4.1.8" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" + integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== + resolve-alpn@^1.0.0, resolve-alpn@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" @@ -20288,7 +21216,7 @@ setprototypeof@1.2.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== -sha.js@^2.4.0, sha.js@^2.4.8: +sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== @@ -20318,6 +21246,11 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" +shallowequal@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -20698,6 +21631,11 @@ source-map@~0.2.0: dependencies: amdefine ">=0.0.4" +spark-md5@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" + integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== + spdx-correct@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" @@ -21119,6 +22057,16 @@ stubs@^3.0.0: resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== +sublevel-pouchdb@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.3.1.tgz#c1cc03af45081345c7c82821d6dcaa74564ae2ef" + integrity sha512-n+4fK72F/ORdqPwoGgMGYeOrW2HaPpW9o9k80bT1B3Cim5BSvkKkr9WbWOWynni/GHkbCEdvLVFJL1ktosAdhQ== + dependencies: + inherits "2.0.4" + level-codec "9.0.2" + ltgt "2.2.1" + readable-stream "1.1.14" + superagent@^8.0.5: version "8.0.9" resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.9.tgz#2c6fda6fadb40516515f93e9098c0eb1602e0535" @@ -21293,6 +22241,11 @@ swarm-js@^0.1.40: tar "^4.0.2" xhr-request "^1.0.1" +symbol-observable@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + sync-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.1.0.tgz#e96217565b5e50bbffe179868ba75532fb597e68" @@ -21595,6 +22548,14 @@ through2@2.0.1: readable-stream "~2.0.0" xtend "~4.0.0" +through2@3.0.2, through2@^3.0.0, through2@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" + integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== + dependencies: + inherits "^2.0.4" + readable-stream "2 || 3" + through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -21603,14 +22564,6 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through2@^3.0.0, through2@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" - integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== - dependencies: - inherits "^2.0.4" - readable-stream "2 || 3" - through2@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" @@ -21770,6 +22723,16 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" +"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0": + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tough-cookie@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" @@ -21886,14 +22849,19 @@ truffle-typings@^1.0.6: "@types/mocha" "^5.2.5" "@types/web3" "^1.0.18" -truffle@5.1.18: - version "5.1.18" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.18.tgz#2fefaed849698b7fb865b417a197d1b6d9229db3" - integrity sha512-9oxmLmyTXML5Auxl8adPd3kLcOZVhYNapCmPUcMnYCOXthxa3NEOW9y3PTcoDnwFyuIOETGIiJp4Ew9bmY8v6Q== +truffle@5.9.0: + version "5.9.0" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.9.0.tgz#55035fd092795a3ee8204656bfb593e71438fed2" + integrity sha512-XZBlGzU+IA0F3oDpmTWas62TYrNseG3xYh861zR+E09K2A0E0eSuTi1d5k+Uzhv4I6bIlNSWL31iI1J/PiZxcw== dependencies: + "@truffle/db-loader" "^0.2.24" + "@truffle/debugger" "^11.1.0" app-module-path "^2.2.0" - mocha "5.2.0" - original-require "1.0.1" + ganache "7.8.0" + mocha "10.1.0" + original-require "^1.0.1" + optionalDependencies: + "@truffle/db" "^2.0.24" truncate-utf8-bytes@^1.0.0: version "1.0.2" @@ -22023,6 +22991,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3 resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== +tslib@~2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" + integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== + tslint-config-prettier@^1.18.0: version "1.18.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" @@ -22294,6 +23267,18 @@ typeforce@^1.11.5: resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc" integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g== +typescript-compare@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425" + integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA== + dependencies: + typescript-logic "^0.0.0" + +typescript-logic@^0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196" + integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q== + typescript-tslint-plugin@^0.5.4: version "0.5.5" resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c" @@ -22303,6 +23288,13 @@ typescript-tslint-plugin@^0.5.4: mock-require "^3.0.3" vscode-languageserver "^5.2.1" +typescript-tuple@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2" + integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q== + dependencies: + typescript-compare "^0.0.2" + typescript@4.4.3: version "4.4.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324" @@ -22452,6 +23444,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -22594,6 +23591,14 @@ url-parse@1.4.4: querystringify "^2.0.0" requires-port "^1.0.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url-set-query@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-set-query/-/url-set-query-1.0.0.tgz#016e8cfd7c20ee05cafe7795e892bd0702faa339" @@ -22727,6 +23732,11 @@ uuid@8.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== +uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" @@ -22737,11 +23747,6 @@ uuid@^7.0.3: resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== -uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - uuid@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" @@ -22793,6 +23798,16 @@ validate-npm-package-name@^4.0.0: dependencies: builtins "^5.0.0" +value-or-promise@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" + integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== + +value-or-promise@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" + integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== + varint@^5.0.0: version "5.0.2" resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4" @@ -22851,6 +23866,11 @@ vscode-uri@^1.0.6: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== +vuvuzela@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" + integrity sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ== + walk-up-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" @@ -22880,6 +23900,15 @@ weak-map@^1.0.5: resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== +web3-bzz@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.10.0.tgz#ac74bc71cdf294c7080a79091079192f05c5baed" + integrity sha512-o9IR59io3pDUsXTsps5pO5hW1D5zBmg46iNc2t4j2DkaYHNdDLwk2IP9ukoM2wg47QILfPEJYzhTfkS/CcX0KA== + dependencies: + "@types/node" "^12.12.6" + got "12.1.0" + swarm-js "^0.1.40" + web3-bzz@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.2.tgz#a3b9f613c49fd3e120e0997088a73557d5adb724" @@ -22938,6 +23967,14 @@ web3-core-helpers@1.0.0-beta.55: web3-eth-iban "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-core-helpers@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.10.0.tgz#1016534c51a5df77ed4f94d1fcce31de4af37fad" + integrity sha512-pIxAzFDS5vnbXvfvLSpaA1tfRykAe9adw43YCKsEYQwH0gCLL0kMLkaCX3q+Q8EVmAh+e1jWL/nl9U0de1+++g== + dependencies: + web3-eth-iban "1.10.0" + web3-utils "1.10.0" + web3-core-helpers@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz#484974f4bd4a487217b85b0d7cfe841af0907619" @@ -22994,6 +24031,17 @@ web3-core-method@1.0.0-beta.55: web3-core-subscriptions "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-core-method@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.10.0.tgz#82668197fa086e8cc8066742e35a9d72535e3412" + integrity sha512-4R700jTLAMKDMhQ+nsVfIXvH6IGJlJzGisIfMKWAIswH31h5AZz7uDUW2YctI+HrYd+5uOAlS4OJeeT9bIpvkA== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.10.0" + web3-core-promievent "1.10.0" + web3-core-subscriptions "1.10.0" + web3-utils "1.10.0" + web3-core-method@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.2.tgz#d4fe2bb1945b7152e5f08e4ea568b171132a1e56" @@ -23050,6 +24098,13 @@ web3-core-method@1.9.0: web3-core-subscriptions "1.9.0" web3-utils "1.9.0" +web3-core-promievent@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.10.0.tgz#cbb5b3a76b888df45ed3a8d4d8d4f54ccb66a37b" + integrity sha512-68N7k5LWL5R38xRaKFrTFT2pm2jBNFaM4GioS00YjAKXRQ3KjmhijOMG3TICz6Aa5+6GDWYelDNx21YAeZ4YTg== + dependencies: + eventemitter3 "4.0.4" + web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -23086,6 +24141,17 @@ web3-core-promievent@1.9.0: dependencies: eventemitter3 "4.0.4" +web3-core-requestmanager@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.10.0.tgz#4b34f6e05837e67c70ff6f6993652afc0d54c340" + integrity sha512-3z/JKE++Os62APml4dvBM+GAuId4h3L9ckUrj7ebEtS2AR0ixyQPbrBodgL91Sv7j7cQ3Y+hllaluqjguxvSaQ== + dependencies: + util "^0.12.5" + web3-core-helpers "1.10.0" + web3-providers-http "1.10.0" + web3-providers-ipc "1.10.0" + web3-providers-ws "1.10.0" + web3-core-requestmanager@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" @@ -23151,6 +24217,14 @@ web3-core-subscriptions@1.0.0-beta.55: eventemitter3 "^3.1.0" lodash "^4.17.11" +web3-core-subscriptions@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.10.0.tgz#b534592ee1611788fc0cb0b95963b9b9b6eacb7c" + integrity sha512-HGm1PbDqsxejI075gxBc5OSkwymilRWZufIy9zEpnWKNmfbuv5FfHgW1/chtJP6aP3Uq2vHkvTDl3smQBb8l+g== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.10.0" + web3-core-subscriptions@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz#bf4ba23a653a003bdc3551649958cc0b080b068e" @@ -23206,6 +24280,19 @@ web3-core@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-core@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.10.0.tgz#9aa07c5deb478cf356c5d3b5b35afafa5fa8e633" + integrity sha512-fWySwqy2hn3TL89w5TM8wXF1Z2Q6frQTKHWmP0ppRQorEK8NcHJRfeMiv/mQlSKoTS1F6n/nv2uyZsixFycjYQ== + dependencies: + "@types/bn.js" "^5.1.1" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-core-requestmanager "1.10.0" + web3-utils "1.10.0" + web3-core@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.2.tgz#334b99c8222ef9cfd0339e27352f0b58ea789a2f" @@ -23270,6 +24357,14 @@ web3-core@1.9.0: web3-core-requestmanager "1.9.0" web3-utils "1.9.0" +web3-eth-abi@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.10.0.tgz#53a7a2c95a571e205e27fd9e664df4919483cce1" + integrity sha512-cwS+qRBWpJ43aI9L3JS88QYPfFcSJJ3XapxOQ4j40v6mk7ATpA8CVK1vGTzpihNlOfMVRBkR95oAj7oL6aiDOg== + dependencies: + "@ethersproject/abi" "^5.6.3" + web3-utils "1.10.0" + web3-eth-abi@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" @@ -23312,6 +24407,22 @@ web3-eth-abi@1.9.0, web3-eth-abi@^1.0.0-beta.24: "@ethersproject/abi" "^5.6.3" web3-utils "1.9.0" +web3-eth-accounts@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.10.0.tgz#2942beca0a4291455f32cf09de10457a19a48117" + integrity sha512-wiq39Uc3mOI8rw24wE2n15hboLE0E9BsQLdlmsL4Zua9diDS6B5abXG0XhFcoNsXIGMWXVZz4TOq3u4EdpXF/Q== + dependencies: + "@ethereumjs/common" "2.5.0" + "@ethereumjs/tx" "3.3.2" + eth-lib "0.2.8" + ethereumjs-util "^7.1.5" + scrypt-js "^3.0.1" + uuid "^9.0.0" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-utils "1.10.0" + web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -23409,6 +24520,20 @@ web3-eth-admin@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-eth-contract@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.10.0.tgz#8e68c7654576773ec3c91903f08e49d0242c503a" + integrity sha512-MIC5FOzP/+2evDksQQ/dpcXhSqa/2hFNytdl/x61IeWxhh6vlFeSjq0YVTAyIzdjwnL7nEmZpjfI6y6/Ufhy7w== + dependencies: + "@types/bn.js" "^5.1.1" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-core-promievent "1.10.0" + web3-core-subscriptions "1.10.0" + web3-eth-abi "1.10.0" + web3-utils "1.10.0" + web3-eth-contract@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz#84e92714918a29e1028ee7718f0712536e14e9a1" @@ -23481,6 +24606,20 @@ web3-eth-contract@1.9.0: web3-eth-abi "1.9.0" web3-utils "1.9.0" +web3-eth-ens@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.10.0.tgz#96a676524e0b580c87913f557a13ed810cf91cd9" + integrity sha512-3hpGgzX3qjgxNAmqdrC2YUQMTfnZbs4GeLEmy8aCWziVwogbuqQZ+Gzdfrym45eOZodk+lmXyLuAdqkNlvkc1g== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-promievent "1.10.0" + web3-eth-abi "1.10.0" + web3-eth-contract "1.10.0" + web3-utils "1.10.0" + web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -23561,6 +24700,14 @@ web3-eth-iban@1.0.0-beta.55: bn.js "4.11.8" web3-utils "1.0.0-beta.55" +web3-eth-iban@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.10.0.tgz#5a46646401965b0f09a4f58e7248c8a8cd22538a" + integrity sha512-0l+SP3IGhInw7Q20LY3IVafYEuufo4Dn75jAHT7c2aDJsIolvf2Lc6ugHkBajlwUneGfbRQs/ccYPQ9JeMUbrg== + dependencies: + bn.js "^5.2.1" + web3-utils "1.10.0" + web3-eth-iban@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz#76bec73bad214df7c4192388979a59fc98b96c5a" @@ -23601,6 +24748,18 @@ web3-eth-iban@1.9.0: bn.js "^5.2.1" web3-utils "1.9.0" +web3-eth-personal@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.10.0.tgz#94d525f7a29050a0c2a12032df150ac5ea633071" + integrity sha512-anseKn98w/d703eWq52uNuZi7GhQeVjTC5/svrBWEKob0WZ5kPdo+EZoFN0sp5a5ubbrk/E0xSl1/M5yORMtpg== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-net "1.10.0" + web3-utils "1.10.0" + web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -23661,6 +24820,24 @@ web3-eth-personal@1.9.0: web3-net "1.9.0" web3-utils "1.9.0" +web3-eth@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.10.0.tgz#38b905e2759697c9624ab080cfcf4e6c60b3a6cf" + integrity sha512-Z5vT6slNMLPKuwRyKGbqeGYC87OAy8bOblaqRTgg94CXcn/mmqU7iPIlG4506YdcdK3x6cfEDG7B6w+jRxypKA== + dependencies: + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-core-subscriptions "1.10.0" + web3-eth-abi "1.10.0" + web3-eth-accounts "1.10.0" + web3-eth-contract "1.10.0" + web3-eth-ens "1.10.0" + web3-eth-iban "1.10.0" + web3-eth-personal "1.10.0" + web3-net "1.10.0" + web3-utils "1.10.0" + web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -23766,6 +24943,15 @@ web3-net@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-net@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.10.0.tgz#be53e7f5dafd55e7c9013d49c505448b92c9c97b" + integrity sha512-NLH/N3IshYWASpxk4/18Ge6n60GEvWBVeM8inx2dmZJVmRI6SJIlUxbL8jySgiTn3MMZlhbdvrGo8fpUW7a1GA== + dependencies: + web3-core "1.10.0" + web3-core-method "1.10.0" + web3-utils "1.10.0" + web3-net@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.2.tgz#5c3226ca72df7c591422440ce6f1203fd42ddad9" @@ -23885,6 +25071,16 @@ web3-provider-engine@^8.4.0: xhr "^2.2.0" xtend "^4.0.1" +web3-providers-http@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.10.0.tgz#864fa48675e7918c9a4374e5f664b32c09d0151b" + integrity sha512-eNr965YB8a9mLiNrkjAWNAPXgmQWfpBfkkn7tpEFlghfww0u3I0tktMZiaToJVcL2+Xq+81cxbkpeWJ5XQDwOA== + dependencies: + abortcontroller-polyfill "^1.7.3" + cross-fetch "^3.1.4" + es6-promise "^4.2.8" + web3-core-helpers "1.10.0" + web3-providers-http@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.2.tgz#155e55c1d69f4c5cc0b411ede40dea3d06720956" @@ -23931,6 +25127,14 @@ web3-providers-http@1.9.0: es6-promise "^4.2.8" web3-core-helpers "1.9.0" +web3-providers-ipc@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.10.0.tgz#9747c7a6aee96a51488e32fa7c636c3460b39889" + integrity sha512-OfXG1aWN8L1OUqppshzq8YISkWrYHaATW9H8eh0p89TlWMc1KZOL9vttBuaBEi96D/n0eYDn2trzt22bqHWfXA== + dependencies: + oboe "2.1.5" + web3-core-helpers "1.10.0" + web3-providers-ipc@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" @@ -23973,6 +25177,15 @@ web3-providers-ipc@1.9.0: oboe "2.1.5" web3-core-helpers "1.9.0" +web3-providers-ws@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.10.0.tgz#cb0b87b94c4df965cdf486af3a8cd26daf3975e5" + integrity sha512-sK0fNcglW36yD5xjnjtSGBnEtf59cbw4vZzJ+CmOWIKGIR96mP5l684g0WD0Eo+f4NQc2anWWXG74lRc9OVMCQ== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.10.0" + websocket "^1.0.32" + web3-providers-ws@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" @@ -24036,6 +25249,16 @@ web3-providers@1.0.0-beta.55: websocket "^1.0.28" xhr2-cookies "1.1.0" +web3-shh@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.10.0.tgz#c2979b87e0f67a7fef2ce9ee853bd7bfbe9b79a8" + integrity sha512-uNUUuNsO2AjX41GJARV9zJibs11eq6HtOe6Wr0FtRUcj8SN6nHeYIzwstAvJ4fXA53gRqFMTxdntHEt9aXVjpg== + dependencies: + web3-core "1.10.0" + web3-core-method "1.10.0" + web3-core-subscriptions "1.10.0" + web3-net "1.10.0" + web3-shh@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.2.tgz#44ed998f2a6ba0ec5cb9d455184a0f647826a49c" @@ -24102,6 +25325,19 @@ web3-utils@1.0.0-beta.55: randombytes "^2.1.0" utf8 "2.1.1" +web3-utils@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.10.0.tgz#ca4c1b431a765c14ac7f773e92e0fd9377ccf578" + integrity sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg== + dependencies: + bn.js "^5.2.1" + ethereum-bloom-filters "^1.0.6" + ethereumjs-util "^7.1.0" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + utf8 "3.0.0" + web3-utils@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.1.tgz#21466e38291551de0ab34558de21512ac4274534" @@ -24195,6 +25431,19 @@ web3@*, web3@^1.2.4: web3-shh "1.9.0" web3-utils "1.9.0" +web3@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.10.0.tgz#2fde0009f59aa756c93e07ea2a7f3ab971091274" + integrity sha512-YfKY9wSkGcM8seO+daR89oVTcbu18NsVfvOngzqMYGUU0pPSQmE57qQDvQzUeoIOHAnXEBNzrhjQJmm8ER0rng== + dependencies: + web3-bzz "1.10.0" + web3-core "1.10.0" + web3-eth "1.10.0" + web3-eth-personal "1.10.0" + web3-net "1.10.0" + web3-shh "1.10.0" + web3-utils "1.10.0" + web3@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.2.tgz#b1b8b69aafdf94cbaeadbb68a8aa1df2ef266aec" @@ -24330,6 +25579,11 @@ whatwg-fetch@>=0.10.0, whatwg-fetch@^3.4.1: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -24605,6 +25859,13 @@ write-pkg@^4.0.0: type-fest "^0.4.1" write-json-file "^3.2.0" +write-stream@~0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/write-stream/-/write-stream-0.4.3.tgz#83cc8c0347d0af6057a93862b4e3ae01de5c81c1" + integrity sha512-IJrvkhbAnj89W/GAVdVgbnPiVw5Ntg/B4tc/MUCIEwj/g6JIww1DWJyB/yBMT3yw2/TkT6IUZ0+IYef3flEw8A== + dependencies: + readable-stream "~0.0.2" + write@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" @@ -24728,6 +25989,14 @@ xregexp@2.0.0: resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA== +xss@^1.0.8: + version "1.0.14" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694" + integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw== + dependencies: + commander "^2.20.3" + cssfilter "0.0.10" + xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" From ae8b2a08b2a2965b05aa3aed6bca369b38754919 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 19 May 2023 17:35:34 -0400 Subject: [PATCH 084/184] add web3*@1.8.2 to resolutions --- package.json | 8 +- yarn.lock | 1530 ++------------------------------------------------ 2 files changed, 56 insertions(+), 1482 deletions(-) diff --git a/package.json b/package.json index 6b1c52f5091..80634612fc9 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,12 @@ "resolutions": { "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", "@types/bn.js": "4.11.6", - "bignumber.js": "9.0.0" + "bignumber.js": "9.0.0", + "web3-eth-contract":"1.8.2", + "web3-eth-abi":"1.8.2", + "web3":"1.8.2", + "web3-utils":"1.8.2", + "web3-core":"1.8.2", + "web3-core-helpers":"1.8.2" } } diff --git a/yarn.lock b/yarn.lock index 0892a3fd123..4d31b375fc0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1334,21 +1334,6 @@ mcl-wasm "^0.7.1" rustbn.js "~0.2.0" -"@ethersproject/abi@5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" - integrity sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw== - dependencies: - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/hash" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/strings" "^5.0.4" - "@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.0-beta.146", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" @@ -1388,7 +1373,7 @@ "@ethersproject/logger" "^5.7.0" "@ethersproject/properties" "^5.7.0" -"@ethersproject/address@5.7.0", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.7.0": +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== @@ -1414,7 +1399,7 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/properties" "^5.7.0" -"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.7.0": +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== @@ -1423,14 +1408,14 @@ "@ethersproject/logger" "^5.7.0" bn.js "^5.2.1" -"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.7.0": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== dependencies: "@ethersproject/logger" "^5.7.0" -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== @@ -1453,7 +1438,7 @@ "@ethersproject/properties" "^5.7.0" "@ethersproject/transactions" "^5.7.0" -"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.7.0": +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== @@ -1505,7 +1490,7 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.7.0": +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== @@ -1513,7 +1498,7 @@ "@ethersproject/bytes" "^5.7.0" js-sha3 "0.8.0" -"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.7.0": +"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.7.0.tgz#6ce9ae168e74fecf287be17062b590852c311892" integrity sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig== @@ -1533,7 +1518,7 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/sha2" "^5.7.0" -"@ethersproject/properties@5.7.0", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.7.0": +"@ethersproject/properties@5.7.0", "@ethersproject/properties@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.7.0.tgz#a6e12cb0439b878aaf470f1902a176033067ed30" integrity sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw== @@ -1615,7 +1600,7 @@ "@ethersproject/sha2" "^5.7.0" "@ethersproject/strings" "^5.7.0" -"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.7.0": +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== @@ -1624,7 +1609,7 @@ "@ethersproject/constants" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -5216,7 +5201,7 @@ dependencies: "@babel/types" "^7.3.0" -"@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5", "@types/bn.js@^5.1.0", "@types/bn.js@^5.1.1": +"@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^5.1.0": version "4.11.6" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== @@ -5702,7 +5687,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== -"@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": +"@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== @@ -7209,7 +7194,7 @@ bigint-crypto-utils@^3.0.23: resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.2.2.tgz#e30a49ec38357c6981cd3da5aaa6480b1f752ee4" integrity sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw== -bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js#master", "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", bignumber.js@~9.0.2: +bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, bignumber.js@~9.0.2: version "9.0.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== @@ -7389,7 +7374,7 @@ bn.js@4.11.9: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== @@ -7657,7 +7642,7 @@ buffer-alloc@^1.2.0: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" -buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: +buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== @@ -7726,7 +7711,7 @@ buffer@6.0.3, buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: +buffer@^5.0.5, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -8787,7 +8772,7 @@ commander@3.0.2, commander@^3.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.12.1, commander@^2.20.3, commander@^2.8.1: +commander@^2.12.1, commander@^2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -9321,7 +9306,7 @@ crypto-browserify@3.12.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^3.1.4, crypto-js@^3.1.9-1: +crypto-js@^3.1.9-1: version "3.3.0" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b" integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q== @@ -9526,7 +9511,7 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== -decompress-response@^3.2.0, decompress-response@^3.3.0: +decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== @@ -9547,59 +9532,6 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" - integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== - dependencies: - file-type "^5.2.0" - is-stream "^1.1.0" - tar-stream "^1.5.2" - -decompress-tarbz2@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b" - integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== - dependencies: - decompress-tar "^4.1.0" - file-type "^6.1.0" - is-stream "^1.1.0" - seek-bzip "^1.0.5" - unbzip2-stream "^1.0.9" - -decompress-targz@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee" - integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== - dependencies: - decompress-tar "^4.1.1" - file-type "^5.2.0" - is-stream "^1.1.0" - -decompress-unzip@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" - integrity sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw== - dependencies: - file-type "^3.8.0" - get-stream "^2.2.0" - pify "^2.3.0" - yauzl "^2.4.2" - -decompress@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118" - integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== - dependencies: - decompress-tar "^4.0.0" - decompress-tarbz2 "^4.0.0" - decompress-targz "^4.0.0" - decompress-unzip "^4.0.1" - graceful-fs "^4.1.10" - make-dir "^1.0.0" - pify "^2.3.0" - strip-dirs "^2.0.0" - dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -10152,16 +10084,6 @@ electron-to-chromium@^1.4.284: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.369.tgz#a98d838cdd79be4471cd04e9b4dffe891d037874" integrity sha512-LfxbHXdA/S+qyoTEA4EbhxGjrxx7WK2h6yb5K2v0UCOufUKX+VZaHbl3svlzZfv9sGseym/g3Ne4DpsgRULmqg== -elliptic@6.3.3: - version "6.3.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" - integrity sha512-cIky9SO2H8W2eU1NOLySnhOYJnuEWCq9ZJeHvHd/lXzEL9vyraIMfilZSn57X3aVX+wkfYmqkch2LvmTzkjFpA== - dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" - hash.js "^1.0.0" - inherits "^2.0.1" - elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" @@ -10932,7 +10854,7 @@ ethereumjs-tx@^2.1.1, ethereumjs-tx@^2.1.2: ethereumjs-common "^1.5.0" ethereumjs-util "^6.0.0" -ethereumjs-util@7.1.5, ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: +ethereumjs-util@7.1.5, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: version "7.1.5" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== @@ -11036,22 +10958,6 @@ ethereumjs-wallet@^1.0.1: utf8 "^3.0.0" uuid "^8.3.2" -ethers@4.0.0-beta.3: - version "4.0.0-beta.3" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.3.tgz#15bef14e57e94ecbeb7f9b39dd0a4bd435bc9066" - integrity sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog== - dependencies: - "@types/node" "^10.3.2" - aes-js "3.0.0" - bn.js "^4.4.0" - elliptic "6.3.3" - hash.js "1.1.3" - js-sha3 "0.5.7" - scrypt-js "2.0.3" - setimmediate "1.0.4" - uuid "2.0.1" - xmlhttprequest "1.8.0" - ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: version "4.0.49" resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894" @@ -11103,7 +11009,7 @@ ethers@^5.0.13, ethers@^5.2.0, ethers@^5.7.1: "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" -ethjs-unit@0.1.6, ethjs-unit@^0.1.6: +ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" integrity sha512-/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw== @@ -11606,13 +11512,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== - dependencies: - pend "~1.2.0" - fecha@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" @@ -11677,21 +11576,6 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-type@^3.8.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" - integrity sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA== - -file-type@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" - integrity sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ== - -file-type@^6.1.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919" - integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== - file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -12527,14 +12411,6 @@ get-stdin@^7.0.0: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ== -get-stream@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" - integrity sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA== - dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" - get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -13166,23 +13042,6 @@ got@12.1.0: p-cancelable "^3.0.0" responselike "^2.0.0" -got@9.6.0, got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" - got@^11.8.5: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" @@ -13200,27 +13059,24 @@ got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" -got@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" - integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw== +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== dependencies: - decompress-response "^3.2.0" + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-plain-obj "^1.1.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - isurl "^1.0.0-alpha5" - lowercase-keys "^1.0.0" - p-cancelable "^0.3.0" - p-timeout "^1.1.1" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - url-parse-lax "^1.0.0" - url-to-options "^1.0.1" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -13368,23 +13224,11 @@ has-proto@^1.0.1: resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== -has-symbol-support-x@^1.4.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" - integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== - has-symbols@^1.0.0, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-to-string-tag-x@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" - integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== - dependencies: - has-symbol-support-x "^1.4.1" - has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -14376,11 +14220,6 @@ is-map@^2.0.2: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== -is-natural-number@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" - integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ== - is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" @@ -14437,7 +14276,7 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-object@^1.0.1, is-object@~1.0.1: +is-object@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== @@ -14504,7 +14343,7 @@ is-relative@^0.2.1: dependencies: is-unc-path "^0.1.1" -is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: +is-retry-allowed@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== @@ -14538,7 +14377,7 @@ is-stream-ended@^0.1.4: resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda" integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw== -is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: +is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== @@ -14792,14 +14631,6 @@ istanbul@^0.4.5: which "^1.1.1" wordwrap "^1.0.0" -isurl@^1.0.0-alpha5: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" - integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== - dependencies: - has-to-string-tag-x "^1.2.0" - is-object "^1.0.1" - iter-tools@^7.0.2: version "7.5.1" resolved "https://registry.yarnpkg.com/iter-tools/-/iter-tools-7.5.1.tgz#0b0253403bf9364335917d562ba7735d19b4c16a" @@ -18358,13 +18189,6 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -oboe@2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.4.tgz#20c88cdb0c15371bb04119257d4fdd34b0aa49f6" - integrity sha512-ymBJ4xSC6GBXLT9Y7lirj+xbqBLa+jADGJldGEYG7u8sZbS9GyG+u1Xk9c5cbriKwSpCg41qUhPjvU5xOpvIyQ== - dependencies: - http-https "^1.0.0" - oboe@2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.5.tgz#5554284c543a2266d7a38f17e073821fbde393cd" @@ -18562,11 +18386,6 @@ os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== -p-cancelable@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" - integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== - p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -18686,13 +18505,6 @@ p-reduce@^2.0.0, p-reduce@^2.1.0: resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a" integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw== -p-timeout@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" - integrity sha512-gb0ryzr+K2qFqFv6qi3khoeqMZF/+ajxQipEF6NteZVnvz9tzdsfAVj3lYtn1gAXvH5lfLwfxEII799gt/mRIA== - dependencies: - p-finally "^1.0.0" - p-timeout@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe" @@ -19087,11 +18899,6 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.0.9: safe-buffer "^5.0.1" sha.js "^2.4.8" -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -19541,11 +19348,6 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prepend-http@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg== - prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -20129,11 +19931,6 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -randomhex@0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/randomhex/-/randomhex-0.1.5.tgz#baceef982329091400f2a2912c6cd02f1094f585" - integrity sha512-2+Kkw7UiZGQWOz7rw8hPW44utkBYMEciQfziaZ71RcyDu+refQWzS/0DgfUSa5MwclrOD3sf3vI5vmrTYjwpjQ== - range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -20959,11 +20756,6 @@ sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scrypt-js@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" - integrity sha512-d8DzQxNivoNDogyYmb/9RD5mEQE/Q7vG2dLDUgvfPmKL9xCVzgqUntOdS0me9Cq9Sh9VxIZuoNEFcsfyXRnyUw== - scrypt-js@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.4.tgz#32f8c5149f0797672e551c07e230f834b6af5f16" @@ -21026,13 +20818,6 @@ seedrandom@3.0.5: resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg== -seek-bzip@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" - integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== - dependencies: - commander "^2.8.1" - semaphore-async-await@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz#857bef5e3644601ca4b9570b87e9df5ca12974fa" @@ -21992,13 +21777,6 @@ strip-comments@^2.0.1: resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== -strip-dirs@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" - integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== - dependencies: - is-natural-number "^4.0.1" - strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -22206,24 +21984,6 @@ swap-case@^1.1.0: lower-case "^1.1.1" upper-case "^1.1.1" -swarm-js@0.1.39: - version "0.1.39" - resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.39.tgz#79becb07f291d4b2a178c50fee7aa6e10342c0e8" - integrity sha512-QLMqL2rzF6n5s50BptyD6Oi0R1aWlJC5Y17SRIVXRj6OR1DRIPM7nepvrxxkjA1zNzFz6mUOMjfeqeDaWB7OOg== - dependencies: - bluebird "^3.5.0" - buffer "^5.0.5" - decompress "^4.0.0" - eth-lib "^0.1.26" - fs-extra "^4.0.2" - got "^7.1.0" - mime-types "^2.1.16" - mkdirp-promise "^5.0.1" - mock-fs "^4.1.0" - setimmediate "^1.0.5" - tar "^4.0.2" - xhr-request-promise "^0.1.2" - swarm-js@^0.1.40: version "0.1.42" resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.42.tgz#497995c62df6696f6e22372f457120e43e727979" @@ -22318,7 +22078,7 @@ tar-fs@^2.0.0: pump "^3.0.0" tar-stream "^2.1.4" -tar-stream@^1.1.2, tar-stream@^1.5.2: +tar-stream@^1.1.2: version "1.6.2" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== @@ -22581,7 +22341,7 @@ tildify@2.0.0: resolved "https://registry.yarnpkg.com/tildify/-/tildify-2.0.0.tgz#f205f3674d677ce698b7067a99e949ce03b4754a" integrity sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw== -timed-out@^4.0.0, timed-out@^4.0.1: +timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== @@ -23345,24 +23105,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -unbzip2-stream@^1.0.9: - version "1.4.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" - integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== - dependencies: - buffer "^5.2.1" - through "^2.3.8" - unc-path-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== -underscore@1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e" - integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw== - underscore@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" @@ -23569,13 +23316,6 @@ url-join@0.0.1: resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" integrity sha512-H6dnQ/yPAAVzMQRvEvyz01hhfQL5qRWSEt7BX8t9DqnPw9BjMb64fjIRq76Uvf1hkHp+mTZvEVJ5guXOT0Xqaw== -url-parse-lax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" - integrity sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA== - dependencies: - prepend-http "^1.0.1" - url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" @@ -23609,11 +23349,6 @@ url-template@^2.0.8: resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" integrity sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw== -url-to-options@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" - integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A== - url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" @@ -23661,21 +23396,11 @@ utf8-byte-length@^1.0.1: resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== -utf8@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" - integrity sha512-FzZp4f0vPa0AfWf+eav6hqZEqbn7TU1my/GUexpF9e0Afe/fnuLQvgdq5KgD3ggUpu3DpwRUGC0iS8q35eVBLQ== - utf8@3.0.0, utf8@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== -utf8@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" - integrity sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg== - util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -23701,7 +23426,7 @@ util@^0.10.3: dependencies: inherits "2.0.3" -util@^0.12.0, util@^0.12.4, util@^0.12.5: +util@^0.12.4, util@^0.12.5: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== @@ -23900,44 +23625,6 @@ weak-map@^1.0.5: resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== -web3-bzz@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.10.0.tgz#ac74bc71cdf294c7080a79091079192f05c5baed" - integrity sha512-o9IR59io3pDUsXTsps5pO5hW1D5zBmg46iNc2t4j2DkaYHNdDLwk2IP9ukoM2wg47QILfPEJYzhTfkS/CcX0KA== - dependencies: - "@types/node" "^12.12.6" - got "12.1.0" - swarm-js "^0.1.40" - -web3-bzz@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.2.tgz#a3b9f613c49fd3e120e0997088a73557d5adb724" - integrity sha512-b1O2ObsqUN1lJxmFSjvnEC4TsaCbmh7Owj3IAIWTKqL9qhVgx7Qsu5O9cD13pBiSPNZJ68uJPaKq380QB4NWeA== - dependencies: - "@types/node" "^10.12.18" - got "9.6.0" - swarm-js "0.1.39" - underscore "1.9.1" - -web3-bzz@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.6.tgz#95f370aecc3ff6ad07f057e6c0c916ef09b04dde" - integrity sha512-ibHdx1wkseujFejrtY7ZyC0QxQ4ATXjzcNUpaLrvM6AEae8prUiyT/OloG9FWDgFD2CPLwzKwfSQezYQlANNlw== - dependencies: - "@types/node" "^12.12.6" - got "9.6.0" - swarm-js "^0.1.40" - underscore "1.12.1" - -web3-bzz@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.8.1.tgz#81397be5ce262d03d82b92e9d8acc11f8a609ea1" - integrity sha512-dJJHS84nvpoxv6ijTMkdUSlRr5beCXNtx4UZcrFLHBva8dT63QEtKdLyDt2AyMJJdVzTCk78uir/6XtVWrdS6w== - dependencies: - "@types/node" "^12.12.6" - got "12.1.0" - swarm-js "^0.1.40" - web3-bzz@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.8.2.tgz#67ea1c775874056250eece551ded22905ed08784" @@ -23947,61 +23634,7 @@ web3-bzz@1.8.2: got "12.1.0" swarm-js "^0.1.40" -web3-bzz@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.9.0.tgz#3334049f386e73e2b3dcfa96432e65391538d8ac" - integrity sha512-9Zli9dikX8GdHwBb5/WPzpSVuy3EWMKY3P4EokCQra31fD7DLizqAAaTUsFwnK7xYkw5ogpHgelw9uKHHzNajg== - dependencies: - "@types/node" "^12.12.6" - got "12.1.0" - swarm-js "^0.1.40" - -web3-core-helpers@1.0.0-beta.55: - version "1.0.0-beta.55" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.55.tgz#832b8499889f9f514b1d174f00172fd3683d63de" - integrity sha512-suj9Xy/lIqajaYLJTEjr2rlFgu6hGYwChHmf8+qNrC2luZA6kirTamtB9VThWMxbywx7p0bqQFjW6zXogAgWhg== - dependencies: - "@babel/runtime" "^7.3.1" - lodash "^4.17.11" - web3-core "1.0.0-beta.55" - web3-eth-iban "1.0.0-beta.55" - web3-utils "1.0.0-beta.55" - -web3-core-helpers@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.10.0.tgz#1016534c51a5df77ed4f94d1fcce31de4af37fad" - integrity sha512-pIxAzFDS5vnbXvfvLSpaA1tfRykAe9adw43YCKsEYQwH0gCLL0kMLkaCX3q+Q8EVmAh+e1jWL/nl9U0de1+++g== - dependencies: - web3-eth-iban "1.10.0" - web3-utils "1.10.0" - -web3-core-helpers@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz#484974f4bd4a487217b85b0d7cfe841af0907619" - integrity sha512-HJrRsIGgZa1jGUIhvGz4S5Yh6wtOIo/TMIsSLe+Xay+KVnbseJpPprDI5W3s7H2ODhMQTbogmmUFquZweW2ImQ== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.2.2" - web3-utils "1.2.2" - -web3-core-helpers@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.6.tgz#c478246a9abe4e5456acf42657dac2f7c330be74" - integrity sha512-nhtjA2ZbkppjlxTSwG0Ttu6FcPkVu1rCN5IFAOVpF/L0SEt+jy+O5l90+cjDq0jAYvlBwUwnbh2mR9hwDEJCNA== - dependencies: - underscore "1.12.1" - web3-eth-iban "1.3.6" - web3-utils "1.3.6" - -web3-core-helpers@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.8.1.tgz#7904747b23fd0afa4f2c86ed98ea9418ccad7672" - integrity sha512-ClzNO6T1S1gifC+BThw0+GTfcsjLEY8T1qUp6Ly2+w4PntAdNtKahxWKApWJ0l9idqot/fFIDXwO3Euu7I0Xqw== - dependencies: - web3-eth-iban "1.8.1" - web3-utils "1.8.1" - -web3-core-helpers@1.8.2: +web3-core-helpers@1.0.0-beta.55, web3-core-helpers@1.2.2, web3-core-helpers@1.8.1, web3-core-helpers@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.8.2.tgz#82066560f8085e6c7b93bcc8e88b441289ea9f9f" integrity sha512-6B1eLlq9JFrfealZBomd1fmlq1o4A09vrCVQSa51ANoib/jllT3atZrRDr0zt1rfI7TSZTZBXdN/aTdeN99DWw== @@ -24009,14 +23642,6 @@ web3-core-helpers@1.8.2: web3-eth-iban "1.8.2" web3-utils "1.8.2" -web3-core-helpers@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.9.0.tgz#a1ca4ac7b9cec822886643312d2e98b0e4d8f1bc" - integrity sha512-NeJzylAp9Yj9xAt2uTT+kyug3X0DLnfBdnAcGZuY6HhoNPDIfQRA9CkJjLngVRlGTLZGjNp9x9eR+RyZQgUlXg== - dependencies: - web3-eth-iban "1.9.0" - web3-utils "1.9.0" - web3-core-method@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.55.tgz#0af994295ac2dd64ccd53305b7df8da76e11da49" @@ -24031,17 +23656,6 @@ web3-core-method@1.0.0-beta.55: web3-core-subscriptions "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-core-method@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.10.0.tgz#82668197fa086e8cc8066742e35a9d72535e3412" - integrity sha512-4R700jTLAMKDMhQ+nsVfIXvH6IGJlJzGisIfMKWAIswH31h5AZz7uDUW2YctI+HrYd+5uOAlS4OJeeT9bIpvkA== - dependencies: - "@ethersproject/transactions" "^5.6.2" - web3-core-helpers "1.10.0" - web3-core-promievent "1.10.0" - web3-core-subscriptions "1.10.0" - web3-utils "1.10.0" - web3-core-method@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.2.tgz#d4fe2bb1945b7152e5f08e4ea568b171132a1e56" @@ -24053,29 +23667,6 @@ web3-core-method@1.2.2: web3-core-subscriptions "1.2.2" web3-utils "1.2.2" -web3-core-method@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.6.tgz#4b0334edd94b03dfec729d113c69a4eb6ebc68ae" - integrity sha512-RyegqVGxn0cyYW5yzAwkPlsSEynkdPiegd7RxgB4ak1eKk2Cv1q2x4C7D2sZjeeCEF+q6fOkVmo2OZNqS2iQxg== - dependencies: - "@ethersproject/transactions" "^5.0.0-beta.135" - underscore "1.12.1" - web3-core-helpers "1.3.6" - web3-core-promievent "1.3.6" - web3-core-subscriptions "1.3.6" - web3-utils "1.3.6" - -web3-core-method@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.8.1.tgz#0fc5a433a9fc784c447522f141c0a8e0163c7790" - integrity sha512-oYGRodktfs86NrnFwaWTbv2S38JnpPslFwSSARwFv4W9cjbGUW3LDeA5MKD/dRY+ssZ5OaekeMsUCLoGhX68yA== - dependencies: - "@ethersproject/transactions" "^5.6.2" - web3-core-helpers "1.8.1" - web3-core-promievent "1.8.1" - web3-core-subscriptions "1.8.1" - web3-utils "1.8.1" - web3-core-method@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.8.2.tgz#ba5ec68084e903f0516415010477618be017eac2" @@ -24087,24 +23678,6 @@ web3-core-method@1.8.2: web3-core-subscriptions "1.8.2" web3-utils "1.8.2" -web3-core-method@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.9.0.tgz#81da8aa21503b470537c9f075f30adfad194a2d8" - integrity sha512-sswbNsY2xRBBhGeaLt9c/eDc+0yDDhi6keUBAkgIRa9ueSx/VKzUY9HMqiV6bXDcGT2fJyejq74FfEB4lc/+/w== - dependencies: - "@ethersproject/transactions" "^5.6.2" - web3-core-helpers "1.9.0" - web3-core-promievent "1.9.0" - web3-core-subscriptions "1.9.0" - web3-utils "1.9.0" - -web3-core-promievent@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.10.0.tgz#cbb5b3a76b888df45ed3a8d4d8d4f54ccb66a37b" - integrity sha512-68N7k5LWL5R38xRaKFrTFT2pm2jBNFaM4GioS00YjAKXRQ3KjmhijOMG3TICz6Aa5+6GDWYelDNx21YAeZ4YTg== - dependencies: - eventemitter3 "4.0.4" - web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -24113,13 +23686,6 @@ web3-core-promievent@1.2.2: any-promise "1.3.0" eventemitter3 "3.1.2" -web3-core-promievent@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.6.tgz#6c27dc79de8f71b74f5d17acaf9aaf593d3cb0c9" - integrity sha512-Z+QzfyYDTXD5wJmZO5wwnRO8bAAHEItT1XNSPVb4J1CToV/I/SbF7CuF8Uzh2jns0Cm1109o666H7StFFvzVKw== - dependencies: - eventemitter3 "4.0.4" - web3-core-promievent@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.8.1.tgz#f334c8b2ceac6c2228f06d2a515f6d103157f036" @@ -24134,58 +23700,6 @@ web3-core-promievent@1.8.2: dependencies: eventemitter3 "4.0.4" -web3-core-promievent@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.9.0.tgz#2598a4d91b4edd3607366529f52bc96dee9f6d83" - integrity sha512-PHG1Mn23IGwMZhnPDN8dETKypqsFbHfiyRqP+XsVMPmTHkVfzDQTCBU/c2r6hUktBDoGKut5xZQpGfhFk71KbQ== - dependencies: - eventemitter3 "4.0.4" - -web3-core-requestmanager@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.10.0.tgz#4b34f6e05837e67c70ff6f6993652afc0d54c340" - integrity sha512-3z/JKE++Os62APml4dvBM+GAuId4h3L9ckUrj7ebEtS2AR0ixyQPbrBodgL91Sv7j7cQ3Y+hllaluqjguxvSaQ== - dependencies: - util "^0.12.5" - web3-core-helpers "1.10.0" - web3-providers-http "1.10.0" - web3-providers-ipc "1.10.0" - web3-providers-ws "1.10.0" - -web3-core-requestmanager@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" - integrity sha512-a+gSbiBRHtHvkp78U2bsntMGYGF2eCb6219aMufuZWeAZGXJ63Wc2321PCbA8hF9cQrZI4EoZ4kVLRI4OF15Hw== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.2" - web3-providers-http "1.2.2" - web3-providers-ipc "1.2.2" - web3-providers-ws "1.2.2" - -web3-core-requestmanager@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.6.tgz#4fea269fe913fd4fca464b4f7c65cb94857b5b2a" - integrity sha512-2rIaeuqeo7QN1Eex7aXP0ZqeteJEPWXYFS/M3r3LXMiV8R4STQBKE+//dnHJXoo2ctzEB5cgd+7NaJM8S3gPyA== - dependencies: - underscore "1.12.1" - util "^0.12.0" - web3-core-helpers "1.3.6" - web3-providers-http "1.3.6" - web3-providers-ipc "1.3.6" - web3-providers-ws "1.3.6" - -web3-core-requestmanager@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.8.1.tgz#272ffa55b7b568ecbc8e4a257ca080355c31c60e" - integrity sha512-x+VC2YPPwZ1khvqA6TA69LvfFCOZXsoUVOxmTx/vIN22PrY9KzKhxcE7pBSiGhmab1jtmRYXUbcQSVpAXqL8cw== - dependencies: - util "^0.12.0" - web3-core-helpers "1.8.1" - web3-providers-http "1.8.1" - web3-providers-ipc "1.8.1" - web3-providers-ws "1.8.1" - web3-core-requestmanager@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.8.2.tgz#dda95e83ca4808949612a41e54ecea557f78ef26" @@ -24197,17 +23711,6 @@ web3-core-requestmanager@1.8.2: web3-providers-ipc "1.8.2" web3-providers-ws "1.8.2" -web3-core-requestmanager@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.9.0.tgz#9d7d0e7f890cf7a24e9c568b9772c64d57fc4fcd" - integrity sha512-hcJ5PCtTIJpj+8qWxoseqlCovDo94JJjTX7dZOLXgwp8ah7E3WRYozhGyZocerx+KebKyg1mCQIhkDpMwjfo9Q== - dependencies: - util "^0.12.5" - web3-core-helpers "1.9.0" - web3-providers-http "1.9.0" - web3-providers-ipc "1.9.0" - web3-providers-ws "1.9.0" - web3-core-subscriptions@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.55.tgz#105902c13db53466fc17d07a981ad3d41c700f76" @@ -24217,14 +23720,6 @@ web3-core-subscriptions@1.0.0-beta.55: eventemitter3 "^3.1.0" lodash "^4.17.11" -web3-core-subscriptions@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.10.0.tgz#b534592ee1611788fc0cb0b95963b9b9b6eacb7c" - integrity sha512-HGm1PbDqsxejI075gxBc5OSkwymilRWZufIy9zEpnWKNmfbuv5FfHgW1/chtJP6aP3Uq2vHkvTDl3smQBb8l+g== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.10.0" - web3-core-subscriptions@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz#bf4ba23a653a003bdc3551649958cc0b080b068e" @@ -24234,23 +23729,6 @@ web3-core-subscriptions@1.2.2: underscore "1.9.1" web3-core-helpers "1.2.2" -web3-core-subscriptions@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.6.tgz#ee24e7974d1d72ff6c992c599deba4ef9b308415" - integrity sha512-wi9Z9X5X75OKvxAg42GGIf81ttbNR2TxzkAsp1g+nnp5K8mBwgZvXrIsDuj7Z7gx72Y45mWJADCWjk/2vqNu8g== - dependencies: - eventemitter3 "4.0.4" - underscore "1.12.1" - web3-core-helpers "1.3.6" - -web3-core-subscriptions@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.8.1.tgz#f5ae1380e92746eadfab6475b8a70ef5a1be6bbf" - integrity sha512-bmCMq5OeA3E2vZUh8Js1HcJbhwtsE+yeMqGC4oIZB3XsL5SLqyKLB/pU+qUYqQ9o4GdcrFTDPhPg1bgvf7p1Pw== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.8.1" - web3-core-subscriptions@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.8.2.tgz#0c8bd49439d83c6f0a03c70f00b24a915a70a5ed" @@ -24259,79 +23737,7 @@ web3-core-subscriptions@1.8.2: eventemitter3 "4.0.4" web3-core-helpers "1.8.2" -web3-core-subscriptions@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.9.0.tgz#dc67b478875dab1875844df3307a986dd7d468dd" - integrity sha512-MaIo29yz7hTV8X8bioclPDbHFOVuHmnbMv+D3PDH12ceJFJAXGyW8GL5KU1DYyWIj4TD1HM4WknyVA/YWBiiLA== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.9.0" - -web3-core@1.0.0-beta.55: - version "1.0.0-beta.55" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.55.tgz#26b9abbf1bc1837c9cc90f06ecbc4ed714f89b53" - integrity sha512-AMMp7TLEtE7u8IJAu/THrRhBTZyZzeo7Y6GiWYNwb5+KStC9hIGLr9cI1KX9R6ZioTOLRHrqT7awDhnJ1ku2mg== - dependencies: - "@babel/runtime" "^7.3.1" - "@types/bn.js" "^4.11.4" - "@types/node" "^10.12.18" - lodash "^4.17.11" - web3-core-method "1.0.0-beta.55" - web3-providers "1.0.0-beta.55" - web3-utils "1.0.0-beta.55" - -web3-core@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.10.0.tgz#9aa07c5deb478cf356c5d3b5b35afafa5fa8e633" - integrity sha512-fWySwqy2hn3TL89w5TM8wXF1Z2Q6frQTKHWmP0ppRQorEK8NcHJRfeMiv/mQlSKoTS1F6n/nv2uyZsixFycjYQ== - dependencies: - "@types/bn.js" "^5.1.1" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.10.0" - web3-core-method "1.10.0" - web3-core-requestmanager "1.10.0" - web3-utils "1.10.0" - -web3-core@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.2.tgz#334b99c8222ef9cfd0339e27352f0b58ea789a2f" - integrity sha512-miHAX3qUgxV+KYfaOY93Hlc3kLW2j5fH8FJy6kSxAv+d4d5aH0wwrU2IIoJylQdT+FeenQ38sgsCnFu9iZ1hCQ== - dependencies: - "@types/bn.js" "^4.11.4" - "@types/node" "^12.6.1" - web3-core-helpers "1.2.2" - web3-core-method "1.2.2" - web3-core-requestmanager "1.2.2" - web3-utils "1.2.2" - -web3-core@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.6.tgz#a6a761d1ff2f3ee462b8dab679229d2f8e267504" - integrity sha512-gkLDM4T1Sc0T+HZIwxrNrwPg0IfWI0oABSglP2X5ZbBAYVUeEATA0o92LWV8BeF+okvKXLK1Fek/p6axwM/h3Q== - dependencies: - "@types/bn.js" "^4.11.5" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.3.6" - web3-core-method "1.3.6" - web3-core-requestmanager "1.3.6" - web3-utils "1.3.6" - -web3-core@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.1.tgz#050b1c408d1f9b7ae539e90f7f7d1b7a7d10578b" - integrity sha512-LbRZlJH2N6nS3n3Eo9Y++25IvzMY7WvYnp4NM/Ajhh97dAdglYs6rToQ2DbL2RLvTYmTew4O/y9WmOk4nq9COw== - dependencies: - "@types/bn.js" "^5.1.0" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.8.1" - web3-core-method "1.8.1" - web3-core-requestmanager "1.8.1" - web3-utils "1.8.1" - -web3-core@1.8.2: +web3-core@1.0.0-beta.55, web3-core@1.2.2, web3-core@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.2.tgz#333e93d7872b1a36efe758ed8b89a7acbdd962c2" integrity sha512-DJTVEAYcNqxkqruJE+Rxp3CIv0y5AZMwPHQmOkz/cz+MM75SIzMTc0AUdXzGyTS8xMF8h3YWMQGgGEy8SBf1PQ== @@ -24344,54 +23750,7 @@ web3-core@1.8.2: web3-core-requestmanager "1.8.2" web3-utils "1.8.2" -web3-core@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.9.0.tgz#9cfafb2f8c01931429108af75205610406a5a1ab" - integrity sha512-DZ+TPmq/ZLlx4LSVzFgrHCP/QFpKDbGWO4HoquZSdu24cjk5SZ+FEU1SZB2OaK3/bgBh+25mRbmv8y56ysUu1w== - dependencies: - "@types/bn.js" "^5.1.1" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-core-requestmanager "1.9.0" - web3-utils "1.9.0" - -web3-eth-abi@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.10.0.tgz#53a7a2c95a571e205e27fd9e664df4919483cce1" - integrity sha512-cwS+qRBWpJ43aI9L3JS88QYPfFcSJJ3XapxOQ4j40v6mk7ATpA8CVK1vGTzpihNlOfMVRBkR95oAj7oL6aiDOg== - dependencies: - "@ethersproject/abi" "^5.6.3" - web3-utils "1.10.0" - -web3-eth-abi@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" - integrity sha512-Yn/ZMgoOLxhTVxIYtPJ0eS6pnAnkTAaJgUJh1JhZS4ekzgswMfEYXOwpMaD5eiqPJLpuxmZFnXnBZlnQ1JMXsw== - dependencies: - ethers "4.0.0-beta.3" - underscore "1.9.1" - web3-utils "1.2.2" - -web3-eth-abi@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.6.tgz#4272ca48d817aa651bbf97b269f5ff10abc2b8a9" - integrity sha512-Or5cRnZu6WzgScpmbkvC6bfNxR26hqiKK4i8sMPFeTUABQcb/FU3pBj7huBLYbp9dH+P5W79D2MqwbWwjj9DoQ== - dependencies: - "@ethersproject/abi" "5.0.7" - underscore "1.12.1" - web3-utils "1.3.6" - -web3-eth-abi@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.8.1.tgz#47455d6513217c4b0866fea6f97b1c4afa0b6535" - integrity sha512-0mZvCRTIG0UhDhJwNQJgJxu4b4DyIpuMA0GTfqxqeuqzX4Q/ZvmoNurw0ExTfXaGPP82UUmmdkRi6FdZOx+C6w== - dependencies: - "@ethersproject/abi" "^5.6.3" - web3-utils "1.8.1" - -web3-eth-abi@1.8.2: +web3-eth-abi@1.10.0, web3-eth-abi@1.2.2, web3-eth-abi@1.3.6, web3-eth-abi@1.8.1, web3-eth-abi@1.8.2, web3-eth-abi@^1.0.0-beta.24: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.8.2.tgz#16e1e9be40e2527404f041a4745111211488f31a" integrity sha512-Om9g3kaRNjqiNPAgKwGT16y+ZwtBzRe4ZJFGjLiSs6v5I7TPNF+rRMWuKnR6jq0azQZDj6rblvKFMA49/k48Og== @@ -24399,30 +23758,6 @@ web3-eth-abi@1.8.2: "@ethersproject/abi" "^5.6.3" web3-utils "1.8.2" -web3-eth-abi@1.9.0, web3-eth-abi@^1.0.0-beta.24: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.9.0.tgz#18662ef68bd3d25eedd9a1a1484089c39529c652" - integrity sha512-0BLQ3FKMrzJkA930jOX3fMaybAyubk06HChclLpiR0NWmgWXm1tmBrJdkyRy2ZTZpmfuZc9xTFRfl0yZID1voA== - dependencies: - "@ethersproject/abi" "^5.6.3" - web3-utils "1.9.0" - -web3-eth-accounts@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.10.0.tgz#2942beca0a4291455f32cf09de10457a19a48117" - integrity sha512-wiq39Uc3mOI8rw24wE2n15hboLE0E9BsQLdlmsL4Zua9diDS6B5abXG0XhFcoNsXIGMWXVZz4TOq3u4EdpXF/Q== - dependencies: - "@ethereumjs/common" "2.5.0" - "@ethereumjs/tx" "3.3.2" - eth-lib "0.2.8" - ethereumjs-util "^7.1.5" - scrypt-js "^3.0.1" - uuid "^9.0.0" - web3-core "1.10.0" - web3-core-helpers "1.10.0" - web3-core-method "1.10.0" - web3-utils "1.10.0" - web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -24441,40 +23776,6 @@ web3-eth-accounts@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" -web3-eth-accounts@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.6.tgz#f9fcb50b28ee58090ab292a10d996155caa2b474" - integrity sha512-Ilr0hG6ONbCdSlVKffasCmNwftD5HsNpwyQASevocIQwHdTlvlwO0tb3oGYuajbKOaDzNTwXfz25bttAEoFCGA== - dependencies: - crypto-browserify "3.12.0" - eth-lib "0.2.8" - ethereumjs-common "^1.3.2" - ethereumjs-tx "^2.1.1" - scrypt-js "^3.0.1" - underscore "1.12.1" - uuid "3.3.2" - web3-core "1.3.6" - web3-core-helpers "1.3.6" - web3-core-method "1.3.6" - web3-utils "1.3.6" - -web3-eth-accounts@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.8.1.tgz#1ce7387721f118aeb0376291e4d8bbe2ac323406" - integrity sha512-mgzxSYgN54/NsOFBO1Fq1KkXp1S5KlBvI/DlgvajU72rupoFMq6Cu6Yp9GUaZ/w2ij9PzEJuFJk174XwtfMCmg== - dependencies: - "@ethereumjs/common" "2.5.0" - "@ethereumjs/tx" "3.3.2" - crypto-browserify "3.12.0" - eth-lib "0.2.8" - ethereumjs-util "^7.0.10" - scrypt-js "^3.0.1" - uuid "^9.0.0" - web3-core "1.8.1" - web3-core-helpers "1.8.1" - web3-core-method "1.8.1" - web3-utils "1.8.1" - web3-eth-accounts@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.8.2.tgz#b894f5d5158fcae429da42de75d96520d0712971" @@ -24491,22 +23792,6 @@ web3-eth-accounts@1.8.2: web3-core-method "1.8.2" web3-utils "1.8.2" -web3-eth-accounts@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.9.0.tgz#fab7d563c63bdff2aa5ad89a94faf128961d9504" - integrity sha512-VeIZVevmnSll0AC1k5F/y398ZE89d1SRuYk8IewLUhL/tVAsFEsjl2SGgm0+aDcHmgPrkW+qsCJ+C7rWg/N4ZA== - dependencies: - "@ethereumjs/common" "2.5.0" - "@ethereumjs/tx" "3.3.2" - eth-lib "0.2.8" - ethereumjs-util "^7.1.5" - scrypt-js "^3.0.1" - uuid "^9.0.0" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-utils "1.9.0" - web3-eth-admin@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-eth-admin/-/web3-eth-admin-1.0.0-beta.55.tgz#dcbcc5be4e3a008ce367c2ac83432b9a711f39e9" @@ -24520,65 +23805,7 @@ web3-eth-admin@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-eth-contract@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.10.0.tgz#8e68c7654576773ec3c91903f08e49d0242c503a" - integrity sha512-MIC5FOzP/+2evDksQQ/dpcXhSqa/2hFNytdl/x61IeWxhh6vlFeSjq0YVTAyIzdjwnL7nEmZpjfI6y6/Ufhy7w== - dependencies: - "@types/bn.js" "^5.1.1" - web3-core "1.10.0" - web3-core-helpers "1.10.0" - web3-core-method "1.10.0" - web3-core-promievent "1.10.0" - web3-core-subscriptions "1.10.0" - web3-eth-abi "1.10.0" - web3-utils "1.10.0" - -web3-eth-contract@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz#84e92714918a29e1028ee7718f0712536e14e9a1" - integrity sha512-EKT2yVFws3FEdotDQoNsXTYL798+ogJqR2//CaGwx3p0/RvQIgfzEwp8nbgA6dMxCsn9KOQi7OtklzpnJMkjtA== - dependencies: - "@types/bn.js" "^4.11.4" - underscore "1.9.1" - web3-core "1.2.2" - web3-core-helpers "1.2.2" - web3-core-method "1.2.2" - web3-core-promievent "1.2.2" - web3-core-subscriptions "1.2.2" - web3-eth-abi "1.2.2" - web3-utils "1.2.2" - -web3-eth-contract@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.6.tgz#cccf4d32dc56917fb6923e778498a9ba2a5ba866" - integrity sha512-8gDaRrLF2HCg+YEZN1ov0zN35vmtPnGf3h1DxmJQK5Wm2lRMLomz9rsWsuvig3UJMHqZAQKD7tOl3ocJocQsmA== - dependencies: - "@types/bn.js" "^4.11.5" - underscore "1.12.1" - web3-core "1.3.6" - web3-core-helpers "1.3.6" - web3-core-method "1.3.6" - web3-core-promievent "1.3.6" - web3-core-subscriptions "1.3.6" - web3-eth-abi "1.3.6" - web3-utils "1.3.6" - -web3-eth-contract@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.8.1.tgz#bdf3e33bbcb79a1b6144dffd6a0deefd2e459272" - integrity sha512-1wphnl+/xwCE2io44JKnN+ti3oa47BKRiVzvWd42icwRbcpFfRxH9QH+aQX3u8VZIISNH7dAkTWpGIIJgGFTmg== - dependencies: - "@types/bn.js" "^5.1.0" - web3-core "1.8.1" - web3-core-helpers "1.8.1" - web3-core-method "1.8.1" - web3-core-promievent "1.8.1" - web3-core-subscriptions "1.8.1" - web3-eth-abi "1.8.1" - web3-utils "1.8.1" - -web3-eth-contract@1.8.2: +web3-eth-contract@1.2.2, web3-eth-contract@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.8.2.tgz#5388b7130923d2b790c09a420391a81312a867fb" integrity sha512-ID5A25tHTSBNwOPjiXSVzxruz006ULRIDbzWTYIFTp7NJ7vXu/kynKK2ag/ObuTqBpMbobP8nXcA9b5EDkIdQA== @@ -24592,34 +23819,6 @@ web3-eth-contract@1.8.2: web3-eth-abi "1.8.2" web3-utils "1.8.2" -web3-eth-contract@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.9.0.tgz#00b7ac8314d562d10d7dd0c7d0f52555c3862995" - integrity sha512-+j26hpSaEtAdUed0TN5rnc+YZOcjPxMjFX4ZBKatvFkImdbVv/tzTvcHlltubSpgb2ZLyZ89lSL6phKYwd2zNQ== - dependencies: - "@types/bn.js" "^5.1.1" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-core-promievent "1.9.0" - web3-core-subscriptions "1.9.0" - web3-eth-abi "1.9.0" - web3-utils "1.9.0" - -web3-eth-ens@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.10.0.tgz#96a676524e0b580c87913f557a13ed810cf91cd9" - integrity sha512-3hpGgzX3qjgxNAmqdrC2YUQMTfnZbs4GeLEmy8aCWziVwogbuqQZ+Gzdfrym45eOZodk+lmXyLuAdqkNlvkc1g== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - web3-core "1.10.0" - web3-core-helpers "1.10.0" - web3-core-promievent "1.10.0" - web3-eth-abi "1.10.0" - web3-eth-contract "1.10.0" - web3-utils "1.10.0" - web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -24634,35 +23833,6 @@ web3-eth-ens@1.2.2: web3-eth-contract "1.2.2" web3-utils "1.2.2" -web3-eth-ens@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.6.tgz#0d28c5d4ea7b4462ef6c077545a77956a6cdf175" - integrity sha512-n27HNj7lpSkRxTgSx+Zo7cmKAgyg2ElFilaFlUu/X2CNH23lXfcPm2bWssivH9z0ndhg0OyR4AYFZqPaqDHkJA== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - underscore "1.12.1" - web3-core "1.3.6" - web3-core-helpers "1.3.6" - web3-core-promievent "1.3.6" - web3-eth-abi "1.3.6" - web3-eth-contract "1.3.6" - web3-utils "1.3.6" - -web3-eth-ens@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.8.1.tgz#e78a9651fea8282abe8565b001819e2d645e5929" - integrity sha512-FT8xTI9uN8RxeBQa/W8pLa2aoFh4+EE34w7W2271LICKzla1dtLyb6XSdn48vsUcPmhWsTVk9mO9RTU0l4LGQQ== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - web3-core "1.8.1" - web3-core-helpers "1.8.1" - web3-core-promievent "1.8.1" - web3-eth-abi "1.8.1" - web3-eth-contract "1.8.1" - web3-utils "1.8.1" - web3-eth-ens@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.8.2.tgz#0a086ad4d919102e28b9fd3036df246add9df22a" @@ -24677,37 +23847,6 @@ web3-eth-ens@1.8.2: web3-eth-contract "1.8.2" web3-utils "1.8.2" -web3-eth-ens@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.9.0.tgz#2014b16e1116be5ab34404a8db29ad1d8632ced0" - integrity sha512-LOJZeN+AGe9arhuExnrPPFYQr4WSxXEkpvYIlst/joOEUNLDwfndHnJIK6PI5mXaYSROBtTx6erv+HupzGo7vA== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-promievent "1.9.0" - web3-eth-abi "1.9.0" - web3-eth-contract "1.9.0" - web3-utils "1.9.0" - -web3-eth-iban@1.0.0-beta.55: - version "1.0.0-beta.55" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.55.tgz#15146a69de21addc99e7dbfb2920555b1e729637" - integrity sha512-a2Fxsb5Mssa+jiXgjUdIzJipE0175IcQXJbZLpKft2+zeSJWNTbaa3PQD2vPPpIM4W789q06N+f9Zc0Fyls+1g== - dependencies: - "@babel/runtime" "^7.3.1" - bn.js "4.11.8" - web3-utils "1.0.0-beta.55" - -web3-eth-iban@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.10.0.tgz#5a46646401965b0f09a4f58e7248c8a8cd22538a" - integrity sha512-0l+SP3IGhInw7Q20LY3IVafYEuufo4Dn75jAHT7c2aDJsIolvf2Lc6ugHkBajlwUneGfbRQs/ccYPQ9JeMUbrg== - dependencies: - bn.js "^5.2.1" - web3-utils "1.10.0" - web3-eth-iban@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz#76bec73bad214df7c4192388979a59fc98b96c5a" @@ -24716,22 +23855,6 @@ web3-eth-iban@1.2.2: bn.js "4.11.8" web3-utils "1.2.2" -web3-eth-iban@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.6.tgz#0d6ba21fe78f190af8919e9cd5453882457209e0" - integrity sha512-nfMQaaLA/zsg5W4Oy/EJQbs8rSs1vBAX6b/35xzjYoutXlpHMQadujDx2RerTKhSHqFXSJeQAfE+2f6mdhYkRQ== - dependencies: - bn.js "^4.11.9" - web3-utils "1.3.6" - -web3-eth-iban@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.8.1.tgz#c6484e5d68ca644aa78431301e7acd5df24598d1" - integrity sha512-DomoQBfvIdtM08RyMGkMVBOH0vpOIxSSQ+jukWk/EkMLGMWJtXw/K2c2uHAeq3L/VPWNB7zXV2DUEGV/lNE2Dg== - dependencies: - bn.js "^5.2.1" - web3-utils "1.8.1" - web3-eth-iban@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.8.2.tgz#5cb3022234b13986f086353b53f0379a881feeaf" @@ -24740,26 +23863,6 @@ web3-eth-iban@1.8.2: bn.js "^5.2.1" web3-utils "1.8.2" -web3-eth-iban@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.9.0.tgz#a8f838e42c20d49ff58aaa9f67ece47a968e40b1" - integrity sha512-jPAm77PuEs1kE/UrrBFJdPD2PN42pwfXA0gFuuw35bZezhskYML9W4QCxcqnUtceyEA4FUn7K2qTMuCk+23fog== - dependencies: - bn.js "^5.2.1" - web3-utils "1.9.0" - -web3-eth-personal@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.10.0.tgz#94d525f7a29050a0c2a12032df150ac5ea633071" - integrity sha512-anseKn98w/d703eWq52uNuZi7GhQeVjTC5/svrBWEKob0WZ5kPdo+EZoFN0sp5a5ubbrk/E0xSl1/M5yORMtpg== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.10.0" - web3-core-helpers "1.10.0" - web3-core-method "1.10.0" - web3-net "1.10.0" - web3-utils "1.10.0" - web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -24772,30 +23875,6 @@ web3-eth-personal@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" -web3-eth-personal@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.6.tgz#226137916754c498f0284f22c55924c87a2efcf0" - integrity sha512-pOHU0+/h1RFRYoh1ehYBehRbcKWP4OSzd4F7mDljhHngv6W8ewMHrAN8O1ol9uysN2MuCdRE19qkRg5eNgvzFQ== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.3.6" - web3-core-helpers "1.3.6" - web3-core-method "1.3.6" - web3-net "1.3.6" - web3-utils "1.3.6" - -web3-eth-personal@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.8.1.tgz#00b5ff1898b62044d25ed5fddd8486168d4827cf" - integrity sha512-myIYMvj7SDIoV9vE5BkVdon3pya1WinaXItugoii2VoTcQNPOtBxmYVH+XS5ErzCJlnxzphpQrkywyY64bbbCA== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.8.1" - web3-core-helpers "1.8.1" - web3-core-method "1.8.1" - web3-net "1.8.1" - web3-utils "1.8.1" - web3-eth-personal@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.8.2.tgz#3526c1ebaa4e7bf3a0a8ec77e34f067cc9a750b2" @@ -24808,36 +23887,6 @@ web3-eth-personal@1.8.2: web3-net "1.8.2" web3-utils "1.8.2" -web3-eth-personal@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.9.0.tgz#f5092bcb2688979dd7778d5a56ae6922c341ce52" - integrity sha512-r9Ldo/luBqJlv1vCUEQnUS+C3a3ZdbYxVHyfDkj6RWMyCqqo8JE41HWE+pfa0RmB1xnGL2g8TbYcHcqItck/qg== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-net "1.9.0" - web3-utils "1.9.0" - -web3-eth@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.10.0.tgz#38b905e2759697c9624ab080cfcf4e6c60b3a6cf" - integrity sha512-Z5vT6slNMLPKuwRyKGbqeGYC87OAy8bOblaqRTgg94CXcn/mmqU7iPIlG4506YdcdK3x6cfEDG7B6w+jRxypKA== - dependencies: - web3-core "1.10.0" - web3-core-helpers "1.10.0" - web3-core-method "1.10.0" - web3-core-subscriptions "1.10.0" - web3-eth-abi "1.10.0" - web3-eth-accounts "1.10.0" - web3-eth-contract "1.10.0" - web3-eth-ens "1.10.0" - web3-eth-iban "1.10.0" - web3-eth-personal "1.10.0" - web3-net "1.10.0" - web3-utils "1.10.0" - web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -24857,43 +23906,6 @@ web3-eth@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" -web3-eth@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.6.tgz#2c650893d540a7a0eb1365dd5b2dca24ac919b7c" - integrity sha512-9+rnywRRpyX3C4hfsAQXPQh6vHh9XzQkgLxo3gyeXfbhbShUoq2gFVuy42vsRs//6JlsKdyZS7Z3hHPHz2wreA== - dependencies: - underscore "1.12.1" - web3-core "1.3.6" - web3-core-helpers "1.3.6" - web3-core-method "1.3.6" - web3-core-subscriptions "1.3.6" - web3-eth-abi "1.3.6" - web3-eth-accounts "1.3.6" - web3-eth-contract "1.3.6" - web3-eth-ens "1.3.6" - web3-eth-iban "1.3.6" - web3-eth-personal "1.3.6" - web3-net "1.3.6" - web3-utils "1.3.6" - -web3-eth@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.8.1.tgz#395f6cd56edaac5dbb23e8cec9886c3fd32c430e" - integrity sha512-LgyzbhFqiFRd8M8sBXoFN4ztzOnkeckl3H/9lH5ek7AdoRMhBg7tYpYRP3E5qkhd/q+yiZmcUgy1AF6NHrC1wg== - dependencies: - web3-core "1.8.1" - web3-core-helpers "1.8.1" - web3-core-method "1.8.1" - web3-core-subscriptions "1.8.1" - web3-eth-abi "1.8.1" - web3-eth-accounts "1.8.1" - web3-eth-contract "1.8.1" - web3-eth-ens "1.8.1" - web3-eth-iban "1.8.1" - web3-eth-personal "1.8.1" - web3-net "1.8.1" - web3-utils "1.8.1" - web3-eth@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.8.2.tgz#8562287ae1803c30eb54dc7d832092e5739ce06a" @@ -24912,24 +23924,6 @@ web3-eth@1.8.2: web3-net "1.8.2" web3-utils "1.8.2" -web3-eth@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.9.0.tgz#1fe82ba429a44b1aa0a3b95de3e79e6c5a9eb00c" - integrity sha512-c5gSWk9bLNr6VPATHmZ1n7LTIefIZQnJMzfnvkoBcIFGKJbGmsuRhv6lEXsKdAO/FlqYnSbaw3fOq1fVFiIOFQ== - dependencies: - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-core-subscriptions "1.9.0" - web3-eth-abi "1.9.0" - web3-eth-accounts "1.9.0" - web3-eth-contract "1.9.0" - web3-eth-ens "1.9.0" - web3-eth-iban "1.9.0" - web3-eth-personal "1.9.0" - web3-net "1.9.0" - web3-utils "1.9.0" - web3-net@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.55.tgz#daf24323df16a890a0bac6c6eda48b6e8c7e96ef" @@ -24943,15 +23937,6 @@ web3-net@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-net@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.10.0.tgz#be53e7f5dafd55e7c9013d49c505448b92c9c97b" - integrity sha512-NLH/N3IshYWASpxk4/18Ge6n60GEvWBVeM8inx2dmZJVmRI6SJIlUxbL8jySgiTn3MMZlhbdvrGo8fpUW7a1GA== - dependencies: - web3-core "1.10.0" - web3-core-method "1.10.0" - web3-utils "1.10.0" - web3-net@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.2.tgz#5c3226ca72df7c591422440ce6f1203fd42ddad9" @@ -24961,24 +23946,6 @@ web3-net@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" -web3-net@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.6.tgz#a56492e2227475e38db29394f8bac305a2446e41" - integrity sha512-KhzU3wMQY/YYjyMiQzbaLPt2kut88Ncx2iqjy3nw28vRux3gVX0WOCk9EL/KVJBiAA/fK7VklTXvgy9dZnnipw== - dependencies: - web3-core "1.3.6" - web3-core-method "1.3.6" - web3-utils "1.3.6" - -web3-net@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.8.1.tgz#2bed4d4b93166724129ec33d0e5dea98880285f4" - integrity sha512-LyEJAwogdFo0UAXZqoSJGFjopdt+kLw0P00FSZn2yszbgcoI7EwC+nXiOsEe12xz4LqpYLOtbR7+gxgiTVjjHQ== - dependencies: - web3-core "1.8.1" - web3-core-method "1.8.1" - web3-utils "1.8.1" - web3-net@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.8.2.tgz#97e1e0015fabc4cda31017813e98d0b5468dd04f" @@ -24988,15 +23955,6 @@ web3-net@1.8.2: web3-core-method "1.8.2" web3-utils "1.8.2" -web3-net@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.9.0.tgz#ee8799bf766039aa5b157d6db0be5ffdecd39d64" - integrity sha512-L+fDZFgrLM5Y15aonl2q6L+RvfaImAngmC0Jv45hV2FJ5IfRT0/2ob9etxZmvEBWvOpbqSvghfOhJIT3XZ37Pg== - dependencies: - web3-core "1.9.0" - web3-core-method "1.9.0" - web3-utils "1.9.0" - web3-provider-engine@16.0.4: version "16.0.4" resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-16.0.4.tgz#a6565d85f3cfdc2da68f141af8728f90ad198f3f" @@ -25071,42 +24029,6 @@ web3-provider-engine@^8.4.0: xhr "^2.2.0" xtend "^4.0.1" -web3-providers-http@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.10.0.tgz#864fa48675e7918c9a4374e5f664b32c09d0151b" - integrity sha512-eNr965YB8a9mLiNrkjAWNAPXgmQWfpBfkkn7tpEFlghfww0u3I0tktMZiaToJVcL2+Xq+81cxbkpeWJ5XQDwOA== - dependencies: - abortcontroller-polyfill "^1.7.3" - cross-fetch "^3.1.4" - es6-promise "^4.2.8" - web3-core-helpers "1.10.0" - -web3-providers-http@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.2.tgz#155e55c1d69f4c5cc0b411ede40dea3d06720956" - integrity sha512-BNZ7Hguy3eBszsarH5gqr9SIZNvqk9eKwqwmGH1LQS1FL3NdoOn7tgPPdddrXec4fL94CwgNk4rCU+OjjZRNDg== - dependencies: - web3-core-helpers "1.2.2" - xhr2-cookies "1.1.0" - -web3-providers-http@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.6.tgz#36e8724a7424d52827819d53fd75dbf31f5422c2" - integrity sha512-OQkT32O1A06dISIdazpGLveZcOXhEo5cEX6QyiSQkiPk/cjzDrXMw4SKZOGQbbS1+0Vjizm1Hrp7O8Vp2D1M5Q== - dependencies: - web3-core-helpers "1.3.6" - xhr2-cookies "1.1.0" - -web3-providers-http@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.8.1.tgz#8aa89c11a9272f11ddb74b871273c92225faa28d" - integrity sha512-1Zyts4O9W/UNEPkp+jyL19Jc3D15S4yp8xuLTjVhcUEAlHo24NDWEKxtZGUuHk4HrKL2gp8OlsDbJ7MM+ESDgg== - dependencies: - abortcontroller-polyfill "^1.7.3" - cross-fetch "^3.1.4" - es6-promise "^4.2.8" - web3-core-helpers "1.8.1" - web3-providers-http@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.8.2.tgz#fbda3a3bbc8db004af36e91bec35f80273b37885" @@ -25117,50 +24039,6 @@ web3-providers-http@1.8.2: es6-promise "^4.2.8" web3-core-helpers "1.8.2" -web3-providers-http@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.9.0.tgz#93cd3eb42fff974c9f7634ede1a9795d6435c3fe" - integrity sha512-5+dMNDAE0rRFz6SJpfnBqlVi2J5bB/Ivr2SanMt2YUrkxW5t8betZbzVwRkTbwtUvkqgj3xeUQzqpOttiv+IqQ== - dependencies: - abortcontroller-polyfill "^1.7.3" - cross-fetch "^3.1.4" - es6-promise "^4.2.8" - web3-core-helpers "1.9.0" - -web3-providers-ipc@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.10.0.tgz#9747c7a6aee96a51488e32fa7c636c3460b39889" - integrity sha512-OfXG1aWN8L1OUqppshzq8YISkWrYHaATW9H8eh0p89TlWMc1KZOL9vttBuaBEi96D/n0eYDn2trzt22bqHWfXA== - dependencies: - oboe "2.1.5" - web3-core-helpers "1.10.0" - -web3-providers-ipc@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" - integrity sha512-t97w3zi5Kn/LEWGA6D9qxoO0LBOG+lK2FjlEdCwDQatffB/+vYrzZ/CLYVQSoyFZAlsDoBasVoYSWZK1n39aHA== - dependencies: - oboe "2.1.4" - underscore "1.9.1" - web3-core-helpers "1.2.2" - -web3-providers-ipc@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.6.tgz#cef8d12c1ebb47adce5ebf597f553c623362cb4a" - integrity sha512-+TVsSd2sSVvVgHG4s6FXwwYPPT91boKKcRuEFXqEfAbUC5t52XOgmyc2LNiD9LzPhed65FbV4LqICpeYGUvSwA== - dependencies: - oboe "2.1.5" - underscore "1.12.1" - web3-core-helpers "1.3.6" - -web3-providers-ipc@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.8.1.tgz#6128a3a3a824d06bf0efcfe86325401f8691a5ca" - integrity sha512-nw/W5nclvi+P2z2dYkLWReKLnocStflWqFl+qjtv0xn3MrUTyXMzSF0+61i77+16xFsTgzo4wS/NWIOVkR0EFA== - dependencies: - oboe "2.1.5" - web3-core-helpers "1.8.1" - web3-providers-ipc@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.8.2.tgz#e52a7250f40c83b99a2482ec5b4cf2728377ae5c" @@ -25169,51 +24047,6 @@ web3-providers-ipc@1.8.2: oboe "2.1.5" web3-core-helpers "1.8.2" -web3-providers-ipc@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.9.0.tgz#db486cb0dde9062ac6055478861e3d37535924d2" - integrity sha512-cPXU93Du40HCylvjaa5x62DbnGqH+86HpK/+kMcFIzF6sDUBhKpag2tSbYhGbj7GMpfkmDTUiiMLdWnFV6+uBA== - dependencies: - oboe "2.1.5" - web3-core-helpers "1.9.0" - -web3-providers-ws@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.10.0.tgz#cb0b87b94c4df965cdf486af3a8cd26daf3975e5" - integrity sha512-sK0fNcglW36yD5xjnjtSGBnEtf59cbw4vZzJ+CmOWIKGIR96mP5l684g0WD0Eo+f4NQc2anWWXG74lRc9OVMCQ== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.10.0" - websocket "^1.0.32" - -web3-providers-ws@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" - integrity sha512-Wb1mrWTGMTXOpJkL0yGvL/WYLt8fUIXx8k/l52QB2IiKzvyd42dTWn4+j8IKXGSYYzOm7NMqv6nhA5VDk12VfA== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.2" - websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" - -web3-providers-ws@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.6.tgz#e1df617bc89d66165abdf2191da0014c505bfaac" - integrity sha512-bk7MnJf5or0Re2zKyhR3L3CjGululLCHXx4vlbc/drnaTARUVvi559OI5uLytc/1k5HKUUyENAxLvetz2G1dnQ== - dependencies: - eventemitter3 "4.0.4" - underscore "1.12.1" - web3-core-helpers "1.3.6" - websocket "^1.0.32" - -web3-providers-ws@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.8.1.tgz#5e5370e07eb8c615ed298ebc8602b283c7b7d649" - integrity sha512-TNefIDAMpdx57+YdWpYZ/xdofS0P+FfKaDYXhn24ie/tH9G+AB+UBSOKnjN0KSadcRSCMBwGPRiEmNHPavZdsA== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.8.1" - websocket "^1.0.32" - web3-providers-ws@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.8.2.tgz#56a2b701387011aca9154ca4bc06ea4b5f27e4ef" @@ -25223,15 +24056,6 @@ web3-providers-ws@1.8.2: web3-core-helpers "1.8.2" websocket "^1.0.32" -web3-providers-ws@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.9.0.tgz#568330766e8abbb6eb43e1153a72fb24398fcb7e" - integrity sha512-JRVsnQZ7j2k1a2yzBNHe39xqk1ijOv01dfIBFw52VeEkSRzvrOcsPIM/ttSyBuJqt70ntMxXY0ekCrqfleKH/w== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.9.0" - websocket "^1.0.32" - web3-providers@1.0.0-beta.55: version "1.0.0-beta.55" resolved "https://registry.yarnpkg.com/web3-providers/-/web3-providers-1.0.0-beta.55.tgz#639503517741b69baaa82f1f940630df6a25992b" @@ -25249,46 +24073,6 @@ web3-providers@1.0.0-beta.55: websocket "^1.0.28" xhr2-cookies "1.1.0" -web3-shh@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.10.0.tgz#c2979b87e0f67a7fef2ce9ee853bd7bfbe9b79a8" - integrity sha512-uNUUuNsO2AjX41GJARV9zJibs11eq6HtOe6Wr0FtRUcj8SN6nHeYIzwstAvJ4fXA53gRqFMTxdntHEt9aXVjpg== - dependencies: - web3-core "1.10.0" - web3-core-method "1.10.0" - web3-core-subscriptions "1.10.0" - web3-net "1.10.0" - -web3-shh@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.2.tgz#44ed998f2a6ba0ec5cb9d455184a0f647826a49c" - integrity sha512-og258NPhlBn8yYrDWjoWBBb6zo1OlBgoWGT+LL5/LPqRbjPe09hlOYHgscAAr9zZGtohTOty7RrxYw6Z6oDWCg== - dependencies: - web3-core "1.2.2" - web3-core-method "1.2.2" - web3-core-subscriptions "1.2.2" - web3-net "1.2.2" - -web3-shh@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.6.tgz#4e3486c7eca5cbdb87f88910948223a5b7ea6c20" - integrity sha512-9zRo415O0iBslxBnmu9OzYjNErzLnzOsy+IOvSpIreLYbbAw0XkDWxv3SfcpKnTIWIACBR4AYMIxmmyi5iB3jw== - dependencies: - web3-core "1.3.6" - web3-core-method "1.3.6" - web3-core-subscriptions "1.3.6" - web3-net "1.3.6" - -web3-shh@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.8.1.tgz#028a95cf9d3a36020380938b9a127610efbb9be7" - integrity sha512-sqHgarnfcY2Qt3PYS4R6YveHrDy7hmL09yeLLHHCI+RKirmjLVqV0rc5LJWUtlbYI+kDoa5gbgde489M9ZAC0g== - dependencies: - web3-core "1.8.1" - web3-core-method "1.8.1" - web3-core-subscriptions "1.8.1" - web3-net "1.8.1" - web3-shh@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.8.2.tgz#217a417f0d6e243dd4d441848ffc2bd164cea8a0" @@ -25299,100 +24083,7 @@ web3-shh@1.8.2: web3-core-subscriptions "1.8.2" web3-net "1.8.2" -web3-shh@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.9.0.tgz#75a37cd9f78d485ee5f018e2e66853e1e1c6ce4f" - integrity sha512-bIBZlralgz4ICCrwkefB2nPPJWfx28NuHIpjB7d9ADKynElubQuqudYhKtSEkKXACuME/BJm0pIFJcJs/gDnMg== - dependencies: - web3-core "1.9.0" - web3-core-method "1.9.0" - web3-core-subscriptions "1.9.0" - web3-net "1.9.0" - -web3-utils@1.0.0-beta.55: - version "1.0.0-beta.55" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.55.tgz#beb40926b7c04208b752d36a9bc959d27a04b308" - integrity sha512-ASWqUi8gtWK02Tp8ZtcoAbHenMpQXNvHrakgzvqTNNZn26wgpv+Q4mdPi0KOR6ZgHFL8R/9b5BBoUTglS1WPpg== - dependencies: - "@babel/runtime" "^7.3.1" - "@types/bn.js" "^4.11.4" - "@types/node" "^10.12.18" - bn.js "4.11.8" - eth-lib "0.2.8" - ethjs-unit "^0.1.6" - lodash "^4.17.11" - number-to-bn "1.7.0" - randombytes "^2.1.0" - utf8 "2.1.1" - -web3-utils@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.10.0.tgz#ca4c1b431a765c14ac7f773e92e0fd9377ccf578" - integrity sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg== - dependencies: - bn.js "^5.2.1" - ethereum-bloom-filters "^1.0.6" - ethereumjs-util "^7.1.0" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - utf8 "3.0.0" - -web3-utils@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.1.tgz#21466e38291551de0ab34558de21512ac4274534" - integrity sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA== - dependencies: - bn.js "4.11.8" - eth-lib "0.2.7" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randomhex "0.1.5" - underscore "1.9.1" - utf8 "3.0.0" - -web3-utils@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.2.tgz#b53a08c40d2c3f31d3c4a28e7d749405df99c8c0" - integrity sha512-joF+s3243TY5cL7Z7y4h1JsJpUCf/kmFmj+eJar7Y2yNIGVcW961VyrAms75tjUysSuHaUQ3eQXjBEUJueT52A== - dependencies: - bn.js "4.11.8" - eth-lib "0.2.7" - ethereum-bloom-filters "^1.0.6" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - underscore "1.9.1" - utf8 "3.0.0" - -web3-utils@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.6.tgz#390bc9fa3a7179746963cfaca55bb80ac4d8dc10" - integrity sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg== - dependencies: - bn.js "^4.11.9" - eth-lib "0.2.8" - ethereum-bloom-filters "^1.0.6" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - underscore "1.12.1" - utf8 "3.0.0" - -web3-utils@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.1.tgz#f2f7ca7eb65e6feb9f3d61056d0de6bbd57125ff" - integrity sha512-LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ== - dependencies: - bn.js "^5.2.1" - ethereum-bloom-filters "^1.0.6" - ethereumjs-util "^7.1.0" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - utf8 "3.0.0" - -web3-utils@1.8.2: +web3-utils@1.0.0-beta.55, web3-utils@1.10.0, web3-utils@1.2.1, web3-utils@1.2.2, web3-utils@1.3.6, web3-utils@1.8.1, web3-utils@1.8.2, web3-utils@^1.0.0-beta.31: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.2.tgz#c32dec5e9b955acbab220eefd7715bc540b75cc9" integrity sha512-v7j6xhfLQfY7xQDrUP0BKbaNrmZ2/+egbqP9q3KYmOiPpnvAfol+32slgL0WX/5n8VPvKCK5EZ1HGrAVICSToA== @@ -25405,86 +24096,7 @@ web3-utils@1.8.2: randombytes "^2.1.0" utf8 "3.0.0" -web3-utils@1.9.0, web3-utils@^1.0.0-beta.31: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.9.0.tgz#7c5775a47586cefb4ad488831be8f6627be9283d" - integrity sha512-p++69rCNNfu2jM9n5+VD/g26l+qkEOQ1m6cfRQCbH8ZRrtquTmrirJMgTmyOoax5a5XRYOuws14aypCOs51pdQ== - dependencies: - bn.js "^5.2.1" - ethereum-bloom-filters "^1.0.6" - ethereumjs-util "^7.1.0" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - utf8 "3.0.0" - -web3@*, web3@^1.2.4: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.9.0.tgz#4fde5d134f8ee11355ed5bfa1bb41f8bc58e23f3" - integrity sha512-E9IvVy/d2ozfQQsCiV+zh/LmlZGv9fQxI0UedDVjm87yOKf4AYbBNEn1iWtHveiGzAk2CEMZMUzAZzaQNSSYog== - dependencies: - web3-bzz "1.9.0" - web3-core "1.9.0" - web3-eth "1.9.0" - web3-eth-personal "1.9.0" - web3-net "1.9.0" - web3-shh "1.9.0" - web3-utils "1.9.0" - -web3@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.10.0.tgz#2fde0009f59aa756c93e07ea2a7f3ab971091274" - integrity sha512-YfKY9wSkGcM8seO+daR89oVTcbu18NsVfvOngzqMYGUU0pPSQmE57qQDvQzUeoIOHAnXEBNzrhjQJmm8ER0rng== - dependencies: - web3-bzz "1.10.0" - web3-core "1.10.0" - web3-eth "1.10.0" - web3-eth-personal "1.10.0" - web3-net "1.10.0" - web3-shh "1.10.0" - web3-utils "1.10.0" - -web3@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.2.tgz#b1b8b69aafdf94cbaeadbb68a8aa1df2ef266aec" - integrity sha512-/ChbmB6qZpfGx6eNpczt5YSUBHEA5V2+iUCbn85EVb3Zv6FVxrOo5Tv7Lw0gE2tW7EEjASbCyp3mZeiZaCCngg== - dependencies: - "@types/node" "^12.6.1" - web3-bzz "1.2.2" - web3-core "1.2.2" - web3-eth "1.2.2" - web3-eth-personal "1.2.2" - web3-net "1.2.2" - web3-shh "1.2.2" - web3-utils "1.2.2" - -web3@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.6.tgz#599425461c3f9a8cbbefa70616438995f4a064cc" - integrity sha512-jEpPhnL6GDteifdVh7ulzlPrtVQeA30V9vnki9liYlUvLV82ZM7BNOQJiuzlDePuE+jZETZSP/0G/JlUVt6pOA== - dependencies: - web3-bzz "1.3.6" - web3-core "1.3.6" - web3-eth "1.3.6" - web3-eth-personal "1.3.6" - web3-net "1.3.6" - web3-shh "1.3.6" - web3-utils "1.3.6" - -web3@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.8.1.tgz#8ea67215ef5f3a6f6d3381800b527242ea22885a" - integrity sha512-tAqFsQhGv340C9OgRJIuoScN7f7wa1tUvsnnDUMt9YE6J4gcm7TV2Uwv+KERnzvV+xgdeuULYpsioRRNKrUvoQ== - dependencies: - web3-bzz "1.8.1" - web3-core "1.8.1" - web3-eth "1.8.1" - web3-eth-personal "1.8.1" - web3-net "1.8.1" - web3-shh "1.8.1" - web3-utils "1.8.1" - -web3@1.8.2: +web3@*, web3@1.10.0, web3@1.2.2, web3@1.3.6, web3@1.8.1, web3@1.8.2, web3@^0.16.0, web3@^0.18.2, web3@^1.2.4: version "1.8.2" resolved "https://registry.yarnpkg.com/web3/-/web3-1.8.2.tgz#95a4e5398fd0f01325264bf8e5e8cdc69a7afe86" integrity sha512-92h0GdEHW9wqDICQQKyG4foZBYi0OQkyg4CRml2F7XBl/NG+fu9o6J19kzfFXzSBoA4DnJXbyRgj/RHZv5LRiw== @@ -25497,27 +24109,6 @@ web3@1.8.2: web3-shh "1.8.2" web3-utils "1.8.2" -web3@^0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019" - integrity sha512-8vET/GI2qDtShXNtPkuWByWvPNou9ecuYI9OJswBdA+NUwe5WZKirHUWakS0y4mK6lGmOhv7mLN7cHCBhmQRyA== - dependencies: - bignumber.js "git+https://github.com/debris/bignumber.js#master" - crypto-js "^3.1.4" - utf8 "^2.1.1" - xmlhttprequest "*" - -web3@^0.18.2: - version "0.18.4" - resolved "https://registry.yarnpkg.com/web3/-/web3-0.18.4.tgz#81ec1784145491f2eaa8955b31c06049e07c5e7d" - integrity sha512-TG+CtszzJHRHq+1T0AJVN4ATDvNn4QIAIEnErTgx2jj9oCa5ggOqZv3Ub0RAF+Yr2F/e5F6UFpEUSH9QK7w50Q== - dependencies: - bignumber.js "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" - crypto-js "^3.1.4" - utf8 "^2.1.1" - xhr2 "*" - xmlhttprequest "*" - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -25554,16 +24145,6 @@ websocket@^1.0.28, websocket@^1.0.32: utf-8-validate "^5.0.2" yaeti "^0.0.6" -"websocket@github:web3-js/WebSocket-Node#polyfill/globalThis": - version "1.0.29" - resolved "https://codeload.github.com/web3-js/WebSocket-Node/tar.gz/ef5ea2f41daf4a2113b80c9223df884b4d56c400" - dependencies: - debug "^2.2.0" - es5-ext "^0.10.50" - nan "^2.14.0" - typedarray-to-buffer "^3.1.5" - yaeti "^0.0.6" - whatwg-fetch@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" @@ -25941,11 +24522,6 @@ xhr2-cookies@1.1.0: dependencies: cookiejar "^2.1.1" -xhr2@*: - version "0.2.1" - resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93" - integrity sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw== - xhr@^2.0.4, xhr@^2.2.0, xhr@^2.3.3: version "2.6.0" resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d" @@ -25974,7 +24550,7 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlhttprequest@*, xmlhttprequest@1.8.0: +xmlhttprequest@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" integrity sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA== @@ -26246,14 +24822,6 @@ yarn@^1.21.1: resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ== -yauzl@^2.4.2: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - yn@3.1.1, yn@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 43f8a1c8b7c3dbbfa7b2ce5df0520fe174aed819 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 19 May 2023 17:46:04 -0400 Subject: [PATCH 085/184] Fixed stability test --- packages/protocol/lib/test-utils.ts | 9 +-- .../protocol/test/stability/grandamento.ts | 3 +- .../protocol/test/stability/sortedoracles.ts | 72 +++++++++++++++---- .../protocol/test/stability/stabletoken.ts | 61 ++++++++++++---- 4 files changed, 109 insertions(+), 36 deletions(-) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index c2c7ea10777..b370fbe2e88 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -137,14 +137,15 @@ export async function assertRevertWithReason(promise: any, expectedRevertReason: await promise assert.fail('Expected transaction to revert') } catch (error) { +// XXX(soloseng): Some transactions revert without reason. // Only ever tested with ganache. // When it's a view call, error.message has a shape like: - // `Returned error: VM Exception while processing transaction: revert ${revertMessage}` + // `Returned error: VM Exception while processing transaction: revert ${expectedRevertReason}` // When it's a transaction (eg a non-view send call), error.message has a shape like: - // `Returned error: VM Exception while processing transaction: revert ${revertMessage} -- Reason given: ${revertMessage}.` - // Therefore we try to parse the first instance of `${revertMessage}`. + // 'StatusError: Transaction: ${transactionHash} exited with an error (status 0). Reason given: ${revertMessage}.' + // Therefore we try to search for `${expectedRevertReason}`. const revertFound: boolean = - error.message.search(expectedRevertReason) >= 0 + error.message.search( expectedRevertReason) >= 0 const msg: string = expectedRevertReason === '' ? `Expected "revert", got ${error} instead` : expectedRevertReason assert(revertFound, msg) diff --git a/packages/protocol/test/stability/grandamento.ts b/packages/protocol/test/stability/grandamento.ts index c87a97e7a72..c2ffd1ca72c 100644 --- a/packages/protocol/test/stability/grandamento.ts +++ b/packages/protocol/test/stability/grandamento.ts @@ -3,7 +3,6 @@ import { assertEqualBN, assertEqualBNArray, assertLogMatches2, - assertRevert, assertRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' @@ -1087,7 +1086,7 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts when the spread is more than 1', async () => { - await assertRevert( + await assertRevertWithReason( grandaMento.setSpread(toFixed(1001 / 1000)), 'Spread must be less than or equal to 1' ) diff --git a/packages/protocol/test/stability/sortedoracles.ts b/packages/protocol/test/stability/sortedoracles.ts index 7467c023815..1613042c414 100644 --- a/packages/protocol/test/stability/sortedoracles.ts +++ b/packages/protocol/test/stability/sortedoracles.ts @@ -2,7 +2,7 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { assertEqualBN, assertLogMatches2, - assertRevert, + assertRevertWithReason, matchAddress, matchAny, timeTravel, @@ -41,7 +41,10 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(sortedOracles.initialize(aReportExpiry)) + await assertRevertWithReason( + sortedOracles.initialize(aReportExpiry), + 'contract already initialized' + ) }) }) @@ -66,7 +69,10 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when called by a non-owner', async () => { - await assertRevert(sortedOracles.setReportExpiry(newReportExpiry, { from: accounts[1] })) + await assertRevertWithReason( + sortedOracles.setReportExpiry(newReportExpiry, { from: accounts[1] }), + 'Ownable: caller is not the owner' + ) }) }) @@ -93,7 +99,10 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when called by a non-owner', async () => { - await assertRevert(sortedOracles.setReportExpiry(newReportExpiry, { from: accounts[1] })) + await assertRevertWithReason( + sortedOracles.setReportExpiry(newReportExpiry, { from: accounts[1] }), + 'Ownable: caller is not the owner' + ) }) }) @@ -117,20 +126,32 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when token is the null address', async () => { - await assertRevert(sortedOracles.addOracle(NULL_ADDRESS, anOracle)) + await assertRevertWithReason( + sortedOracles.addOracle(NULL_ADDRESS, anOracle), + 'token addr was null or oracle addr was null or oracle addr is not an oracle for token addr' + ) }) it('should revert when the oracle is the null address', async () => { - await assertRevert(sortedOracles.addOracle(aToken, NULL_ADDRESS)) + await assertRevertWithReason( + sortedOracles.addOracle(aToken, NULL_ADDRESS), + 'token addr was null or oracle addr was null or oracle addr is not an oracle for token addr' + ) }) it('should revert when the oracle has already been added', async () => { await sortedOracles.addOracle(aToken, anOracle) - await assertRevert(sortedOracles.addOracle(aToken, anOracle)) + await assertRevertWithReason( + sortedOracles.addOracle(aToken, anOracle), + 'token addr was null or oracle addr was null or oracle addr is not an oracle for token addr' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(sortedOracles.addOracle(aToken, anOracle, { from: accounts[1] })) + await assertRevertWithReason( + sortedOracles.addOracle(aToken, anOracle, { from: accounts[1] }), + 'Ownable: caller is not the owner' + ) }) }) @@ -162,7 +183,10 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when no report exists', async () => { - await assertRevert(sortedOracles.removeExpiredReports(aToken, 1)) + await assertRevertWithReason( + sortedOracles.removeExpiredReports(aToken, 1), + 'token addr null or trying to remove too many reports' + ) }) describe('when a report has been made', () => { @@ -173,7 +197,10 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when only 1 report exists', async () => { - await assertRevert(sortedOracles.removeExpiredReports(aToken, 1)) + await assertRevertWithReason( + sortedOracles.removeExpiredReports(aToken, 1), + 'token addr null or trying to remove too many reports' + ) }) describe('when multiple reports have been made', () => { @@ -200,7 +227,10 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when n>=numTimestamps', async () => { - await assertRevert(sortedOracles.removeExpiredReports(aToken, 5)) + await assertRevertWithReason( + sortedOracles.removeExpiredReports(aToken, 5), + 'token addr null or trying to remove too many reports' + ) }) it('should remove n when n { @@ -438,15 +468,24 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when the wrong index is provided', async () => { - await assertRevert(sortedOracles.removeOracle(aToken, anOracle, 1)) + await assertRevertWithReason( + sortedOracles.removeOracle(aToken, anOracle, 1), + 'token addr null or oracle addr null or index of token oracle not mapped to oracle addr' + ) }) it('should revert when the wrong address is provided', async () => { - await assertRevert(sortedOracles.removeOracle(aToken, accounts[0], 0)) + await assertRevertWithReason( + sortedOracles.removeOracle(aToken, accounts[0], 0), + 'token addr null or oracle addr null or index of token oracle not mapped to oracle addr' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(sortedOracles.removeOracle(aToken, anOracle, 0, { from: accounts[1] })) + await assertRevertWithReason( + sortedOracles.removeOracle(aToken, anOracle, 0, { from: accounts[1] }), + 'Ownable: caller is not the owner' + ) }) }) @@ -512,7 +551,10 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when called by a non-oracle', async () => { - await assertRevert(sortedOracles.report(aToken, value, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + sortedOracles.report(aToken, value, NULL_ADDRESS, NULL_ADDRESS), + 'sender was not an oracle for token addr' + ) }) describe('when there exists exactly one other report, made by this oracle', () => { diff --git a/packages/protocol/test/stability/stabletoken.ts b/packages/protocol/test/stability/stabletoken.ts index 594ad8fa87d..5e623f52486 100644 --- a/packages/protocol/test/stability/stabletoken.ts +++ b/packages/protocol/test/stability/stabletoken.ts @@ -4,6 +4,7 @@ import { assertLogMatches, assertLogMatches2, assertRevert, + assertRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { fixed1, fromFixed, toFixed } from '@celo/utils/lib/fixidity' @@ -91,7 +92,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert( + await assertRevertWithReason( stableToken.initialize( 'Celo Dollar', 'cUSD', @@ -102,7 +103,8 @@ contract('StableToken', (accounts: string[]) => { [], [], 'Exchange' // USD - ) + ), + 'contract already initialized' ) }) }) @@ -117,7 +119,10 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow other users to set registry', async () => { - await assertRevert(stableToken.setRegistry(anAddress, { from: nonOwner })) + await assertRevertWithReason( + stableToken.setRegistry(anAddress, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -164,7 +169,10 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow anyone else to mint', async () => { - await assertRevert(stableToken.mint(validators, amountToMint, { from: accounts[3] })) + await assertRevertWithReason( + stableToken.mint(validators, amountToMint, { from: accounts[3] }), + 'Sender not authorized to mint' + ) }) }) @@ -193,12 +201,18 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevert(stableToken.transferWithComment(NULL_ADDRESS, 1, comment)) + await assertRevertWithReason( + stableToken.transferWithComment(NULL_ADDRESS, 1, comment), + 'transfer attempted to reserved address 0x0' + ) }) it('should not allow transferring more than the owner has', async () => { const value = (await stableToken.balanceOf(sender)).toNumber() + 1 - await assertRevert(stableToken.transferWithComment(receiver, value, comment)) + await assertRevertWithReason( + stableToken.transferWithComment(receiver, value, comment), + 'transfer value exceeded balance of sender.' + ) }) describe('when inflation factor is outdated', () => { @@ -274,7 +288,10 @@ contract('StableToken', (accounts: string[]) => { }) it('should revert when a zero rate is provided', async () => { - await assertRevert(stableToken.setInflationParameters(toFixed(0), SECONDS_IN_A_WEEK)) + await assertRevertWithReason( + stableToken.setInflationParameters(toFixed(0), SECONDS_IN_A_WEEK), + 'Must provide a non-zero inflation rate.' + ) }) }) @@ -410,7 +427,10 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow anyone else to burn', async () => { - await assertRevert(stableToken.burn(amountToBurn, { from: accounts[2] })) + await assertRevertWithReason( + stableToken.burn(amountToBurn, { from: accounts[2] }), + 'Sender not authorized to burn' + ) }) }) @@ -563,14 +583,20 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevert(stableToken.transfer(NULL_ADDRESS, transferAmount)) + await assertRevertWithReason( + stableToken.transfer(NULL_ADDRESS, transferAmount), + 'transfer attempted to reserved address 0x0' + ) }) it('should not allow transferring more than the sender has', async () => { // We try to send four more tokens than the sender has, in case they happen to mine the // block with this transaction, which will reward them with 3 tokens. const value = (await stableToken.balanceOf(sender)).toNumber() + 4 - await assertRevert(stableToken.transfer(receiver, value)) + await assertRevertWithReason( + stableToken.transfer(receiver, value), + 'transfer value exceeded balance of sender' + ) }) }) @@ -588,8 +614,9 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevert( - stableToken.transferFrom(sender, NULL_ADDRESS, transferAmount, { from: receiver }) + await assertRevertWithReason( + stableToken.transferFrom(sender, NULL_ADDRESS, transferAmount, { from: receiver }), + 'transfer attempted to reserved address 0x0' ) }) @@ -598,14 +625,18 @@ contract('StableToken', (accounts: string[]) => { // block with this transaction, which will reward them with 3 tokens. const value = (await stableToken.balanceOf(sender)).toNumber() + 4 await stableToken.approve(receiver, value) - await assertRevert(stableToken.transferFrom(sender, receiver, value, { from: receiver })) + await assertRevertWithReason( + stableToken.transferFrom(sender, receiver, value, { from: receiver }), + 'transfer value exceeded balance of sender' + ) }) it('should not allow transferring more than the spender is allowed', async () => { - await assertRevert( + await assertRevertWithReason( stableToken.transferFrom(sender, receiver, 2, { from: receiver, - }) + }), + "transfer value exceeded sender's allowance for recipient" ) }) }) From b2c009b0620efebe48332e38722bdc732375f490 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 11:44:47 -0400 Subject: [PATCH 086/184] removed resolutions --- package.json | 8 +- yarn.lock | 1309 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 1257 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index 80634612fc9..6b1c52f5091 100644 --- a/package.json +++ b/package.json @@ -85,12 +85,6 @@ "resolutions": { "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", "@types/bn.js": "4.11.6", - "bignumber.js": "9.0.0", - "web3-eth-contract":"1.8.2", - "web3-eth-abi":"1.8.2", - "web3":"1.8.2", - "web3-utils":"1.8.2", - "web3-core":"1.8.2", - "web3-core-helpers":"1.8.2" + "bignumber.js": "9.0.0" } } diff --git a/yarn.lock b/yarn.lock index 4d31b375fc0..10497406e4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1334,6 +1334,21 @@ mcl-wasm "^0.7.1" rustbn.js "~0.2.0" +"@ethersproject/abi@5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" + integrity sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw== + dependencies: + "@ethersproject/address" "^5.0.4" + "@ethersproject/bignumber" "^5.0.7" + "@ethersproject/bytes" "^5.0.4" + "@ethersproject/constants" "^5.0.4" + "@ethersproject/hash" "^5.0.4" + "@ethersproject/keccak256" "^5.0.3" + "@ethersproject/logger" "^5.0.5" + "@ethersproject/properties" "^5.0.3" + "@ethersproject/strings" "^5.0.4" + "@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.0-beta.146", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" @@ -1373,7 +1388,7 @@ "@ethersproject/logger" "^5.7.0" "@ethersproject/properties" "^5.7.0" -"@ethersproject/address@5.7.0", "@ethersproject/address@^5.7.0": +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== @@ -1399,7 +1414,7 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/properties" "^5.7.0" -"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.7.0": +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== @@ -1408,14 +1423,14 @@ "@ethersproject/logger" "^5.7.0" bn.js "^5.2.1" -"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== dependencies: "@ethersproject/logger" "^5.7.0" -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== @@ -1438,7 +1453,7 @@ "@ethersproject/properties" "^5.7.0" "@ethersproject/transactions" "^5.7.0" -"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.7.0": +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== @@ -1490,7 +1505,7 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.7.0": +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== @@ -1498,7 +1513,7 @@ "@ethersproject/bytes" "^5.7.0" js-sha3 "0.8.0" -"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.7.0": +"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.7.0.tgz#6ce9ae168e74fecf287be17062b590852c311892" integrity sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig== @@ -1518,7 +1533,7 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/sha2" "^5.7.0" -"@ethersproject/properties@5.7.0", "@ethersproject/properties@^5.7.0": +"@ethersproject/properties@5.7.0", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.7.0.tgz#a6e12cb0439b878aaf470f1902a176033067ed30" integrity sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw== @@ -1600,7 +1615,7 @@ "@ethersproject/sha2" "^5.7.0" "@ethersproject/strings" "^5.7.0" -"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.7.0": +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== @@ -1609,7 +1624,7 @@ "@ethersproject/constants" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -5201,7 +5216,7 @@ dependencies: "@babel/types" "^7.3.0" -"@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^5.1.0": +"@types/bn.js@*", "@types/bn.js@4.11.6", "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.4", "@types/bn.js@^4.11.5", "@types/bn.js@^5.1.0", "@types/bn.js@^5.1.1": version "4.11.6" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== @@ -5687,7 +5702,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== -"@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18": +"@types/node@^10.0.3", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== @@ -7194,7 +7209,7 @@ bigint-crypto-utils@^3.0.23: resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.2.2.tgz#e30a49ec38357c6981cd3da5aaa6480b1f752ee4" integrity sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw== -bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, bignumber.js@~9.0.2: +bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", "bignumber.js@git+https://github.com/debris/bignumber.js.git#master", bignumber.js@~9.0.2: version "9.0.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== @@ -7374,7 +7389,7 @@ bn.js@4.11.9: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== @@ -7642,7 +7657,7 @@ buffer-alloc@^1.2.0: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" -buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: +buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== @@ -7711,7 +7726,7 @@ buffer@6.0.3, buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -buffer@^5.0.5, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: +buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -8772,7 +8787,7 @@ commander@3.0.2, commander@^3.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.12.1, commander@^2.20.3: +commander@^2.12.1, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -9306,7 +9321,7 @@ crypto-browserify@3.12.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^3.1.9-1: +crypto-js@^3.1.4, crypto-js@^3.1.9-1: version "3.3.0" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b" integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q== @@ -9511,7 +9526,7 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== -decompress-response@^3.3.0: +decompress-response@^3.2.0, decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== @@ -9532,6 +9547,59 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" +decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" + integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== + dependencies: + file-type "^5.2.0" + is-stream "^1.1.0" + tar-stream "^1.5.2" + +decompress-tarbz2@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b" + integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== + dependencies: + decompress-tar "^4.1.0" + file-type "^6.1.0" + is-stream "^1.1.0" + seek-bzip "^1.0.5" + unbzip2-stream "^1.0.9" + +decompress-targz@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee" + integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== + dependencies: + decompress-tar "^4.1.1" + file-type "^5.2.0" + is-stream "^1.1.0" + +decompress-unzip@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" + integrity sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw== + dependencies: + file-type "^3.8.0" + get-stream "^2.2.0" + pify "^2.3.0" + yauzl "^2.4.2" + +decompress@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118" + integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== + dependencies: + decompress-tar "^4.0.0" + decompress-tarbz2 "^4.0.0" + decompress-targz "^4.0.0" + decompress-unzip "^4.0.1" + graceful-fs "^4.1.10" + make-dir "^1.0.0" + pify "^2.3.0" + strip-dirs "^2.0.0" + dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -10084,6 +10152,16 @@ electron-to-chromium@^1.4.284: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.369.tgz#a98d838cdd79be4471cd04e9b4dffe891d037874" integrity sha512-LfxbHXdA/S+qyoTEA4EbhxGjrxx7WK2h6yb5K2v0UCOufUKX+VZaHbl3svlzZfv9sGseym/g3Ne4DpsgRULmqg== +elliptic@6.3.3: + version "6.3.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" + integrity sha512-cIky9SO2H8W2eU1NOLySnhOYJnuEWCq9ZJeHvHd/lXzEL9vyraIMfilZSn57X3aVX+wkfYmqkch2LvmTzkjFpA== + dependencies: + bn.js "^4.4.0" + brorand "^1.0.1" + hash.js "^1.0.0" + inherits "^2.0.1" + elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" @@ -10854,7 +10932,7 @@ ethereumjs-tx@^2.1.1, ethereumjs-tx@^2.1.2: ethereumjs-common "^1.5.0" ethereumjs-util "^6.0.0" -ethereumjs-util@7.1.5, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: +ethereumjs-util@7.1.5, ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: version "7.1.5" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== @@ -10958,6 +11036,22 @@ ethereumjs-wallet@^1.0.1: utf8 "^3.0.0" uuid "^8.3.2" +ethers@4.0.0-beta.3: + version "4.0.0-beta.3" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.3.tgz#15bef14e57e94ecbeb7f9b39dd0a4bd435bc9066" + integrity sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog== + dependencies: + "@types/node" "^10.3.2" + aes-js "3.0.0" + bn.js "^4.4.0" + elliptic "6.3.3" + hash.js "1.1.3" + js-sha3 "0.5.7" + scrypt-js "2.0.3" + setimmediate "1.0.4" + uuid "2.0.1" + xmlhttprequest "1.8.0" + ethers@^4.0.20, ethers@^4.0.32, ethers@^4.0.40, ethers@~4.0.4: version "4.0.49" resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894" @@ -11009,7 +11103,7 @@ ethers@^5.0.13, ethers@^5.2.0, ethers@^5.7.1: "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" -ethjs-unit@0.1.6: +ethjs-unit@0.1.6, ethjs-unit@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" integrity sha512-/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw== @@ -11512,6 +11606,13 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== + dependencies: + pend "~1.2.0" + fecha@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" @@ -11576,6 +11677,21 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +file-type@^3.8.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + integrity sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA== + +file-type@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" + integrity sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ== + +file-type@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919" + integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== + file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -12411,6 +12527,14 @@ get-stdin@^7.0.0: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ== +get-stream@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + integrity sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA== + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -13042,6 +13166,23 @@ got@12.1.0: p-cancelable "^3.0.0" responselike "^2.0.0" +got@9.6.0, got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + got@^11.8.5: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" @@ -13059,24 +13200,27 @@ got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== +got@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" + integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw== dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" + decompress-response "^3.2.0" duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" + get-stream "^3.0.0" + is-plain-obj "^1.1.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + isurl "^1.0.0-alpha5" + lowercase-keys "^1.0.0" + p-cancelable "^0.3.0" + p-timeout "^1.1.1" + safe-buffer "^5.0.1" + timed-out "^4.0.0" + url-parse-lax "^1.0.0" + url-to-options "^1.0.1" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -13224,11 +13368,23 @@ has-proto@^1.0.1: resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-symbol-support-x@^1.4.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" + integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== + has-symbols@^1.0.0, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== +has-to-string-tag-x@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" + integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== + dependencies: + has-symbol-support-x "^1.4.1" + has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -14220,6 +14376,11 @@ is-map@^2.0.2: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== +is-natural-number@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" + integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ== + is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" @@ -14276,7 +14437,7 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-object@~1.0.1: +is-object@^1.0.1, is-object@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== @@ -14343,7 +14504,7 @@ is-relative@^0.2.1: dependencies: is-unc-path "^0.1.1" -is-retry-allowed@^1.1.0: +is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== @@ -14377,7 +14538,7 @@ is-stream-ended@^0.1.4: resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda" integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw== -is-stream@^1.0.1, is-stream@^1.1.0: +is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== @@ -14631,6 +14792,14 @@ istanbul@^0.4.5: which "^1.1.1" wordwrap "^1.0.0" +isurl@^1.0.0-alpha5: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" + integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== + dependencies: + has-to-string-tag-x "^1.2.0" + is-object "^1.0.1" + iter-tools@^7.0.2: version "7.5.1" resolved "https://registry.yarnpkg.com/iter-tools/-/iter-tools-7.5.1.tgz#0b0253403bf9364335917d562ba7735d19b4c16a" @@ -18189,6 +18358,13 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" +oboe@2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.4.tgz#20c88cdb0c15371bb04119257d4fdd34b0aa49f6" + integrity sha512-ymBJ4xSC6GBXLT9Y7lirj+xbqBLa+jADGJldGEYG7u8sZbS9GyG+u1Xk9c5cbriKwSpCg41qUhPjvU5xOpvIyQ== + dependencies: + http-https "^1.0.0" + oboe@2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.5.tgz#5554284c543a2266d7a38f17e073821fbde393cd" @@ -18386,6 +18562,11 @@ os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== +p-cancelable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" + integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== + p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -18505,6 +18686,13 @@ p-reduce@^2.0.0, p-reduce@^2.1.0: resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a" integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw== +p-timeout@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" + integrity sha512-gb0ryzr+K2qFqFv6qi3khoeqMZF/+ajxQipEF6NteZVnvz9tzdsfAVj3lYtn1gAXvH5lfLwfxEII799gt/mRIA== + dependencies: + p-finally "^1.0.0" + p-timeout@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe" @@ -18899,6 +19087,11 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.0.9: safe-buffer "^5.0.1" sha.js "^2.4.8" +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -19348,6 +19541,11 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg== + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -19931,6 +20129,11 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" +randomhex@0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/randomhex/-/randomhex-0.1.5.tgz#baceef982329091400f2a2912c6cd02f1094f585" + integrity sha512-2+Kkw7UiZGQWOz7rw8hPW44utkBYMEciQfziaZ71RcyDu+refQWzS/0DgfUSa5MwclrOD3sf3vI5vmrTYjwpjQ== + range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -20756,6 +20959,11 @@ sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +scrypt-js@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" + integrity sha512-d8DzQxNivoNDogyYmb/9RD5mEQE/Q7vG2dLDUgvfPmKL9xCVzgqUntOdS0me9Cq9Sh9VxIZuoNEFcsfyXRnyUw== + scrypt-js@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.4.tgz#32f8c5149f0797672e551c07e230f834b6af5f16" @@ -20818,6 +21026,13 @@ seedrandom@3.0.5: resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg== +seek-bzip@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" + integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== + dependencies: + commander "^2.8.1" + semaphore-async-await@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz#857bef5e3644601ca4b9570b87e9df5ca12974fa" @@ -21777,6 +21992,13 @@ strip-comments@^2.0.1: resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== +strip-dirs@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" + integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== + dependencies: + is-natural-number "^4.0.1" + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -21984,6 +22206,24 @@ swap-case@^1.1.0: lower-case "^1.1.1" upper-case "^1.1.1" +swarm-js@0.1.39: + version "0.1.39" + resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.39.tgz#79becb07f291d4b2a178c50fee7aa6e10342c0e8" + integrity sha512-QLMqL2rzF6n5s50BptyD6Oi0R1aWlJC5Y17SRIVXRj6OR1DRIPM7nepvrxxkjA1zNzFz6mUOMjfeqeDaWB7OOg== + dependencies: + bluebird "^3.5.0" + buffer "^5.0.5" + decompress "^4.0.0" + eth-lib "^0.1.26" + fs-extra "^4.0.2" + got "^7.1.0" + mime-types "^2.1.16" + mkdirp-promise "^5.0.1" + mock-fs "^4.1.0" + setimmediate "^1.0.5" + tar "^4.0.2" + xhr-request-promise "^0.1.2" + swarm-js@^0.1.40: version "0.1.42" resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.42.tgz#497995c62df6696f6e22372f457120e43e727979" @@ -22078,7 +22318,7 @@ tar-fs@^2.0.0: pump "^3.0.0" tar-stream "^2.1.4" -tar-stream@^1.1.2: +tar-stream@^1.1.2, tar-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== @@ -22341,7 +22581,7 @@ tildify@2.0.0: resolved "https://registry.yarnpkg.com/tildify/-/tildify-2.0.0.tgz#f205f3674d677ce698b7067a99e949ce03b4754a" integrity sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw== -timed-out@^4.0.1: +timed-out@^4.0.0, timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== @@ -23105,11 +23345,24 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +unbzip2-stream@^1.0.9: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + unc-path-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== +underscore@1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e" + integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw== + underscore@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" @@ -23316,6 +23569,13 @@ url-join@0.0.1: resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" integrity sha512-H6dnQ/yPAAVzMQRvEvyz01hhfQL5qRWSEt7BX8t9DqnPw9BjMb64fjIRq76Uvf1hkHp+mTZvEVJ5guXOT0Xqaw== +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + integrity sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA== + dependencies: + prepend-http "^1.0.1" + url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" @@ -23349,6 +23609,11 @@ url-template@^2.0.8: resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" integrity sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw== +url-to-options@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" + integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A== + url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" @@ -23396,11 +23661,21 @@ utf8-byte-length@^1.0.1: resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== +utf8@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" + integrity sha512-FzZp4f0vPa0AfWf+eav6hqZEqbn7TU1my/GUexpF9e0Afe/fnuLQvgdq5KgD3ggUpu3DpwRUGC0iS8q35eVBLQ== + utf8@3.0.0, utf8@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== +utf8@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" + integrity sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg== + util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -23426,7 +23701,7 @@ util@^0.10.3: dependencies: inherits "2.0.3" -util@^0.12.4, util@^0.12.5: +util@^0.12.0, util@^0.12.4, util@^0.12.5: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== @@ -23625,6 +23900,44 @@ weak-map@^1.0.5: resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== +web3-bzz@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.10.0.tgz#ac74bc71cdf294c7080a79091079192f05c5baed" + integrity sha512-o9IR59io3pDUsXTsps5pO5hW1D5zBmg46iNc2t4j2DkaYHNdDLwk2IP9ukoM2wg47QILfPEJYzhTfkS/CcX0KA== + dependencies: + "@types/node" "^12.12.6" + got "12.1.0" + swarm-js "^0.1.40" + +web3-bzz@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.2.tgz#a3b9f613c49fd3e120e0997088a73557d5adb724" + integrity sha512-b1O2ObsqUN1lJxmFSjvnEC4TsaCbmh7Owj3IAIWTKqL9qhVgx7Qsu5O9cD13pBiSPNZJ68uJPaKq380QB4NWeA== + dependencies: + "@types/node" "^10.12.18" + got "9.6.0" + swarm-js "0.1.39" + underscore "1.9.1" + +web3-bzz@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.6.tgz#95f370aecc3ff6ad07f057e6c0c916ef09b04dde" + integrity sha512-ibHdx1wkseujFejrtY7ZyC0QxQ4ATXjzcNUpaLrvM6AEae8prUiyT/OloG9FWDgFD2CPLwzKwfSQezYQlANNlw== + dependencies: + "@types/node" "^12.12.6" + got "9.6.0" + swarm-js "^0.1.40" + underscore "1.12.1" + +web3-bzz@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.8.1.tgz#81397be5ce262d03d82b92e9d8acc11f8a609ea1" + integrity sha512-dJJHS84nvpoxv6ijTMkdUSlRr5beCXNtx4UZcrFLHBva8dT63QEtKdLyDt2AyMJJdVzTCk78uir/6XtVWrdS6w== + dependencies: + "@types/node" "^12.12.6" + got "12.1.0" + swarm-js "^0.1.40" + web3-bzz@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.8.2.tgz#67ea1c775874056250eece551ded22905ed08784" @@ -23634,7 +23947,52 @@ web3-bzz@1.8.2: got "12.1.0" swarm-js "^0.1.40" -web3-core-helpers@1.0.0-beta.55, web3-core-helpers@1.2.2, web3-core-helpers@1.8.1, web3-core-helpers@1.8.2: +web3-core-helpers@1.0.0-beta.55: + version "1.0.0-beta.55" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.55.tgz#832b8499889f9f514b1d174f00172fd3683d63de" + integrity sha512-suj9Xy/lIqajaYLJTEjr2rlFgu6hGYwChHmf8+qNrC2luZA6kirTamtB9VThWMxbywx7p0bqQFjW6zXogAgWhg== + dependencies: + "@babel/runtime" "^7.3.1" + lodash "^4.17.11" + web3-core "1.0.0-beta.55" + web3-eth-iban "1.0.0-beta.55" + web3-utils "1.0.0-beta.55" + +web3-core-helpers@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.10.0.tgz#1016534c51a5df77ed4f94d1fcce31de4af37fad" + integrity sha512-pIxAzFDS5vnbXvfvLSpaA1tfRykAe9adw43YCKsEYQwH0gCLL0kMLkaCX3q+Q8EVmAh+e1jWL/nl9U0de1+++g== + dependencies: + web3-eth-iban "1.10.0" + web3-utils "1.10.0" + +web3-core-helpers@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz#484974f4bd4a487217b85b0d7cfe841af0907619" + integrity sha512-HJrRsIGgZa1jGUIhvGz4S5Yh6wtOIo/TMIsSLe+Xay+KVnbseJpPprDI5W3s7H2ODhMQTbogmmUFquZweW2ImQ== + dependencies: + underscore "1.9.1" + web3-eth-iban "1.2.2" + web3-utils "1.2.2" + +web3-core-helpers@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.6.tgz#c478246a9abe4e5456acf42657dac2f7c330be74" + integrity sha512-nhtjA2ZbkppjlxTSwG0Ttu6FcPkVu1rCN5IFAOVpF/L0SEt+jy+O5l90+cjDq0jAYvlBwUwnbh2mR9hwDEJCNA== + dependencies: + underscore "1.12.1" + web3-eth-iban "1.3.6" + web3-utils "1.3.6" + +web3-core-helpers@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.8.1.tgz#7904747b23fd0afa4f2c86ed98ea9418ccad7672" + integrity sha512-ClzNO6T1S1gifC+BThw0+GTfcsjLEY8T1qUp6Ly2+w4PntAdNtKahxWKApWJ0l9idqot/fFIDXwO3Euu7I0Xqw== + dependencies: + web3-eth-iban "1.8.1" + web3-utils "1.8.1" + +web3-core-helpers@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.8.2.tgz#82066560f8085e6c7b93bcc8e88b441289ea9f9f" integrity sha512-6B1eLlq9JFrfealZBomd1fmlq1o4A09vrCVQSa51ANoib/jllT3atZrRDr0zt1rfI7TSZTZBXdN/aTdeN99DWw== @@ -23656,6 +24014,17 @@ web3-core-method@1.0.0-beta.55: web3-core-subscriptions "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-core-method@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.10.0.tgz#82668197fa086e8cc8066742e35a9d72535e3412" + integrity sha512-4R700jTLAMKDMhQ+nsVfIXvH6IGJlJzGisIfMKWAIswH31h5AZz7uDUW2YctI+HrYd+5uOAlS4OJeeT9bIpvkA== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.10.0" + web3-core-promievent "1.10.0" + web3-core-subscriptions "1.10.0" + web3-utils "1.10.0" + web3-core-method@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.2.tgz#d4fe2bb1945b7152e5f08e4ea568b171132a1e56" @@ -23667,6 +24036,29 @@ web3-core-method@1.2.2: web3-core-subscriptions "1.2.2" web3-utils "1.2.2" +web3-core-method@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.6.tgz#4b0334edd94b03dfec729d113c69a4eb6ebc68ae" + integrity sha512-RyegqVGxn0cyYW5yzAwkPlsSEynkdPiegd7RxgB4ak1eKk2Cv1q2x4C7D2sZjeeCEF+q6fOkVmo2OZNqS2iQxg== + dependencies: + "@ethersproject/transactions" "^5.0.0-beta.135" + underscore "1.12.1" + web3-core-helpers "1.3.6" + web3-core-promievent "1.3.6" + web3-core-subscriptions "1.3.6" + web3-utils "1.3.6" + +web3-core-method@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.8.1.tgz#0fc5a433a9fc784c447522f141c0a8e0163c7790" + integrity sha512-oYGRodktfs86NrnFwaWTbv2S38JnpPslFwSSARwFv4W9cjbGUW3LDeA5MKD/dRY+ssZ5OaekeMsUCLoGhX68yA== + dependencies: + "@ethersproject/transactions" "^5.6.2" + web3-core-helpers "1.8.1" + web3-core-promievent "1.8.1" + web3-core-subscriptions "1.8.1" + web3-utils "1.8.1" + web3-core-method@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.8.2.tgz#ba5ec68084e903f0516415010477618be017eac2" @@ -23678,6 +24070,13 @@ web3-core-method@1.8.2: web3-core-subscriptions "1.8.2" web3-utils "1.8.2" +web3-core-promievent@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.10.0.tgz#cbb5b3a76b888df45ed3a8d4d8d4f54ccb66a37b" + integrity sha512-68N7k5LWL5R38xRaKFrTFT2pm2jBNFaM4GioS00YjAKXRQ3KjmhijOMG3TICz6Aa5+6GDWYelDNx21YAeZ4YTg== + dependencies: + eventemitter3 "4.0.4" + web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -23686,6 +24085,13 @@ web3-core-promievent@1.2.2: any-promise "1.3.0" eventemitter3 "3.1.2" +web3-core-promievent@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.6.tgz#6c27dc79de8f71b74f5d17acaf9aaf593d3cb0c9" + integrity sha512-Z+QzfyYDTXD5wJmZO5wwnRO8bAAHEItT1XNSPVb4J1CToV/I/SbF7CuF8Uzh2jns0Cm1109o666H7StFFvzVKw== + dependencies: + eventemitter3 "4.0.4" + web3-core-promievent@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.8.1.tgz#f334c8b2ceac6c2228f06d2a515f6d103157f036" @@ -23700,6 +24106,51 @@ web3-core-promievent@1.8.2: dependencies: eventemitter3 "4.0.4" +web3-core-requestmanager@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.10.0.tgz#4b34f6e05837e67c70ff6f6993652afc0d54c340" + integrity sha512-3z/JKE++Os62APml4dvBM+GAuId4h3L9ckUrj7ebEtS2AR0ixyQPbrBodgL91Sv7j7cQ3Y+hllaluqjguxvSaQ== + dependencies: + util "^0.12.5" + web3-core-helpers "1.10.0" + web3-providers-http "1.10.0" + web3-providers-ipc "1.10.0" + web3-providers-ws "1.10.0" + +web3-core-requestmanager@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" + integrity sha512-a+gSbiBRHtHvkp78U2bsntMGYGF2eCb6219aMufuZWeAZGXJ63Wc2321PCbA8hF9cQrZI4EoZ4kVLRI4OF15Hw== + dependencies: + underscore "1.9.1" + web3-core-helpers "1.2.2" + web3-providers-http "1.2.2" + web3-providers-ipc "1.2.2" + web3-providers-ws "1.2.2" + +web3-core-requestmanager@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.6.tgz#4fea269fe913fd4fca464b4f7c65cb94857b5b2a" + integrity sha512-2rIaeuqeo7QN1Eex7aXP0ZqeteJEPWXYFS/M3r3LXMiV8R4STQBKE+//dnHJXoo2ctzEB5cgd+7NaJM8S3gPyA== + dependencies: + underscore "1.12.1" + util "^0.12.0" + web3-core-helpers "1.3.6" + web3-providers-http "1.3.6" + web3-providers-ipc "1.3.6" + web3-providers-ws "1.3.6" + +web3-core-requestmanager@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.8.1.tgz#272ffa55b7b568ecbc8e4a257ca080355c31c60e" + integrity sha512-x+VC2YPPwZ1khvqA6TA69LvfFCOZXsoUVOxmTx/vIN22PrY9KzKhxcE7pBSiGhmab1jtmRYXUbcQSVpAXqL8cw== + dependencies: + util "^0.12.0" + web3-core-helpers "1.8.1" + web3-providers-http "1.8.1" + web3-providers-ipc "1.8.1" + web3-providers-ws "1.8.1" + web3-core-requestmanager@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.8.2.tgz#dda95e83ca4808949612a41e54ecea557f78ef26" @@ -23720,6 +24171,14 @@ web3-core-subscriptions@1.0.0-beta.55: eventemitter3 "^3.1.0" lodash "^4.17.11" +web3-core-subscriptions@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.10.0.tgz#b534592ee1611788fc0cb0b95963b9b9b6eacb7c" + integrity sha512-HGm1PbDqsxejI075gxBc5OSkwymilRWZufIy9zEpnWKNmfbuv5FfHgW1/chtJP6aP3Uq2vHkvTDl3smQBb8l+g== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.10.0" + web3-core-subscriptions@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz#bf4ba23a653a003bdc3551649958cc0b080b068e" @@ -23729,6 +24188,23 @@ web3-core-subscriptions@1.2.2: underscore "1.9.1" web3-core-helpers "1.2.2" +web3-core-subscriptions@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.6.tgz#ee24e7974d1d72ff6c992c599deba4ef9b308415" + integrity sha512-wi9Z9X5X75OKvxAg42GGIf81ttbNR2TxzkAsp1g+nnp5K8mBwgZvXrIsDuj7Z7gx72Y45mWJADCWjk/2vqNu8g== + dependencies: + eventemitter3 "4.0.4" + underscore "1.12.1" + web3-core-helpers "1.3.6" + +web3-core-subscriptions@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.8.1.tgz#f5ae1380e92746eadfab6475b8a70ef5a1be6bbf" + integrity sha512-bmCMq5OeA3E2vZUh8Js1HcJbhwtsE+yeMqGC4oIZB3XsL5SLqyKLB/pU+qUYqQ9o4GdcrFTDPhPg1bgvf7p1Pw== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.8.1" + web3-core-subscriptions@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.8.2.tgz#0c8bd49439d83c6f0a03c70f00b24a915a70a5ed" @@ -23737,12 +24213,76 @@ web3-core-subscriptions@1.8.2: eventemitter3 "4.0.4" web3-core-helpers "1.8.2" -web3-core@1.0.0-beta.55, web3-core@1.2.2, web3-core@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.2.tgz#333e93d7872b1a36efe758ed8b89a7acbdd962c2" - integrity sha512-DJTVEAYcNqxkqruJE+Rxp3CIv0y5AZMwPHQmOkz/cz+MM75SIzMTc0AUdXzGyTS8xMF8h3YWMQGgGEy8SBf1PQ== +web3-core@1.0.0-beta.55: + version "1.0.0-beta.55" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.55.tgz#26b9abbf1bc1837c9cc90f06ecbc4ed714f89b53" + integrity sha512-AMMp7TLEtE7u8IJAu/THrRhBTZyZzeo7Y6GiWYNwb5+KStC9hIGLr9cI1KX9R6ZioTOLRHrqT7awDhnJ1ku2mg== dependencies: - "@types/bn.js" "^5.1.0" + "@babel/runtime" "^7.3.1" + "@types/bn.js" "^4.11.4" + "@types/node" "^10.12.18" + lodash "^4.17.11" + web3-core-method "1.0.0-beta.55" + web3-providers "1.0.0-beta.55" + web3-utils "1.0.0-beta.55" + +web3-core@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.10.0.tgz#9aa07c5deb478cf356c5d3b5b35afafa5fa8e633" + integrity sha512-fWySwqy2hn3TL89w5TM8wXF1Z2Q6frQTKHWmP0ppRQorEK8NcHJRfeMiv/mQlSKoTS1F6n/nv2uyZsixFycjYQ== + dependencies: + "@types/bn.js" "^5.1.1" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-core-requestmanager "1.10.0" + web3-utils "1.10.0" + +web3-core@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.2.tgz#334b99c8222ef9cfd0339e27352f0b58ea789a2f" + integrity sha512-miHAX3qUgxV+KYfaOY93Hlc3kLW2j5fH8FJy6kSxAv+d4d5aH0wwrU2IIoJylQdT+FeenQ38sgsCnFu9iZ1hCQ== + dependencies: + "@types/bn.js" "^4.11.4" + "@types/node" "^12.6.1" + web3-core-helpers "1.2.2" + web3-core-method "1.2.2" + web3-core-requestmanager "1.2.2" + web3-utils "1.2.2" + +web3-core@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.6.tgz#a6a761d1ff2f3ee462b8dab679229d2f8e267504" + integrity sha512-gkLDM4T1Sc0T+HZIwxrNrwPg0IfWI0oABSglP2X5ZbBAYVUeEATA0o92LWV8BeF+okvKXLK1Fek/p6axwM/h3Q== + dependencies: + "@types/bn.js" "^4.11.5" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.3.6" + web3-core-method "1.3.6" + web3-core-requestmanager "1.3.6" + web3-utils "1.3.6" + +web3-core@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.1.tgz#050b1c408d1f9b7ae539e90f7f7d1b7a7d10578b" + integrity sha512-LbRZlJH2N6nS3n3Eo9Y++25IvzMY7WvYnp4NM/Ajhh97dAdglYs6rToQ2DbL2RLvTYmTew4O/y9WmOk4nq9COw== + dependencies: + "@types/bn.js" "^5.1.0" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-core-requestmanager "1.8.1" + web3-utils "1.8.1" + +web3-core@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.8.2.tgz#333e93d7872b1a36efe758ed8b89a7acbdd962c2" + integrity sha512-DJTVEAYcNqxkqruJE+Rxp3CIv0y5AZMwPHQmOkz/cz+MM75SIzMTc0AUdXzGyTS8xMF8h3YWMQGgGEy8SBf1PQ== + dependencies: + "@types/bn.js" "^5.1.0" "@types/node" "^12.12.6" bignumber.js "^9.0.0" web3-core-helpers "1.8.2" @@ -23750,7 +24290,41 @@ web3-core@1.0.0-beta.55, web3-core@1.2.2, web3-core@1.8.2: web3-core-requestmanager "1.8.2" web3-utils "1.8.2" -web3-eth-abi@1.10.0, web3-eth-abi@1.2.2, web3-eth-abi@1.3.6, web3-eth-abi@1.8.1, web3-eth-abi@1.8.2, web3-eth-abi@^1.0.0-beta.24: +web3-eth-abi@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.10.0.tgz#53a7a2c95a571e205e27fd9e664df4919483cce1" + integrity sha512-cwS+qRBWpJ43aI9L3JS88QYPfFcSJJ3XapxOQ4j40v6mk7ATpA8CVK1vGTzpihNlOfMVRBkR95oAj7oL6aiDOg== + dependencies: + "@ethersproject/abi" "^5.6.3" + web3-utils "1.10.0" + +web3-eth-abi@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" + integrity sha512-Yn/ZMgoOLxhTVxIYtPJ0eS6pnAnkTAaJgUJh1JhZS4ekzgswMfEYXOwpMaD5eiqPJLpuxmZFnXnBZlnQ1JMXsw== + dependencies: + ethers "4.0.0-beta.3" + underscore "1.9.1" + web3-utils "1.2.2" + +web3-eth-abi@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.6.tgz#4272ca48d817aa651bbf97b269f5ff10abc2b8a9" + integrity sha512-Or5cRnZu6WzgScpmbkvC6bfNxR26hqiKK4i8sMPFeTUABQcb/FU3pBj7huBLYbp9dH+P5W79D2MqwbWwjj9DoQ== + dependencies: + "@ethersproject/abi" "5.0.7" + underscore "1.12.1" + web3-utils "1.3.6" + +web3-eth-abi@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.8.1.tgz#47455d6513217c4b0866fea6f97b1c4afa0b6535" + integrity sha512-0mZvCRTIG0UhDhJwNQJgJxu4b4DyIpuMA0GTfqxqeuqzX4Q/ZvmoNurw0ExTfXaGPP82UUmmdkRi6FdZOx+C6w== + dependencies: + "@ethersproject/abi" "^5.6.3" + web3-utils "1.8.1" + +web3-eth-abi@1.8.2, web3-eth-abi@^1.0.0-beta.24: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.8.2.tgz#16e1e9be40e2527404f041a4745111211488f31a" integrity sha512-Om9g3kaRNjqiNPAgKwGT16y+ZwtBzRe4ZJFGjLiSs6v5I7TPNF+rRMWuKnR6jq0azQZDj6rblvKFMA49/k48Og== @@ -23758,6 +24332,22 @@ web3-eth-abi@1.10.0, web3-eth-abi@1.2.2, web3-eth-abi@1.3.6, web3-eth-abi@1.8.1, "@ethersproject/abi" "^5.6.3" web3-utils "1.8.2" +web3-eth-accounts@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.10.0.tgz#2942beca0a4291455f32cf09de10457a19a48117" + integrity sha512-wiq39Uc3mOI8rw24wE2n15hboLE0E9BsQLdlmsL4Zua9diDS6B5abXG0XhFcoNsXIGMWXVZz4TOq3u4EdpXF/Q== + dependencies: + "@ethereumjs/common" "2.5.0" + "@ethereumjs/tx" "3.3.2" + eth-lib "0.2.8" + ethereumjs-util "^7.1.5" + scrypt-js "^3.0.1" + uuid "^9.0.0" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-utils "1.10.0" + web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -23776,6 +24366,40 @@ web3-eth-accounts@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" +web3-eth-accounts@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.6.tgz#f9fcb50b28ee58090ab292a10d996155caa2b474" + integrity sha512-Ilr0hG6ONbCdSlVKffasCmNwftD5HsNpwyQASevocIQwHdTlvlwO0tb3oGYuajbKOaDzNTwXfz25bttAEoFCGA== + dependencies: + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-common "^1.3.2" + ethereumjs-tx "^2.1.1" + scrypt-js "^3.0.1" + underscore "1.12.1" + uuid "3.3.2" + web3-core "1.3.6" + web3-core-helpers "1.3.6" + web3-core-method "1.3.6" + web3-utils "1.3.6" + +web3-eth-accounts@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.8.1.tgz#1ce7387721f118aeb0376291e4d8bbe2ac323406" + integrity sha512-mgzxSYgN54/NsOFBO1Fq1KkXp1S5KlBvI/DlgvajU72rupoFMq6Cu6Yp9GUaZ/w2ij9PzEJuFJk174XwtfMCmg== + dependencies: + "@ethereumjs/common" "2.5.0" + "@ethereumjs/tx" "3.3.2" + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-util "^7.0.10" + scrypt-js "^3.0.1" + uuid "^9.0.0" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-utils "1.8.1" + web3-eth-accounts@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.8.2.tgz#b894f5d5158fcae429da42de75d96520d0712971" @@ -23805,7 +24429,65 @@ web3-eth-admin@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -web3-eth-contract@1.2.2, web3-eth-contract@1.8.2: +web3-eth-contract@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.10.0.tgz#8e68c7654576773ec3c91903f08e49d0242c503a" + integrity sha512-MIC5FOzP/+2evDksQQ/dpcXhSqa/2hFNytdl/x61IeWxhh6vlFeSjq0YVTAyIzdjwnL7nEmZpjfI6y6/Ufhy7w== + dependencies: + "@types/bn.js" "^5.1.1" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-core-promievent "1.10.0" + web3-core-subscriptions "1.10.0" + web3-eth-abi "1.10.0" + web3-utils "1.10.0" + +web3-eth-contract@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz#84e92714918a29e1028ee7718f0712536e14e9a1" + integrity sha512-EKT2yVFws3FEdotDQoNsXTYL798+ogJqR2//CaGwx3p0/RvQIgfzEwp8nbgA6dMxCsn9KOQi7OtklzpnJMkjtA== + dependencies: + "@types/bn.js" "^4.11.4" + underscore "1.9.1" + web3-core "1.2.2" + web3-core-helpers "1.2.2" + web3-core-method "1.2.2" + web3-core-promievent "1.2.2" + web3-core-subscriptions "1.2.2" + web3-eth-abi "1.2.2" + web3-utils "1.2.2" + +web3-eth-contract@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.6.tgz#cccf4d32dc56917fb6923e778498a9ba2a5ba866" + integrity sha512-8gDaRrLF2HCg+YEZN1ov0zN35vmtPnGf3h1DxmJQK5Wm2lRMLomz9rsWsuvig3UJMHqZAQKD7tOl3ocJocQsmA== + dependencies: + "@types/bn.js" "^4.11.5" + underscore "1.12.1" + web3-core "1.3.6" + web3-core-helpers "1.3.6" + web3-core-method "1.3.6" + web3-core-promievent "1.3.6" + web3-core-subscriptions "1.3.6" + web3-eth-abi "1.3.6" + web3-utils "1.3.6" + +web3-eth-contract@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.8.1.tgz#bdf3e33bbcb79a1b6144dffd6a0deefd2e459272" + integrity sha512-1wphnl+/xwCE2io44JKnN+ti3oa47BKRiVzvWd42icwRbcpFfRxH9QH+aQX3u8VZIISNH7dAkTWpGIIJgGFTmg== + dependencies: + "@types/bn.js" "^5.1.0" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-core-promievent "1.8.1" + web3-core-subscriptions "1.8.1" + web3-eth-abi "1.8.1" + web3-utils "1.8.1" + +web3-eth-contract@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.8.2.tgz#5388b7130923d2b790c09a420391a81312a867fb" integrity sha512-ID5A25tHTSBNwOPjiXSVzxruz006ULRIDbzWTYIFTp7NJ7vXu/kynKK2ag/ObuTqBpMbobP8nXcA9b5EDkIdQA== @@ -23819,6 +24501,20 @@ web3-eth-contract@1.2.2, web3-eth-contract@1.8.2: web3-eth-abi "1.8.2" web3-utils "1.8.2" +web3-eth-ens@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.10.0.tgz#96a676524e0b580c87913f557a13ed810cf91cd9" + integrity sha512-3hpGgzX3qjgxNAmqdrC2YUQMTfnZbs4GeLEmy8aCWziVwogbuqQZ+Gzdfrym45eOZodk+lmXyLuAdqkNlvkc1g== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-promievent "1.10.0" + web3-eth-abi "1.10.0" + web3-eth-contract "1.10.0" + web3-utils "1.10.0" + web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -23833,6 +24529,35 @@ web3-eth-ens@1.2.2: web3-eth-contract "1.2.2" web3-utils "1.2.2" +web3-eth-ens@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.6.tgz#0d28c5d4ea7b4462ef6c077545a77956a6cdf175" + integrity sha512-n27HNj7lpSkRxTgSx+Zo7cmKAgyg2ElFilaFlUu/X2CNH23lXfcPm2bWssivH9z0ndhg0OyR4AYFZqPaqDHkJA== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + underscore "1.12.1" + web3-core "1.3.6" + web3-core-helpers "1.3.6" + web3-core-promievent "1.3.6" + web3-eth-abi "1.3.6" + web3-eth-contract "1.3.6" + web3-utils "1.3.6" + +web3-eth-ens@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.8.1.tgz#e78a9651fea8282abe8565b001819e2d645e5929" + integrity sha512-FT8xTI9uN8RxeBQa/W8pLa2aoFh4+EE34w7W2271LICKzla1dtLyb6XSdn48vsUcPmhWsTVk9mO9RTU0l4LGQQ== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-promievent "1.8.1" + web3-eth-abi "1.8.1" + web3-eth-contract "1.8.1" + web3-utils "1.8.1" + web3-eth-ens@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.8.2.tgz#0a086ad4d919102e28b9fd3036df246add9df22a" @@ -23847,6 +24572,23 @@ web3-eth-ens@1.8.2: web3-eth-contract "1.8.2" web3-utils "1.8.2" +web3-eth-iban@1.0.0-beta.55: + version "1.0.0-beta.55" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.55.tgz#15146a69de21addc99e7dbfb2920555b1e729637" + integrity sha512-a2Fxsb5Mssa+jiXgjUdIzJipE0175IcQXJbZLpKft2+zeSJWNTbaa3PQD2vPPpIM4W789q06N+f9Zc0Fyls+1g== + dependencies: + "@babel/runtime" "^7.3.1" + bn.js "4.11.8" + web3-utils "1.0.0-beta.55" + +web3-eth-iban@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.10.0.tgz#5a46646401965b0f09a4f58e7248c8a8cd22538a" + integrity sha512-0l+SP3IGhInw7Q20LY3IVafYEuufo4Dn75jAHT7c2aDJsIolvf2Lc6ugHkBajlwUneGfbRQs/ccYPQ9JeMUbrg== + dependencies: + bn.js "^5.2.1" + web3-utils "1.10.0" + web3-eth-iban@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz#76bec73bad214df7c4192388979a59fc98b96c5a" @@ -23855,6 +24597,22 @@ web3-eth-iban@1.2.2: bn.js "4.11.8" web3-utils "1.2.2" +web3-eth-iban@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.6.tgz#0d6ba21fe78f190af8919e9cd5453882457209e0" + integrity sha512-nfMQaaLA/zsg5W4Oy/EJQbs8rSs1vBAX6b/35xzjYoutXlpHMQadujDx2RerTKhSHqFXSJeQAfE+2f6mdhYkRQ== + dependencies: + bn.js "^4.11.9" + web3-utils "1.3.6" + +web3-eth-iban@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.8.1.tgz#c6484e5d68ca644aa78431301e7acd5df24598d1" + integrity sha512-DomoQBfvIdtM08RyMGkMVBOH0vpOIxSSQ+jukWk/EkMLGMWJtXw/K2c2uHAeq3L/VPWNB7zXV2DUEGV/lNE2Dg== + dependencies: + bn.js "^5.2.1" + web3-utils "1.8.1" + web3-eth-iban@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.8.2.tgz#5cb3022234b13986f086353b53f0379a881feeaf" @@ -23863,6 +24621,18 @@ web3-eth-iban@1.8.2: bn.js "^5.2.1" web3-utils "1.8.2" +web3-eth-personal@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.10.0.tgz#94d525f7a29050a0c2a12032df150ac5ea633071" + integrity sha512-anseKn98w/d703eWq52uNuZi7GhQeVjTC5/svrBWEKob0WZ5kPdo+EZoFN0sp5a5ubbrk/E0xSl1/M5yORMtpg== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-net "1.10.0" + web3-utils "1.10.0" + web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -23875,6 +24645,30 @@ web3-eth-personal@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" +web3-eth-personal@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.6.tgz#226137916754c498f0284f22c55924c87a2efcf0" + integrity sha512-pOHU0+/h1RFRYoh1ehYBehRbcKWP4OSzd4F7mDljhHngv6W8ewMHrAN8O1ol9uysN2MuCdRE19qkRg5eNgvzFQ== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.3.6" + web3-core-helpers "1.3.6" + web3-core-method "1.3.6" + web3-net "1.3.6" + web3-utils "1.3.6" + +web3-eth-personal@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.8.1.tgz#00b5ff1898b62044d25ed5fddd8486168d4827cf" + integrity sha512-myIYMvj7SDIoV9vE5BkVdon3pya1WinaXItugoii2VoTcQNPOtBxmYVH+XS5ErzCJlnxzphpQrkywyY64bbbCA== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-net "1.8.1" + web3-utils "1.8.1" + web3-eth-personal@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.8.2.tgz#3526c1ebaa4e7bf3a0a8ec77e34f067cc9a750b2" @@ -23887,6 +24681,24 @@ web3-eth-personal@1.8.2: web3-net "1.8.2" web3-utils "1.8.2" +web3-eth@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.10.0.tgz#38b905e2759697c9624ab080cfcf4e6c60b3a6cf" + integrity sha512-Z5vT6slNMLPKuwRyKGbqeGYC87OAy8bOblaqRTgg94CXcn/mmqU7iPIlG4506YdcdK3x6cfEDG7B6w+jRxypKA== + dependencies: + web3-core "1.10.0" + web3-core-helpers "1.10.0" + web3-core-method "1.10.0" + web3-core-subscriptions "1.10.0" + web3-eth-abi "1.10.0" + web3-eth-accounts "1.10.0" + web3-eth-contract "1.10.0" + web3-eth-ens "1.10.0" + web3-eth-iban "1.10.0" + web3-eth-personal "1.10.0" + web3-net "1.10.0" + web3-utils "1.10.0" + web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -23906,6 +24718,43 @@ web3-eth@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" +web3-eth@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.6.tgz#2c650893d540a7a0eb1365dd5b2dca24ac919b7c" + integrity sha512-9+rnywRRpyX3C4hfsAQXPQh6vHh9XzQkgLxo3gyeXfbhbShUoq2gFVuy42vsRs//6JlsKdyZS7Z3hHPHz2wreA== + dependencies: + underscore "1.12.1" + web3-core "1.3.6" + web3-core-helpers "1.3.6" + web3-core-method "1.3.6" + web3-core-subscriptions "1.3.6" + web3-eth-abi "1.3.6" + web3-eth-accounts "1.3.6" + web3-eth-contract "1.3.6" + web3-eth-ens "1.3.6" + web3-eth-iban "1.3.6" + web3-eth-personal "1.3.6" + web3-net "1.3.6" + web3-utils "1.3.6" + +web3-eth@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.8.1.tgz#395f6cd56edaac5dbb23e8cec9886c3fd32c430e" + integrity sha512-LgyzbhFqiFRd8M8sBXoFN4ztzOnkeckl3H/9lH5ek7AdoRMhBg7tYpYRP3E5qkhd/q+yiZmcUgy1AF6NHrC1wg== + dependencies: + web3-core "1.8.1" + web3-core-helpers "1.8.1" + web3-core-method "1.8.1" + web3-core-subscriptions "1.8.1" + web3-eth-abi "1.8.1" + web3-eth-accounts "1.8.1" + web3-eth-contract "1.8.1" + web3-eth-ens "1.8.1" + web3-eth-iban "1.8.1" + web3-eth-personal "1.8.1" + web3-net "1.8.1" + web3-utils "1.8.1" + web3-eth@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.8.2.tgz#8562287ae1803c30eb54dc7d832092e5739ce06a" @@ -23937,6 +24786,15 @@ web3-net@1.0.0-beta.55: web3-providers "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3-net@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.10.0.tgz#be53e7f5dafd55e7c9013d49c505448b92c9c97b" + integrity sha512-NLH/N3IshYWASpxk4/18Ge6n60GEvWBVeM8inx2dmZJVmRI6SJIlUxbL8jySgiTn3MMZlhbdvrGo8fpUW7a1GA== + dependencies: + web3-core "1.10.0" + web3-core-method "1.10.0" + web3-utils "1.10.0" + web3-net@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.2.tgz#5c3226ca72df7c591422440ce6f1203fd42ddad9" @@ -23946,6 +24804,24 @@ web3-net@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" +web3-net@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.6.tgz#a56492e2227475e38db29394f8bac305a2446e41" + integrity sha512-KhzU3wMQY/YYjyMiQzbaLPt2kut88Ncx2iqjy3nw28vRux3gVX0WOCk9EL/KVJBiAA/fK7VklTXvgy9dZnnipw== + dependencies: + web3-core "1.3.6" + web3-core-method "1.3.6" + web3-utils "1.3.6" + +web3-net@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.8.1.tgz#2bed4d4b93166724129ec33d0e5dea98880285f4" + integrity sha512-LyEJAwogdFo0UAXZqoSJGFjopdt+kLw0P00FSZn2yszbgcoI7EwC+nXiOsEe12xz4LqpYLOtbR7+gxgiTVjjHQ== + dependencies: + web3-core "1.8.1" + web3-core-method "1.8.1" + web3-utils "1.8.1" + web3-net@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.8.2.tgz#97e1e0015fabc4cda31017813e98d0b5468dd04f" @@ -24029,6 +24905,42 @@ web3-provider-engine@^8.4.0: xhr "^2.2.0" xtend "^4.0.1" +web3-providers-http@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.10.0.tgz#864fa48675e7918c9a4374e5f664b32c09d0151b" + integrity sha512-eNr965YB8a9mLiNrkjAWNAPXgmQWfpBfkkn7tpEFlghfww0u3I0tktMZiaToJVcL2+Xq+81cxbkpeWJ5XQDwOA== + dependencies: + abortcontroller-polyfill "^1.7.3" + cross-fetch "^3.1.4" + es6-promise "^4.2.8" + web3-core-helpers "1.10.0" + +web3-providers-http@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.2.tgz#155e55c1d69f4c5cc0b411ede40dea3d06720956" + integrity sha512-BNZ7Hguy3eBszsarH5gqr9SIZNvqk9eKwqwmGH1LQS1FL3NdoOn7tgPPdddrXec4fL94CwgNk4rCU+OjjZRNDg== + dependencies: + web3-core-helpers "1.2.2" + xhr2-cookies "1.1.0" + +web3-providers-http@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.6.tgz#36e8724a7424d52827819d53fd75dbf31f5422c2" + integrity sha512-OQkT32O1A06dISIdazpGLveZcOXhEo5cEX6QyiSQkiPk/cjzDrXMw4SKZOGQbbS1+0Vjizm1Hrp7O8Vp2D1M5Q== + dependencies: + web3-core-helpers "1.3.6" + xhr2-cookies "1.1.0" + +web3-providers-http@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.8.1.tgz#8aa89c11a9272f11ddb74b871273c92225faa28d" + integrity sha512-1Zyts4O9W/UNEPkp+jyL19Jc3D15S4yp8xuLTjVhcUEAlHo24NDWEKxtZGUuHk4HrKL2gp8OlsDbJ7MM+ESDgg== + dependencies: + abortcontroller-polyfill "^1.7.3" + cross-fetch "^3.1.4" + es6-promise "^4.2.8" + web3-core-helpers "1.8.1" + web3-providers-http@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.8.2.tgz#fbda3a3bbc8db004af36e91bec35f80273b37885" @@ -24039,6 +24951,40 @@ web3-providers-http@1.8.2: es6-promise "^4.2.8" web3-core-helpers "1.8.2" +web3-providers-ipc@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.10.0.tgz#9747c7a6aee96a51488e32fa7c636c3460b39889" + integrity sha512-OfXG1aWN8L1OUqppshzq8YISkWrYHaATW9H8eh0p89TlWMc1KZOL9vttBuaBEi96D/n0eYDn2trzt22bqHWfXA== + dependencies: + oboe "2.1.5" + web3-core-helpers "1.10.0" + +web3-providers-ipc@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" + integrity sha512-t97w3zi5Kn/LEWGA6D9qxoO0LBOG+lK2FjlEdCwDQatffB/+vYrzZ/CLYVQSoyFZAlsDoBasVoYSWZK1n39aHA== + dependencies: + oboe "2.1.4" + underscore "1.9.1" + web3-core-helpers "1.2.2" + +web3-providers-ipc@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.6.tgz#cef8d12c1ebb47adce5ebf597f553c623362cb4a" + integrity sha512-+TVsSd2sSVvVgHG4s6FXwwYPPT91boKKcRuEFXqEfAbUC5t52XOgmyc2LNiD9LzPhed65FbV4LqICpeYGUvSwA== + dependencies: + oboe "2.1.5" + underscore "1.12.1" + web3-core-helpers "1.3.6" + +web3-providers-ipc@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.8.1.tgz#6128a3a3a824d06bf0efcfe86325401f8691a5ca" + integrity sha512-nw/W5nclvi+P2z2dYkLWReKLnocStflWqFl+qjtv0xn3MrUTyXMzSF0+61i77+16xFsTgzo4wS/NWIOVkR0EFA== + dependencies: + oboe "2.1.5" + web3-core-helpers "1.8.1" + web3-providers-ipc@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.8.2.tgz#e52a7250f40c83b99a2482ec5b4cf2728377ae5c" @@ -24047,6 +24993,43 @@ web3-providers-ipc@1.8.2: oboe "2.1.5" web3-core-helpers "1.8.2" +web3-providers-ws@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.10.0.tgz#cb0b87b94c4df965cdf486af3a8cd26daf3975e5" + integrity sha512-sK0fNcglW36yD5xjnjtSGBnEtf59cbw4vZzJ+CmOWIKGIR96mP5l684g0WD0Eo+f4NQc2anWWXG74lRc9OVMCQ== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.10.0" + websocket "^1.0.32" + +web3-providers-ws@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" + integrity sha512-Wb1mrWTGMTXOpJkL0yGvL/WYLt8fUIXx8k/l52QB2IiKzvyd42dTWn4+j8IKXGSYYzOm7NMqv6nhA5VDk12VfA== + dependencies: + underscore "1.9.1" + web3-core-helpers "1.2.2" + websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" + +web3-providers-ws@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.6.tgz#e1df617bc89d66165abdf2191da0014c505bfaac" + integrity sha512-bk7MnJf5or0Re2zKyhR3L3CjGululLCHXx4vlbc/drnaTARUVvi559OI5uLytc/1k5HKUUyENAxLvetz2G1dnQ== + dependencies: + eventemitter3 "4.0.4" + underscore "1.12.1" + web3-core-helpers "1.3.6" + websocket "^1.0.32" + +web3-providers-ws@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.8.1.tgz#5e5370e07eb8c615ed298ebc8602b283c7b7d649" + integrity sha512-TNefIDAMpdx57+YdWpYZ/xdofS0P+FfKaDYXhn24ie/tH9G+AB+UBSOKnjN0KSadcRSCMBwGPRiEmNHPavZdsA== + dependencies: + eventemitter3 "4.0.4" + web3-core-helpers "1.8.1" + websocket "^1.0.32" + web3-providers-ws@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.8.2.tgz#56a2b701387011aca9154ca4bc06ea4b5f27e4ef" @@ -24073,6 +25056,46 @@ web3-providers@1.0.0-beta.55: websocket "^1.0.28" xhr2-cookies "1.1.0" +web3-shh@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.10.0.tgz#c2979b87e0f67a7fef2ce9ee853bd7bfbe9b79a8" + integrity sha512-uNUUuNsO2AjX41GJARV9zJibs11eq6HtOe6Wr0FtRUcj8SN6nHeYIzwstAvJ4fXA53gRqFMTxdntHEt9aXVjpg== + dependencies: + web3-core "1.10.0" + web3-core-method "1.10.0" + web3-core-subscriptions "1.10.0" + web3-net "1.10.0" + +web3-shh@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.2.tgz#44ed998f2a6ba0ec5cb9d455184a0f647826a49c" + integrity sha512-og258NPhlBn8yYrDWjoWBBb6zo1OlBgoWGT+LL5/LPqRbjPe09hlOYHgscAAr9zZGtohTOty7RrxYw6Z6oDWCg== + dependencies: + web3-core "1.2.2" + web3-core-method "1.2.2" + web3-core-subscriptions "1.2.2" + web3-net "1.2.2" + +web3-shh@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.6.tgz#4e3486c7eca5cbdb87f88910948223a5b7ea6c20" + integrity sha512-9zRo415O0iBslxBnmu9OzYjNErzLnzOsy+IOvSpIreLYbbAw0XkDWxv3SfcpKnTIWIACBR4AYMIxmmyi5iB3jw== + dependencies: + web3-core "1.3.6" + web3-core-method "1.3.6" + web3-core-subscriptions "1.3.6" + web3-net "1.3.6" + +web3-shh@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.8.1.tgz#028a95cf9d3a36020380938b9a127610efbb9be7" + integrity sha512-sqHgarnfcY2Qt3PYS4R6YveHrDy7hmL09yeLLHHCI+RKirmjLVqV0rc5LJWUtlbYI+kDoa5gbgde489M9ZAC0g== + dependencies: + web3-core "1.8.1" + web3-core-method "1.8.1" + web3-core-subscriptions "1.8.1" + web3-net "1.8.1" + web3-shh@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.8.2.tgz#217a417f0d6e243dd4d441848ffc2bd164cea8a0" @@ -24083,7 +25106,90 @@ web3-shh@1.8.2: web3-core-subscriptions "1.8.2" web3-net "1.8.2" -web3-utils@1.0.0-beta.55, web3-utils@1.10.0, web3-utils@1.2.1, web3-utils@1.2.2, web3-utils@1.3.6, web3-utils@1.8.1, web3-utils@1.8.2, web3-utils@^1.0.0-beta.31: +web3-utils@1.0.0-beta.55: + version "1.0.0-beta.55" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.55.tgz#beb40926b7c04208b752d36a9bc959d27a04b308" + integrity sha512-ASWqUi8gtWK02Tp8ZtcoAbHenMpQXNvHrakgzvqTNNZn26wgpv+Q4mdPi0KOR6ZgHFL8R/9b5BBoUTglS1WPpg== + dependencies: + "@babel/runtime" "^7.3.1" + "@types/bn.js" "^4.11.4" + "@types/node" "^10.12.18" + bn.js "4.11.8" + eth-lib "0.2.8" + ethjs-unit "^0.1.6" + lodash "^4.17.11" + number-to-bn "1.7.0" + randombytes "^2.1.0" + utf8 "2.1.1" + +web3-utils@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.10.0.tgz#ca4c1b431a765c14ac7f773e92e0fd9377ccf578" + integrity sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg== + dependencies: + bn.js "^5.2.1" + ethereum-bloom-filters "^1.0.6" + ethereumjs-util "^7.1.0" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + utf8 "3.0.0" + +web3-utils@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.1.tgz#21466e38291551de0ab34558de21512ac4274534" + integrity sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA== + dependencies: + bn.js "4.11.8" + eth-lib "0.2.7" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randomhex "0.1.5" + underscore "1.9.1" + utf8 "3.0.0" + +web3-utils@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.2.tgz#b53a08c40d2c3f31d3c4a28e7d749405df99c8c0" + integrity sha512-joF+s3243TY5cL7Z7y4h1JsJpUCf/kmFmj+eJar7Y2yNIGVcW961VyrAms75tjUysSuHaUQ3eQXjBEUJueT52A== + dependencies: + bn.js "4.11.8" + eth-lib "0.2.7" + ethereum-bloom-filters "^1.0.6" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + underscore "1.9.1" + utf8 "3.0.0" + +web3-utils@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.6.tgz#390bc9fa3a7179746963cfaca55bb80ac4d8dc10" + integrity sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg== + dependencies: + bn.js "^4.11.9" + eth-lib "0.2.8" + ethereum-bloom-filters "^1.0.6" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + underscore "1.12.1" + utf8 "3.0.0" + +web3-utils@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.1.tgz#f2f7ca7eb65e6feb9f3d61056d0de6bbd57125ff" + integrity sha512-LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ== + dependencies: + bn.js "^5.2.1" + ethereum-bloom-filters "^1.0.6" + ethereumjs-util "^7.1.0" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + utf8 "3.0.0" + +web3-utils@1.8.2, web3-utils@^1.0.0-beta.31: version "1.8.2" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.8.2.tgz#c32dec5e9b955acbab220eefd7715bc540b75cc9" integrity sha512-v7j6xhfLQfY7xQDrUP0BKbaNrmZ2/+egbqP9q3KYmOiPpnvAfol+32slgL0WX/5n8VPvKCK5EZ1HGrAVICSToA== @@ -24096,7 +25202,7 @@ web3-utils@1.0.0-beta.55, web3-utils@1.10.0, web3-utils@1.2.1, web3-utils@1.2.2, randombytes "^2.1.0" utf8 "3.0.0" -web3@*, web3@1.10.0, web3@1.2.2, web3@1.3.6, web3@1.8.1, web3@1.8.2, web3@^0.16.0, web3@^0.18.2, web3@^1.2.4: +web3@*, web3@1.8.2, web3@^1.2.4: version "1.8.2" resolved "https://registry.yarnpkg.com/web3/-/web3-1.8.2.tgz#95a4e5398fd0f01325264bf8e5e8cdc69a7afe86" integrity sha512-92h0GdEHW9wqDICQQKyG4foZBYi0OQkyg4CRml2F7XBl/NG+fu9o6J19kzfFXzSBoA4DnJXbyRgj/RHZv5LRiw== @@ -24109,6 +25215,80 @@ web3@*, web3@1.10.0, web3@1.2.2, web3@1.3.6, web3@1.8.1, web3@1.8.2, web3@^0.16. web3-shh "1.8.2" web3-utils "1.8.2" +web3@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.10.0.tgz#2fde0009f59aa756c93e07ea2a7f3ab971091274" + integrity sha512-YfKY9wSkGcM8seO+daR89oVTcbu18NsVfvOngzqMYGUU0pPSQmE57qQDvQzUeoIOHAnXEBNzrhjQJmm8ER0rng== + dependencies: + web3-bzz "1.10.0" + web3-core "1.10.0" + web3-eth "1.10.0" + web3-eth-personal "1.10.0" + web3-net "1.10.0" + web3-shh "1.10.0" + web3-utils "1.10.0" + +web3@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.2.tgz#b1b8b69aafdf94cbaeadbb68a8aa1df2ef266aec" + integrity sha512-/ChbmB6qZpfGx6eNpczt5YSUBHEA5V2+iUCbn85EVb3Zv6FVxrOo5Tv7Lw0gE2tW7EEjASbCyp3mZeiZaCCngg== + dependencies: + "@types/node" "^12.6.1" + web3-bzz "1.2.2" + web3-core "1.2.2" + web3-eth "1.2.2" + web3-eth-personal "1.2.2" + web3-net "1.2.2" + web3-shh "1.2.2" + web3-utils "1.2.2" + +web3@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.6.tgz#599425461c3f9a8cbbefa70616438995f4a064cc" + integrity sha512-jEpPhnL6GDteifdVh7ulzlPrtVQeA30V9vnki9liYlUvLV82ZM7BNOQJiuzlDePuE+jZETZSP/0G/JlUVt6pOA== + dependencies: + web3-bzz "1.3.6" + web3-core "1.3.6" + web3-eth "1.3.6" + web3-eth-personal "1.3.6" + web3-net "1.3.6" + web3-shh "1.3.6" + web3-utils "1.3.6" + +web3@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.8.1.tgz#8ea67215ef5f3a6f6d3381800b527242ea22885a" + integrity sha512-tAqFsQhGv340C9OgRJIuoScN7f7wa1tUvsnnDUMt9YE6J4gcm7TV2Uwv+KERnzvV+xgdeuULYpsioRRNKrUvoQ== + dependencies: + web3-bzz "1.8.1" + web3-core "1.8.1" + web3-eth "1.8.1" + web3-eth-personal "1.8.1" + web3-net "1.8.1" + web3-shh "1.8.1" + web3-utils "1.8.1" + +web3@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019" + integrity sha512-8vET/GI2qDtShXNtPkuWByWvPNou9ecuYI9OJswBdA+NUwe5WZKirHUWakS0y4mK6lGmOhv7mLN7cHCBhmQRyA== + dependencies: + bignumber.js "git+https://github.com/debris/bignumber.js#master" + crypto-js "^3.1.4" + utf8 "^2.1.1" + xmlhttprequest "*" + +web3@^0.18.2: + version "0.18.4" + resolved "https://registry.yarnpkg.com/web3/-/web3-0.18.4.tgz#81ec1784145491f2eaa8955b31c06049e07c5e7d" + integrity sha512-TG+CtszzJHRHq+1T0AJVN4ATDvNn4QIAIEnErTgx2jj9oCa5ggOqZv3Ub0RAF+Yr2F/e5F6UFpEUSH9QK7w50Q== + dependencies: + bignumber.js "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" + crypto-js "^3.1.4" + utf8 "^2.1.1" + xhr2 "*" + xmlhttprequest "*" + webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -24145,6 +25325,16 @@ websocket@^1.0.28, websocket@^1.0.32: utf-8-validate "^5.0.2" yaeti "^0.0.6" +"websocket@github:web3-js/WebSocket-Node#polyfill/globalThis": + version "1.0.29" + resolved "https://codeload.github.com/web3-js/WebSocket-Node/tar.gz/ef5ea2f41daf4a2113b80c9223df884b4d56c400" + dependencies: + debug "^2.2.0" + es5-ext "^0.10.50" + nan "^2.14.0" + typedarray-to-buffer "^3.1.5" + yaeti "^0.0.6" + whatwg-fetch@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" @@ -24522,6 +25712,11 @@ xhr2-cookies@1.1.0: dependencies: cookiejar "^2.1.1" +xhr2@*: + version "0.2.1" + resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93" + integrity sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw== + xhr@^2.0.4, xhr@^2.2.0, xhr@^2.3.3: version "2.6.0" resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d" @@ -24550,7 +25745,7 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlhttprequest@1.8.0: +xmlhttprequest@*, xmlhttprequest@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" integrity sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA== @@ -24822,6 +26017,14 @@ yarn@^1.21.1: resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ== +yauzl@^2.4.2: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + yn@3.1.1, yn@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 3e11de338b8e405038d3b31e933f2f4ef68e0eaf Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 12:01:42 -0400 Subject: [PATCH 087/184] updated yarn lock --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 10497406e4f..cbba6f0cd67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7209,7 +7209,7 @@ bigint-crypto-utils@^3.0.23: resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.2.2.tgz#e30a49ec38357c6981cd3da5aaa6480b1f752ee4" integrity sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw== -bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", "bignumber.js@git+https://github.com/debris/bignumber.js.git#master", bignumber.js@~9.0.2: +bignumber.js@7.2.1, bignumber.js@9.0.0, bignumber.js@9.1.0, bignumber.js@^7.2.0, bignumber.js@^7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.1, "bignumber.js@git+https://github.com/debris/bignumber.js#master", "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", bignumber.js@~9.0.2: version "9.0.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== From 50bec2a505e74ea7e165c3ddc2f9d82a6e8efa90 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 14:25:11 -0400 Subject: [PATCH 088/184] updated governance/network test revert messages --- .../governance/network/blockchainparams.ts | 36 +- .../test/governance/network/epochrewards.ts | 67 ++-- .../test/governance/network/governance.ts | 313 +++++++++++++----- .../governance/network/governance_slasher.ts | 17 +- 4 files changed, 318 insertions(+), 115 deletions(-) diff --git a/packages/protocol/test/governance/network/blockchainparams.ts b/packages/protocol/test/governance/network/blockchainparams.ts index c26655cccca..da32f5f0b0b 100644 --- a/packages/protocol/test/governance/network/blockchainparams.ts +++ b/packages/protocol/test/governance/network/blockchainparams.ts @@ -2,6 +2,7 @@ import { assertContainSubset, assertEqualBN, assertRevert, + assertRevertWithReason, mineBlocks, } from '@celo/protocol/lib/test-utils' import { BigNumber } from 'bignumber.js' @@ -62,10 +63,11 @@ contract('BlockchainParameters', (accounts: string[]) => { }) }) it('only owner should be able to set', async () => { - await assertRevert( + await assertRevertWithReason( blockchainParameters.setMinimumClientVersion(version.major, version.minor, version.patch, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -87,10 +89,11 @@ contract('BlockchainParameters', (accounts: string[]) => { }) }) it('only owner should be able to set', async () => { - await assertRevert( + await assertRevertWithReason( blockchainParameters.setBlockGasLimit(gasLimit, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -117,10 +120,11 @@ contract('BlockchainParameters', (accounts: string[]) => { }) }) it('only owner should be able to set', async () => { - await assertRevert( + await assertRevertWithReason( blockchainParameters.setIntrinsicGasForAlternativeFeeCurrency(gasLimit, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -168,20 +172,30 @@ contract('BlockchainParameters', (accounts: string[]) => { }) it('only owner should be able to set', () => - assertRevert( + assertRevertWithReason( blockchainParameters.setUptimeLookbackWindow(newValue, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' )) it('should fail when using value lower than safe minimum', () => - assertRevert(blockchainParameters.setUptimeLookbackWindow(2))) + assertRevertWithReason( + blockchainParameters.setUptimeLookbackWindow(2), + 'UptimeLookbackWindow must be within safe range' + )) it('should fail when using value greater than safe maximum', () => - assertRevert(blockchainParameters.setUptimeLookbackWindow(721))) + assertRevertWithReason( + blockchainParameters.setUptimeLookbackWindow(721), + 'UptimeLookbackWindow must be within safe range' + )) it('should fail when using value greater than epochSize - 2', () => - assertRevert(blockchainParameters.setUptimeLookbackWindow(EPOCH - 1))) + assertRevertWithReason( + blockchainParameters.setUptimeLookbackWindow(EPOCH - 1), + 'UptimeLookbackWindow must be smaller or equal to epochSize - 2' + )) }) describe('#initialize()', () => { diff --git a/packages/protocol/test/governance/network/epochrewards.ts b/packages/protocol/test/governance/network/epochrewards.ts index e91c71bb015..9d20d6f46cb 100644 --- a/packages/protocol/test/governance/network/epochrewards.ts +++ b/packages/protocol/test/governance/network/epochrewards.ts @@ -4,7 +4,7 @@ import { assertContainSubset, assertEqualBN, assertEqualDpBN, - assertRevert, + assertRevertWithReason, jsonRpc, timeTravel, } from '@celo/protocol/lib/test-utils' @@ -153,7 +153,7 @@ contract('EpochRewards', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.initialize( registry.address, targetVotingYieldParams.initial, @@ -167,7 +167,8 @@ contract('EpochRewards', (accounts: string[]) => { communityRewardFraction, carbonOffsettingPartner, carbonOffsettingFraction - ) + ), + 'contract already initialized' ) }) }) @@ -196,10 +197,11 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setTargetVotingGoldFraction(newFraction, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -207,7 +209,10 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the fraction is the same', () => { it('should revert', async () => { - await assertRevert(epochRewards.setTargetVotingGoldFraction(targetVotingGoldFraction)) + await assertRevertWithReason( + epochRewards.setTargetVotingGoldFraction(targetVotingGoldFraction) + ), + 'Target voting gold fraction unchanged' }) }) }) @@ -237,10 +242,11 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setCommunityRewardFraction(newFraction, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -248,7 +254,10 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the fraction is the same', () => { it('should revert', async () => { - await assertRevert(epochRewards.setCommunityRewardFraction(communityRewardFraction)) + await assertRevertWithReason( + epochRewards.setCommunityRewardFraction(communityRewardFraction) + ), + 'Value must be different from existing community reward fraction and less than 1' }) }) }) @@ -278,8 +287,9 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the payment is the same', () => { it('should revert', async () => { - await assertRevert( - epochRewards.setTargetValidatorEpochPayment(targetValidatorEpochPayment) + await assertRevertWithReason( + epochRewards.setTargetValidatorEpochPayment(targetValidatorEpochPayment), + 'Target validator epoch payment unchanged' ) }) }) @@ -287,10 +297,11 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setTargetValidatorEpochPayment(newPayment, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -338,7 +349,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setRewardsMultiplierParameters( newParams.max, newParams.underspend, @@ -346,7 +357,8 @@ contract('EpochRewards', (accounts: string[]) => { { from: nonOwner, } - ) + ), + 'Ownable: caller is not the owner' ) }) }) @@ -354,12 +366,13 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the parameters are the same', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setRewardsMultiplierParameters( rewardsMultiplier.max, rewardsMultiplier.adjustments.underspend, rewardsMultiplier.adjustments.overspend - ) + ), + 'Bad rewards multiplier parameters' ) }) }) @@ -398,10 +411,11 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setTargetVotingYieldParameters(newMax, newFactor, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -409,11 +423,12 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the parameters are the same', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setTargetVotingYieldParameters( targetVotingYieldParams.max, targetVotingYieldParams.adjustmentFactor - ) + ), + 'Bad target voting yield parameters' ) }) }) @@ -449,10 +464,11 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( epochRewards.setTargetVotingYield(newTarget, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -1164,7 +1180,10 @@ contract('EpochRewards', (accounts: string[]) => { }) it('should make updateTargetVotingYield revert', async () => { - await assertRevert(epochRewards.updateTargetVotingYield()) + await assertRevertWithReason( + epochRewards.updateTargetVotingYield(), + "can't call when contract is frozen" + ) }) }) }) diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index 3c1636ae8a5..7da6b287cc4 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -238,7 +238,7 @@ contract('Governance', (accounts: string[]) => { // TODO(asa): Consider testing reversion when 0 values provided it('should not be callable again', async () => { - await assertRevert( + await assertRevertWithReason( governance.initialize( registry.address, approver, @@ -252,7 +252,8 @@ contract('Governance', (accounts: string[]) => { participationFloor, baselineUpdateFactor, baselineQuorumFactor - ) + ), + 'contract already initialized' ) }) }) @@ -277,15 +278,18 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when approver is the null address', async () => { - await assertRevert(governance.setApprover(NULL_ADDRESS)) + await assertRevertWithReason(governance.setApprover(NULL_ADDRESS), 'Approver cannot be 0') }) it('should revert when the approver is unchanged', async () => { - await assertRevert(governance.setApprover(approver)) + await assertRevertWithReason(governance.setApprover(approver), 'Approver unchanged') }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(governance.setApprover(newApprover, { from: nonOwner })) + await assertRevertWithReason( + governance.setApprover(newApprover, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -309,11 +313,17 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the minDeposit is unchanged', async () => { - await assertRevert(governance.setMinDeposit(minDeposit)) + await assertRevertWithReason( + governance.setMinDeposit(minDeposit), + 'Minimum deposit unchanged' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(governance.setMinDeposit(newMinDeposit, { from: nonOwner })) + await assertRevertWithReason( + governance.setMinDeposit(newMinDeposit, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -337,16 +347,23 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when concurrent proposals is 0', async () => { - await assertRevert(governance.setConcurrentProposals(0)) + await assertRevertWithReason( + governance.setConcurrentProposals(0), + 'Number of proposals must be larger than zero' + ) }) it('should revert when concurrent proposals is unchanged', async () => { - await assertRevert(governance.setConcurrentProposals(concurrentProposals)) + await assertRevertWithReason( + governance.setConcurrentProposals(concurrentProposals), + 'Number of proposals unchanged' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( - governance.setConcurrentProposals(newConcurrentProposals, { from: nonOwner }) + await assertRevertWithReason( + governance.setConcurrentProposals(newConcurrentProposals, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -371,15 +388,21 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when queue expiry is 0', async () => { - await assertRevert(governance.setQueueExpiry(0)) + await assertRevertWithReason( + governance.setQueueExpiry(0), + 'QueueExpiry must be larger than 0' + ) }) it('should revert when queue expiry is unchanged', async () => { - await assertRevert(governance.setQueueExpiry(queueExpiry)) + await assertRevertWithReason(governance.setQueueExpiry(queueExpiry), 'QueueExpiry unchanged') }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(governance.setQueueExpiry(newQueueExpiry, { from: nonOwner })) + await assertRevertWithReason( + governance.setQueueExpiry(newQueueExpiry, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -403,15 +426,24 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when dequeue frequency is 0', async () => { - await assertRevert(governance.setDequeueFrequency(0)) + await assertRevertWithReason( + governance.setDequeueFrequency(0), + 'dequeueFrequency must be larger than 0' + ) }) it('should revert when dequeue frequency is unchanged', async () => { - await assertRevert(governance.setDequeueFrequency(dequeueFrequency)) + await assertRevertWithReason( + governance.setDequeueFrequency(dequeueFrequency), + 'dequeueFrequency unchanged' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(governance.setDequeueFrequency(newDequeueFrequency, { from: nonOwner })) + await assertRevertWithReason( + governance.setDequeueFrequency(newDequeueFrequency, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -436,16 +468,23 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when referendum stage duration is 0', async () => { - await assertRevert(governance.setReferendumStageDuration(0)) + await assertRevertWithReason( + governance.setReferendumStageDuration(0), + 'Duration must be larger than 0' + ) }) it('should revert when referendum stage duration is unchanged', async () => { - await assertRevert(governance.setReferendumStageDuration(referendumStageDuration)) + await assertRevertWithReason( + governance.setReferendumStageDuration(referendumStageDuration), + 'Duration unchanged' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( - governance.setReferendumStageDuration(newReferendumStageDuration, { from: nonOwner }) + await assertRevertWithReason( + governance.setReferendumStageDuration(newReferendumStageDuration, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -471,16 +510,23 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when execution stage duration is 0', async () => { - await assertRevert(governance.setExecutionStageDuration(0)) + await assertRevertWithReason( + governance.setExecutionStageDuration(0), + 'Duration must be larger than 0' + ) }) it('should revert when execution stage duration is unchanged', async () => { - await assertRevert(governance.setExecutionStageDuration(executionStageDuration)) + await assertRevertWithReason( + governance.setExecutionStageDuration(executionStageDuration), + 'Duration unchanged' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( - governance.setExecutionStageDuration(newExecutionStageDuration, { from: nonOwner }) + await assertRevertWithReason( + governance.setExecutionStageDuration(newExecutionStageDuration, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -507,12 +553,16 @@ contract('Governance', (accounts: string[]) => { }) it('should revert if new participation floor is above 1', async () => { - await assertRevert(governance.setParticipationFloor(toFixed(101 / 100))) + await assertRevertWithReason( + governance.setParticipationFloor(toFixed(101 / 100)), + 'Participation floor greater than one' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( - governance.setParticipationFloor(differentParticipationFloor, { from: nonOwner }) + await assertRevertWithReason( + governance.setParticipationFloor(differentParticipationFloor, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -539,12 +589,16 @@ contract('Governance', (accounts: string[]) => { }) it('should revert if new update coefficient is above 1', async () => { - await assertRevert(governance.setBaselineUpdateFactor(toFixed(101 / 100))) + await assertRevertWithReason( + governance.setBaselineUpdateFactor(toFixed(101 / 100)), + 'Baseline update factor greater than one' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( - governance.setBaselineUpdateFactor(differentBaselineUpdateFactor, { from: nonOwner }) + await assertRevertWithReason( + governance.setBaselineUpdateFactor(differentBaselineUpdateFactor, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -571,12 +625,16 @@ contract('Governance', (accounts: string[]) => { }) it('should revert if new critical baseline level is above 1', async () => { - await assertRevert(governance.setBaselineQuorumFactor(toFixed(101 / 100))) + await assertRevertWithReason( + governance.setBaselineQuorumFactor(toFixed(101 / 100)), + 'Baseline quorum factor greater than one' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( - governance.setBaselineQuorumFactor(differentBaselineQuorumFactor, { from: nonOwner }) + await assertRevertWithReason( + governance.setBaselineQuorumFactor(differentBaselineQuorumFactor, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -656,28 +714,39 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the destination is the null address', async () => { - await assertRevert(governance.setConstitution(NULL_ADDRESS, nullFunctionId, threshold)) + await assertRevertWithReason( + governance.setConstitution(NULL_ADDRESS, nullFunctionId, threshold), + 'Destination cannot be zero' + ) }) it('should revert when the threshold is zero', async () => { - await assertRevert(governance.setConstitution(destination, nullFunctionId, 0)) + await assertRevertWithReason( + governance.setConstitution(destination, nullFunctionId, 0), + 'Threshold has to be greater than majority and not greater than unanimity' + ) }) it('should revert when the threshold is not greater than a majority', async () => { - await assertRevert(governance.setConstitution(destination, nullFunctionId, toFixed(1 / 2))) + await assertRevertWithReason( + governance.setConstitution(destination, nullFunctionId, toFixed(1 / 2)), + 'Threshold has to be greater than majority and not greater than unanimity' + ) }) it('should revert when the threshold is greater than 100%', async () => { - await assertRevert( - governance.setConstitution(destination, nullFunctionId, toFixed(101 / 100)) + await assertRevertWithReason( + governance.setConstitution(destination, nullFunctionId, toFixed(101 / 100)), + 'Threshold has to be greater than majority and not greater than unanimity' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( + await assertRevertWithReason( governance.setConstitution(destination, nullFunctionId, threshold, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -1026,7 +1095,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when upvoting a proposal that is not queued', async () => { - await assertRevert(governance.upvote(proposalId.plus(1), 0, 0)) + await assertRevertWithReason( + governance.upvote(proposalId.plus(1), 0, 0), + 'cannot upvote a proposal not in the queue' + ) }) describe('when the upvoted proposal is at the end of the queue', () => { @@ -1133,7 +1205,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when upvoting a proposal that will be dequeued', async () => { - await assertRevert(governance.upvote(proposalId, 0, 0)) + await assertRevertWithReason( + governance.upvote(proposalId, 0, 0), + 'cannot upvote a proposal not in the queue' + ) }) }) @@ -1251,7 +1326,10 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account does not have an upvoted proposal', async () => { await governance.revokeUpvote(0, 0) - await assertRevert(governance.revokeUpvote(0, 0)) + await assertRevertWithReason( + governance.revokeUpvote(0, 0), + 'Account has no historical upvote' + ) }) describe('when the upvoted proposal has expired', () => { @@ -1344,7 +1422,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the caller was not the proposer of a dequeued proposal', async () => { - await assertRevert(governance.withdraw({ from: accounts[1] })) + await assertRevertWithReason( + governance.withdraw({ from: accounts[1] }), + 'Nothing to withdraw' + ) }) }) @@ -1401,7 +1482,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the index is out of bounds', async () => { - await assertRevert(governance.approve(proposalId, index + 1)) + await assertRevertWithReason( + governance.approve(proposalId, index + 1), + 'Provided index greater than dequeue length.' + ) }) it('should revert if the proposal id does not match the index', async () => { @@ -1417,11 +1501,17 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevert(governance.approve(otherProposalId, index)) + await assertRevertWithReason( + governance.approve(otherProposalId, index), + 'Proposal not dequeued' + ) }) it('should revert when not called by the approver', async () => { - await assertRevert(governance.approve(proposalId, index, { from: nonApprover })) + await assertRevertWithReason( + governance.approve(proposalId, index, { from: nonApprover }), + 'msg.sender not approver' + ) }) it('should revert when the proposal is queued', async () => { @@ -1435,12 +1525,18 @@ contract('Governance', (accounts: string[]) => { // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails { value: minDeposit } ) - await assertRevert(governance.approve(proposalId + 1, index)) + await assertRevertWithReason( + governance.approve(proposalId + 1, index), + 'Proposal not dequeued' + ) }) it('should revert if the proposal has already been approved', async () => { await governance.approve(proposalId, index) - await assertRevert(governance.approve(proposalId, index)) + await assertRevertWithReason( + governance.approve(proposalId, index), + 'Proposal already approved' + ) }) describe('when the proposal is within referendum stage', () => { @@ -1747,11 +1843,14 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevert(governance.vote(proposalId, index, value)) + await assertRevertWithReason(governance.vote(proposalId, index, value), 'Voter weight zero') }) it('should revert when the index is out of bounds', async () => { - await assertRevert(governance.vote(proposalId, index + 1, value)) + await assertRevertWithReason( + governance.vote(proposalId, index + 1, value), + 'Provided index greater than dequeue length.' + ) }) it('should revert if the proposal id does not match the index', async () => { @@ -1767,7 +1866,10 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevert(governance.vote(otherProposalId, index, value)) + await assertRevertWithReason( + governance.vote(otherProposalId, index, value), + 'Proposal not dequeued' + ) }) describe('when voting on two proposals', () => { @@ -2016,11 +2118,14 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevert(governance.vote(proposalId, index, value)) + await assertRevertWithReason(governance.vote(proposalId, index, value), 'Voter weight zero') }) it('should revert when the index is out of bounds', async () => { - await assertRevert(governance.vote(proposalId, index + 1, value)) + await assertRevertWithReason( + governance.vote(proposalId, index + 1, value), + 'Provided index greater than dequeue length.' + ) }) it('should revert if the proposal id does not match the index', async () => { @@ -2036,7 +2141,10 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevert(governance.vote(otherProposalId, index, value)) + await assertRevertWithReason( + governance.vote(otherProposalId, index, value), + 'Proposal not dequeued' + ) }) }) @@ -2188,20 +2296,32 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevert(governance.votePartially(proposalId, index, yesVotes, 0, 0)) + await assertRevertWithReason( + governance.votePartially(proposalId, index, yesVotes, 0, 0), + "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" + ) }) it('should revert when the account does not have enough gold', async () => { - await assertRevert(governance.votePartially(proposalId, index, yesVotes + 1, 0, 0)) + await assertRevertWithReason( + governance.votePartially(proposalId, index, yesVotes + 1, 0, 0), + "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" + ) }) it('should revert when the account does not have enough gold when voting partially', async () => { const noVotes = yesVotes - await assertRevert(governance.votePartially(proposalId, index, yesVotes, noVotes, 0)) + await assertRevertWithReason( + governance.votePartially(proposalId, index, yesVotes, noVotes, 0), + "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" + ) }) it('should revert when the index is out of bounds', async () => { - await assertRevert(governance.votePartially(proposalId, index + 1, yesVotes, 0, 0)) + await assertRevertWithReason( + governance.votePartially(proposalId, index + 1, yesVotes, 0, 0), + 'Provided index greater than dequeue length.' + ) }) it('should revert if the proposal id does not match the index', async () => { @@ -2217,7 +2337,10 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevert(governance.votePartially(otherProposalId, index, yesVotes, 0, 0)) + await assertRevertWithReason( + governance.votePartially(otherProposalId, index, yesVotes, 0, 0), + 'Proposal not dequeued' + ) }) describe('when voting on two proposals', () => { @@ -2518,11 +2641,17 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevert(governance.votePartially(proposalId, index, yesVotes, 0, 0)) + await assertRevertWithReason( + governance.votePartially(proposalId, index, yesVotes, 0, 0), + "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" + ) }) it('should revert when the index is out of bounds', async () => { - await assertRevert(governance.votePartially(proposalId, index + 1, yesVotes, 0, 0)) + await assertRevertWithReason( + governance.votePartially(proposalId, index + 1, yesVotes, 0, 0), + 'Provided index greater than dequeue length.' + ) }) it('should revert if the proposal id does not match the index', async () => { @@ -2538,7 +2667,10 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevert(governance.votePartially(otherProposalId, index, yesVotes, 0, 0)) + await assertRevertWithReason( + governance.votePartially(otherProposalId, index, yesVotes, 0, 0), + 'Proposal not dequeued' + ) }) }) @@ -2681,7 +2813,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the index is out of bounds', async () => { - await assertRevert(governance.execute(proposalId, index + 1)) + await assertRevertWithReason( + governance.execute(proposalId, index + 1), + 'Provided index greater than dequeue length.' + ) }) }) @@ -2750,7 +2885,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the index is out of bounds', async () => { - await assertRevert(governance.execute(proposalId, index + 1)) + await assertRevertWithReason( + governance.execute(proposalId, index + 1), + 'Provided index greater than dequeue length.' + ) }) }) @@ -2773,7 +2911,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(governance.execute(proposalId, index)) + await assertRevertWithReason( + governance.execute(proposalId, index), + 'Proposal not approved' + ) }) }) @@ -2797,7 +2938,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(governance.execute(proposalId, index)) + await assertRevertWithReason( + governance.execute(proposalId, index), + 'Proposal execution failed' + ) }) }) @@ -2821,7 +2965,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(governance.execute(proposalId, index)) + await assertRevertWithReason( + governance.execute(proposalId, index), + 'Invalid contract address' + ) }) }) }) @@ -2914,7 +3061,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(governance.execute(proposalId, index)) + await assertRevertWithReason( + governance.execute(proposalId, index), + 'Proposal execution failed' + ) }) }) @@ -2938,7 +3088,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(governance.execute(proposalId, index)) + await assertRevertWithReason( + governance.execute(proposalId, index), + 'Proposal execution failed' + ) }) }) }) @@ -3128,7 +3281,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when called by non-approver', async () => { - await assertRevert(governance.approveHotfix(hotfixHashStr, { from: accounts[2] })) + await assertRevertWithReason( + governance.approveHotfix(hotfixHashStr, { from: accounts[2] }), + 'msg.sender not approver' + ) }) }) @@ -3244,7 +3400,10 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when hotfix is not passing', async () => { - await assertRevert(governance.prepareHotfix(hotfixHashStr)) + await assertRevertWithReason( + governance.prepareHotfix(hotfixHashStr), + 'hotfix not whitelisted by 2f[+]1 validators' + ) }) describe('when hotfix is passing', () => { @@ -3277,7 +3436,10 @@ contract('Governance', (accounts: string[]) => { it('should revert when epoch == preparedEpoch', async () => { await governance.prepareHotfix(hotfixHashStr) - await assertRevert(governance.prepareHotfix(hotfixHashStr)) + await assertRevertWithReason( + governance.prepareHotfix(hotfixHashStr), + 'hotfix already prepared for this epoch' + ) }) it('should succeed for epoch != preparedEpoch', async () => { @@ -3296,8 +3458,7 @@ contract('Governance', (accounts: string[]) => { // @ts-ignore bytes type transactionSuccess1.data, [transactionSuccess1.data.length], - salt, - { gas: 2000000 } + salt ) } diff --git a/packages/protocol/test/governance/network/governance_slasher.ts b/packages/protocol/test/governance/network/governance_slasher.ts index 1cbea962061..ce3b6c0d206 100644 --- a/packages/protocol/test/governance/network/governance_slasher.ts +++ b/packages/protocol/test/governance/network/governance_slasher.ts @@ -1,5 +1,5 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertContainSubset, assertRevert } from '@celo/protocol/lib/test-utils' +import { assertContainSubset, assertRevertWithReason } from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { AccountsContract, @@ -54,7 +54,10 @@ contract('GovernanceSlasher', (accounts: string[]) => { assert.equal(owner, accounts[0]) }) it('can only be called once', async () => { - await assertRevert(slasher.initialize(registry.address)) + await assertRevertWithReason( + slasher.initialize(registry.address), + 'contract already initialized' + ) }) }) @@ -71,13 +74,19 @@ contract('GovernanceSlasher', (accounts: string[]) => { assert.equal(amount.toNumber(), 2000) }) it('can only be called by owner', async () => { - await assertRevert(slasher.approveSlashing(accounts[2], 1000, { from: nonOwner })) + await assertRevertWithReason( + slasher.approveSlashing(accounts[2], 1000, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) describe('#slash()', () => { it('fails if there is nothing to slash', async () => { - await assertRevert(slasher.slash(validator, [], [], [])) + await assertRevertWithReason( + slasher.slash(validator, [], [], []), + 'No penalty given by governance' + ) }) it('decrements gold', async () => { await slasher.approveSlashing(validator, 1000) From bccd968724686844bbd5da2e9e3c54aa1d314c9a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 14:32:01 -0400 Subject: [PATCH 089/184] updated protocol common test revert assertion msg --- packages/protocol/test/common/accounts.ts | 4 +- packages/protocol/test/common/integration.ts | 11 ++- packages/protocol/test/common/linkedlist.ts | 57 +++++++++++--- .../test/common/metatransactionwallet.ts | 48 ++++++++---- packages/protocol/test/common/multisig.ts | 76 ++++++++++++++----- packages/protocol/test/common/proxy.ts | 32 +++++--- .../protocol/test/common/transferwhitelist.ts | 27 ++++--- 7 files changed, 190 insertions(+), 65 deletions(-) diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index 1bdda360ffd..c29e23f5598 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -770,9 +770,9 @@ contract('Accounts', (accounts: string[]) => { accountsInstance.address ) await accountsInstance.authorizeSignerWithSignature(signer, role, sig.v, sig.r, sig.s) - await assertRevert( + await assertRevertWithReason( accountsInstance.authorizeSignerWithSignature(signer, role, sigTwo.v, sigTwo.r, sigTwo.s), - 'Cannot re-authorize address or locked gold account for another account' + 'Invalid signature' ) }) diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index 13e4bca7c82..37606ecdebc 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -4,6 +4,7 @@ import { addressMinedLatestBlock, assertEqualBN, assertRevert, + assertRevertWithReason, assumeOwnership, stripHexEncoding, timeTravel, @@ -664,12 +665,18 @@ contract('Integration: Adding StableToken', (accounts: string[]) => { it(`should be impossible to sell CELO`, async () => { await goldToken.approve(exchangeAbc.address, sellAmount) - await assertRevert(exchangeAbc.sell(sellAmount, minBuyAmount, true)) + await assertRevertWithReason( + exchangeAbc.sell(sellAmount, minBuyAmount, true), + "can't call when contract is frozen" + ) }) it(`should be impossible to sell stable token`, async () => { await stableTokenAbc.approve(exchangeAbc.address, sellAmount) - await assertRevert(exchangeAbc.sell(sellAmount, minBuyAmount, false)) + await assertRevertWithReason( + exchangeAbc.sell(sellAmount, minBuyAmount, false), + "can't call when contract is frozen" + ) }) }) diff --git a/packages/protocol/test/common/linkedlist.ts b/packages/protocol/test/common/linkedlist.ts index a4c0eaedb3b..a34dcb77657 100644 --- a/packages/protocol/test/common/linkedlist.ts +++ b/packages/protocol/test/common/linkedlist.ts @@ -1,4 +1,4 @@ -import { assertRevert, assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' import { LinkedListTestContract, LinkedListTestInstance } from 'types' const LinkedListTest: LinkedListTestContract = artifacts.require('LinkedListTest') @@ -20,11 +20,17 @@ contract('LinkedListTest', () => { describe('when inserting to empty list', () => { it('should revert if previous is equal to key', async () => { - await assertRevert(linkedListTest.insert(addedKey, addedKey, NULL_KEY)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, addedKey, NULL_KEY), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if next is equal to key', async () => { - await assertRevert(linkedListTest.insert(addedKey, NULL_KEY, addedKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, NULL_KEY, addedKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) }) @@ -34,11 +40,17 @@ contract('LinkedListTest', () => { }) it('should revert if next is equal to key', async () => { - await assertRevert(linkedListTest.insert(addedKey, firstKey, addedKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, firstKey, addedKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if previous is equal to key', async () => { - await assertRevert(linkedListTest.insert(addedKey, addedKey, firstKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, addedKey, firstKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) }) @@ -51,31 +63,52 @@ contract('LinkedListTest', () => { }) it('should revert if next is equal to key (beginning)', async () => { - await assertRevert(linkedListTest.insert(addedKey, firstKey, addedKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, firstKey, addedKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if previous is equal to key (beginning)', async () => { - await assertRevert(linkedListTest.insert(addedKey, addedKey, firstKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, addedKey, firstKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if next is equal to key (end)', async () => { - await assertRevert(linkedListTest.insert(addedKey, lastKey, addedKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, lastKey, addedKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if previous is equal to key (end)', async () => { - await assertRevert(linkedListTest.insert(addedKey, addedKey, lastKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, addedKey, lastKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if next is equal to key (middle)', async () => { - await assertRevert(linkedListTest.insert(addedKey, middleKey, addedKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, middleKey, addedKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if previous is equal to key (middle)', async () => { - await assertRevert(linkedListTest.insert(addedKey, addedKey, middleKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, addedKey, middleKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) it('should revert if next and previous equal to key', async () => { - await assertRevert(linkedListTest.insert(addedKey, addedKey, addedKey)) + await assertRevertWithReason( + linkedListTest.insert(addedKey, addedKey, addedKey), + 'Key cannot be the same as previousKey or nextKey' + ) }) }) }) diff --git a/packages/protocol/test/common/metatransactionwallet.ts b/packages/protocol/test/common/metatransactionwallet.ts index 6e09a782393..3fca5bc4803 100644 --- a/packages/protocol/test/common/metatransactionwallet.ts +++ b/packages/protocol/test/common/metatransactionwallet.ts @@ -3,7 +3,12 @@ import { getDomainDigest, getSignatureForMetaTransaction, } from '@celo/protocol/lib/meta-tx-utils' -import { assertEqualBN, assertLogMatches2, assertRevert } from '@celo/protocol/lib/test-utils' +import { + assertEqualBN, + assertLogMatches2, + assertRevert, + assertRevertWithReason, +} from '@celo/protocol/lib/test-utils' import { ensureLeading0x, trimLeading0x } from '@celo/utils/lib/address' import { MetaTransactionWalletContract, MetaTransactionWalletInstance } from 'types' @@ -76,7 +81,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(wallet.initialize(signer)) + await assertRevertWithReason(wallet.initialize(signer), 'contract already initialized') }) }) @@ -130,7 +135,10 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when called by the signer', () => { it('should revert', async () => { - await assertRevert(wallet.setSigner(newSigner, { from: signer })) + await assertRevertWithReason( + wallet.setSigner(newSigner, { from: signer }), + 'Ownable: caller is not the owner' + ) }) }) }) @@ -160,7 +168,10 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when not called by the wallet contract', () => { it('should revert', async () => { - await assertRevert(wallet.setGuardian(guardian, { from: nonSigner })) + await assertRevertWithReason( + wallet.setGuardian(guardian, { from: nonSigner }), + 'Ownable: caller is not the owner' + ) }) }) }) @@ -194,13 +205,19 @@ contract('MetaTransactionWallet', (accounts: string[]) => { }) it('non guardian should not be able to recover wallet', async () => { - await assertRevert(wallet.recoverWallet(newSigner, { from: nonGuardian })) + await assertRevertWithReason( + wallet.recoverWallet(newSigner, { from: nonGuardian }), + 'Caller is not the guardian' + ) }) }) describe('when the guardian is not set', () => { it('should not be able to recover wallet', async () => { - await assertRevert(wallet.recoverWallet(newSigner, { from: guardian })) + await assertRevertWithReason( + wallet.recoverWallet(newSigner, { from: guardian }), + 'Caller is not the guardian' + ) }) }) }) @@ -245,8 +262,9 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when the caller is not the signer', () => { it('should revert', async () => { - await assertRevert( - wallet.executeTransaction(destination, value, data, { from: nonSigner }) + await assertRevertWithReason( + wallet.executeTransaction(destination, value, data, { from: nonSigner }), + 'Invalid transaction sender' ) }) }) @@ -288,8 +306,9 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when data is not empty', () => { it('should revert', async () => { - await assertRevert( - wallet.executeTransaction(destination, value, '0x1234', { from: signer }) + await assertRevertWithReason( + wallet.executeTransaction(destination, value, '0x1234', { from: signer }), + 'Invalid contract address' ) }) }) @@ -412,14 +431,15 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when the data parameter has extra bytes appended', () => { it('reverts', async () => { - await assertRevert( + await assertRevertWithReason( wallet.executeTransactions( transactions.map((t) => t.destination), transactions.map((t) => t.value), ensureLeading0x(transactions.map((t) => trimLeading0x(t.data)).join('deadbeef')), transactions.map((t) => trimLeading0x(t.data).length / 2), { from: signer } - ) + ), + 'data cannot have extra bytes appended' ) }) }) @@ -560,7 +580,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when signed by a non-signer', () => { it('should revert', async () => { transferSigner = nonSigner - await assertRevert(doTransfer()) + await assertRevertWithReason(doTransfer(), 'Invalid meta-transaction signer') }) }) }) @@ -574,7 +594,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { transferSigner = signer }) it('should revert', async () => { - await assertRevert(doTransfer()) + await assertRevertWithReason(doTransfer(), 'Invalid meta-transaction signer') }) }) }) diff --git a/packages/protocol/test/common/multisig.ts b/packages/protocol/test/common/multisig.ts index 5e9895e3cbc..5d9977d86b3 100644 --- a/packages/protocol/test/common/multisig.ts +++ b/packages/protocol/test/common/multisig.ts @@ -1,5 +1,9 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' -import { assertEqualBN, assertLogMatches2, assertRevert } from '@celo/protocol/lib/test-utils' +import { + assertEqualBN, + assertLogMatches2, + assertRevertWithReason, +} from '@celo/protocol/lib/test-utils' import { parseMultiSigTransaction } from '@celo/protocol/lib/web3-utils' import _ from 'lodash' import { MultiSigContract, MultiSigInstance } from 'types' @@ -35,8 +39,9 @@ contract('MultiSig', (accounts: any) => { }) it('should not be callable again', async () => { - await assertRevert( - multiSig.initialize(owners, requiredSignatures, internalRequiredSignatures) + await assertRevertWithReason( + multiSig.initialize(owners, requiredSignatures, internalRequiredSignatures), + 'contract already initialized' ) }) }) @@ -96,13 +101,17 @@ contract('MultiSig', (accounts: any) => { it('should not allow an owner to submit a transaction to a null address', async () => { // @ts-ignore: TODO(mcortesi): fix typings - await assertRevert(multiSig.submitTransaction(NULL_ADDRESS, 0, txData)) + await assertRevertWithReason( + multiSig.submitTransaction(NULL_ADDRESS, 0, txData), + 'address was null' + ) }) it('should not allow a non-owner to submit a transaction', async () => { - await assertRevert( + await assertRevertWithReason( // @ts-ignore: TODO(mcortesi): fix typings - multiSig.submitTransaction(multiSig.address, 0, txData, { from: accounts[2] }) + multiSig.submitTransaction(multiSig.address, 0, txData, { from: accounts[2] }), + 'owner does not exist' ) }) }) @@ -135,11 +144,17 @@ contract('MultiSig', (accounts: any) => { }) it('should not allow an owner to confirm a transaction twice', async () => { - await assertRevert(multiSig.confirmTransaction(txId, { from: accounts[0] })) + await assertRevertWithReason( + multiSig.confirmTransaction(txId, { from: accounts[0] }), + 'transaction was already confirmed for owner' + ) }) it('should not allow a non-owner to confirm a transaction', async () => { - await assertRevert(multiSig.confirmTransaction(txId, { from: accounts[2] })) + await assertRevertWithReason( + multiSig.confirmTransaction(txId, { from: accounts[2] }), + 'owner does not exist' + ) }) }) @@ -167,11 +182,17 @@ contract('MultiSig', (accounts: any) => { }) it('should not allow a non-owner to revoke a confirmation', async () => { - await assertRevert(multiSig.revokeConfirmation(txId, { from: accounts[2] })) + await assertRevertWithReason( + multiSig.revokeConfirmation(txId, { from: accounts[2] }), + 'owner does not exist' + ) }) it('should not allow an owner to revoke before confirming', async () => { - await assertRevert(multiSig.revokeConfirmation(txId, { from: accounts[1] })) + await assertRevertWithReason( + multiSig.revokeConfirmation(txId, { from: accounts[1] }), + 'transaction was not confirmed for owner' + ) }) }) @@ -197,7 +218,10 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to add an owner', async () => { // @ts-ignore - await assertRevert(multiSig.addOwner(accounts[2], { from: accounts[3] })) + await assertRevertWithReason( + multiSig.addOwner(accounts[2], { from: accounts[3] }), + 'msg.sender was not multisig wallet' + ) }) it('should not allow adding the null address', async () => { @@ -211,7 +235,10 @@ contract('MultiSig', (accounts: any) => { event: 'Confirmation', }) const txId = txEvent.args.transactionId - await assertRevert(multiSig.confirmTransaction(txId, { from: accounts[1] })) + await assertRevertWithReason( + multiSig.confirmTransaction(txId, { from: accounts[1] }), + 'Transaction execution failed.' + ) }) }) @@ -242,7 +269,10 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to remove an owner', async () => { // @ts-ignore - await assertRevert(multiSig.removeOwner(accounts[1], { from: accounts[3] })) + await assertRevertWithReason( + multiSig.removeOwner(accounts[1], { from: accounts[3] }), + 'msg.sender was not multisig wallet' + ) }) }) @@ -268,7 +298,10 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to replace an owner', async () => { // @ts-ignore - await assertRevert(multiSig.replaceOwner(accounts[1], accounts[2], { from: accounts[3] })) + await assertRevertWithReason( + multiSig.replaceOwner(accounts[1], accounts[2], { from: accounts[3] }), + 'msg.sender was not multisig wallet' + ) }) it('should not allow an owner to be replaced by the null address', async () => { @@ -282,7 +315,10 @@ contract('MultiSig', (accounts: any) => { event: 'Confirmation', }) const txId = txEvent.args.transactionId - await assertRevert(multiSig.confirmTransaction(txId, { from: accounts[1] })) + await assertRevertWithReason( + multiSig.confirmTransaction(txId, { from: accounts[1] }), + 'Transaction execution failed.' + ) }) }) @@ -307,7 +343,10 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to change the requirement', async () => { // @ts-ignore - await assertRevert(multiSig.changeRequirement(3, { from: accounts[3] })) + await assertRevertWithReason( + multiSig.changeRequirement(3, { from: accounts[3] }), + 'msg.sender was not multisig wallet' + ) }) }) @@ -332,7 +371,10 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to change the internal requirement', async () => { // @ts-ignore - await assertRevert(multiSig.changeInternalRequirement(3, { from: accounts[3] })) + await assertRevertWithReason( + multiSig.changeInternalRequirement(3, { from: accounts[3] }), + 'msg.sender was not multisig wallet' + ) }) }) diff --git a/packages/protocol/test/common/proxy.ts b/packages/protocol/test/common/proxy.ts index 30b630c36b0..dd6ba3db741 100644 --- a/packages/protocol/test/common/proxy.ts +++ b/packages/protocol/test/common/proxy.ts @@ -1,6 +1,6 @@ import { recoverFunds } from '@celo/protocol/lib/recover-funds' import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertRevert } from '@celo/protocol/lib/test-utils' +import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' import { BigNumber } from 'bignumber.js' import { FreezerContract, @@ -49,7 +49,10 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow a non-owner to set an implementation', async () => { - await assertRevert(proxy._setImplementation(getSet.address, { from: accounts[1] })) + await assertRevertWithReason( + proxy._setImplementation(getSet.address, { from: accounts[1] }), + 'sender was not owner' + ) }) it('should allow the implementation to be updated', async () => { @@ -123,22 +126,27 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow to call a non contract address', async () => - assertRevert( + assertRevertWithReason( proxy._setAndInitializeImplementation(accounts[1], initializeData(42), { from: accounts[1], - }) + }), + 'sender was not owner' )) it('should not allow a non-owner to set an implementation', async () => - assertRevert( + assertRevertWithReason( proxy._setAndInitializeImplementation(hasInitializer.address, initializeData(42), { from: accounts[1], - }) + }), + 'sender was not owner' )) it('should not allow for a call to `initialize` after initialization', async () => { await proxy._setAndInitializeImplementation(hasInitializer.address, initializeData(42)) - await assertRevert(proxiedHasInitializer.initialize(43)) + await assertRevertWithReason( + proxiedHasInitializer.initialize(43), + 'contract already initialized' + ) }) }) @@ -150,7 +158,10 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow a non-owner to transfer ownership', async () => { - await assertRevert(proxy._transferOwnership(accounts[2], { from: accounts[1] })) + await assertRevertWithReason( + proxy._transferOwnership(accounts[2], { from: accounts[1] }), + 'sender was not owner' + ) }) it('should emit an event', async () => { @@ -174,7 +185,10 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow the previous owner to perform onlyOwner actions', async () => { - await assertRevert(proxy._setImplementation(getSet1.address)) + await assertRevertWithReason( + proxy._setImplementation(getSet1.address), + 'sender was not owner' + ) }) }) }) diff --git a/packages/protocol/test/common/transferwhitelist.ts b/packages/protocol/test/common/transferwhitelist.ts index 95d73e8a68f..bb73379c00e 100644 --- a/packages/protocol/test/common/transferwhitelist.ts +++ b/packages/protocol/test/common/transferwhitelist.ts @@ -1,4 +1,4 @@ -import { assertLogMatches2, assertRevert } from '@celo/protocol/lib/test-utils' +import { assertLogMatches2, assertRevertWithReason } from '@celo/protocol/lib/test-utils' import { RegistryContract, RegistryInstance, @@ -43,7 +43,10 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertRevert(transferWhitelist.whitelistAddress(anAddress, { from: nonOwner })) + await assertRevertWithReason( + transferWhitelist.whitelistAddress(anAddress, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -67,7 +70,10 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to remove an address', async () => { - await assertRevert(transferWhitelist.removeAddress(anAddress, 0, { from: nonOwner })) + await assertRevertWithReason( + transferWhitelist.removeAddress(anAddress, 0, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -83,8 +89,9 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a registry id', async () => { - await assertRevert( - transferWhitelist.whitelistRegisteredContract(anIdentifierHash, { from: nonOwner }) + await assertRevertWithReason( + transferWhitelist.whitelistRegisteredContract(anIdentifierHash, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -112,10 +119,11 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to set the whitelist', async () => { - await assertRevert( + await assertRevertWithReason( transferWhitelist.setDirectlyWhitelistedAddresses([anAddress, anotherAddress], { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -136,13 +144,14 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to set the list of registered contracts', async () => { - await assertRevert( + await assertRevertWithReason( transferWhitelist.setWhitelistedContractIdentifiers( [anIdentifierHash, anotherIdentifierHash], { from: nonOwner, } - ) + ), + 'Ownable: caller is not the owner' ) }) }) From 04a3d2c292b2d29e17daf0834abc4f9999c69792 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 15:53:09 -0400 Subject: [PATCH 090/184] appease linter --- packages/protocol/test/governance/network/epochrewards.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/protocol/test/governance/network/epochrewards.ts b/packages/protocol/test/governance/network/epochrewards.ts index 9d20d6f46cb..7ce9d125563 100644 --- a/packages/protocol/test/governance/network/epochrewards.ts +++ b/packages/protocol/test/governance/network/epochrewards.ts @@ -210,9 +210,9 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the fraction is the same', () => { it('should revert', async () => { await assertRevertWithReason( - epochRewards.setTargetVotingGoldFraction(targetVotingGoldFraction) - ), + epochRewards.setTargetVotingGoldFraction(targetVotingGoldFraction), 'Target voting gold fraction unchanged' + ) }) }) }) @@ -255,9 +255,9 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the fraction is the same', () => { it('should revert', async () => { await assertRevertWithReason( - epochRewards.setCommunityRewardFraction(communityRewardFraction) - ), + epochRewards.setCommunityRewardFraction(communityRewardFraction), 'Value must be different from existing community reward fraction and less than 1' + ) }) }) }) From eca7b4f139d556e625dd04beee43b4d92b237f5c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 16:13:33 -0400 Subject: [PATCH 091/184] using assertRevertWithReason in governance/validators --- .../validators/doublesigningslasher.ts | 42 ++- .../governance/validators/downtimeslasher.ts | 49 +-- .../governance/validators/sortedlinkedlist.ts | 28 +- .../test/governance/validators/validators.ts | 288 +++++++++++++----- 4 files changed, 288 insertions(+), 119 deletions(-) diff --git a/packages/protocol/test/governance/validators/doublesigningslasher.ts b/packages/protocol/test/governance/validators/doublesigningslasher.ts index 88c4c587f53..125ff545506 100644 --- a/packages/protocol/test/governance/validators/doublesigningslasher.ts +++ b/packages/protocol/test/governance/validators/doublesigningslasher.ts @@ -1,5 +1,5 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertContainSubset, assertRevert } from '@celo/protocol/lib/test-utils' +import { assertContainSubset, assertRevertWithReason } from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { AccountsContract, @@ -70,16 +70,25 @@ contract('DoubleSigningSlasher', (accounts: string[]) => { assert.equal(res[1].toNumber(), 100) }) it('can only be called once', async () => { - await assertRevert(slasher.initialize(registry.address, 10000, 100)) + await assertRevertWithReason( + slasher.initialize(registry.address, 10000, 100), + 'contract already initialized' + ) }) }) describe('#setSlashingIncentives()', () => { it('can only be set by the owner', async () => { - await assertRevert(slasher.setSlashingIncentives(123, 67, { from: nonOwner })) + await assertRevertWithReason( + slasher.setSlashingIncentives(123, 67, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) it('reward cannot be larger than penalty', async () => { - await assertRevert(slasher.setSlashingIncentives(123, 678)) + await assertRevertWithReason( + slasher.setSlashingIncentives(123, 678), + 'Penalty has to be larger than reward' + ) }) it('should have set slashing incentives', async () => { await slasher.setSlashingIncentives(123, 67) @@ -122,24 +131,28 @@ contract('DoubleSigningSlasher', (accounts: string[]) => { await slasher.setVerifiedSealBitmap(headerC, bitmap) }) it('fails if block numbers do not match', async () => { - await assertRevert( - slasher.slash(validator, validatorIndex, headerA, headerB, 0, [], [], [], [], [], []) + await assertRevertWithReason( + slasher.slash(validator, validatorIndex, headerA, headerB, 0, [], [], [], [], [], []), + 'Block headers are from different height' ) }) it('fails if is not signed at index', async () => { - await assertRevert( - slasher.slash(accounts[4], validatorIndex + 1, headerA, headerC, 0, [], [], [], [], [], []) + await assertRevertWithReason( + slasher.slash(accounts[4], validatorIndex + 1, headerA, headerC, 0, [], [], [], [], [], []), + "Didn't sign first block" ) }) it('fails if epoch signer is wrong', async () => { - await assertRevert( - slasher.slash(accounts[4], validatorIndex, headerA, headerC, 0, [], [], [], [], [], []) + await assertRevertWithReason( + slasher.slash(accounts[4], validatorIndex, headerA, headerC, 0, [], [], [], [], [], []), + "Wasn't a signer with given index" ) }) it('fails if there are not enough signers', async () => { await slasher.setNumberValidators(100) - await assertRevert( - slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []) + await assertRevertWithReason( + slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []), + 'Not enough signers in the first block' ) }) it('should emit the corresponding event', async () => { @@ -177,8 +190,9 @@ contract('DoubleSigningSlasher', (accounts: string[]) => { }) it('fails when tried second time', async () => { await slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []) - await assertRevert( - slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []) + await assertRevertWithReason( + slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []), + ' Already slashed' ) }) }) diff --git a/packages/protocol/test/governance/validators/downtimeslasher.ts b/packages/protocol/test/governance/validators/downtimeslasher.ts index 25865c2b226..d271fd22d12 100644 --- a/packages/protocol/test/governance/validators/downtimeslasher.ts +++ b/packages/protocol/test/governance/validators/downtimeslasher.ts @@ -2,6 +2,7 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { assertLogMatches2, assertRevert, + assertRevertWithReason, getEpochNumberOfBlock, getFirstBlockNumberForEpoch, jsonRpc, @@ -131,13 +132,19 @@ contract('DowntimeSlasher', (accounts: string[]) => { }) it('can only be called once', async () => { - await assertRevert(slasher.initialize(registry.address, 10000, 100, 2)) + await assertRevertWithReason( + slasher.initialize(registry.address, 10000, 100, 2), + 'contract already initialized' + ) }) }) describe('#setSlashingIncentives()', () => { it('can only be set by the owner', async () => { - await assertRevert(slasher.setSlashingIncentives(123, 67, { from: nonOwner })) + await assertRevertWithReason( + slasher.setSlashingIncentives(123, 67, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) it('should have set slashing incentives', async () => { @@ -148,7 +155,10 @@ contract('DowntimeSlasher', (accounts: string[]) => { }) it('reward cannot be larger than penalty', async () => { - await assertRevert(slasher.setSlashingIncentives(123, 678)) + await assertRevertWithReason( + slasher.setSlashingIncentives(123, 678), + 'Penalty has to be larger than reward' + ) }) it('should emit the SlashingIncentivesSet corresponding event', async () => { @@ -166,7 +176,10 @@ contract('DowntimeSlasher', (accounts: string[]) => { describe('#setSlashableDowntime()', () => { it('can only be set by the owner', async () => { - await assertRevert(slasher.setSlashableDowntime(23, { from: nonOwner })) + await assertRevertWithReason( + slasher.setSlashableDowntime(23, { from: nonOwner }), + ' Ownable: caller is not the owner' + ) }) it('should have set slashable downtime', async () => { @@ -270,7 +283,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { const resp = await slasher.setBitmapForInterval(blockNumber, blockNumber + 1) assert.equal(resp.logs.length, 1) - await assertRevert( + await assertRevertWithReason( slasher.setBitmapForInterval(blockNumber, blockNumber + 1), 'bitmap already set' ) @@ -378,7 +391,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // First block with every validator signatures await presetParentSealForBlocks(startBlock, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -406,7 +419,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Last block with every validator signatures await presetParentSealForBlocks(startBlock + slashableDowntime - 1, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -434,7 +447,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Middle block with every validator signatures await presetParentSealForBlocks(startBlock + intervalSize, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -462,7 +475,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // First block with every validator signatures await presetParentSealForBlocks(startBlock, 1, [bitmapVI99]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -559,7 +572,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { ]) } await generateProofs(startBlocks, endBlocks) - await assertRevert( + await assertRevertWithReason( slasher.slash( startBlocks, endBlocks, @@ -572,7 +585,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { [], [] ), - 'at least one endBlock is not in the boundaries of the next interval' + 'each interval must start at most one block after the end of the previous interval' ) }) }) @@ -590,7 +603,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { ]) } await generateProofs(startBlocks, endBlocks) - await assertRevert( + await assertRevertWithReason( slasher.slash( startBlocks, endBlocks, @@ -603,7 +616,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { [], [] ), - 'the intervals are not covering the slashableDowntime window' + 'startBlocks and endBlocks must have the same length' ) }) }) @@ -702,7 +715,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Last block with every validator signatures await presetParentSealForBlocks(startBlock + slashableDowntime - 1, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -731,7 +744,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Last block with every validator signatures await presetParentSealForBlocks(startBlock + slashableDowntime - 1, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -802,7 +815,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { 1, validatorIndexInEpoch, ]) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -850,7 +863,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { const slotArrays = await ensureValidatorIsSlashable(newStartBlock, [ validatorIndexInEpoch, ]) - await assertRevert( + await assertRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -863,7 +876,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { [], [] ), - 'validator has a newer slash' + 'cannot slash validator for downtime for which they may already have been slashed' ) }) }) diff --git a/packages/protocol/test/governance/validators/sortedlinkedlist.ts b/packages/protocol/test/governance/validators/sortedlinkedlist.ts index 3641db07a3e..a71ccd791e2 100644 --- a/packages/protocol/test/governance/validators/sortedlinkedlist.ts +++ b/packages/protocol/test/governance/validators/sortedlinkedlist.ts @@ -1,4 +1,4 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' +import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { IntegerSortedLinkedListTestContract, IntegerSortedLinkedListTestInstance } from 'types' @@ -46,15 +46,15 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if key is 0', async () => { - await assertRevert(sortedListTest.insert(0, value, 0, 0)) + await assertRevertWithReason(sortedListTest.insert(0, value, 0, 0), 'invalid key') }) it('should revert if lesser is equal to key', async () => { - await assertRevert(sortedListTest.insert(key, value, key, 0)) + await assertRevertWithReason(sortedListTest.insert(key, value, key, 0), 'invalid key') }) it('should revert if greater is equal to key', async () => { - await assertRevert(sortedListTest.insert(key, value, 0, key)) + await assertRevertWithReason(sortedListTest.insert(key, value, 0, key), 'invalid key') }) describe('when an element is already in the list', () => { @@ -63,13 +63,16 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert when inserting an element already in the list', async () => { - await assertRevert(sortedListTest.insert(key, value, 0, key)) + await assertRevertWithReason(sortedListTest.insert(key, value, 0, key), 'invalid key') }) it('should revert when inserting a non-maximal element at the head of the list', async () => { const nonKey = key - 1 const newKey = key + 1 - await assertRevert(sortedListTest.insert(newKey, value - 1, nonKey, 0)) + await assertRevertWithReason( + sortedListTest.insert(newKey, value - 1, nonKey, 0), + 'greater and lesser key zero' + ) }) }) }) @@ -93,15 +96,18 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if the key is not in the list', async () => { - await assertRevert(sortedListTest.update(key + 1, newValue, 0, 0)) + await assertRevertWithReason( + sortedListTest.update(key + 1, newValue, 0, 0), + 'key not in list' + ) }) it('should revert if lesser is equal to key', async () => { - await assertRevert(sortedListTest.update(key, newValue, key, 0)) + await assertRevertWithReason(sortedListTest.update(key, newValue, key, 0), 'invalid key') }) it('should revert if greater is equal to key', async () => { - await assertRevert(sortedListTest.update(key, newValue, 0, key)) + await assertRevertWithReason(sortedListTest.update(key, newValue, 0, key), 'invalid key') }) }) @@ -136,7 +142,7 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if the key is not in the list', async () => { - await assertRevert(sortedListTest.remove(key + 1)) + await assertRevertWithReason(sortedListTest.remove(key + 1), 'key not in list') }) }) @@ -186,7 +192,7 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if n is greater than the number of elements', async () => { - await assertRevert(sortedListTest.popN(numElements + 1)) + await assertRevertWithReason(sortedListTest.popN(numElements + 1), 'not enough elements') }) }) diff --git a/packages/protocol/test/governance/validators/validators.ts b/packages/protocol/test/governance/validators/validators.ts index 5a491cf8271..2c2959cf6a0 100644 --- a/packages/protocol/test/governance/validators/validators.ts +++ b/packages/protocol/test/governance/validators/validators.ts @@ -7,6 +7,7 @@ import { assertEqualBNArray, assertEqualDpBN, assertRevert, + assertRevertWithReason, assertSameAddress, currentEpochNumber, mineBlocks, @@ -217,7 +218,7 @@ contract('Validators', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert( + await assertRevertWithReason( validators.initialize( registry.address, groupLockedGoldRequirements.value, @@ -231,7 +232,8 @@ contract('Validators', (accounts: string[]) => { maxGroupSize, commissionUpdateDelay, downtimeGracePeriod - ) + ), + 'contract already initialized' ) }) }) @@ -264,10 +266,11 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setMembershipHistoryLength(newLength, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -275,7 +278,10 @@ contract('Validators', (accounts: string[]) => { describe('when the length is the same', () => { it('should revert', async () => { - await assertRevert(validators.setMembershipHistoryLength(membershipHistoryLength)) + await assertRevertWithReason( + validators.setMembershipHistoryLength(membershipHistoryLength), + 'Membership history length not changed' + ) }) }) }) @@ -309,10 +315,11 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setMaxGroupSize(newSize, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -320,7 +327,10 @@ contract('Validators', (accounts: string[]) => { describe('when the size is the same', () => { it('should revert', async () => { - await assertRevert(validators.setMaxGroupSize(maxGroupSize)) + await assertRevertWithReason( + validators.setMaxGroupSize(maxGroupSize), + 'Max group size not changed' + ) }) }) }) @@ -363,12 +373,13 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setGroupLockedGoldRequirements( newRequirements.value, newRequirements.duration, { from: nonOwner } - ) + ), + 'Ownable: caller is not the owner' ) }) }) @@ -376,11 +387,12 @@ contract('Validators', (accounts: string[]) => { describe('when the requirements are the same', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setGroupLockedGoldRequirements( groupLockedGoldRequirements.value, groupLockedGoldRequirements.duration - ) + ), + 'Group requirements not changed' ) }) }) @@ -424,12 +436,13 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setValidatorLockedGoldRequirements( newRequirements.value, newRequirements.duration, { from: nonOwner } - ) + ), + 'Ownable: caller is not the owner' ) }) }) @@ -437,11 +450,12 @@ contract('Validators', (accounts: string[]) => { describe('when the requirements are the same', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setValidatorLockedGoldRequirements( validatorLockedGoldRequirements.value, validatorLockedGoldRequirements.duration - ) + ), + 'Validator requirements not changed' ) }) }) @@ -485,14 +499,15 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setValidatorScoreParameters( newParameters.exponent, newParameters.adjustmentSpeed, { from: nonOwner, } - ) + ), + 'Ownable: caller is not the owner' ) }) }) @@ -500,11 +515,12 @@ contract('Validators', (accounts: string[]) => { describe('when the lockups are the same', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( validators.setValidatorScoreParameters( validatorScoreParameters.exponent, validatorScoreParameters.adjustmentSpeed - ) + ), + 'Adjustment speed and exponent not changed' ) }) }) @@ -540,14 +556,20 @@ contract('Validators', (accounts: string[]) => { describe('when the size is the same', () => { it('should revert', async () => { - await assertRevert(validators.setMaxGroupSize(maxGroupSize)) + await assertRevertWithReason( + validators.setMaxGroupSize(maxGroupSize), + 'Max group size not changed' + ) }) }) }) describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevert(validators.setMaxGroupSize(maxGroupSize, { from: nonOwner })) + await assertRevertWithReason( + validators.setMaxGroupSize(maxGroupSize, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) }) @@ -569,7 +591,7 @@ contract('Validators', (accounts: string[]) => { const sig = await getParsedSignatureOfAddress(web3, validator, signer) await accountsInstance.authorizeValidatorSigner(signer, sig.v, sig.r, sig.s) const publicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevert( + await assertRevertWithReason( validators.registerValidator(publicKey, blsPublicKey, blsPoP), 'Validators cannot vote for more than max number of groups' ) @@ -666,7 +688,10 @@ contract('Validators', (accounts: string[]) => { it('should revert', async () => { publicKey = await addressToPublicKey(validator, web3.eth.sign) await validators.registerValidator(publicKey, blsPublicKey, blsPoP) - await assertRevert(validators.registerValidator(publicKey, blsPublicKey, blsPoP)) + await assertRevertWithReason( + validators.registerValidator(publicKey, blsPublicKey, blsPoP), + 'Already registered' + ) }) }) @@ -678,7 +703,10 @@ contract('Validators', (accounts: string[]) => { it('should revert', async () => { const publicKey = await addressToPublicKey(validator, web3.eth.sign) - await assertRevert(validators.registerValidator(publicKey, blsPublicKey, blsPoP)) + await assertRevertWithReason( + validators.registerValidator(publicKey, blsPublicKey, blsPoP), + 'Already registered' + ) }) }) @@ -692,7 +720,10 @@ contract('Validators', (accounts: string[]) => { it('should revert', async () => { const publicKey = await addressToPublicKey(validator, web3.eth.sign) - await assertRevert(validators.registerValidator(publicKey, blsPublicKey, blsPoP)) + await assertRevertWithReason( + validators.registerValidator(publicKey, blsPublicKey, blsPoP), + 'Deposit too small' + ) }) }) }) @@ -786,25 +817,34 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.deregisterValidator(index)) + await assertRevertWithReason( + validators.deregisterValidator(index), + 'Not yet requirement end time' + ) }) }) }) describe('when the validator is still a member of a validator group', () => { it('should revert', async () => { - await assertRevert(validators.deregisterValidator(index)) + await assertRevertWithReason( + validators.deregisterValidator(index), + 'Has been group member recently' + ) }) }) }) }) it('should revert when the account is not a registered validator', async () => { - await assertRevert(validators.deregisterValidator(index, { from: accounts[2] })) + await assertRevertWithReason( + validators.deregisterValidator(index, { from: accounts[2] }), + 'Not a validator' + ) }) it('should revert when the wrong index is provided', async () => { - await assertRevert(validators.deregisterValidator(index + 1)) + await assertRevertWithReason(validators.deregisterValidator(index + 1), 'Not a validator') }) }) @@ -958,7 +998,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.affiliate(group)) + await assertRevertWithReason( + validators.affiliate(group), + "Group doesn't meet requirements" + ) }) }) }) @@ -972,21 +1015,24 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.affiliate(group)) + await assertRevertWithReason( + validators.affiliate(group), + "Validator doesn't meet requirements" + ) }) }) }) describe('when affiliating with a non-registered validator group', () => { it('should revert', async () => { - await assertRevert(validators.affiliate(group)) + await assertRevertWithReason(validators.affiliate(group), 'Not a validator group') }) }) }) describe('when the account does not have a registered validator', () => { it('should revert', async () => { - await assertRevert(validators.affiliate(group)) + await assertRevertWithReason(validators.affiliate(group), 'Not a validator') }) }) }) @@ -1073,12 +1119,12 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the account is not a registered validator', async () => { - await assertRevert(validators.deaffiliate({ from: accounts[2] })) + await assertRevertWithReason(validators.deaffiliate({ from: accounts[2] }), 'Not a validator') }) it('should revert when the validator is not affiliated with a validator group', async () => { await validators.deaffiliate() - await assertRevert(validators.deaffiliate()) + await assertRevertWithReason(validators.deaffiliate(), 'not affiliated') }) }) @@ -1126,7 +1172,10 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(accounts[8], web3.eth.sign) - await assertRevert(validators.updateEcdsaPublicKey(validator, signer, newPublicKey)) + await assertRevertWithReason( + validators.updateEcdsaPublicKey(validator, signer, newPublicKey), + 'ECDSA key does not match signer' + ) }) }) }) @@ -1136,7 +1185,10 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevert(validators.updateEcdsaPublicKey(validator, signer, newPublicKey)) + await assertRevertWithReason( + validators.updateEcdsaPublicKey(validator, signer, newPublicKey), + 'only registered contract' + ) }) }) }) @@ -1201,14 +1253,15 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(accounts[8], web3.eth.sign) - await assertRevert( + await assertRevertWithReason( validators.updatePublicKeys( validator, signer, newPublicKey, newBlsPublicKey, newBlsPoP - ) + ), + 'ECDSA key does not match signer' ) }) }) @@ -1219,14 +1272,15 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevert( + await assertRevertWithReason( validators.updatePublicKeys( validator, signer, newPublicKey, newBlsPublicKey, newBlsPoP - ) + ), + 'only registered contract' ) }) }) @@ -1269,13 +1323,19 @@ contract('Validators', (accounts: string[]) => { describe('when the public key is not 96 bytes', () => { it('should revert', async () => { - await assertRevert(validators.updateBlsPublicKey(newBlsPublicKey + '01', newBlsPoP)) + await assertRevertWithReason( + validators.updateBlsPublicKey(newBlsPublicKey + '01', newBlsPoP), + 'Wrong BLS public key length' + ) }) }) describe('when the proof of possession is not 48 bytes', () => { it('should revert', async () => { - await assertRevert(validators.updateBlsPublicKey(newBlsPublicKey, newBlsPoP + '01')) + await assertRevertWithReason( + validators.updateBlsPublicKey(newBlsPublicKey, newBlsPoP + '01'), + 'Wrong BLS PoP length' + ) }) }) }) @@ -1291,7 +1351,7 @@ contract('Validators', (accounts: string[]) => { const sig = await getParsedSignatureOfAddress(web3, group, signer) await accountsInstance.authorizeValidatorSigner(signer, sig.v, sig.r, sig.s) const publicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevert( + await assertRevertWithReason( validators.registerValidator(publicKey, blsPublicKey, blsPoP), 'Validators cannot vote for more than max number of groups' ) @@ -1343,7 +1403,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.registerValidatorGroup(commission)) + await assertRevertWithReason( + validators.registerValidatorGroup(commission), + 'Not enough locked gold' + ) }) }) }) @@ -1354,7 +1417,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.registerValidatorGroup(commission)) + await assertRevertWithReason( + validators.registerValidatorGroup(commission), + 'Already registered as validator' + ) }) }) @@ -1365,7 +1431,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.registerValidatorGroup(commission)) + await assertRevertWithReason( + validators.registerValidatorGroup(commission), + 'Already registered as group' + ) }) }) @@ -1375,7 +1444,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.registerValidatorGroup(commission)) + await assertRevertWithReason( + validators.registerValidatorGroup(commission), + 'Already registered as group' + ) }) }) }) @@ -1468,26 +1540,38 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.deregisterValidatorGroup(index)) + await assertRevertWithReason( + validators.deregisterValidatorGroup(index), + "Hasn't been empty for long enough" + ) }) }) }) describe('when the group still has members', () => { it('should revert', async () => { - await assertRevert(validators.deregisterValidatorGroup(index)) + await assertRevertWithReason( + validators.deregisterValidatorGroup(index), + 'Validator group not empty' + ) }) }) }) it('should revert when the wrong index is provided', async () => { - await assertRevert(validators.deregisterValidatorGroup(index + 1)) + await assertRevertWithReason( + validators.deregisterValidatorGroup(index + 1), + 'deleteElement: index out of range' + ) }) }) describe('when the account does not have a registered validator group', () => { it('should revert', async () => { - await assertRevert(validators.deregisterValidatorGroup(index)) + await assertRevertWithReason( + validators.deregisterValidatorGroup(index), + 'Not a validator group' + ) }) }) }) @@ -1569,7 +1653,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.addMember(accounts[2])) + await assertRevertWithReason( + validators.addMember(accounts[2]), + 'group would exceed maximum size' + ) }) }) @@ -1613,7 +1700,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), + 'Validator requirements not met' + ) }) }) }) @@ -1628,7 +1718,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), + 'Group requirements not met' + ) }) }) @@ -1645,7 +1738,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.addMember(validator2)) + await assertRevertWithReason( + validators.addMember(validator2), + 'Group requirements not met' + ) }) }) }) @@ -1657,20 +1753,26 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), + 'Not affiliated to group' + ) }) }) }) describe('when the account does not have a registered validator group', () => { it('should revert', async () => { - await assertRevert(validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), + 'Not validator and group' + ) }) }) describe('when the validator is already a member of the group', () => { it('should revert', async () => { - await assertRevert(validators.addMember(validator)) + await assertRevertWithReason(validators.addMember(validator), 'Validator group empty') }) }) }) @@ -1739,11 +1841,17 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the account is not a registered validator group', async () => { - await assertRevert(validators.removeMember(validator, { from: accounts[2] })) + await assertRevertWithReason( + validators.removeMember(validator, { from: accounts[2] }), + 'is not group and validator' + ) }) it('should revert when the member is not a registered validator', async () => { - await assertRevert(validators.removeMember(accounts[2])) + await assertRevertWithReason( + validators.removeMember(accounts[2]), + 'is not group and validator' + ) }) describe('when the validator is not a member of the validator group', () => { @@ -1752,7 +1860,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.removeMember(validator)) + await assertRevertWithReason(validators.removeMember(validator), 'Not affiliated to group') }) }) }) @@ -1785,13 +1893,17 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the account is not a registered validator group', async () => { - await assertRevert( - validators.reorderMember(validator2, validator1, NULL_ADDRESS, { from: accounts[2] }) + await assertRevertWithReason( + validators.reorderMember(validator2, validator1, NULL_ADDRESS, { from: accounts[2] }), + 'Not a group' ) }) it('should revert when the member is not a registered validator', async () => { - await assertRevert(validators.reorderMember(accounts[3], validator1, NULL_ADDRESS)) + await assertRevertWithReason( + validators.reorderMember(accounts[3], validator1, NULL_ADDRESS), + 'Not a validator' + ) }) describe('when the validator is not a member of the validator group', () => { @@ -1800,7 +1912,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(validators.reorderMember(validator2, validator1, NULL_ADDRESS)) + await assertRevertWithReason( + validators.reorderMember(validator2, validator1, NULL_ADDRESS), + 'Not a member of the group' + ) }) }) }) @@ -1845,13 +1960,19 @@ contract('Validators', (accounts: string[]) => { describe('when the commission is the same', () => { it('should revert', async () => { - await assertRevert(validators.setNextCommissionUpdate(commission)) + await assertRevertWithReason( + validators.setNextCommissionUpdate(commission), + 'Not a validator group' + ) }) }) describe('when the commission is greater than one', () => { it('should revert', async () => { - await assertRevert(validators.setNextCommissionUpdate(fixed1.plus(1))) + await assertRevertWithReason( + validators.setNextCommissionUpdate(fixed1.plus(1)), + 'Not a validator group' + ) }) }) }) @@ -1894,13 +2015,16 @@ contract('Validators', (accounts: string[]) => { describe('when activationBlock has NOT passed', () => { it('should revert', async () => { await validators.setNextCommissionUpdate(newCommission) - await assertRevert(validators.updateCommission()) + await assertRevertWithReason( + validators.updateCommission(), + "Can't apply commission update yet" + ) }) }) describe('when NO Commission has been queued', () => { it('should revert', async () => { - await assertRevert(validators.updateCommission()) + await assertRevertWithReason(validators.updateCommission(), 'No commission update queued') }) }) @@ -1909,7 +2033,7 @@ contract('Validators', (accounts: string[]) => { await validators.setNextCommissionUpdate(newCommission) await mineBlocks(commissionUpdateDelay.toNumber(), web3) await validators.updateCommission() - await assertRevert(validators.updateCommission()) + await assertRevertWithReason(validators.updateCommission(), 'No commission update queued') }) }) }) @@ -2047,7 +2171,10 @@ contract('Validators', (accounts: string[]) => { describe('when uptime > 1.0', () => { const uptime = 1.01 it('should revert', async () => { - await assertRevert(validators.updateValidatorScoreFromSigner(validator, toFixed(uptime))) + await assertRevertWithReason( + validators.updateValidatorScoreFromSigner(validator, toFixed(uptime)), + 'Uptime cannot be larger than one' + ) }) }) }) @@ -2436,7 +2563,10 @@ contract('Validators', (accounts: string[]) => { describe('when the sender is not an approved address', () => { it('should revert', async () => { - await assertRevert(validators.forceDeaffiliateIfValidator(validator)) + await assertRevertWithReason( + validators.forceDeaffiliateIfValidator(validator), + 'Only registered slasher can call' + ) }) }) }) @@ -2581,7 +2711,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when called by non-slasher', async () => { - await assertRevert(validators.halveSlashingMultiplier(group, { from: accounts[0] })) + await assertRevertWithReason( + validators.halveSlashingMultiplier(group, { from: accounts[0] }), + 'Only registered slasher can call' + ) }) }) }) @@ -2612,7 +2745,10 @@ contract('Validators', (accounts: string[]) => { describe('when the slashing multiplier is reset before reset period', async () => { it('should revert', async () => { await timeTravel(slashingMultiplierResetPeriod - 10, web3) - await assertRevert(validators.resetSlashingMultiplier({ from: group })) + await assertRevertWithReason( + validators.resetSlashingMultiplier({ from: group }), + '`resetSlashingMultiplier` called before resetPeriod expired' + ) }) }) From 9368c6b74142d21f17dd05f32240c1db543fe092 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 17:52:16 -0400 Subject: [PATCH 092/184] using assertRevertWithReason in governance/voting --- .../test/governance/voting/election.ts | 138 ++++++--- .../test/governance/voting/lockedgold.ts | 82 ++++-- .../test/governance/voting/release_gold.ts | 272 ++++++++++++------ 3 files changed, 345 insertions(+), 147 deletions(-) diff --git a/packages/protocol/test/governance/voting/election.ts b/packages/protocol/test/governance/voting/election.ts index e3c1854075c..c5793abdef4 100644 --- a/packages/protocol/test/governance/voting/election.ts +++ b/packages/protocol/test/governance/voting/election.ts @@ -5,6 +5,7 @@ import { assertContainSubset, assertEqualBN, assertRevert, + assertRevertWithReason, mineBlocks, } from '@celo/protocol/lib/test-utils' import { normalizeAddressWith0x } from '@celo/utils/lib/address' @@ -119,14 +120,15 @@ contract('Election', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert( + await assertRevertWithReason( election.initialize( registry.address, electableValidators.min, electableValidators.max, maxNumGroupsVotedFor, electabilityThreshold - ) + ), + 'contract already initialized' ) }) }) @@ -141,7 +143,10 @@ contract('Election', (accounts: string[]) => { it('should revert when the threshold is larger than 100%', async () => { const threshold = toFixed(new BigNumber('2')) - await assertRevert(election.setElectabilityThreshold(threshold)) + await assertRevertWithReason( + election.setElectabilityThreshold(threshold), + 'Electability threshold must be lower than 100%' + ) }) }) @@ -175,29 +180,35 @@ contract('Election', (accounts: string[]) => { }) it('should revert when the minElectableValidators is zero', async () => { - await assertRevert(election.setElectableValidators(0, newElectableValidators.max)) + await assertRevertWithReason( + election.setElectableValidators(0, newElectableValidators.max), + 'Minimum electable validators cannot be zero' + ) }) it('should revert when the min is greater than max', async () => { - await assertRevert( + await assertRevertWithReason( election.setElectableValidators( newElectableValidators.max.plus(1), newElectableValidators.max - ) + ), + 'Maximum electable validators cannot be smaller than minimum' ) }) it('should revert when the values are unchanged', async () => { - await assertRevert( - election.setElectableValidators(electableValidators.min, electableValidators.max) + await assertRevertWithReason( + election.setElectableValidators(electableValidators.min, electableValidators.max), + 'Electable validators not changed' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( + await assertRevertWithReason( election.setElectableValidators(newElectableValidators.min, newElectableValidators.max, { from: nonOwner, - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -222,12 +233,16 @@ contract('Election', (accounts: string[]) => { }) it('should revert when the maxNumGroupsVotedFor is unchanged', async () => { - await assertRevert(election.setMaxNumGroupsVotedFor(maxNumGroupsVotedFor)) + await assertRevertWithReason( + election.setMaxNumGroupsVotedFor(maxNumGroupsVotedFor), + 'Max groups voted for not changed' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert( - election.setMaxNumGroupsVotedFor(newMaxNumGroupsVotedFor, { from: nonOwner }) + await assertRevertWithReason( + election.setMaxNumGroupsVotedFor(newMaxNumGroupsVotedFor, { from: nonOwner }), + 'Ownable: caller is not the owner' ) }) }) @@ -240,7 +255,7 @@ contract('Election', (accounts: string[]) => { it('should revert when vote over max number of groups set to true', async () => { await mockValidators.setValidator(accounts[0]) - await assertRevert( + await assertRevertWithReason( election.setAllowedToVoteOverMaxNumberOfGroups(true), 'Validators cannot vote for more than max number of groups' ) @@ -248,7 +263,7 @@ contract('Election', (accounts: string[]) => { it('should revert when vote over max number of groups set to true', async () => { await mockValidators.setValidatorGroup(accounts[0]) - await assertRevert( + await assertRevertWithReason( election.setAllowedToVoteOverMaxNumberOfGroups(true), 'Validator groups cannot vote for more than max number of groups' ) @@ -322,7 +337,10 @@ contract('Election', (accounts: string[]) => { describe('when the group has already been marked eligible', () => { it('should revert', async () => { - await assertRevert(election.markGroupEligible(group, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + election.markGroupEligible(group, NULL_ADDRESS, NULL_ADDRESS), + 'invalid key' + ) }) }) }) @@ -330,7 +348,10 @@ contract('Election', (accounts: string[]) => { describe('not called by the registered validators contract', () => { it('should revert', async () => { - await assertRevert(election.markGroupEligible(group, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + election.markGroupEligible(group, NULL_ADDRESS, NULL_ADDRESS), + 'only registered contract' + ) }) }) }) @@ -370,7 +391,10 @@ contract('Election', (accounts: string[]) => { describe('when not called by the registered Validators contract', () => { it('should revert', async () => { - await assertRevert(election.markGroupIneligible(group)) + await assertRevertWithReason( + election.markGroupIneligible(group), + 'only registered contract' + ) }) }) }) @@ -382,7 +406,7 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(election.markGroupIneligible(group)) + await assertRevertWithReason(election.markGroupIneligible(group), 'key not in list') }) }) }) @@ -522,7 +546,10 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS), + 'SafeMath: subtraction overflow' + ) }) }) }) @@ -538,8 +565,9 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert( - election.vote(group, value.minus(maxNumGroupsVotedFor), newGroup, NULL_ADDRESS) + await assertRevertWithReason( + election.vote(group, value.minus(maxNumGroupsVotedFor), newGroup, NULL_ADDRESS), + 'Voted for too many groups' ) }) }) @@ -587,7 +615,7 @@ contract('Election', (accounts: string[]) => { }) it('should revert when turning off of setAllowedToVoteOverMaxNumberOfGroups', async () => { - await assertRevert( + await assertRevertWithReason( election.setAllowedToVoteOverMaxNumberOfGroups(false), 'Too many groups voted for!' ) @@ -729,14 +757,20 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert(election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS), + 'Group cannot receive votes' + ) }) }) }) describe('when the group is not eligible', () => { it('should revert', async () => { - await assertRevert(election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS)) + await assertRevertWithReason( + election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS), + 'Group not eligible' + ) }) }) }) @@ -855,14 +889,14 @@ contract('Election', (accounts: string[]) => { describe('when an epoch boundary has not passed since the pending votes were made', () => { it('should revert', async () => { - await assertRevert(election.activate(group)) + await assertRevertWithReason(election.activate(group), 'Pending vote epoch not passed') }) }) }) describe('when the voter does not have pending votes', () => { it('should revert', async () => { - await assertRevert(election.activate(group)) + await assertRevertWithReason(election.activate(group), 'Vote value cannot be zero') }) }) }) @@ -981,14 +1015,20 @@ contract('Election', (accounts: string[]) => { describe('when an epoch boundary has not passed since the pending votes were made', () => { it('should revert', async () => { - await assertRevert(election.activateForAccount(group, voter)) + await assertRevertWithReason( + election.activateForAccount(group, voter), + 'Pending vote epoch not passed' + ) }) }) }) describe('when the voter does not have pending votes', () => { it('should revert', async () => { - await assertRevert(election.activateForAccount(group, voter)) + await assertRevertWithReason( + election.activateForAccount(group, voter), + 'Vote value cannot be zero' + ) }) }) }) @@ -1132,8 +1172,9 @@ contract('Election', (accounts: string[]) => { describe('when the wrong index is provided', () => { const index = 1 it('should revert', async () => { - await assertRevert( - election.revokePending(group, value, NULL_ADDRESS, NULL_ADDRESS, index) + await assertRevertWithReason( + election.revokePending(group, value, NULL_ADDRESS, NULL_ADDRESS, index), + 'Bad index' ) }) }) @@ -1142,8 +1183,9 @@ contract('Election', (accounts: string[]) => { describe('when the revoked value is greater than the pending votes', () => { const index = 0 it('should revert', async () => { - await assertRevert( - election.revokePending(group, value + 1, NULL_ADDRESS, NULL_ADDRESS, index) + await assertRevertWithReason( + election.revokePending(group, value + 1, NULL_ADDRESS, NULL_ADDRESS, index), + 'Vote value larger than pending votes' ) }) }) @@ -1378,8 +1420,9 @@ contract('Election', (accounts: string[]) => { describe('when the wrong index is provided', () => { const index = 1 it('should revert', async () => { - await assertRevert( - election.revokeActive(group, voteValue0 + reward0, NULL_ADDRESS, NULL_ADDRESS, index) + await assertRevertWithReason( + election.revokeActive(group, voteValue0 + reward0, NULL_ADDRESS, NULL_ADDRESS, index), + 'Bad index' ) }) }) @@ -1388,7 +1431,7 @@ contract('Election', (accounts: string[]) => { describe('when the revoked value is greater than the active votes', () => { const index = 0 it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( election.revokeActive( group, voteValue0 + reward0 + 1, @@ -1396,7 +1439,8 @@ contract('Election', (accounts: string[]) => { NULL_ADDRESS, index ) - ) + ), + 'Vote value larger than active votes' }) }) }) @@ -2185,7 +2229,7 @@ contract('Election', (accounts: string[]) => { describe('when `forceDecrementVotes` is called with malformed inputs', () => { describe('when called to slash more value than groups have', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( election.forceDecrementVotes( voter, value + value2 + 1, @@ -2193,7 +2237,8 @@ contract('Election', (accounts: string[]) => { [NULL_ADDRESS, group2], [0, 1], { from: accounts[2] } - ) + ), + 'only registered contract' ) }) }) @@ -2202,7 +2247,7 @@ contract('Election', (accounts: string[]) => { it('should revert', async () => { const slashedValue = value // `group` should be listed as a lesser for index 0 (group2's lesser) - await assertRevert( + await assertRevertWithReason( election.forceDecrementVotes( voter, slashedValue, @@ -2210,7 +2255,8 @@ contract('Election', (accounts: string[]) => { [NULL_ADDRESS, group2], [0, 1], { from: accounts[2] } - ) + ), + 'only registered contract' ) }) }) @@ -2218,7 +2264,7 @@ contract('Election', (accounts: string[]) => { describe('when called to slash with incorrect indices', () => { it('should revert', async () => { const slashedValue = value - await assertRevert( + await assertRevertWithReason( election.forceDecrementVotes( voter, slashedValue, @@ -2227,20 +2273,22 @@ contract('Election', (accounts: string[]) => { [0, 0], { from: accounts[2] } ) - ) + ), + 'only registered contract' }) }) describe('when called from an address other than the locked gold contract', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( election.forceDecrementVotes( voter, value, [group, NULL_ADDRESS], [NULL_ADDRESS, group2], [0, 0] - ) + ), + 'only registered contract' ) }) }) diff --git a/packages/protocol/test/governance/voting/lockedgold.ts b/packages/protocol/test/governance/voting/lockedgold.ts index c93155b3aeb..fc42c636782 100644 --- a/packages/protocol/test/governance/voting/lockedgold.ts +++ b/packages/protocol/test/governance/voting/lockedgold.ts @@ -96,7 +96,10 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert if already initialized', async () => { - await assertRevert(lockedGold.initialize(registry.address, unlockingPeriod)) + await assertRevertWithReason( + lockedGold.initialize(registry.address, unlockingPeriod), + 'contract already initialized' + ) }) }) @@ -109,7 +112,10 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when not called by the owner', async () => { - await assertRevert(lockedGold.setRegistry(anAddress, { from: nonOwner })) + await assertRevertWithReason( + lockedGold.setRegistry(anAddress, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -133,11 +139,17 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when the unlockingPeriod is unchanged', async () => { - await assertRevert(lockedGold.setUnlockingPeriod(unlockingPeriod)) + await assertRevertWithReason( + lockedGold.setUnlockingPeriod(unlockingPeriod), + 'Unlocking period not changed' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevert(lockedGold.setUnlockingPeriod(newUnlockingPeriod, { from: nonOwner })) + await assertRevertWithReason( + lockedGold.setUnlockingPeriod(newUnlockingPeriod, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) @@ -181,7 +193,7 @@ contract('LockedGold', (accounts: string[]) => { it('should revert when the account does not exist', async () => { // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails - await assertRevert(lockedGold.lock({ value, from: accounts[1] })) + await assertRevertWithReason(lockedGold.lock({ value, from: accounts[1] }), 'not account') }) }) @@ -253,7 +265,8 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when requesting gold that is voted with', async () => { - await assertRevert(lockedGold.unlock(value)) + await assertRevertWithReason(lockedGold.unlock(value)), + 'Not enough unlockable celo. Celo is locked in voting.' }) describe('when the account is requesting only non voting gold', () => { @@ -319,7 +332,10 @@ contract('LockedGold', (accounts: string[]) => { describe('when unlocking would yield a locked gold balance less than the required value', () => { describe('when the the current time is earlier than the requirement time', () => { it('should revert', async () => { - await assertRevert(lockedGold.unlock(value)) + await assertRevertWithReason( + lockedGold.unlock(value), + "Either account doesn't have enough locked Celo or locked Celo is being used for voting." + ) }) }) }) @@ -422,14 +438,20 @@ contract('LockedGold', (accounts: string[]) => { describe('when relocking value greater than the value of the pending withdrawal', () => { const value = pendingWithdrawalValue + 1 it('should revert', async () => { - await assertRevert(lockedGold.relock(index, value)) + await assertRevertWithReason( + lockedGold.relock(index, value), + 'Requested value larger than pending value' + ) }) }) }) describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevert(lockedGold.relock(index, pendingWithdrawalValue)) + await assertRevertWithReason( + lockedGold.relock(index, pendingWithdrawalValue), + 'Bad pending withdrawal index' + ) }) }) }) @@ -469,14 +491,17 @@ contract('LockedGold', (accounts: string[]) => { describe('when it is before the availablity time', () => { it('should revert', async () => { - await assertRevert(lockedGold.withdraw(index)) + await assertRevertWithReason( + lockedGold.withdraw(index), + 'Pending withdrawal not available' + ) }) }) }) describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevert(lockedGold.withdraw(index)) + await assertRevertWithReason(lockedGold.withdraw(index), 'Bad pending withdrawal index') }) }) }) @@ -494,13 +519,17 @@ contract('LockedGold', (accounts: string[]) => { assert.equal(bytes, (await lockedGold.getSlashingWhitelist())[0]) }) it('can only be called by owner', async () => { - await assertRevert( - lockedGold.addSlasher(CeloContractName.DowntimeSlasher, { from: accounts[1] }) + await assertRevertWithReason( + lockedGold.addSlasher(CeloContractName.DowntimeSlasher, { from: accounts[1] }), + 'Ownable: caller is not the owner' ) }) it('cannot add a slasher twice', async () => { await lockedGold.addSlasher(CeloContractName.DowntimeSlasher) - await assertRevert(lockedGold.addSlasher(CeloContractName.DowntimeSlasher)) + await assertRevertWithReason( + lockedGold.addSlasher(CeloContractName.DowntimeSlasher), + 'Cannot add slasher ID twice.' + ) }) }) @@ -515,19 +544,29 @@ contract('LockedGold', (accounts: string[]) => { assert.equal(0, (await lockedGold.getSlashingWhitelist()).length) }) it('can only be called by owner', async () => { - await assertRevert( - lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 0, { from: accounts[1] }) + await assertRevertWithReason( + lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 0, { from: accounts[1] }), + 'Ownable: caller is not the owner' ) }) it('reverts when index too large', async () => { - await assertRevert(lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 100)) + await assertRevertWithReason( + lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 100), + 'Provided index exceeds whitelist bounds.' + ) }) it('reverts when key does not exists', async () => { - await assertRevert(lockedGold.removeSlasher(CeloContractName.GovernanceSlasher, 100)) + await assertRevertWithReason( + lockedGold.removeSlasher(CeloContractName.GovernanceSlasher, 100), + 'Cannot remove slasher ID not yet added.' + ) }) it('reverts when index and key have mismatch', async () => { await lockedGold.addSlasher(CeloContractName.GovernanceSlasher) - await assertRevert(lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 1)) + await assertRevertWithReason( + lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 1), + "Index doesn't match identifier" + ) }) }) @@ -599,7 +638,7 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( lockedGold.slash( account, penalty, @@ -609,7 +648,8 @@ contract('LockedGold', (accounts: string[]) => { [NULL_ADDRESS], [0], { from: accounts[2] } - ) + ), + 'Caller is not a whitelisted slasher.' ) }) }) diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index 1f19c102ab3..63f6fa2c3f7 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -328,7 +328,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should emit safeTransfer logs on erc20 revert', async () => { const startBalanceFrom = await mockStableToken.balanceOf(releaseGoldInstance.address) - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.genericTransfer( mockStableToken.address, receiver, @@ -342,10 +342,11 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert when attempting transfer of goldtoken from the release gold instance', async () => { - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.genericTransfer(goldTokenInstance.address, receiver, transferAmount, { from: beneficiary, - }) + }), + 'Transfer must not target celo balance' ) }) }) @@ -439,19 +440,28 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when releaseGold beneficiary is the null address', async () => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.beneficiary = NULL_ADDRESS - await assertRevert(createNewReleaseGoldInstance(releaseGoldSchedule, web3)) + await assertRevertWithReason( + createNewReleaseGoldInstance(releaseGoldSchedule, web3), + 'The release schedule beneficiary cannot be the zero addresss' + ) }) it('should revert when releaseGold periods are zero', async () => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.numReleasePeriods = 0 - await assertRevert(createNewReleaseGoldInstance(releaseGoldSchedule, web3)) + await assertRevertWithReason( + createNewReleaseGoldInstance(releaseGoldSchedule, web3), + 'There must be at least one releasing period' + ) }) it('should revert when released amount per period is zero', async () => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.amountReleasedPerPeriod = new BigNumber('0') - await assertRevert(createNewReleaseGoldInstance(releaseGoldSchedule, web3)) + await assertRevertWithReason( + createNewReleaseGoldInstance(releaseGoldSchedule, web3), + 'The released amount per period must be greater than zero' + ) }) it('should overflow for very large combinations of release periods and amount per time', async () => { @@ -478,7 +488,10 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert when setting a new beneficiary from the release owner', async () => { - await assertRevert(releaseGoldInstance.setBeneficiary(newBeneficiary, { from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.setBeneficiary(newBeneficiary, { from: releaseOwner }), + 'Ownable: caller is not the owner' + ) }) it('should emit the BeneficiarySet event', async () => { @@ -508,7 +521,10 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if a non-beneficiary attempts account creation', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevert(releaseGoldInstance.createAccount({ from: accounts[2] })) + await assertRevertWithReason( + releaseGoldInstance.createAccount({ from: accounts[2] }), + 'Sender must be the beneficiary and state must not be revoked' + ) }) }) @@ -520,7 +536,10 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if anyone attempts account creation', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevert(releaseGoldInstance.createAccount({ from: beneficiary })) + await assertRevertWithReason( + releaseGoldInstance.createAccount({ from: beneficiary }), + 'Sender must be the beneficiary and state must not be revoked' + ) }) }) }) @@ -561,7 +580,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if a non-beneficiary attempts to set the account', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -572,7 +591,8 @@ contract('ReleaseGold', (accounts: string[]) => { { from: accounts[2], } - ) + ), + 'Sender must be the beneficiary and state must not be revoked' ) }) @@ -608,7 +628,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert to set the name, dataEncryptionKey and walletAddress of the account by a non-beneficiary', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -619,7 +639,8 @@ contract('ReleaseGold', (accounts: string[]) => { { from: releaseOwner, } - ) + ), + 'Sender must be the beneficiary and state must not be revoked' ) }) }) @@ -632,7 +653,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if anyone attempts to set the account', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -643,14 +664,15 @@ contract('ReleaseGold', (accounts: string[]) => { { from: releaseOwner, } - ) + ), + 'Sender must be the beneficiary and state must not be revoked' ) }) it('should revert to set the name, dataEncryptionKey and walletAddress of the account', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -661,7 +683,8 @@ contract('ReleaseGold', (accounts: string[]) => { { from: releaseOwner, } - ) + ), + 'Sender must be the beneficiary and state must not be revoked' ) }) }) @@ -676,7 +699,10 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.setAccountName(accountName, { from: beneficiary })) + await assertRevertWithReason( + releaseGoldInstance.setAccountName(accountName, { from: beneficiary }), + 'Unknown account' + ) }) }) @@ -693,7 +719,10 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set the name', async () => { - await assertRevert(releaseGoldInstance.setAccountName(accountName, { from: accounts[2] })) + await assertRevertWithReason( + releaseGoldInstance.setAccountName(accountName, { from: accounts[2] }), + 'Sender must be the beneficiary and state must not be revoked' + ) }) }) @@ -703,8 +732,9 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if anyone attempts to set the name', async () => { - await assertRevert( - releaseGoldInstance.setAccountName(accountName, { from: releaseOwner }) + await assertRevertWithReason( + releaseGoldInstance.setAccountName(accountName, { from: releaseOwner }), + 'Sender must be the beneficiary and state must not be revoked' ) }) }) @@ -723,14 +753,15 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when the releaseGold account has not been created', () => { it('should revert', async () => { - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.setAccountWalletAddress( walletAddress, proofOfWalletOwnership.v, proofOfWalletOwnership.r, proofOfWalletOwnership.s, { from: beneficiary } - ) + ), + 'Unknown account' ) }) }) @@ -754,14 +785,15 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set the walletAddress', async () => { - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.setAccountWalletAddress( walletAddress, proofOfWalletOwnership.v, proofOfWalletOwnership.r, proofOfWalletOwnership.s, { from: accounts[2] } - ) + ), + 'Sender must be the beneficiary and state must not be revoked' ) }) @@ -780,14 +812,15 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if anyone attempts to set the walletAddress', async () => { - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.setAccountWalletAddress( walletAddress, proofOfWalletOwnership.v, proofOfWalletOwnership.r, proofOfWalletOwnership.s, { from: releaseOwner } - ) + ), + 'Sender must be the beneficiary and state must not be revoked' ) }) }) @@ -803,8 +836,9 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevert( - releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: beneficiary }), + 'Unknown account' ) }) }) @@ -822,8 +856,9 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set the metadataURL', async () => { - await assertRevert( - releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: accounts[2] }) + await assertRevertWithReason( + releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: accounts[2] }), + 'Sender must be the beneficiary and state must not be revoked' ) }) }) @@ -834,8 +869,9 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if anyone attempts to set the metadataURL', async () => { - await assertRevert( - releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: releaseOwner }) + await assertRevertWithReason( + releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: releaseOwner }), + 'Sender must be the beneficiary and state must not be revoked' ) }) }) @@ -866,8 +902,9 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set dataEncryptionKey', async () => { - await assertRevert( - releaseGoldInstance.setAccountDataEncryptionKey(dataEncryptionKey, { from: accounts[2] }) + await assertRevertWithReason( + releaseGoldInstance.setAccountDataEncryptionKey(dataEncryptionKey, { from: accounts[2] }), + 'Sender must be the beneficiary and state must not be revoked' ) }) @@ -884,8 +921,9 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when the key is invalid', async () => { const invalidKey: any = '0x32132931293' - await assertRevert( - releaseGoldInstance.setAccountDataEncryptionKey(invalidKey, { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.setAccountDataEncryptionKey(invalidKey, { from: beneficiary }), + 'data encryption key length <= 32' ) }) @@ -930,7 +968,10 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('cannot be lowered again', async () => { - await assertRevert(releaseGoldInstance.setMaxDistribution(500, { from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.setMaxDistribution(500, { from: releaseOwner }), + 'Cannot set max distribution lower if already set to 1000' + ) }) }) }) @@ -1004,8 +1045,9 @@ contract('ReleaseGold', (accounts: string[]) => { it(`should revert if the ${authorizationTestDescriptions[key].me} is an account`, async () => { await accountsInstance.createAccount({ from: authorized }) - await assertRevert( - authorizationTest.fn(authorized, sig.v, sig.r, sig.s, { from: beneficiary }) + await assertRevertWithReason( + authorizationTest.fn(authorized, sig.v, sig.r, sig.s, { from: beneficiary }), + 'Cannot re-authorize address or locked gold account for another account' ) }) @@ -1017,10 +1059,11 @@ contract('ReleaseGold', (accounts: string[]) => { otherAccount ) await accountsInstance.createAccount({ from: otherAccount }) - await assertRevert( + await assertRevertWithReason( authorizationTest.fn(otherAccount, otherSig.v, otherSig.r, otherSig.s, { from: beneficiary, - }) + }), + 'Cannot re-authorize address or locked gold account for another account' ) }) @@ -1031,10 +1074,11 @@ contract('ReleaseGold', (accounts: string[]) => { releaseGoldInstance.address, nonVoter ) - await assertRevert( + await assertRevertWithReason( authorizationTest.fn(authorized, incorrectSig.v, incorrectSig.r, incorrectSig.s, { from: beneficiary, - }) + }), + 'Invalid signature' ) }) @@ -1177,13 +1221,19 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when non-releaseOwner attempts to revoke the releaseGold', async () => { await createNewReleaseGoldInstance(releaseGoldDefaultSchedule, web3) - await assertRevert(releaseGoldInstance.revoke({ from: accounts[5] })) + await assertRevertWithReason( + releaseGoldInstance.revoke({ from: accounts[5] }), + 'Sender must be the registered releaseOwner address' + ) }) it('should revert if releaseGold is already revoked', async () => { await createNewReleaseGoldInstance(releaseGoldDefaultSchedule, web3) await releaseGoldInstance.revoke({ from: releaseOwner }) - await assertRevert(releaseGoldInstance.revoke({ from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.revoke({ from: releaseOwner }), + 'Release schedule instance must not already be revoked' + ) }) it('should revert if releaseGold is non-revocable', async () => { @@ -1191,7 +1241,10 @@ contract('ReleaseGold', (accounts: string[]) => { releaseGoldSchedule.revocable = false releaseGoldSchedule.refundAddress = '0x0000000000000000000000000000000000000000' await createNewReleaseGoldInstance(releaseGoldSchedule, web3) - await assertRevert(releaseGoldInstance.revoke({ from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.revoke({ from: releaseOwner }), + 'Release schedule instance must be revocable' + ) }) }) @@ -1203,7 +1256,10 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when called before expiration time has passed', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.expire({ from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.expire({ from: releaseOwner }), + '`EXPIRATION_TIME` must have passed after the end of releasing' + ) }) }) @@ -1218,7 +1274,10 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert before `EXPIRATION_TIME` after release schedule end', async () => { - await assertRevert(releaseGoldInstance.expire({ from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.expire({ from: releaseOwner }), + '`EXPIRATION_TIME` must have passed after the end of releasing' + ) }) describe('when `EXPIRATION_TIME` has passed after release schedule completion', () => { @@ -1229,7 +1288,10 @@ contract('ReleaseGold', (accounts: string[]) => { }) describe('when not called by releaseOwner', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.expire()) + await assertRevertWithReason( + releaseGoldInstance.expire(), + 'Sender must be the registered releaseOwner address' + ) }) }) @@ -1312,7 +1374,10 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when `expire` is called', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.expire({ from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.expire({ from: releaseOwner }), + 'Contract must be expirable' + ) }) }) }) @@ -1333,11 +1398,17 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when revoked but called by a non-releaseOwner', async () => { await releaseGoldInstance.revoke({ from: releaseOwner }) - await assertRevert(releaseGoldInstance.refundAndFinalize({ from: accounts[5] })) + await assertRevertWithReason( + releaseGoldInstance.refundAndFinalize({ from: accounts[5] }), + 'Sender must be the releaseOwner and state must be revoked' + ) }) it('should revert when non-revoked but called by a releaseOwner', async () => { - await assertRevert(releaseGoldInstance.refundAndFinalize({ from: releaseOwner })) + await assertRevertWithReason( + releaseGoldInstance.refundAndFinalize({ from: releaseOwner }), + 'Sender must be the releaseOwner and state must be revoked' + ) }) describe('when revoked()', () => { @@ -1416,10 +1487,11 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if releaseGold instance is not an account', async () => { - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.lockGold(lockAmount, { from: beneficiary, - }) + }), + 'not account' ) }) @@ -1434,7 +1506,10 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert if non-beneficiary tries to lock up any unlocked amount', async () => { await releaseGoldInstance.createAccount({ from: beneficiary }) - await assertRevert(releaseGoldInstance.lockGold(lockAmount, { from: accounts[6] })) + await assertRevertWithReason( + releaseGoldInstance.lockGold(lockAmount, { from: accounts[6] }), + 'Sender must be the beneficiary and state must not be revoked' + ) }) }) @@ -1486,7 +1561,10 @@ contract('ReleaseGold', (accounts: string[]) => { from: beneficiary, }) // unlock the latter - await assertRevert(releaseGoldInstance.unlockGold(lockAmount, { from: accounts[5] })) + await assertRevertWithReason( + releaseGoldInstance.unlockGold(lockAmount, { from: accounts[5] }), + 'Must be called by releaseOwner when revoked or beneficiary before revocation' + ) }) it('should revert if beneficiary in voting tries to unlock the locked amount', async () => { @@ -1497,7 +1575,10 @@ contract('ReleaseGold', (accounts: string[]) => { from: beneficiary, }) // unlock the latter - await assertRevert(releaseGoldInstance.unlockGold(lockAmount, { from: accounts[5] })) + await assertRevertWithReason( + releaseGoldInstance.unlockGold(lockAmount, { from: accounts[5] }), + 'Must be called by releaseOwner when revoked or beneficiary before revocation' + ) }) it('should revert if beneficiary with balance requirements tries to unlock the locked amount', async () => { @@ -1514,7 +1595,10 @@ contract('ReleaseGold', (accounts: string[]) => { balanceRequirement ) // unlock the latter - await assertRevert(releaseGoldInstance.unlockGold(lockAmount, { from: beneficiary })) + await assertRevertWithReason( + releaseGoldInstance.unlockGold(lockAmount, { from: beneficiary }), + "Either account doesn't have enough locked Celo or locked Celo is being used for voting." + ) }) }) @@ -1549,20 +1633,29 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when it is before the availablity time', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.withdrawLockedGold(index, { from: beneficiary })) + await assertRevertWithReason( + releaseGoldInstance.withdrawLockedGold(index, { from: beneficiary }), + 'Pending withdrawal not available' + ) }) }) describe('when non-beneficiary attempts to withdraw the gold', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.withdrawLockedGold(index, { from: accounts[4] })) + await assertRevertWithReason( + releaseGoldInstance.withdrawLockedGold(index, { from: accounts[4] }), + 'Must be called by releaseOwner when revoked or beneficiary before revocation' + ) }) }) }) describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.withdrawLockedGold(index, { from: beneficiary })) + await assertRevertWithReason( + releaseGoldInstance.withdrawLockedGold(index, { from: beneficiary }), + 'Pending withdrawal not available' + ) }) }) }) @@ -1658,14 +1751,20 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when relocking value greater than the value of the pending withdrawal', () => { const value = pendingWithdrawalValue + 1 it('should revert', async () => { - await assertRevert(releaseGoldInstance.relockGold(index, value, { from: beneficiary })) + await assertRevertWithReason( + releaseGoldInstance.relockGold(index, value, { from: beneficiary }), + 'Requested value larger than pending value' + ) }) }) }) describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevert(releaseGoldInstance.relockGold(index, pendingWithdrawalValue)) + await assertRevertWithReason( + releaseGoldInstance.relockGold(index, pendingWithdrawalValue), + 'Sender must be the beneficiary and state must not be revoked' + ) }) }) }) @@ -1687,8 +1786,9 @@ contract('ReleaseGold', (accounts: string[]) => { await releaseGoldInstance.setMaxDistribution(1000, { from: releaseOwner }) const timeToTravel = 0.5 * HOUR await timeTravel(timeToTravel, web3) - await assertRevert( - releaseGoldInstance.withdraw(initialreleaseGoldAmount.div(20), { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.withdraw(initialreleaseGoldAmount.div(20), { from: beneficiary }), + 'Requested amount is greater than available released funds' ) }) @@ -1696,7 +1796,10 @@ contract('ReleaseGold', (accounts: string[]) => { await releaseGoldInstance.setMaxDistribution(1000, { from: releaseOwner }) const timeToTravel = 3 * MONTH + 1 * DAY await timeTravel(timeToTravel, web3) - await assertRevert(releaseGoldInstance.withdraw(new BigNumber(0), { from: beneficiary })) + await assertRevertWithReason( + releaseGoldInstance.withdraw(new BigNumber(0), { from: beneficiary }), + 'Requested withdrawal amount must be greater than zero' + ) }) describe('when not revoked', () => { @@ -1711,8 +1814,9 @@ contract('ReleaseGold', (accounts: string[]) => { const expectedWithdrawalAmount = await releaseGoldInstance.getCurrentReleasedTotalAmount() const beneficiaryBalanceAfter = await goldTokenInstance.balanceOf(beneficiary) assertEqualBN(expectedWithdrawalAmount, 0) - await assertRevert( - releaseGoldInstance.withdraw(expectedWithdrawalAmount, { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.withdraw(expectedWithdrawalAmount, { from: beneficiary }), + 'Requested withdrawal amount must be greater than zero' ) assertEqualBN( new BigNumber(beneficiaryBalanceAfter).minus(new BigNumber(beneficiaryBalanceBefore)), @@ -1827,8 +1931,9 @@ contract('ReleaseGold', (accounts: string[]) => { it('should not allow withdrawal of more than 50% gold', async () => { const unexpectedWithdrawalAmount = TOTAL_AMOUNT.plus(ONE_GOLDTOKEN).div(2).plus(1) - await assertRevert( - releaseGoldInstance.withdraw(unexpectedWithdrawalAmount, { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.withdraw(unexpectedWithdrawalAmount, { from: beneficiary }), + 'Requested amount is greater than available released funds' ) }) }) @@ -1853,8 +1958,9 @@ contract('ReleaseGold', (accounts: string[]) => { const expectedWithdrawalAmount = TOTAL_AMOUNT.div(2) await releaseGoldInstance.withdraw(expectedWithdrawalAmount, { from: beneficiary }) const unexpectedWithdrawalAmount = 1 - await assertRevert( - releaseGoldInstance.withdraw(unexpectedWithdrawalAmount, { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.withdraw(unexpectedWithdrawalAmount, { from: beneficiary }), + 'Requested amount exceeds current alloted maximum distribution' ) }) }) @@ -1886,13 +1992,14 @@ contract('ReleaseGold', (accounts: string[]) => { await timeTravel(timeToTravel, web3) await releaseGoldInstance.revoke({ from: releaseOwner }) const [, , expectedWithdrawalAmount] = await releaseGoldInstance.revocationInfo() - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.withdraw( new BigNumber(expectedWithdrawalAmount).multipliedBy(1.1), { from: beneficiary, } - ) + ), + 'Requested amount is greater than available released funds' ) }) @@ -1945,8 +2052,9 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert on withdrawal of more than 50%', async () => { - await assertRevert( - releaseGoldInstance.withdraw(initialreleaseGoldAmount, { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.withdraw(initialreleaseGoldAmount, { from: beneficiary }), + 'Requested amount exceeds current alloted maximum distribution' ) }) }) @@ -1980,13 +2088,15 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert on withdraw of any amount', async () => { - await assertRevert( + await assertRevertWithReason( releaseGoldInstance.withdraw(initialreleaseGoldAmount.multipliedBy(0.5), { from: beneficiary, - }) + }), + 'Requested withdrawal before liquidity provision is met' ) - await assertRevert( - releaseGoldInstance.withdraw(initialreleaseGoldAmount, { from: beneficiary }) + await assertRevertWithReason( + releaseGoldInstance.withdraw(initialreleaseGoldAmount, { from: beneficiary }), + 'Requested withdrawal before liquidity provision is met' ) }) }) From 8a64112fdb42913932386cda675bdc5ce52320bb Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 20 May 2023 18:05:00 -0400 Subject: [PATCH 093/184] angry linter --- packages/protocol/test/governance/voting/election.ts | 8 ++++---- packages/protocol/test/governance/voting/lockedgold.ts | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/protocol/test/governance/voting/election.ts b/packages/protocol/test/governance/voting/election.ts index c5793abdef4..27a3d22473a 100644 --- a/packages/protocol/test/governance/voting/election.ts +++ b/packages/protocol/test/governance/voting/election.ts @@ -1438,9 +1438,9 @@ contract('Election', (accounts: string[]) => { NULL_ADDRESS, NULL_ADDRESS, index - ) - ), + ), 'Vote value larger than active votes' + ) }) }) }) @@ -2272,9 +2272,9 @@ contract('Election', (accounts: string[]) => { [NULL_ADDRESS, group2], [0, 0], { from: accounts[2] } - ) - ), + ), 'only registered contract' + ) }) }) diff --git a/packages/protocol/test/governance/voting/lockedgold.ts b/packages/protocol/test/governance/voting/lockedgold.ts index fc42c636782..eeb2bc5ff6f 100644 --- a/packages/protocol/test/governance/voting/lockedgold.ts +++ b/packages/protocol/test/governance/voting/lockedgold.ts @@ -265,8 +265,10 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when requesting gold that is voted with', async () => { - await assertRevertWithReason(lockedGold.unlock(value)), + await assertRevertWithReason( + lockedGold.unlock(value), 'Not enough unlockable celo. Celo is locked in voting.' + ) }) describe('when the account is requesting only non voting gold', () => { From 6f70d377b73b2a53cf00bfcf0f7bc90821af3b79 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 23 May 2023 10:55:09 -0400 Subject: [PATCH 094/184] using assertRevertWithReason in identity/ --- .../protocol/test/identity/attestations.ts | 41 +++++++++++------ packages/protocol/test/identity/escrow.ts | 43 +++++++++++------- .../test/identity/federatedattestations.ts | 45 ++++++++++++------- .../protocol/test/identity/identityproxy.ts | 8 ++-- .../test/identity/identityproxyhub.ts | 3 ++ .../protocol/test/identity/odispayments.ts | 9 ++-- packages/protocol/test/identity/random.ts | 11 ++++- 7 files changed, 104 insertions(+), 56 deletions(-) diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index 3d906ffd473..a1859da25ab 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -6,6 +6,7 @@ import { assertEqualBN, assertLogMatches2, assertRevert, + assertRevertWithReason, getDerivedKey, KeyOffsets, unlockAndAuthorizeKey, @@ -151,7 +152,7 @@ contract('Attestations', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert( + await assertRevertWithReason( attestations.initialize( registry.address, attestationExpiryBlocks, @@ -159,7 +160,8 @@ contract('Attestations', (accounts: string[]) => { maxAttestations, [mockERC20Token.address], [attestationFee] - ) + ), + 'contract already initialized' ) }) }) @@ -184,10 +186,11 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when set by a non-owner', async () => { - await assertRevert( + await assertRevertWithReason( attestations.setAttestationExpiryBlocks(newMaxNumBlocksPerAttestation, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -202,14 +205,18 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when the fee is being set to 0', async () => { - await assertRevert(attestations.setAttestationRequestFee(mockERC20Token.address, 0)) + await assertRevertWithReason( + attestations.setAttestationRequestFee(mockERC20Token.address, 0), + 'You have to specify a fee greater than 0' + ) }) it('should not be settable by a non-owner', async () => { - await assertRevert( + await assertRevertWithReason( attestations.setAttestationRequestFee(mockERC20Token.address, newAttestationFee, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' ) }) @@ -250,10 +257,11 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when set by a non-owner', async () => { - await assertRevert( + await assertRevertWithReason( attestations.setSelectIssuersWaitBlocks(newSelectIssuersWaitBlocks, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -277,10 +285,11 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when set by a non-owner', async () => { - await assertRevert( + await assertRevertWithReason( attestations.setMaxAttestations(newMaxAttestations, { from: accounts[1], - }) + }), + 'Ownable: caller is not the owner' ) }) }) @@ -346,7 +355,10 @@ contract('Attestations', (accounts: string[]) => { accounts ) const signer = await accountsInstance.getVoteSigner(issuer) - await assertRevert(attestations.withdraw(mockERC20Token.address, { from: signer })) + await assertRevertWithReason( + attestations.withdraw(mockERC20Token.address, { from: signer }), + 'not active authorized signer for role' + ) }) it('should emit the Withdrawal event', async () => { @@ -366,8 +378,9 @@ contract('Attestations', (accounts: string[]) => { }) it('should not allow someone with no pending withdrawals to withdraw', async () => { - await assertRevert( - attestations.withdraw(mockERC20Token.address, { from: await getNonIssuer() }) + await assertRevertWithReason( + attestations.withdraw(mockERC20Token.address, { from: await getNonIssuer() }), + 'value was negative/zero' ) }) }) diff --git a/packages/protocol/test/identity/escrow.ts b/packages/protocol/test/identity/escrow.ts index 04258989d7f..b398510b18c 100644 --- a/packages/protocol/test/identity/escrow.ts +++ b/packages/protocol/test/identity/escrow.ts @@ -5,7 +5,6 @@ import { assertEqualBN, assertLogMatches2, assertObjectWithBNEqual, - assertRevert, assertRevertWithReason, assumeOwnership, timeTravel, @@ -121,7 +120,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(escrow.initialize()) + await assertRevertWithReason(escrow.initialize(), 'contract already initialized') }) }) @@ -133,7 +132,10 @@ contract('Escrow', (accounts: string[]) => { }) it('reverts if non-owner attempts to add trustedIssuer', async () => { - await assertRevert(escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: trustedIssuer1 })) + await assertRevertWithReason( + escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: trustedIssuer1 }), + 'Ownable: caller is not the owner' + ) }) it('should emit the DefaultTrustedIssuerAdded event', async () => { @@ -207,8 +209,9 @@ contract('Escrow', (accounts: string[]) => { }) it('reverts if non-owner attempts to remove trustedIssuer', async () => { - await assertRevert( - escrow.removeDefaultTrustedIssuer(trustedIssuer1, 0, { from: trustedIssuer1 }) + await assertRevertWithReason( + escrow.removeDefaultTrustedIssuer(trustedIssuer1, 0, { from: trustedIssuer1 }), + 'Ownable: caller is not the owner' ) }) @@ -548,7 +551,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow a transfer if token is 0', async () => { - await assertRevert( + await assertRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, NULL_ADDRESS, @@ -560,12 +563,13 @@ contract('Escrow', (accounts: string[]) => { { from: sender, } - ) + ), + 'Invalid transfer inputs.' ) }) it('should not allow a transfer if value is 0', async () => { - await assertRevert( + await assertRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -577,12 +581,13 @@ contract('Escrow', (accounts: string[]) => { { from: sender, } - ) + ), + 'Invalid transfer inputs.' ) }) it('should not allow a transfer if expirySeconds is 0', async () => { - await assertRevert( + await assertRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -594,7 +599,8 @@ contract('Escrow', (accounts: string[]) => { { from: sender, } - ) + ), + 'Invalid transfer inputs.' ) }) @@ -653,7 +659,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should revert if transfer value exceeds balance', async () => { - await assertRevert( + await assertRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -665,7 +671,8 @@ contract('Escrow', (accounts: string[]) => { { from: sender, } - ) + ), + 'SafeERC20: low-level call failed' ) }) @@ -1233,16 +1240,20 @@ contract('Escrow', (accounts: string[]) => { await escrow.withdraw(uniquePaymentIDRevoke, parsedSig1.v, parsedSig1.r, parsedSig1.s, { from: receiver, }) - await assertRevert(escrow.revoke(uniquePaymentIDRevoke, { from: sender })) + await assertRevertWithReason( + escrow.revoke(uniquePaymentIDRevoke, { from: sender }), + 'Only sender of payment can attempt to revoke payment.' + ) }) it('should not allow receiver to redeem payment after sender revokes it', async () => { await timeTravel(oneDayInSecs, web3) await escrow.revoke(uniquePaymentIDRevoke, { from: sender }) - await assertRevert( + await assertRevertWithReason( escrow.withdraw(uniquePaymentIDRevoke, parsedSig1.v, parsedSig1.r, parsedSig1.s, { from: receiver, - }) + }), + 'Invalid withdraw value.' ) }) diff --git a/packages/protocol/test/identity/federatedattestations.ts b/packages/protocol/test/identity/federatedattestations.ts index 0a47a417c21..0c740294171 100644 --- a/packages/protocol/test/identity/federatedattestations.ts +++ b/packages/protocol/test/identity/federatedattestations.ts @@ -230,7 +230,10 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(federatedAttestations.initialize()) + await assertRevertWithReason( + federatedAttestations.initialize(), + 'contract already initialized' + ) }) }) @@ -668,7 +671,7 @@ contract('FederatedAttestations', (accounts: string[]) => { chainId, federatedAttestations.address ) - await assertRevert( + await assertRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -678,13 +681,14 @@ contract('FederatedAttestations', (accounts: string[]) => { sig2.v, sig2.r, sig2.s - ) + ), + 'Signature is invalid' ) }) it('should revert if signer has been deregistered', async () => { await accountsInstance.removeSigner(signer1, signerRole, { from: issuer1 }) - await assertRevert( + await assertRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -694,7 +698,8 @@ contract('FederatedAttestations', (accounts: string[]) => { sig.v, sig.r, sig.s - ) + ), + 'not active authorized signer for role' ) }) @@ -764,7 +769,7 @@ contract('FederatedAttestations', (accounts: string[]) => { 1, federatedAttestations.address ) - await assertRevert( + await assertRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -775,7 +780,8 @@ contract('FederatedAttestations', (accounts: string[]) => { sig2.r, sig2.s, { from: issuer1 } - ) + ), + 'Signature is invalid' ) }) @@ -930,10 +936,11 @@ contract('FederatedAttestations', (accounts: string[]) => { it('should revert when signer has been deregistered', async () => { await accountsInstance.removeSigner(signer1, signerRole, { from: issuer1 }) - await assertRevert( + await assertRevertWithReason( federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: signer1, - }) + }), + 'not active authorized signer for role' ) }) @@ -1026,10 +1033,11 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should revert if an invalid user attempts to revoke the attestation', async () => { - await assertRevert( + await assertRevertWithReason( federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: accounts[5], - }) + }), + 'not an account' ) }) @@ -1037,7 +1045,7 @@ contract('FederatedAttestations', (accounts: string[]) => { await federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: issuer1, }) - await assertRevert( + await assertRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -1048,7 +1056,8 @@ contract('FederatedAttestations', (accounts: string[]) => { sig.r, sig.s, { from: issuer1 } - ) + ), + 'Attestation has been revoked' ) }) }) @@ -1176,23 +1185,25 @@ contract('FederatedAttestations', (accounts: string[]) => { it('should revert if deregistered signer of issuer batch revokes attestations', async () => { await accountsInstance.removeSigner(signer1, signerRole, { from: issuer1 }) - await assertRevert( + await assertRevertWithReason( federatedAttestations.batchRevokeAttestations( issuer1, [identifier2, identifier1], [account2, account1], { from: signer1 } - ) + ), + 'not active authorized signer for role' ) }) it('should revert if identifiers.length != accounts.length', async () => { - await assertRevert( + await assertRevertWithReason( federatedAttestations.batchRevokeAttestations( issuer1, [identifier2], [account2, account1], { from: signer1 } - ) + ), + 'Unequal number of identifiers and accounts' ) }) it('should revert if one of the (identifier, account) pairs is invalid', async () => { diff --git a/packages/protocol/test/identity/identityproxy.ts b/packages/protocol/test/identity/identityproxy.ts index f09de7c370e..6b59cc3c5f3 100644 --- a/packages/protocol/test/identity/identityproxy.ts +++ b/packages/protocol/test/identity/identityproxy.ts @@ -1,4 +1,4 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' +import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' import { IdentityProxyContract, IdentityProxyInstance, @@ -10,6 +10,7 @@ const IdentityProxy: IdentityProxyContract = artifacts.require('IdentityProxy') const IdentityProxyTest: IdentityProxyTestContract = artifacts.require('IdentityProxyTest') contract('IdentityProxyHub', (accounts: string[]) => { + //TODO (soloseng): see with identy about this contract name. should it be `identityproxy` let identityProxy: IdentityProxyInstance let identityProxyTest: IdentityProxyTestInstance @@ -38,8 +39,9 @@ contract('IdentityProxyHub', (accounts: string[]) => { it('cannot be called by anyone other than the original deployer', async () => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - await assertRevert( - identityProxy.makeCall(identityProxyTest.address, txData, { from: accounts[1] }) + await assertRevertWithReason( + identityProxy.makeCall(identityProxyTest.address, txData, { from: accounts[1] }), + 'Only callable by original deployer' ) }) }) diff --git a/packages/protocol/test/identity/identityproxyhub.ts b/packages/protocol/test/identity/identityproxyhub.ts index b9e7023ee98..234228116eb 100644 --- a/packages/protocol/test/identity/identityproxyhub.ts +++ b/packages/protocol/test/identity/identityproxyhub.ts @@ -169,6 +169,7 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() + // TODO (soloseng): why does this revert without reason await assertRevert(identityProxyHub.makeCall(identifier, identityProxyTest.address, txData)) }) @@ -186,6 +187,7 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() + // TODO (soloseng): why does this revert without reason await assertRevert(identityProxyHub.makeCall(identifier, identityProxyTest.address, txData)) }) @@ -201,6 +203,7 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() + // TODO (soloseng): why does this revert without reason await assertRevert(identityProxyHub.makeCall(identifier, identityProxyTest.address, txData)) }) }) diff --git a/packages/protocol/test/identity/odispayments.ts b/packages/protocol/test/identity/odispayments.ts index 578d05fb2ee..25a0f1c3774 100644 --- a/packages/protocol/test/identity/odispayments.ts +++ b/packages/protocol/test/identity/odispayments.ts @@ -2,7 +2,7 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { assertEqualBN, assertLogMatches2, - assertRevert, + assertRevertWithReason, assumeOwnership, } from '@celo/protocol/lib/test-utils' import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils' @@ -74,7 +74,7 @@ contract('OdisPayments', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(odisPayments.initialize()) + await assertRevertWithReason(odisPayments.initialize(), 'contract already initialized') }) }) @@ -146,8 +146,9 @@ contract('OdisPayments', (accounts: string[]) => { }) it('should revert if transfer fails', async () => { - await assertRevert( - odisPayments.payInCUSD(sender, valueApprovedForTransfer + 1, { from: sender }) + await assertRevertWithReason( + odisPayments.payInCUSD(sender, valueApprovedForTransfer + 1, { from: sender }), + 'SafeERC20: low-level call failed' ) assertEqualBN(await odisPayments.totalPaidCUSD(sender), 0) }) diff --git a/packages/protocol/test/identity/random.ts b/packages/protocol/test/identity/random.ts index c0f941742f1..5b384ceaa75 100644 --- a/packages/protocol/test/identity/random.ts +++ b/packages/protocol/test/identity/random.ts @@ -2,6 +2,7 @@ import { assertContainSubset, assertEqualBN, assertRevert, + assertRevertWithReason, currentEpochNumber, EPOCH, timeTravel, @@ -42,7 +43,10 @@ contract('Random', (accounts: string[]) => { }) it('only owner can set', async () => { - await assertRevert(random.setRandomnessBlockRetentionWindow(1000, { from: accounts[1] })) + await assertRevertWithReason( + random.setRandomnessBlockRetentionWindow(1000, { from: accounts[1] }), + 'Ownable: caller is not the owner' + ) }) }) @@ -173,7 +177,10 @@ contract('Random', (accounts: string[]) => { await random.setRandomnessBlockRetentionWindow(256) }) it('cannot add zero commitment', async () => { - await assertRevert(random.testRevealAndCommit('0x0', hash0, accounts[0])) + await assertRevertWithReason( + random.testRevealAndCommit('0x0', hash0, accounts[0]), + 'cannot commit zero randomness' + ) }) it('can add initial commitment', async () => { await random.testRevealAndCommit('0x0', hash1, accounts[0]) From bff7b5dbce8a2c0913d1efd0b89647bfc99b3b9c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 23 May 2023 10:57:11 -0400 Subject: [PATCH 095/184] fix linter issue --- packages/protocol/test/identity/identityproxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/test/identity/identityproxy.ts b/packages/protocol/test/identity/identityproxy.ts index 6b59cc3c5f3..9fb48264a29 100644 --- a/packages/protocol/test/identity/identityproxy.ts +++ b/packages/protocol/test/identity/identityproxy.ts @@ -10,7 +10,7 @@ const IdentityProxy: IdentityProxyContract = artifacts.require('IdentityProxy') const IdentityProxyTest: IdentityProxyTestContract = artifacts.require('IdentityProxyTest') contract('IdentityProxyHub', (accounts: string[]) => { - //TODO (soloseng): see with identy about this contract name. should it be `identityproxy` + // TODO (soloseng): see with identy about this contract name. should it be `identityproxy` let identityProxy: IdentityProxyInstance let identityProxyTest: IdentityProxyTestInstance From a408c1dae469a8e962f9f038a7408bfea105fdfb Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 24 May 2023 17:29:21 -0400 Subject: [PATCH 096/184] using `@ethereumjs/rlp` for RLP encoding --- packages/celotool/package.json | 4 +- .../celotool/src/e2e-tests/cip35_tests.ts | 116 +++++++++--------- 2 files changed, 64 insertions(+), 56 deletions(-) diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 86fbac29960..1d6cc7f4e92 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -16,6 +16,8 @@ "@celo/identity": "4.0.1-dev", "@celo/network-utils": "4.0.1-dev", "@celo/utils": "4.0.1-dev", + "@ethereumjs/util": "8.0.5", + "@ethereumjs/rlp":"4.0.1", "@google-cloud/monitoring": "0.7.1", "@google-cloud/pubsub": "^0.28.1", "@google-cloud/secret-manager": "3.0.0", @@ -28,7 +30,7 @@ "compare-versions": "^3.5.1", "dotenv": "^16.0.3", "ecurve": "^1.0.6", - "ethereumjs-util": "^7.1.5", + "ethereum-cryptography": "1.2.0", "generate-password": "^1.5.1", "js-yaml": "^3.13.1", "lodash": "^4.17.21", diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index 9a18cd45fa7..e75246b4711 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -2,13 +2,17 @@ import { CeloTx } from '@celo/connect' import { ContractKit, newKitFromWeb3 } from '@celo/contractkit' import { privateKeyToAddress } from '@celo/utils/lib/address' +import * as ejsRlp from '@ethereumjs/rlp' +import * as ejsUtil from '@ethereumjs/util' import BigNumber from 'bignumber.js' import { assert } from 'chai' -import ejsUtil from 'ethereumjs-util' +import { keccak256 } from 'ethereum-cryptography/keccak' +import { toHex } from 'ethereum-cryptography/utils' import lodash from 'lodash' import Web3 from 'web3' import { AccountType, generatePrivateKey } from '../lib/generate_utils' import { GethRunConfig } from '../lib/interfaces/geth-run-config' +import { ensure0x } from '../lib/utils' import { getHooks, initAndSyncGethWithRetry, mnemonic, sleep } from './utils' const TMP_PATH = '/tmp/e2e' @@ -245,7 +249,7 @@ class TestEnv { } async generateUnprotectedTransaction(ethCompatible: boolean): Promise { - const encode = (ejsUtil as any).rlp.encode // the typescript typings are incomplete + const encode = ejsRlp.encode const numToHex = (x: number | BigNumber) => ejsUtil.bufferToHex(ejsUtil.toBuffer(Number(x))) const nonce = await this.kit.connection.nonce(validatorAddress) const celoOnlyFields = ethCompatible ? [] : ['0x', '0x', '0x'] @@ -258,7 +262,8 @@ class TestEnv { '0x05', // value: 5 wei '0x', // no data ] - const signingHash = ejsUtil.rlphash(arr) + //Creates SHA-3 hash of the RLP encoded version of the input. + const signingHash = ejsUtil.toBuffer(keccak256(ejsRlp.encode(arr))) const pk = ejsUtil.addHexPrefix(validatorPrivateKey) const sig = ejsUtil.ecsign(signingHash, ejsUtil.toBuffer(pk)) arr.push( @@ -266,7 +271,7 @@ class TestEnv { ejsUtil.bufferToHex(stripZeros(sig.r) as Buffer), ejsUtil.bufferToHex(stripZeros(sig.s) as Buffer) ) - return ejsUtil.bufferToHex(encode(arr)) + return ensure0x(toHex(encode(arr))) } runReplayProtectionTests() { @@ -421,57 +426,58 @@ class TestEnv { describe('CIP-35 >', function (this: any) { this.timeout(0) - describe('before activation', () => { - if (devFilter.cipIsActivated === true) { - return - } - const testEnv = new TestEnv(false, false) // not donut, not espresso - before(async function (this) { - this.timeout(0) - await testEnv.before() - }) - - if (replayProtectionTests !== 'only') { - for (const testCase of testEnv.testCases) { - testEnv.runTestCase(testCase) - } - } - - if (replayProtectionTests !== 'skip') { - testEnv.runReplayProtectionTests() - } - - after(async function (this: any) { - this.timeout(0) - await testEnv.hooks.after() - }) - }) - - describe('after activation', async () => { - if (devFilter.cipIsActivated === false) { - return - } - const testEnv = new TestEnv(true, false) // donut, not espresso - before(async function (this) { - this.timeout(0) - await testEnv.before() - }) - - if (replayProtectionTests !== 'only') { - for (const testCase of testEnv.testCases) { - testEnv.runTestCase(testCase) - } - } - - if (replayProtectionTests !== 'skip') { - testEnv.runReplayProtectionTests() - } - - after(async function (this: any) { - this.timeout(0) - await testEnv.hooks.after() - }) - }) + // describe('before activation', () => { + // if (devFilter.cipIsActivated === true) { + // return + // } + // const testEnv = new TestEnv(false, false) // not donut, not espresso + // before(async function (this) { + // this.timeout(0) + // console.log('validatorAddress', validatorAddress) + // await testEnv.before() + // }) + + // if (replayProtectionTests !== 'only') { + // for (const testCase of testEnv.testCases) { + // testEnv.runTestCase(testCase) + // } + // } + + // if (replayProtectionTests !== 'skip') { + // testEnv.runReplayProtectionTests() + // } + + // after(async function (this: any) { + // this.timeout(0) + // await testEnv.hooks.after() + // }) + // }) + + // describe('after activation', async () => { + // if (devFilter.cipIsActivated === false) { + // return + // } + // const testEnv = new TestEnv(true, false) // donut, not espresso + // before(async function (this) { + // this.timeout(0) + // await testEnv.before() + // }) + + // if (replayProtectionTests !== 'only') { + // for (const testCase of testEnv.testCases) { + // testEnv.runTestCase(testCase) + // } + // } + + // if (replayProtectionTests !== 'skip') { + // testEnv.runReplayProtectionTests() + // } + + // after(async function (this: any) { + // this.timeout(0) + // await testEnv.hooks.after() + // }) + // }) describe('after cip50 (optional replay protection)', async () => { if (devFilter.cipIsActivated === false) { From 164ff0e6fcb36021d69588ca1ba13982e2211d4e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 24 May 2023 17:43:40 -0400 Subject: [PATCH 097/184] linter fix --- .../celotool/src/e2e-tests/cip35_tests.ts | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index e75246b4711..350c517b71c 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -262,7 +262,7 @@ class TestEnv { '0x05', // value: 5 wei '0x', // no data ] - //Creates SHA-3 hash of the RLP encoded version of the input. + // Creates SHA-3 hash of the RLP encoded version of the input. const signingHash = ejsUtil.toBuffer(keccak256(ejsRlp.encode(arr))) const pk = ejsUtil.addHexPrefix(validatorPrivateKey) const sig = ejsUtil.ecsign(signingHash, ejsUtil.toBuffer(pk)) @@ -426,58 +426,58 @@ class TestEnv { describe('CIP-35 >', function (this: any) { this.timeout(0) - // describe('before activation', () => { - // if (devFilter.cipIsActivated === true) { - // return - // } - // const testEnv = new TestEnv(false, false) // not donut, not espresso - // before(async function (this) { - // this.timeout(0) - // console.log('validatorAddress', validatorAddress) - // await testEnv.before() - // }) - - // if (replayProtectionTests !== 'only') { - // for (const testCase of testEnv.testCases) { - // testEnv.runTestCase(testCase) - // } - // } - - // if (replayProtectionTests !== 'skip') { - // testEnv.runReplayProtectionTests() - // } - - // after(async function (this: any) { - // this.timeout(0) - // await testEnv.hooks.after() - // }) - // }) - - // describe('after activation', async () => { - // if (devFilter.cipIsActivated === false) { - // return - // } - // const testEnv = new TestEnv(true, false) // donut, not espresso - // before(async function (this) { - // this.timeout(0) - // await testEnv.before() - // }) - - // if (replayProtectionTests !== 'only') { - // for (const testCase of testEnv.testCases) { - // testEnv.runTestCase(testCase) - // } - // } - - // if (replayProtectionTests !== 'skip') { - // testEnv.runReplayProtectionTests() - // } - - // after(async function (this: any) { - // this.timeout(0) - // await testEnv.hooks.after() - // }) - // }) + describe('before activation', () => { + if (devFilter.cipIsActivated === true) { + return + } + const testEnv = new TestEnv(false, false) // not donut, not espresso + before(async function (this) { + this.timeout(0) + console.log('validatorAddress', validatorAddress) + await testEnv.before() + }) + + if (replayProtectionTests !== 'only') { + for (const testCase of testEnv.testCases) { + testEnv.runTestCase(testCase) + } + } + + if (replayProtectionTests !== 'skip') { + testEnv.runReplayProtectionTests() + } + + after(async function (this: any) { + this.timeout(0) + await testEnv.hooks.after() + }) + }) + + describe('after activation', async () => { + if (devFilter.cipIsActivated === false) { + return + } + const testEnv = new TestEnv(true, false) // donut, not espresso + before(async function (this) { + this.timeout(0) + await testEnv.before() + }) + + if (replayProtectionTests !== 'only') { + for (const testCase of testEnv.testCases) { + testEnv.runTestCase(testCase) + } + } + + if (replayProtectionTests !== 'skip') { + testEnv.runReplayProtectionTests() + } + + after(async function (this: any) { + this.timeout(0) + await testEnv.hooks.after() + }) + }) describe('after cip50 (optional replay protection)', async () => { if (devFilter.cipIsActivated === false) { From 2b5a71ea2b323b0b523f35d2f065f2a4ab4cd100 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 25 May 2023 13:54:21 -0400 Subject: [PATCH 098/184] updated web3* dependencies --- packages/celotool/package.json | 4 ++-- packages/cli/package.json | 2 +- packages/dev-utils/package.json | 4 ++-- packages/env-tests/package.json | 2 +- packages/metadata-crawler/package.json | 2 +- packages/phone-number-privacy/common/package.json | 2 +- packages/protocol/package.json | 8 ++++---- packages/sdk/base/package.json | 2 +- packages/sdk/connect/package.json | 12 ++++++------ packages/sdk/contractkit/package.json | 2 +- packages/sdk/explorer/package.json | 2 +- packages/sdk/transactions-uri/package.json | 2 +- packages/sdk/utils/package.json | 4 ++-- packages/sdk/wallets/wallet-hsm-aws/package.json | 2 +- packages/sdk/wallets/wallet-hsm-azure/package.json | 2 +- packages/sdk/wallets/wallet-hsm-gcp/package.json | 2 +- packages/sdk/wallets/wallet-local/package.json | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 1d6cc7f4e92..9b9fac9161e 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -41,7 +41,7 @@ "sleep-promise": "^8.0.1", "string-hash": "^1.1.3", "tiny-secp256k1": "2.2.1", - "web3": "1.8.2", + "web3": "1.10.0", "web3-eth-admin": "1.0.0-beta.55", "yargs": "14.0.0" }, @@ -59,7 +59,7 @@ "@types/yargs": "^13.0.2", "chai": "^4.3.7", "mocha": "^10.2.0", - "web3-core": "1.8.2" + "web3-core": "1.10.0" }, "scripts": { "cli": "TS_NODE_FILES=true ts-node -r tsconfig-paths/register src/cli.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index fb711df191a..83dda627acf 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -74,7 +74,7 @@ "randombytes": "^2.0.1", "save": "^2.4.0", "tslib": "^1", - "web3": "1.8.2" + "web3": "1.10.0" }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index a95c6211552..41d260aa4e5 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -17,8 +17,8 @@ }, "dependencies": { "bignumber.js": "^9.0.0", - "web3": "1.8.2", - "web3-core-helpers": "1.8.2", + "web3": "1.10.0", + "web3-core-helpers": "1.10.0", "tmp": "^0.1.0", "targz": "^1.0.1", "fs-extra": "^8.1.0" diff --git a/packages/env-tests/package.json b/packages/env-tests/package.json index 05592ccf5e4..0859c1ab34f 100644 --- a/packages/env-tests/package.json +++ b/packages/env-tests/package.json @@ -18,7 +18,7 @@ "dotenv": "8.2.0", "jest": "^29.0.2", "moment": "^2.29.0", - "web3": "1.8.2" + "web3": "1.10.0" }, "scripts": { "clean": "tsc -b . --clean", diff --git a/packages/metadata-crawler/package.json b/packages/metadata-crawler/package.json index 39fbb32cf08..36b692e104a 100644 --- a/packages/metadata-crawler/package.json +++ b/packages/metadata-crawler/package.json @@ -20,7 +20,7 @@ "googleapis": "^39.2.0", "pg": "^7.18.0", "ts-node": "^8.5.4", - "web3": "1.8.2" + "web3": "1.10.0" }, "devDependencies": { "@types/bunyan": "1.8.8", diff --git a/packages/phone-number-privacy/common/package.json b/packages/phone-number-privacy/common/package.json index 426b7377d05..6784aaed99a 100644 --- a/packages/phone-number-privacy/common/package.json +++ b/packages/phone-number-privacy/common/package.json @@ -39,7 +39,7 @@ "@types/express": "^4.17.6", "@types/is-base64": "^1.1.0", "@types/node-fetch": "^2.5.7", - "web3": "1.8.2" + "web3": "1.10.0" }, "engines": { "node": ">=10" diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 80a50c5bb24..458ff956751 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -87,11 +87,11 @@ "truffle": "5.9.0", "truffle-security": "^1.7.3", "weak-map": "^1.0.5", - "web3": "1.8.2", - "web3-core": "1.8.2", - "web3-core-helpers": "1.8.2", + "web3": "1.10.0", + "web3-core": "1.10.0", + "web3-core-helpers": "1.10.0", "web3-provider-engine": "^16.0.5", - "web3-utils": "1.8.2" + "web3-utils": "1.10.0" }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", diff --git a/packages/sdk/base/package.json b/packages/sdk/base/package.json index 8181f8b86dd..54c07d197d0 100644 --- a/packages/sdk/base/package.json +++ b/packages/sdk/base/package.json @@ -27,6 +27,6 @@ "@celo/typescript": "0.0.1", "bignumber.js": "^9.0.0", "elliptic": "^6.5.4", - "web3-utils": "1.8.2" + "web3-utils": "1.10.0" } } \ No newline at end of file diff --git a/packages/sdk/connect/package.json b/packages/sdk/connect/package.json index 819342b2e95..4827036ec24 100644 --- a/packages/sdk/connect/package.json +++ b/packages/sdk/connect/package.json @@ -32,14 +32,14 @@ }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", - "web3": "1.8.2", - "web3-core": "1.8.2", - "web3-eth": "1.8.2", - "web3-eth-abi": "1.8.2", - "web3-eth-contract": "1.8.2" + "web3": "1.10.0", + "web3-core": "1.10.0", + "web3-eth": "1.10.0", + "web3-eth-abi": "1.10.0", + "web3-eth-contract": "1.10.0" }, "peerDependencies": { - "web3": "1.8.2" + "web3": "1.10.0" }, "engines": { "node": ">=8.14.2" diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 7265a0cac6f..83840ac2702 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -41,7 +41,7 @@ "fp-ts": "2.1.1", "io-ts": "2.0.1", "semver": "^7.3.5", - "web3": "1.8.2" + "web3": "1.10.0" }, "devDependencies": { "@celo/phone-utils": "4.0.1-dev", diff --git a/packages/sdk/explorer/package.json b/packages/sdk/explorer/package.json index 56aa017880e..d9d9b664786 100644 --- a/packages/sdk/explorer/package.json +++ b/packages/sdk/explorer/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@types/fetch-mock": "^7.3.5", "fetch-mock": "^9.11.0", - "web3": "1.8.2" + "web3": "1.10.0" }, "engines": { "node": ">=8.13.0" diff --git a/packages/sdk/transactions-uri/package.json b/packages/sdk/transactions-uri/package.json index 25000a9ad3e..23497ec2a64 100644 --- a/packages/sdk/transactions-uri/package.json +++ b/packages/sdk/transactions-uri/package.json @@ -30,7 +30,7 @@ "@celo/connect": "4.0.1-dev", "bn.js": "4.11.9", "qrcode": "1.4.4", - "web3-eth-abi": "1.8.2" + "web3-eth-abi": "1.10.0" }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", diff --git a/packages/sdk/utils/package.json b/packages/sdk/utils/package.json index c9cc8b42190..93ee2621496 100644 --- a/packages/sdk/utils/package.json +++ b/packages/sdk/utils/package.json @@ -31,8 +31,8 @@ "elliptic": "^6.5.4", "ethereum-cryptography": "1.2.0", "io-ts": "2.0.1", - "web3-eth-abi": "1.8.2", - "web3-utils": "1.8.2" + "web3-eth-abi": "1.10.0", + "web3-utils": "1.10.0" }, "devDependencies": { "@celo/flake-tracker": "0.0.1-dev", diff --git a/packages/sdk/wallets/wallet-hsm-aws/package.json b/packages/sdk/wallets/wallet-hsm-aws/package.json index 3f7eccbd685..285efd06b6b 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/package.json +++ b/packages/sdk/wallets/wallet-hsm-aws/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@celo/connect": "4.0.1-dev", "elliptic": "^6.5.4", - "web3": "1.8.2" + "web3": "1.10.0" }, "engines": { "node": ">=8.14.2" diff --git a/packages/sdk/wallets/wallet-hsm-azure/package.json b/packages/sdk/wallets/wallet-hsm-azure/package.json index 4eab1df92f2..e2bae7f052f 100644 --- a/packages/sdk/wallets/wallet-hsm-azure/package.json +++ b/packages/sdk/wallets/wallet-hsm-azure/package.json @@ -40,7 +40,7 @@ "devDependencies": { "dotenv": "^8.2.0", "elliptic": "^6.5.4", - "web3": "1.8.2" + "web3": "1.10.0" }, "engines": { "node": ">=8.14.2" diff --git a/packages/sdk/wallets/wallet-hsm-gcp/package.json b/packages/sdk/wallets/wallet-hsm-gcp/package.json index cbb0e70a5c2..1b53396bc79 100644 --- a/packages/sdk/wallets/wallet-hsm-gcp/package.json +++ b/packages/sdk/wallets/wallet-hsm-gcp/package.json @@ -36,7 +36,7 @@ "devDependencies": { "@celo/connect": "4.0.1-dev", "elliptic": "^6.5.4", - "web3": "1.8.2" + "web3": "1.10.0" }, "engines": { "node": ">=8.14.2" diff --git a/packages/sdk/wallets/wallet-local/package.json b/packages/sdk/wallets/wallet-local/package.json index 0cd20da9b31..47d84897c15 100644 --- a/packages/sdk/wallets/wallet-local/package.json +++ b/packages/sdk/wallets/wallet-local/package.json @@ -29,7 +29,7 @@ "@ethereumjs/util": "8.0.5" }, "devDependencies": { - "web3": "1.8.2" + "web3": "1.10.0" }, "engines": { "node": ">=8.14.2" From e83d779d84f4139ba277a86eaafa75c58fbd7959 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 25 May 2023 15:09:50 -0400 Subject: [PATCH 099/184] specify type of transaction --- packages/protocol/migrations_ts/08_reserve.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/protocol/migrations_ts/08_reserve.ts b/packages/protocol/migrations_ts/08_reserve.ts index 1e0b97fdb18..a808d1370f8 100644 --- a/packages/protocol/migrations_ts/08_reserve.ts +++ b/packages/protocol/migrations_ts/08_reserve.ts @@ -56,6 +56,8 @@ module.exports = deploymentForCoreContract( from: network.from, to: reserve.address, value: web3.utils.toWei(config.reserve.initialBalance.toString(), 'ether').toString(), + // @ts-ignore + type: 0, }) if (config.reserve.frozenAssetsStartBalance && config.reserve.frozenAssetsDays) { From b15eee7a3922281f8a2cf9314ed40480048f8b30 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 25 May 2023 15:31:29 -0400 Subject: [PATCH 100/184] removed verbose output --- packages/celotool/src/e2e-tests/cip35_tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index 350c517b71c..27517220188 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -33,7 +33,7 @@ const gatewayFeeRecipientAddress = '0xc77538d1e30C0e4ec44B0DcaD97FD3dc63fcaCC4' const bytecode = '0x608060405260008055348015601357600080fd5b5060358060216000396000f3006080604052600080fd00a165627a7a72305820c7f3f7c299940bb1d9b122d25e8f288817e45bbdeaccdd2f6e8801677ed934e70029' -const verbose = true // TODO (soloseng): revert to false +const verbose = false ///////// Configurable values to run only some of the tests during development //////////////// // ReplayProtectionTests lets you skip or run only the replay-protection tests during dev From 2fcf9132f5dc932f01c7bb3af5a6baefdaa14b20 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 26 May 2023 18:26:13 -0400 Subject: [PATCH 101/184] added `assertRevertWithoutReason()` --- packages/celotool/README-e2e.md | 2 +- packages/protocol/lib/test-utils.ts | 20 ++++++++++++++++--- packages/protocol/test/common/integration.ts | 8 ++++---- .../test/common/metatransactionwallet.ts | 5 +++-- .../test/governance/voting/release_gold.ts | 4 ++-- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/packages/celotool/README-e2e.md b/packages/celotool/README-e2e.md index b82187fc4d6..bfef3698e96 100644 --- a/packages/celotool/README-e2e.md +++ b/packages/celotool/README-e2e.md @@ -1,7 +1,7 @@ # Celo-Blockchain End-to-End Tests This package contains a number of end-to-end tests that depend both on the -monorepo protocol package and the Golang celo-blockchain implmenetation. +monorepo protocol package and the Golang celo-blockchain implementation. ## Setup diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index b370fbe2e88..d9de495e508 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -137,7 +137,6 @@ export async function assertRevertWithReason(promise: any, expectedRevertReason: await promise assert.fail('Expected transaction to revert') } catch (error) { -// XXX(soloseng): Some transactions revert without reason. // Only ever tested with ganache. // When it's a view call, error.message has a shape like: // `Returned error: VM Exception while processing transaction: revert ${expectedRevertReason}` @@ -145,9 +144,9 @@ export async function assertRevertWithReason(promise: any, expectedRevertReason: // 'StatusError: Transaction: ${transactionHash} exited with an error (status 0). Reason given: ${revertMessage}.' // Therefore we try to search for `${expectedRevertReason}`. const revertFound: boolean = - error.message.search( expectedRevertReason) >= 0 + error.message.search(expectedRevertReason) >= 0 const msg: string = - expectedRevertReason === '' ? `Expected "revert", got ${error} instead` : expectedRevertReason + expectedRevertReason === '' ? `Expected "StatusError", got ${error} instead` : `Expected ${expectedRevertReason}, got ${error} instead` assert(revertFound, msg) } } @@ -168,6 +167,21 @@ export async function assertRevert(promise: any, errorMessage: string = '') { } } +export async function assertRevertWithoutReason(promise: any, errorMessage: string = '') { + // When a transaction reverts without a reason, error.message has a shape like: + // 'Transaction: ${transactionHash} exited with an error (status 0).' + try { + await promise + assert.fail('Expected transaction to revert') + } catch (error) { + const revertFound: boolean = + error.message.search('exited with an error [(]status 0[)]') >= 0 + const msg: string = + errorMessage === '' ? `Expected "StatusError", got ${error} instead` : errorMessage + assert(revertFound, msg) + } +} + export async function exec(command: string, args: string[]) { return new Promise((resolve, reject) => { const proc = spawn(command, args, { diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index 37606ecdebc..d0f2bbf8aed 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -3,7 +3,7 @@ import { constitution } from '@celo/protocol/governanceConstitution' import { addressMinedLatestBlock, assertEqualBN, - assertRevert, + assertRevertWithoutReason, assertRevertWithReason, assumeOwnership, stripHexEncoding, @@ -635,15 +635,15 @@ contract('Integration: Adding StableToken', (accounts: string[]) => { '1' // minimumReports, minimum possible to avoid having to mock multiple reports ) }) - + // TODO (soloseng): add revert msg to https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/stability/SortedOracles.sol#L174 it(`should be impossible to sell CELO`, async () => { await goldToken.approve(exchangeAbc.address, sellAmount) - await assertRevert(exchangeAbc.sell(sellAmount, minBuyAmount, true)) + await assertRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, true)) }) it(`should be impossible to sell stable token`, async () => { await stableTokenAbc.approve(exchangeAbc.address, sellAmount) - await assertRevert(exchangeAbc.sell(sellAmount, minBuyAmount, false)) + await assertRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, false)) }) }) diff --git a/packages/protocol/test/common/metatransactionwallet.ts b/packages/protocol/test/common/metatransactionwallet.ts index 3fca5bc4803..98ff047ebb9 100644 --- a/packages/protocol/test/common/metatransactionwallet.ts +++ b/packages/protocol/test/common/metatransactionwallet.ts @@ -6,8 +6,9 @@ import { import { assertEqualBN, assertLogMatches2, - assertRevert, + // tslint:disable-next-line: ordered-imports assertRevertWithReason, + assertRevertWithoutReason, } from '@celo/protocol/lib/test-utils' import { ensureLeading0x, trimLeading0x } from '@celo/utils/lib/address' import { MetaTransactionWalletContract, MetaTransactionWalletInstance } from 'types' @@ -446,7 +447,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when dataLengths has erroneous lengths', () => { it('reverts', async () => { - await assertRevert( + await assertRevertWithoutReason( wallet.executeTransactions( transactions.map((t) => t.destination), transactions.map((t) => t.value), diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index 63f6fa2c3f7..5368fa25c44 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -5,8 +5,8 @@ import { assertEqualBN, assertGteBN, assertLogMatches, - assertRevert, assertRevertWithReason, + assertRevertWithoutReason, assertSameAddress, timeTravel, } from '@celo/protocol/lib/test-utils' @@ -1497,7 +1497,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert if beneficiary tries to lock up more than there is remaining in the contract', async () => { await releaseGoldInstance.createAccount({ from: beneficiary }) - await assertRevert( + await assertRevertWithoutReason( releaseGoldInstance.lockGold(lockAmount.multipliedBy(1.1), { from: beneficiary, }) From 722184466ec5c65b22fa54a7e8e14a876688cd5e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 26 May 2023 18:28:56 -0400 Subject: [PATCH 102/184] linting fix --- packages/protocol/test/governance/voting/release_gold.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index 5368fa25c44..f9c77f615dc 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -5,6 +5,7 @@ import { assertEqualBN, assertGteBN, assertLogMatches, + // tslint:disable-next-line: ordered-imports assertRevertWithReason, assertRevertWithoutReason, assertSameAddress, From 77aa86fc5d5a20c32ed90428e8ef682e5b6154a5 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 26 May 2023 19:03:03 -0400 Subject: [PATCH 103/184] added revert without msg for identity test --- .../protocol/test/identity/identityproxy.ts | 3 +-- .../test/identity/identityproxyhub.ts | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/protocol/test/identity/identityproxy.ts b/packages/protocol/test/identity/identityproxy.ts index 9fb48264a29..f274486a6af 100644 --- a/packages/protocol/test/identity/identityproxy.ts +++ b/packages/protocol/test/identity/identityproxy.ts @@ -9,8 +9,7 @@ import { const IdentityProxy: IdentityProxyContract = artifacts.require('IdentityProxy') const IdentityProxyTest: IdentityProxyTestContract = artifacts.require('IdentityProxyTest') -contract('IdentityProxyHub', (accounts: string[]) => { - // TODO (soloseng): see with identy about this contract name. should it be `identityproxy` +contract('IdentityProxy', (accounts: string[]) => { let identityProxy: IdentityProxyInstance let identityProxyTest: IdentityProxyTestInstance diff --git a/packages/protocol/test/identity/identityproxyhub.ts b/packages/protocol/test/identity/identityproxyhub.ts index 234228116eb..9cc370e5f06 100644 --- a/packages/protocol/test/identity/identityproxyhub.ts +++ b/packages/protocol/test/identity/identityproxyhub.ts @@ -1,4 +1,4 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' +import { assertRevertWithoutReason } from '@celo/protocol/lib/test-utils' import { IdentityProxyContract, IdentityProxyHubContract, @@ -169,8 +169,10 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - // TODO (soloseng): why does this revert without reason - await assertRevert(identityProxyHub.makeCall(identifier, identityProxyTest.address, txData)) + // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 + await assertRevertWithoutReason( + identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) + ) }) it('fails to call if sender does not have more than 50% attestation completions', async () => { @@ -187,8 +189,10 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - // TODO (soloseng): why does this revert without reason - await assertRevert(identityProxyHub.makeCall(identifier, identityProxyTest.address, txData)) + // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 + await assertRevertWithoutReason( + identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) + ) }) it('fails to call if another address has more attestations completed', async () => { @@ -203,8 +207,10 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - // TODO (soloseng): why does this revert without reason - await assertRevert(identityProxyHub.makeCall(identifier, identityProxyTest.address, txData)) + // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 + await assertRevertWithoutReason( + identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) + ) }) }) }) From b30972d4b43a1ff2a529ae5a508fe04465fb07b2 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 26 May 2023 19:21:49 -0400 Subject: [PATCH 104/184] updated deprecated functions --- .../celotool/src/e2e-tests/transfer_tests.ts | 2 +- packages/celotool/src/lib/generate_utils.ts | 12 ++++----- packages/metadata-crawler/src/crawler.ts | 2 +- .../common/key-management/aws-key-provider.ts | 2 +- packages/protocol/lib/test-utils.ts | 26 +++++++++---------- .../sdk/connect/src/celo-provider.test.ts | 4 +-- packages/sdk/connect/src/utils/formatter.ts | 2 +- packages/sdk/cryptographic-utils/src/bls.ts | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/celotool/src/e2e-tests/transfer_tests.ts b/packages/celotool/src/e2e-tests/transfer_tests.ts index bad8f9a1cb6..d465fdfb3e4 100644 --- a/packages/celotool/src/e2e-tests/transfer_tests.ts +++ b/packages/celotool/src/e2e-tests/transfer_tests.ts @@ -413,7 +413,7 @@ describe('Transfer tests', function (this: any) { const TRANSFER_TOPIC = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef' function truncateTopic(hex: string) { - return '0x' + hex.substr(26) + return '0x' + hex.substring(26) } function parseEvents(receipt: CeloTxReceipt | undefined) { diff --git a/packages/celotool/src/lib/generate_utils.ts b/packages/celotool/src/lib/generate_utils.ts index 8478ec28c2c..611b6304a93 100644 --- a/packages/celotool/src/lib/generate_utils.ts +++ b/packages/celotool/src/lib/generate_utils.ts @@ -8,7 +8,7 @@ import fs from 'fs' import { merge, range, repeat } from 'lodash' import { tmpdir } from 'os' import path from 'path' -import * as rlp from 'rlp' +import * as rlp from 'rlp' // TODO(soloseng): update? import { MyceloGenesisConfig } from 'src/lib/interfaces/mycelo-genesis-config' import { CurrencyPair } from 'src/lib/k8s-oracle/base' import * as ecc from 'tiny-secp256k1' @@ -360,24 +360,24 @@ export const generateIstanbulExtraData = (validators: Validator[]) => { validators.map((validator) => Buffer.from(validator.address, 'hex')), validators.map((validator) => Buffer.from(validator.blsPublicKey, 'hex')), // Removed validators - new Buffer(0), + Buffer.alloc(0), // Seal Buffer.from(repeat('0', ecdsaSignatureVanity * 2), 'hex'), [ // AggregatedSeal.Bitmap - new Buffer(0), + Buffer.alloc(0), // AggregatedSeal.Signature Buffer.from(repeat('0', blsSignatureVanity * 2), 'hex'), // AggregatedSeal.Round - new Buffer(0), + Buffer.alloc(0), ], [ // ParentAggregatedSeal.Bitmap - new Buffer(0), + Buffer.alloc(0), // ParentAggregatedSeal.Signature Buffer.from(repeat('0', blsSignatureVanity * 2), 'hex'), // ParentAggregatedSeal.Round - new Buffer(0), + Buffer.alloc(0), ], ]) .toString('hex') diff --git a/packages/metadata-crawler/src/crawler.ts b/packages/metadata-crawler/src/crawler.ts index 21f78c49123..bc6f8d1d132 100644 --- a/packages/metadata-crawler/src/crawler.ts +++ b/packages/metadata-crawler/src/crawler.ts @@ -148,7 +148,7 @@ async function processDomainClaims() { items = items.map((a) => ({ ...a, // Addresses are stored by blockscout as just the bytes prepended with \x - address: normalizeAddressWith0x(a.address.substr(2)), + address: normalizeAddressWith0x(a.address.substring(2)), })) return concurrentMap(CONCURRENCY, items, (item) => processDomainClaimForValidator(item)) diff --git a/packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts b/packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts index 9a6c5dfbb01..338af55b8c8 100644 --- a/packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts +++ b/packages/phone-number-privacy/signer/src/common/key-management/aws-key-provider.ts @@ -40,7 +40,7 @@ export class AWSKeyProvider extends KeyProviderBase { privateKey = this.tryParseSecretString(response.SecretString, secretKey) } else if (response.SecretBinary) { // @ts-ignore AWS sdk typings not quite correct - const buff = new Buffer(response.SecretBinary, 'base64') + const buff = Buffer.from(response.SecretBinary, 'base64') privateKey = buff.toString('ascii') } else { throw new Error('Response has neither string nor binary') diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index d9de495e508..95d9d72a1d4 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -33,7 +33,7 @@ chai.use(chaiSubset) export const EPOCH = 100 export function stripHexEncoding(hexString: string) { - return hexString.substr(0, 2) === '0x' ? hexString.substr(2) : hexString + return hexString.substring(0, 2) === '0x' ? hexString.substring(2) : hexString } export function assertContainSubset(superset: any, subset: any) { @@ -129,7 +129,7 @@ export const assertThrowsAsync = async (promise: any, errorMessage: string = '') failed = true } - assert.equal(true, failed, errorMessage) + assert.strictEqual(true, failed, errorMessage) } export async function assertRevertWithReason(promise: any, expectedRevertReason: string = '') { @@ -235,7 +235,7 @@ export const assertProxiesSet = async (getContract: any) => { for (const contractName of proxiedContracts) { const contract = await getContract(contractName, 'contract') const proxy: ProxyInstance = await getContract(contractName, 'proxy') - assert.equal( + assert.strictEqual( contract.address.toLowerCase(), (await proxy._getImplementation()).toLowerCase(), contractName + 'Proxy not pointing to the ' + contractName + ' implementation' @@ -247,7 +247,7 @@ export const assertContractsRegistered = async (getContract: any) => { const registry: RegistryInstance = await getContract('Registry', 'proxiedContract') for (const contractName of hasEntryInRegistry) { const contract: Truffle.ContractInstance = await getContract(contractName, 'proxiedContract') - assert.equal( + assert.strictEqual( contract.address.toLowerCase(), (await registry.getAddressFor(soliditySha3(contractName))).toLowerCase(), 'Registry does not have the correct information for ' + contractName @@ -259,7 +259,7 @@ export const assertRegistryAddressesSet = async (getContract: any) => { const registry: RegistryInstance = await getContract('Registry', 'proxiedContract') for (const contractName of usesRegistry) { const contract: UsingRegistryInstance = await getContract(contractName, 'proxiedContract') - assert.equal( + assert.strictEqual( registry.address.toLowerCase(), (await contract.registry()).toLowerCase(), 'Registry address is not set properly in ' + contractName @@ -271,12 +271,12 @@ export const assertContractsOwnedByMultiSig = async (getContract: any) => { const multiSigAddress = (await getContract('MultiSig', 'proxiedContract')).address for (const contractName of ownedContracts) { const contractOwner: string = await (await getContract(contractName, 'proxiedContract')).owner() - assert.equal(contractOwner, multiSigAddress, contractName + ' is not owned by the MultiSig') + assert.strictEqual(contractOwner, multiSigAddress, contractName + ' is not owned by the MultiSig') } for (const contractName of proxiedContracts) { const proxyOwner = await (await getContract(contractName, 'proxy'))._getOwner() - assert.equal(proxyOwner, multiSigAddress, contractName + 'Proxy is not owned by the MultiSig') + assert.strictEqual(proxyOwner, multiSigAddress, contractName + 'Proxy is not owned by the MultiSig') } } @@ -301,7 +301,7 @@ export function assertLogMatches( event: string, args: Record ) { - assert.equal(log.event, event, `Log event name doesn\'t match`) + assert.strictEqual(log.event, event, `Log event name doesn\'t match`) assertObjectWithBNEqual(log.args, args, (arg) => `Event ${event}, arg: ${arg} do not match`) } @@ -316,7 +316,7 @@ export function assertObjectWithBNEqual( .filter((k) => k !== '__length__' && isNaN(parseInt(k, 10))) .sort() - assert.deepEqual(objectFields, Object.keys(expected).sort(), `Argument names do not match`) + assert.deepStrictEqual(objectFields, Object.keys(expected).sort(), `Argument names do not match`) for (const k of objectFields) { if (typeof expected[k] === 'function') { expected[k](actual[k], fieldErrorMsg(k)) @@ -335,11 +335,11 @@ export function assertObjectWithBNEqual( assertEqualBN(actualArray[i], expectedArray[i], fieldErrorMsg(k)) } } else { - assert.deepEqual(actual[k], expected[k], fieldErrorMsg(k)) + assert.deepStrictEqual(actual[k], expected[k], fieldErrorMsg(k)) } } else { - assert.equal(actual[k], expected[k], fieldErrorMsg(k)) + assert.strictEqual(actual[k], expected[k], fieldErrorMsg(k)) } } } @@ -406,7 +406,7 @@ export function assertEqualBNArray( expected: number[] | BN[] | BigNumber[], msg?: string ) { - assert.equal(value.length, expected.length, msg) + assert.strictEqual(value.length, expected.length, msg) value.forEach((x, i) => assertEqualBN(x, expected[i])) } @@ -485,7 +485,7 @@ export function getOffsetForMinerSelection( } export const assertSameAddress = (value: string, expected: string, msg?: string) => { - assert.equal(expected.toLowerCase(), value.toLowerCase(), msg) + assert.strictEqual(expected.toLowerCase(), value.toLowerCase(), msg) } export function createMatcher(assertFn: (value: A, expected: A, msg?: string) => void) { diff --git a/packages/sdk/connect/src/celo-provider.test.ts b/packages/sdk/connect/src/celo-provider.test.ts index d0cac9826a4..252c5d1c347 100644 --- a/packages/sdk/connect/src/celo-provider.test.ts +++ b/packages/sdk/connect/src/celo-provider.test.ts @@ -54,12 +54,12 @@ class MockWallet implements ReadOnlyWallet { return Promise.resolve('mock') } decrypt(_address: string, _ciphertext: Buffer): Promise { - return Promise.resolve(new Buffer('mock')) + return Promise.resolve(Buffer.from('mock')) } // tslint:disable-next-line: no-empty removeAccount(_address: string): void {} computeSharedSecret(_address: string, _publicKey: string): Promise { - return Promise.resolve(new Buffer('mock')) + return Promise.resolve(Buffer.from('mock')) } } diff --git a/packages/sdk/connect/src/utils/formatter.ts b/packages/sdk/connect/src/utils/formatter.ts index 9924d5c0ee3..dfe3c07f650 100644 --- a/packages/sdk/connect/src/utils/formatter.ts +++ b/packages/sdk/connect/src/utils/formatter.ts @@ -187,7 +187,7 @@ export function outputLogFormatter(log: any): Log { trimLeading0x(log.transactionHash) + trimLeading0x(log.logIndex) )! - log.id = 'log_' + trimLeading0x(shaId).substr(0, 8) + log.id = 'log_' + trimLeading0x(shaId).substring(0, 8) } else if (!log.id) { log.id = null } diff --git a/packages/sdk/cryptographic-utils/src/bls.ts b/packages/sdk/cryptographic-utils/src/bls.ts index 2c1f15192e4..06cde2a0ffb 100644 --- a/packages/sdk/cryptographic-utils/src/bls.ts +++ b/packages/sdk/cryptographic-utils/src/bls.ts @@ -15,7 +15,7 @@ export const blsPrivateKeyToProcessedPrivateKey = (privateKeyHex: string) => { for (let i = 0; i < 256; i++) { const originalPrivateKeyBytes = Buffer.from(privateKeyHex, 'hex') - const iBuffer = new Buffer(1) + const iBuffer = Buffer.alloc(1) iBuffer[0] = i const keyBytes = Buffer.concat([ Buffer.from('ecdsatobls', 'utf8'), From fde198b8794a8360243ddc74a8ab46039a24277f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 13:26:20 -0400 Subject: [PATCH 105/184] distinguish between transaction reverts and view call reverts --- packages/protocol/lib/test-utils.ts | 29 ++-- packages/protocol/test/common/accounts.ts | 46 ++--- .../addresssortedlinkedlistwithmedian.ts | 18 +- packages/protocol/test/common/feeburner.ts | 20 +-- .../test/common/feecurrencywhitelist.ts | 16 +- .../protocol/test/common/gaspriceminimum.ts | 16 +- packages/protocol/test/common/goldtoken.ts | 16 +- packages/protocol/test/common/integration.ts | 12 +- packages/protocol/test/common/linkedlist.ts | 28 +-- .../test/common/metatransactionwallet.ts | 29 ++-- packages/protocol/test/common/multisig.ts | 30 ++-- packages/protocol/test/common/proxy.ts | 14 +- packages/protocol/test/common/registry.ts | 6 +- .../protocol/test/common/transferwhitelist.ts | 12 +- .../governance/network/blockchainparams.ts | 16 +- .../test/governance/network/epochrewards.ts | 28 +-- .../test/governance/network/governance.ts | 161 ++++++++++-------- .../governance/network/governance_slasher.ts | 11 +- .../validators/doublesigningslasher.ts | 21 ++- .../governance/validators/downtimeslasher.ts | 32 ++-- .../governance/validators/sortedlinkedlist.ts | 40 +++-- .../test/governance/validators/validators.ts | 151 +++++++++------- .../test/governance/voting/election.ts | 73 ++++---- .../test/governance/voting/lockedgold.ts | 46 ++--- .../test/governance/voting/release_gold.ts | 120 ++++++------- .../protocol/test/identity/attestations.ts | 18 +- packages/protocol/test/identity/escrow.ts | 54 +++--- .../test/identity/federatedattestations.ts | 30 ++-- .../protocol/test/identity/identityproxy.ts | 4 +- .../test/identity/identityproxyhub.ts | 8 +- .../protocol/test/identity/odispayments.ts | 9 +- packages/protocol/test/identity/random.ts | 6 +- .../protocol/test/stability/grandamento.ts | 58 +++---- .../protocol/test/stability/sortedoracles.ts | 30 ++-- .../protocol/test/stability/stabletoken.ts | 26 +-- 35 files changed, 666 insertions(+), 568 deletions(-) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 95d9d72a1d4..2f4cb4146f1 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -132,14 +132,12 @@ export const assertThrowsAsync = async (promise: any, errorMessage: string = '') assert.strictEqual(true, failed, errorMessage) } -export async function assertRevertWithReason(promise: any, expectedRevertReason: string = '') { +export async function assertTransactionRevertWithReason(promise: any, expectedRevertReason: string = '') { try { await promise assert.fail('Expected transaction to revert') } catch (error) { // Only ever tested with ganache. - // When it's a view call, error.message has a shape like: - // `Returned error: VM Exception while processing transaction: revert ${expectedRevertReason}` // When it's a transaction (eg a non-view send call), error.message has a shape like: // 'StatusError: Transaction: ${transactionHash} exited with an error (status 0). Reason given: ${revertMessage}.' // Therefore we try to search for `${expectedRevertReason}`. @@ -151,33 +149,36 @@ export async function assertRevertWithReason(promise: any, expectedRevertReason: } } -// TODO: Use assertRevert directly from openzeppelin-solidity -// Note that errorMessage is not the expected revert message, but the -// message that is provided if there is no revert. -export async function assertRevert(promise: any, errorMessage: string = '') { +export async function assertTransactionRevertWithoutReason(promise: any, errorMessage: string = '') { + // When a transaction reverts without a reason, error.message has a shape like: + // 'Transaction: ${transactionHash} exited with an error (status 0).' try { await promise assert.fail('Expected transaction to revert') } catch (error) { const revertFound: boolean = - error.message.search('VM Exception while processing transaction: revert') >= 0 + error.message.search('exited with an error [(]status 0[)]') >= 0 const msg: string = - errorMessage === '' ? `Expected "revert", got ${error} instead` : errorMessage + errorMessage === '' ? `Expected "StatusError", got ${error} instead` : errorMessage assert(revertFound, msg) } } -export async function assertRevertWithoutReason(promise: any, errorMessage: string = '') { - // When a transaction reverts without a reason, error.message has a shape like: - // 'Transaction: ${transactionHash} exited with an error (status 0).' +// TODO: Use assertRevert directly from openzeppelin-solidity +// Note that errorMessage is not the expected revert message, but the +// message that is provided if there is no revert. +export async function assertRevert(promise: any, errorMessage: string = '') { + // Only ever tested with ganache. + // When it's a view call, error.message has a shape like: + // `Error: VM Exception while processing transaction: revert ${expectedRevertReason}` try { await promise assert.fail('Expected transaction to revert') } catch (error) { const revertFound: boolean = - error.message.search('exited with an error [(]status 0[)]') >= 0 + error.message.search('VM Exception while processing transaction: revert') >= 0 const msg: string = - errorMessage === '' ? `Expected "StatusError", got ${error} instead` : errorMessage + errorMessage === '' ? `Expected "revert", got ${error} instead` : errorMessage assert(revertFound, msg) } } diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index c29e23f5598..d572e3907c3 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -6,7 +6,7 @@ import { assertLogMatches, assertLogMatches2, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, } from '@celo/protocol/lib/test-utils' import { toFixed } from '@celo/utils/lib/fixidity' import { parseSolidityStringArray } from '@celo/utils/lib/parsing' @@ -99,7 +99,7 @@ contract('Accounts', (accounts: string[]) => { }) it('should revert when the key is invalid', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setAccountDataEncryptionKey('0x32132931293'), 'data encryption key length <= 32' ) @@ -266,7 +266,7 @@ contract('Accounts', (accounts: string[]) => { it('should set a revert with the wrong signature for a different address', async () => { const sig = await getParsedSignatureOfAddress(web3, account, accounts[1]) - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setAccount(name, dataEncryptionKey, accounts[2], sig.v, sig.r, sig.s), 'Invalid signature' ) @@ -277,7 +277,7 @@ contract('Accounts', (accounts: string[]) => { describe('#setWalletAddress', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), 'Unknown account' ) @@ -320,7 +320,7 @@ contract('Accounts', (accounts: string[]) => { it('should set a revert with the wrong signature for a different address', async () => { const sig = await getParsedSignatureOfAddress(web3, account, accounts[1]) - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setWalletAddress(accounts[2], sig.v, sig.r, sig.s), 'Invalid signature' ) @@ -331,7 +331,10 @@ contract('Accounts', (accounts: string[]) => { describe('#setMetadataURL', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason(accountsInstance.setMetadataURL(caller), 'Unknown account') + await assertTransactionRevertWithReason( + accountsInstance.setMetadataURL(caller), + 'Unknown account' + ) }) }) @@ -381,7 +384,7 @@ contract('Accounts', (accounts: string[]) => { describe('#addStorageRoot', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.addStorageRoot(storageRoot), 'Unknown account' ) @@ -421,7 +424,10 @@ contract('Accounts', (accounts: string[]) => { describe('#removeStorageRoot', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason(accountsInstance.removeStorageRoot(0), 'Unknown account') + await assertTransactionRevertWithReason( + accountsInstance.removeStorageRoot(0), + 'Unknown account' + ) }) }) @@ -432,7 +438,7 @@ contract('Accounts', (accounts: string[]) => { describe('when there are no storage roots', async () => { it('should revert with message', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.removeStorageRoot(0), 'Invalid storage root index' ) @@ -476,7 +482,7 @@ contract('Accounts', (accounts: string[]) => { const badFraction = toFixed(1.2) it('should not be callable by a non-account', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setPaymentDelegation(beneficiary, fraction), 'Not an account' ) @@ -497,14 +503,14 @@ contract('Accounts', (accounts: string[]) => { }) it('should not allow a fraction greater than 1', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setPaymentDelegation(beneficiary, badFraction), 'Fraction must not be greater than 1' ) }) it('should not allow a beneficiary with address 0x0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setPaymentDelegation(NULL_ADDRESS, fraction), 'Beneficiary cannot be address 0x0' ) @@ -530,7 +536,7 @@ contract('Accounts', (accounts: string[]) => { }) it('should not be callable by a non-account', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setPaymentDelegation(beneficiary, fraction, { from: accounts[2] }), 'Not an account' ) @@ -557,7 +563,7 @@ contract('Accounts', (accounts: string[]) => { describe('#setName', () => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), 'Unknown account' ) @@ -640,7 +646,7 @@ contract('Accounts', (accounts: string[]) => { describe('smart contract signers', async () => { it("can't complete an authorization that hasn't been started", async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.completeSignerAuthorization(account, role, { from: signer }), 'Signer authorization not started' ) @@ -770,7 +776,7 @@ contract('Accounts', (accounts: string[]) => { accountsInstance.address ) await accountsInstance.authorizeSignerWithSignature(signer, role, sig.v, sig.r, sig.s) - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.authorizeSignerWithSignature(signer, role, sigTwo.v, sigTwo.r, sigTwo.s), 'Invalid signature' ) @@ -781,7 +787,7 @@ contract('Accounts', (accounts: string[]) => { assert.isFalse(await accountsInstance.hasDefaultSigner(account, role)) assert.equal(await accountsInstance.getDefaultSigner(account, role), account) - await assertRevertWithReason( + await assertTransactionRevertWithReason( accountsInstance.setIndexedSigner(signer, role), 'Must authorize signer before setting as default' ) @@ -925,7 +931,7 @@ contract('Accounts', (accounts: string[]) => { it(`should revert if the ${description} is an account`, async () => { await accountsInstance.createAccount({ from: authorized }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( testInstance.fn(authorized, sig.v, sig.r, sig.s), 'Cannot re-authorize address or locked gold account for another account' ) @@ -938,7 +944,7 @@ contract('Accounts', (accounts: string[]) => { await testInstance.fn(authorized, otherSig.v, otherSig.r, otherSig.s, { from: otherAccount, }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( testInstance.fn(authorized, sig.v, sig.r, sig.s), 'Cannot re-authorize address or locked gold account for another account' ) @@ -947,7 +953,7 @@ contract('Accounts', (accounts: string[]) => { it('should revert if the signature is incorrect', async () => { const nonVoter = accounts[3] const incorrectSig = await getSignature(account, nonVoter) - await assertRevertWithReason( + await assertTransactionRevertWithReason( testInstance.fn(authorized, incorrectSig.v, incorrectSig.r, incorrectSig.s), 'Invalid signature' ) diff --git a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts index 38eecd5f30b..a215f440b9b 100644 --- a/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts +++ b/packages/protocol/test/common/addresssortedlinkedlistwithmedian.ts @@ -1,5 +1,5 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' -import { assertRevertWithReason, assertSameAddress } from '@celo/protocol/lib/test-utils' +import { assertSameAddress, assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { AddressSortedLinkedListWithMedianTestContract, @@ -55,7 +55,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if key is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.insert( NULL_ADDRESS, numerator, @@ -67,14 +67,14 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if lesser is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.insert(key, numerator, key, NULL_ADDRESS), 'invalid key' ) }) it('should revert if greater is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, key), 'invalid key' ) @@ -91,7 +91,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert when inserting an element already in the list', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.insert(key, numerator, NULL_ADDRESS, NULL_ADDRESS), 'invalid key' ) @@ -123,7 +123,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if the key is not in the list', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.update( accounts[8], newNumerator, @@ -135,14 +135,14 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if lesser is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.update(key, newNumerator, key, NULL_ADDRESS), 'invalid key' ) }) it('should revert if greater is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.update(key, newNumerator, NULL_ADDRESS, key), 'invalid key' ) @@ -182,7 +182,7 @@ contract('AddressSortedLinkedListWithMedianTest', (accounts: string[]) => { }) it('should revert if the key is not in the list', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( addressSortedLinkedListWithMedianTest.remove(accounts[8]), 'key not in list' ) diff --git a/packages/protocol/test/common/feeburner.ts b/packages/protocol/test/common/feeburner.ts index 377c697a7f2..30965c50326 100644 --- a/packages/protocol/test/common/feeburner.ts +++ b/packages/protocol/test/common/feeburner.ts @@ -3,7 +3,7 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { assertEqualBN, assertGtBN, - assertRevertWithReason, + assertTransactionRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { fixed1, toFixed } from '@celo/utils/lib/fixidity' @@ -202,7 +202,7 @@ contract('FeeBurner', (accounts: string[]) => { }) it('Only owner can take tokens out', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.transfer(tokenA.address, user, new BigNumber(1e18), { from: user }), 'Ownable: caller is not the owner' ) @@ -232,7 +232,7 @@ contract('FeeBurner', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.initialize(registry.address, [], [], [], [], { from: user }), 'contract already initialized' ) @@ -266,7 +266,7 @@ contract('FeeBurner', (accounts: string[]) => { }) it("doesn't remove if the indexes doesn't match", async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.removeRouter(tokenA.address, exchange.address, 0), 'Index does not match' ) @@ -275,7 +275,7 @@ contract('FeeBurner', (accounts: string[]) => { describe('#setDailyBurnLimit()', () => { it('should only be called by owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.setDailyBurnLimit(stableToken.address, goldAmountForRate, { from: user }), 'Ownable: caller is not the owner' ) @@ -284,7 +284,7 @@ contract('FeeBurner', (accounts: string[]) => { describe('#setMaxSplipagge()', () => { it('should only be called by owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.setMaxSplippage(stableToken.address, maxSlippage, { from: user }), 'Ownable: caller is not the owner' ) @@ -301,7 +301,7 @@ contract('FeeBurner', (accounts: string[]) => { it("Can't burn when frozen", async () => { await freezer.freeze(feeBurner.address) - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.burnMentoTokens(), "can't call when contract is frozen" ) @@ -347,7 +347,7 @@ contract('FeeBurner', (accounts: string[]) => { from: user, }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.burn(), 'Calculated buyAmount was less than specified minBuyAmount' ) @@ -416,7 +416,7 @@ contract('FeeBurner', (accounts: string[]) => { it("Can't burn when frozen", async () => { await freezer.freeze(feeBurner.address) - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.burnNonMentoTokens(), "can't call when contract is frozen" ) @@ -472,7 +472,7 @@ contract('FeeBurner', (accounts: string[]) => { it("Doesn't exchange non-Mento when slippage is too high", async () => { await feeBurner.setMaxSplippage(tokenA.address, maxSlippage) - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeBurner.burnNonMentoTokens(), 'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT' ) diff --git a/packages/protocol/test/common/feecurrencywhitelist.ts b/packages/protocol/test/common/feecurrencywhitelist.ts index 61ed1512657..ace3a1e3eab 100644 --- a/packages/protocol/test/common/feecurrencywhitelist.ts +++ b/packages/protocol/test/common/feecurrencywhitelist.ts @@ -1,4 +1,4 @@ -import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { FeeCurrencyWhitelistContract, FeeCurrencyWhitelistInstance } from 'types' const FeeCurrencyWhitelist: FeeCurrencyWhitelistContract = artifacts.require('FeeCurrencyWhitelist') @@ -22,7 +22,7 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeCurrencyWhitelist.initialize(), 'contract already initialized' ) @@ -37,7 +37,7 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -55,7 +55,7 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeCurrencyWhitelist.addNonMentoToken(aTokenAddress, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -76,14 +76,14 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it("Doesn't remove if the index is wrong", async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeCurrencyWhitelist.removeToken(accounts[0], 0), 'Index does not match' ) }) it('should not allow a non-owner to remove Mento token', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeCurrencyWhitelist.removeToken(accounts[0], 0, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -113,14 +113,14 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it("Doesn't remove if the index is wrong", async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1), 'Index does not match' ) }) it('should not allow a non-owner to remove non-Mento token', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( feeCurrencyWhitelist.removeNonMentoToken(accounts[0], 1, 1, { from: nonOwner }), 'Ownable: caller is not the owner' ) diff --git a/packages/protocol/test/common/gaspriceminimum.ts b/packages/protocol/test/common/gaspriceminimum.ts index 60f466ab523..1fe36a83842 100644 --- a/packages/protocol/test/common/gaspriceminimum.ts +++ b/packages/protocol/test/common/gaspriceminimum.ts @@ -2,7 +2,7 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { assertEqualBN, assertLogMatches2, - assertRevertWithReason, + assertTransactionRevertWithReason, } from '@celo/protocol/lib/test-utils' import { fromFixed, toFixed } from '@celo/utils/lib/fixidity' import BigNumber from 'bignumber.js' @@ -68,7 +68,7 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( gasPriceMinimum.initialize( registry.address, gasPriceMinimumFloor, @@ -102,14 +102,14 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided fraction is greater than one', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( gasPriceMinimum.setAdjustmentSpeed(toFixed(3 / 2)), 'adjustment speed must be smaller than 1' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( gasPriceMinimum.setAdjustmentSpeed(newAdjustmentSpeed, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -138,14 +138,14 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided fraction is greater than one', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( gasPriceMinimum.setTargetDensity(toFixed(3 / 2)), 'target density must be smaller than 1' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( gasPriceMinimum.setTargetDensity(newTargetDensity, { from: nonOwner, }), @@ -176,14 +176,14 @@ contract('GasPriceMinimum', (accounts: string[]) => { }) it('should revert when the provided floor is zero', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( gasPriceMinimum.setGasPriceMinimumFloor(0), 'gas price minimum floor must be greater than zero' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( gasPriceMinimum.setGasPriceMinimumFloor(newGasPriceMinFloor, { from: nonOwner, }), diff --git a/packages/protocol/test/common/goldtoken.ts b/packages/protocol/test/common/goldtoken.ts index ab1431a0241..b816f17132f 100644 --- a/packages/protocol/test/common/goldtoken.ts +++ b/packages/protocol/test/common/goldtoken.ts @@ -1,6 +1,10 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertBalance, assertEqualBN, assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { + assertBalance, + assertEqualBN, + assertTransactionRevertWithReason, +} from '@celo/protocol/lib/test-utils' import { BigNumber } from 'bignumber.js' import _ from 'lodash' import { @@ -175,7 +179,7 @@ contract('GoldToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( goldToken.transfer(NULL_ADDRESS, ONE_GOLDTOKEN, { gasPrice: 0 }), 'transfer attempted to reserved address 0x0' ) @@ -187,7 +191,7 @@ contract('GoldToken', (accounts: string[]) => { const value = web3.utils.toBN( (await goldToken.balanceOf(sender)).plus(ONE_GOLDTOKEN.times(4)) ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( goldToken.transfer(receiver, value), 'transfer value exceeded balance of sender' ) @@ -208,7 +212,7 @@ contract('GoldToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( goldToken.transferFrom(sender, NULL_ADDRESS, ONE_GOLDTOKEN, { from: receiver }), 'transfer attempted to reserved address 0x0' ) @@ -221,14 +225,14 @@ contract('GoldToken', (accounts: string[]) => { (await goldToken.balanceOf(sender)).plus(ONE_GOLDTOKEN.times(4)) ) await goldToken.approve(receiver, value) - await assertRevertWithReason( + await assertTransactionRevertWithReason( goldToken.transferFrom(sender, receiver, value, { from: receiver }), 'transfer value exceeded balance of sender' ) }) it('should not allow transferring more than the spender is allowed', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( goldToken.transferFrom(sender, receiver, ONE_GOLDTOKEN.plus(1), { from: receiver, }), diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index d0f2bbf8aed..e0d01382a9c 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -3,8 +3,8 @@ import { constitution } from '@celo/protocol/governanceConstitution' import { addressMinedLatestBlock, assertEqualBN, - assertRevertWithoutReason, - assertRevertWithReason, + assertTransactionRevertWithoutReason, + assertTransactionRevertWithReason, assumeOwnership, stripHexEncoding, timeTravel, @@ -638,12 +638,12 @@ contract('Integration: Adding StableToken', (accounts: string[]) => { // TODO (soloseng): add revert msg to https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/stability/SortedOracles.sol#L174 it(`should be impossible to sell CELO`, async () => { await goldToken.approve(exchangeAbc.address, sellAmount) - await assertRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, true)) + await assertTransactionRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, true)) }) it(`should be impossible to sell stable token`, async () => { await stableTokenAbc.approve(exchangeAbc.address, sellAmount) - await assertRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, false)) + await assertTransactionRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, false)) }) }) @@ -665,7 +665,7 @@ contract('Integration: Adding StableToken', (accounts: string[]) => { it(`should be impossible to sell CELO`, async () => { await goldToken.approve(exchangeAbc.address, sellAmount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( exchangeAbc.sell(sellAmount, minBuyAmount, true), "can't call when contract is frozen" ) @@ -673,7 +673,7 @@ contract('Integration: Adding StableToken', (accounts: string[]) => { it(`should be impossible to sell stable token`, async () => { await stableTokenAbc.approve(exchangeAbc.address, sellAmount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( exchangeAbc.sell(sellAmount, minBuyAmount, false), "can't call when contract is frozen" ) diff --git a/packages/protocol/test/common/linkedlist.ts b/packages/protocol/test/common/linkedlist.ts index a34dcb77657..728ac0b34ce 100644 --- a/packages/protocol/test/common/linkedlist.ts +++ b/packages/protocol/test/common/linkedlist.ts @@ -1,4 +1,4 @@ -import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { LinkedListTestContract, LinkedListTestInstance } from 'types' const LinkedListTest: LinkedListTestContract = artifacts.require('LinkedListTest') @@ -20,14 +20,14 @@ contract('LinkedListTest', () => { describe('when inserting to empty list', () => { it('should revert if previous is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, addedKey, NULL_KEY), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if next is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, NULL_KEY, addedKey), 'Key cannot be the same as previousKey or nextKey' ) @@ -40,14 +40,14 @@ contract('LinkedListTest', () => { }) it('should revert if next is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, firstKey, addedKey), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if previous is equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, addedKey, firstKey), 'Key cannot be the same as previousKey or nextKey' ) @@ -63,49 +63,49 @@ contract('LinkedListTest', () => { }) it('should revert if next is equal to key (beginning)', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, firstKey, addedKey), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if previous is equal to key (beginning)', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, addedKey, firstKey), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if next is equal to key (end)', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, lastKey, addedKey), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if previous is equal to key (end)', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, addedKey, lastKey), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if next is equal to key (middle)', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, middleKey, addedKey), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if previous is equal to key (middle)', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, addedKey, middleKey), 'Key cannot be the same as previousKey or nextKey' ) }) it('should revert if next and previous equal to key', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( linkedListTest.insert(addedKey, addedKey, addedKey), 'Key cannot be the same as previousKey or nextKey' ) @@ -122,7 +122,7 @@ contract('LinkedListTest', () => { describe('removing from an empty list', () => { it('should revert', async () => { - await assertRevertWithReason(linkedListTest.remove(firstKey), 'key not in list') + await assertTransactionRevertWithReason(linkedListTest.remove(firstKey), 'key not in list') }) }) @@ -154,7 +154,7 @@ contract('LinkedListTest', () => { it('should revert when attempting to remove a removed element', async () => { await linkedListTest.remove(firstKey) - await assertRevertWithReason(linkedListTest.remove(firstKey), 'key not in list') + await assertTransactionRevertWithReason(linkedListTest.remove(firstKey), 'key not in list') }) }) }) diff --git a/packages/protocol/test/common/metatransactionwallet.ts b/packages/protocol/test/common/metatransactionwallet.ts index 98ff047ebb9..7a073ca7007 100644 --- a/packages/protocol/test/common/metatransactionwallet.ts +++ b/packages/protocol/test/common/metatransactionwallet.ts @@ -7,8 +7,8 @@ import { assertEqualBN, assertLogMatches2, // tslint:disable-next-line: ordered-imports - assertRevertWithReason, - assertRevertWithoutReason, + assertTransactionRevertWithReason, + assertTransactionRevertWithoutReason, } from '@celo/protocol/lib/test-utils' import { ensureLeading0x, trimLeading0x } from '@celo/utils/lib/address' import { MetaTransactionWalletContract, MetaTransactionWalletInstance } from 'types' @@ -82,7 +82,10 @@ contract('MetaTransactionWallet', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason(wallet.initialize(signer), 'contract already initialized') + await assertTransactionRevertWithReason( + wallet.initialize(signer), + 'contract already initialized' + ) }) }) @@ -136,7 +139,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when called by the signer', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( wallet.setSigner(newSigner, { from: signer }), 'Ownable: caller is not the owner' ) @@ -169,7 +172,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when not called by the wallet contract', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( wallet.setGuardian(guardian, { from: nonSigner }), 'Ownable: caller is not the owner' ) @@ -206,7 +209,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { }) it('non guardian should not be able to recover wallet', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( wallet.recoverWallet(newSigner, { from: nonGuardian }), 'Caller is not the guardian' ) @@ -215,7 +218,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when the guardian is not set', () => { it('should not be able to recover wallet', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( wallet.recoverWallet(newSigner, { from: guardian }), 'Caller is not the guardian' ) @@ -263,7 +266,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when the caller is not the signer', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( wallet.executeTransaction(destination, value, data, { from: nonSigner }), 'Invalid transaction sender' ) @@ -307,7 +310,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when data is not empty', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( wallet.executeTransaction(destination, value, '0x1234', { from: signer }), 'Invalid contract address' ) @@ -432,7 +435,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when the data parameter has extra bytes appended', () => { it('reverts', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( wallet.executeTransactions( transactions.map((t) => t.destination), transactions.map((t) => t.value), @@ -447,7 +450,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when dataLengths has erroneous lengths', () => { it('reverts', async () => { - await assertRevertWithoutReason( + await assertTransactionRevertWithoutReason( wallet.executeTransactions( transactions.map((t) => t.destination), transactions.map((t) => t.value), @@ -581,7 +584,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { describe('when signed by a non-signer', () => { it('should revert', async () => { transferSigner = nonSigner - await assertRevertWithReason(doTransfer(), 'Invalid meta-transaction signer') + await assertTransactionRevertWithReason(doTransfer(), 'Invalid meta-transaction signer') }) }) }) @@ -595,7 +598,7 @@ contract('MetaTransactionWallet', (accounts: string[]) => { transferSigner = signer }) it('should revert', async () => { - await assertRevertWithReason(doTransfer(), 'Invalid meta-transaction signer') + await assertTransactionRevertWithReason(doTransfer(), 'Invalid meta-transaction signer') }) }) }) diff --git a/packages/protocol/test/common/multisig.ts b/packages/protocol/test/common/multisig.ts index 5d9977d86b3..a0e4c070a2f 100644 --- a/packages/protocol/test/common/multisig.ts +++ b/packages/protocol/test/common/multisig.ts @@ -2,7 +2,7 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { assertEqualBN, assertLogMatches2, - assertRevertWithReason, + assertTransactionRevertWithReason, } from '@celo/protocol/lib/test-utils' import { parseMultiSigTransaction } from '@celo/protocol/lib/web3-utils' import _ from 'lodash' @@ -39,7 +39,7 @@ contract('MultiSig', (accounts: any) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.initialize(owners, requiredSignatures, internalRequiredSignatures), 'contract already initialized' ) @@ -101,14 +101,14 @@ contract('MultiSig', (accounts: any) => { it('should not allow an owner to submit a transaction to a null address', async () => { // @ts-ignore: TODO(mcortesi): fix typings - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.submitTransaction(NULL_ADDRESS, 0, txData), 'address was null' ) }) it('should not allow a non-owner to submit a transaction', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( // @ts-ignore: TODO(mcortesi): fix typings multiSig.submitTransaction(multiSig.address, 0, txData, { from: accounts[2] }), 'owner does not exist' @@ -144,14 +144,14 @@ contract('MultiSig', (accounts: any) => { }) it('should not allow an owner to confirm a transaction twice', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.confirmTransaction(txId, { from: accounts[0] }), 'transaction was already confirmed for owner' ) }) it('should not allow a non-owner to confirm a transaction', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.confirmTransaction(txId, { from: accounts[2] }), 'owner does not exist' ) @@ -182,14 +182,14 @@ contract('MultiSig', (accounts: any) => { }) it('should not allow a non-owner to revoke a confirmation', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.revokeConfirmation(txId, { from: accounts[2] }), 'owner does not exist' ) }) it('should not allow an owner to revoke before confirming', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.revokeConfirmation(txId, { from: accounts[1] }), 'transaction was not confirmed for owner' ) @@ -218,7 +218,7 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to add an owner', async () => { // @ts-ignore - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.addOwner(accounts[2], { from: accounts[3] }), 'msg.sender was not multisig wallet' ) @@ -235,7 +235,7 @@ contract('MultiSig', (accounts: any) => { event: 'Confirmation', }) const txId = txEvent.args.transactionId - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.confirmTransaction(txId, { from: accounts[1] }), 'Transaction execution failed.' ) @@ -269,7 +269,7 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to remove an owner', async () => { // @ts-ignore - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.removeOwner(accounts[1], { from: accounts[3] }), 'msg.sender was not multisig wallet' ) @@ -298,7 +298,7 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to replace an owner', async () => { // @ts-ignore - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.replaceOwner(accounts[1], accounts[2], { from: accounts[3] }), 'msg.sender was not multisig wallet' ) @@ -315,7 +315,7 @@ contract('MultiSig', (accounts: any) => { event: 'Confirmation', }) const txId = txEvent.args.transactionId - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.confirmTransaction(txId, { from: accounts[1] }), 'Transaction execution failed.' ) @@ -343,7 +343,7 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to change the requirement', async () => { // @ts-ignore - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.changeRequirement(3, { from: accounts[3] }), 'msg.sender was not multisig wallet' ) @@ -371,7 +371,7 @@ contract('MultiSig', (accounts: any) => { it('should not allow an external account to change the internal requirement', async () => { // @ts-ignore - await assertRevertWithReason( + await assertTransactionRevertWithReason( multiSig.changeInternalRequirement(3, { from: accounts[3] }), 'msg.sender was not multisig wallet' ) diff --git a/packages/protocol/test/common/proxy.ts b/packages/protocol/test/common/proxy.ts index dd6ba3db741..b81da7d4593 100644 --- a/packages/protocol/test/common/proxy.ts +++ b/packages/protocol/test/common/proxy.ts @@ -1,6 +1,6 @@ import { recoverFunds } from '@celo/protocol/lib/recover-funds' import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { BigNumber } from 'bignumber.js' import { FreezerContract, @@ -49,7 +49,7 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow a non-owner to set an implementation', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( proxy._setImplementation(getSet.address, { from: accounts[1] }), 'sender was not owner' ) @@ -126,7 +126,7 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow to call a non contract address', async () => - assertRevertWithReason( + assertTransactionRevertWithReason( proxy._setAndInitializeImplementation(accounts[1], initializeData(42), { from: accounts[1], }), @@ -134,7 +134,7 @@ contract('Proxy', (accounts: string[]) => { )) it('should not allow a non-owner to set an implementation', async () => - assertRevertWithReason( + assertTransactionRevertWithReason( proxy._setAndInitializeImplementation(hasInitializer.address, initializeData(42), { from: accounts[1], }), @@ -143,7 +143,7 @@ contract('Proxy', (accounts: string[]) => { it('should not allow for a call to `initialize` after initialization', async () => { await proxy._setAndInitializeImplementation(hasInitializer.address, initializeData(42)) - await assertRevertWithReason( + await assertTransactionRevertWithReason( proxiedHasInitializer.initialize(43), 'contract already initialized' ) @@ -158,7 +158,7 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow a non-owner to transfer ownership', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( proxy._transferOwnership(accounts[2], { from: accounts[1] }), 'sender was not owner' ) @@ -185,7 +185,7 @@ contract('Proxy', (accounts: string[]) => { }) it('should not allow the previous owner to perform onlyOwner actions', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( proxy._setImplementation(getSet1.address), 'sender was not owner' ) diff --git a/packages/protocol/test/common/registry.ts b/packages/protocol/test/common/registry.ts index f61300e8a06..d8823dea472 100644 --- a/packages/protocol/test/common/registry.ts +++ b/packages/protocol/test/common/registry.ts @@ -1,4 +1,4 @@ -import { assertRevert, assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertRevert, assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { soliditySha3 } from '@celo/utils/lib/solidity' import { RegistryInstance } from 'types' @@ -24,7 +24,7 @@ contract('Registry', (accounts: any) => { }) it('should not be callable again', async () => { - await assertRevertWithReason(registry.initialize(), 'contract already initialized') + await assertTransactionRevertWithReason(registry.initialize(), 'contract already initialized') }) }) @@ -35,7 +35,7 @@ contract('Registry', (accounts: any) => { }) it('should not allow a different user to set an address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( registry.setAddressFor(anIdentifier, anAddress, { from: accounts[1] }), 'Ownable: caller is not the owner' ) diff --git a/packages/protocol/test/common/transferwhitelist.ts b/packages/protocol/test/common/transferwhitelist.ts index bb73379c00e..157fb890107 100644 --- a/packages/protocol/test/common/transferwhitelist.ts +++ b/packages/protocol/test/common/transferwhitelist.ts @@ -1,4 +1,4 @@ -import { assertLogMatches2, assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertLogMatches2, assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { RegistryContract, RegistryInstance, @@ -43,7 +43,7 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( transferWhitelist.whitelistAddress(anAddress, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -70,7 +70,7 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to remove an address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( transferWhitelist.removeAddress(anAddress, 0, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -89,7 +89,7 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a registry id', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( transferWhitelist.whitelistRegisteredContract(anIdentifierHash, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -119,7 +119,7 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to set the whitelist', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( transferWhitelist.setDirectlyWhitelistedAddresses([anAddress, anotherAddress], { from: nonOwner, }), @@ -144,7 +144,7 @@ contract('TransferWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to set the list of registered contracts', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( transferWhitelist.setWhitelistedContractIdentifiers( [anIdentifierHash, anotherIdentifierHash], { diff --git a/packages/protocol/test/governance/network/blockchainparams.ts b/packages/protocol/test/governance/network/blockchainparams.ts index da32f5f0b0b..2b9d7750b3c 100644 --- a/packages/protocol/test/governance/network/blockchainparams.ts +++ b/packages/protocol/test/governance/network/blockchainparams.ts @@ -2,7 +2,7 @@ import { assertContainSubset, assertEqualBN, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, mineBlocks, } from '@celo/protocol/lib/test-utils' import { BigNumber } from 'bignumber.js' @@ -63,7 +63,7 @@ contract('BlockchainParameters', (accounts: string[]) => { }) }) it('only owner should be able to set', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( blockchainParameters.setMinimumClientVersion(version.major, version.minor, version.patch, { from: accounts[1], }), @@ -89,7 +89,7 @@ contract('BlockchainParameters', (accounts: string[]) => { }) }) it('only owner should be able to set', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( blockchainParameters.setBlockGasLimit(gasLimit, { from: accounts[1], }), @@ -120,7 +120,7 @@ contract('BlockchainParameters', (accounts: string[]) => { }) }) it('only owner should be able to set', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( blockchainParameters.setIntrinsicGasForAlternativeFeeCurrency(gasLimit, { from: accounts[1], }), @@ -172,7 +172,7 @@ contract('BlockchainParameters', (accounts: string[]) => { }) it('only owner should be able to set', () => - assertRevertWithReason( + assertTransactionRevertWithReason( blockchainParameters.setUptimeLookbackWindow(newValue, { from: accounts[1], }), @@ -180,19 +180,19 @@ contract('BlockchainParameters', (accounts: string[]) => { )) it('should fail when using value lower than safe minimum', () => - assertRevertWithReason( + assertTransactionRevertWithReason( blockchainParameters.setUptimeLookbackWindow(2), 'UptimeLookbackWindow must be within safe range' )) it('should fail when using value greater than safe maximum', () => - assertRevertWithReason( + assertTransactionRevertWithReason( blockchainParameters.setUptimeLookbackWindow(721), 'UptimeLookbackWindow must be within safe range' )) it('should fail when using value greater than epochSize - 2', () => - assertRevertWithReason( + assertTransactionRevertWithReason( blockchainParameters.setUptimeLookbackWindow(EPOCH - 1), 'UptimeLookbackWindow must be smaller or equal to epochSize - 2' )) diff --git a/packages/protocol/test/governance/network/epochrewards.ts b/packages/protocol/test/governance/network/epochrewards.ts index 7ce9d125563..f931dc2c5ac 100644 --- a/packages/protocol/test/governance/network/epochrewards.ts +++ b/packages/protocol/test/governance/network/epochrewards.ts @@ -4,7 +4,7 @@ import { assertContainSubset, assertEqualBN, assertEqualDpBN, - assertRevertWithReason, + assertTransactionRevertWithReason, jsonRpc, timeTravel, } from '@celo/protocol/lib/test-utils' @@ -153,7 +153,7 @@ contract('EpochRewards', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.initialize( registry.address, targetVotingYieldParams.initial, @@ -197,7 +197,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setTargetVotingGoldFraction(newFraction, { from: nonOwner, }), @@ -209,7 +209,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the fraction is the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setTargetVotingGoldFraction(targetVotingGoldFraction), 'Target voting gold fraction unchanged' ) @@ -242,7 +242,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setCommunityRewardFraction(newFraction, { from: nonOwner, }), @@ -254,7 +254,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the fraction is the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setCommunityRewardFraction(communityRewardFraction), 'Value must be different from existing community reward fraction and less than 1' ) @@ -287,7 +287,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the payment is the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setTargetValidatorEpochPayment(targetValidatorEpochPayment), 'Target validator epoch payment unchanged' ) @@ -297,7 +297,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setTargetValidatorEpochPayment(newPayment, { from: nonOwner, }), @@ -349,7 +349,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setRewardsMultiplierParameters( newParams.max, newParams.underspend, @@ -366,7 +366,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the parameters are the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setRewardsMultiplierParameters( rewardsMultiplier.max, rewardsMultiplier.adjustments.underspend, @@ -411,7 +411,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setTargetVotingYieldParameters(newMax, newFactor, { from: nonOwner, }), @@ -423,7 +423,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when the parameters are the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setTargetVotingYieldParameters( targetVotingYieldParams.max, targetVotingYieldParams.adjustmentFactor @@ -464,7 +464,7 @@ contract('EpochRewards', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.setTargetVotingYield(newTarget, { from: nonOwner, }), @@ -1180,7 +1180,7 @@ contract('EpochRewards', (accounts: string[]) => { }) it('should make updateTargetVotingYield revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( epochRewards.updateTargetVotingYield(), "can't call when contract is frozen" ) diff --git a/packages/protocol/test/governance/network/governance.ts b/packages/protocol/test/governance/network/governance.ts index 7da6b287cc4..a53e0abcaf8 100644 --- a/packages/protocol/test/governance/network/governance.ts +++ b/packages/protocol/test/governance/network/governance.ts @@ -6,7 +6,7 @@ import { assertEqualBN, assertLogMatches2, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, matchAny, mineToNextEpoch, stripHexEncoding, @@ -238,7 +238,7 @@ contract('Governance', (accounts: string[]) => { // TODO(asa): Consider testing reversion when 0 values provided it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.initialize( registry.address, approver, @@ -278,15 +278,21 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when approver is the null address', async () => { - await assertRevertWithReason(governance.setApprover(NULL_ADDRESS), 'Approver cannot be 0') + await assertTransactionRevertWithReason( + governance.setApprover(NULL_ADDRESS), + 'Approver cannot be 0' + ) }) it('should revert when the approver is unchanged', async () => { - await assertRevertWithReason(governance.setApprover(approver), 'Approver unchanged') + await assertTransactionRevertWithReason( + governance.setApprover(approver), + 'Approver unchanged' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setApprover(newApprover, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -313,14 +319,14 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the minDeposit is unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setMinDeposit(minDeposit), 'Minimum deposit unchanged' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setMinDeposit(newMinDeposit, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -347,21 +353,21 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when concurrent proposals is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConcurrentProposals(0), 'Number of proposals must be larger than zero' ) }) it('should revert when concurrent proposals is unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConcurrentProposals(concurrentProposals), 'Number of proposals unchanged' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConcurrentProposals(newConcurrentProposals, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -388,18 +394,21 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when queue expiry is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setQueueExpiry(0), 'QueueExpiry must be larger than 0' ) }) it('should revert when queue expiry is unchanged', async () => { - await assertRevertWithReason(governance.setQueueExpiry(queueExpiry), 'QueueExpiry unchanged') + await assertTransactionRevertWithReason( + governance.setQueueExpiry(queueExpiry), + 'QueueExpiry unchanged' + ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setQueueExpiry(newQueueExpiry, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -426,21 +435,21 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when dequeue frequency is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setDequeueFrequency(0), 'dequeueFrequency must be larger than 0' ) }) it('should revert when dequeue frequency is unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setDequeueFrequency(dequeueFrequency), 'dequeueFrequency unchanged' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setDequeueFrequency(newDequeueFrequency, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -468,21 +477,21 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when referendum stage duration is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setReferendumStageDuration(0), 'Duration must be larger than 0' ) }) it('should revert when referendum stage duration is unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setReferendumStageDuration(referendumStageDuration), 'Duration unchanged' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setReferendumStageDuration(newReferendumStageDuration, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -510,21 +519,21 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when execution stage duration is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setExecutionStageDuration(0), 'Duration must be larger than 0' ) }) it('should revert when execution stage duration is unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setExecutionStageDuration(executionStageDuration), 'Duration unchanged' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setExecutionStageDuration(newExecutionStageDuration, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -553,14 +562,14 @@ contract('Governance', (accounts: string[]) => { }) it('should revert if new participation floor is above 1', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setParticipationFloor(toFixed(101 / 100)), 'Participation floor greater than one' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setParticipationFloor(differentParticipationFloor, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -589,14 +598,14 @@ contract('Governance', (accounts: string[]) => { }) it('should revert if new update coefficient is above 1', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setBaselineUpdateFactor(toFixed(101 / 100)), 'Baseline update factor greater than one' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setBaselineUpdateFactor(differentBaselineUpdateFactor, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -625,14 +634,14 @@ contract('Governance', (accounts: string[]) => { }) it('should revert if new critical baseline level is above 1', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setBaselineQuorumFactor(toFixed(101 / 100)), 'Baseline quorum factor greater than one' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setBaselineQuorumFactor(differentBaselineQuorumFactor, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -714,35 +723,35 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the destination is the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConstitution(NULL_ADDRESS, nullFunctionId, threshold), 'Destination cannot be zero' ) }) it('should revert when the threshold is zero', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConstitution(destination, nullFunctionId, 0), 'Threshold has to be greater than majority and not greater than unanimity' ) }) it('should revert when the threshold is not greater than a majority', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConstitution(destination, nullFunctionId, toFixed(1 / 2)), 'Threshold has to be greater than majority and not greater than unanimity' ) }) it('should revert when the threshold is greater than 100%', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConstitution(destination, nullFunctionId, toFixed(101 / 100)), 'Threshold has to be greater than majority and not greater than unanimity' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.setConstitution(destination, nullFunctionId, threshold, { from: nonOwner, }), @@ -1095,7 +1104,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when upvoting a proposal that is not queued', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.upvote(proposalId.plus(1), 0, 0), 'cannot upvote a proposal not in the queue' ) @@ -1205,7 +1214,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when upvoting a proposal that will be dequeued', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.upvote(proposalId, 0, 0), 'cannot upvote a proposal not in the queue' ) @@ -1326,7 +1335,7 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account does not have an upvoted proposal', async () => { await governance.revokeUpvote(0, 0) - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.revokeUpvote(0, 0), 'Account has no historical upvote' ) @@ -1422,7 +1431,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the caller was not the proposer of a dequeued proposal', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.withdraw({ from: accounts[1] }), 'Nothing to withdraw' ) @@ -1482,7 +1491,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.approve(proposalId, index + 1), 'Provided index greater than dequeue length.' ) @@ -1501,14 +1510,14 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.approve(otherProposalId, index), 'Proposal not dequeued' ) }) it('should revert when not called by the approver', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.approve(proposalId, index, { from: nonApprover }), 'msg.sender not approver' ) @@ -1525,7 +1534,7 @@ contract('Governance', (accounts: string[]) => { // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails { value: minDeposit } ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.approve(proposalId + 1, index), 'Proposal not dequeued' ) @@ -1533,7 +1542,7 @@ contract('Governance', (accounts: string[]) => { it('should revert if the proposal has already been approved', async () => { await governance.approve(proposalId, index) - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.approve(proposalId, index), 'Proposal already approved' ) @@ -1843,11 +1852,14 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevertWithReason(governance.vote(proposalId, index, value), 'Voter weight zero') + await assertTransactionRevertWithReason( + governance.vote(proposalId, index, value), + 'Voter weight zero' + ) }) it('should revert when the index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.vote(proposalId, index + 1, value), 'Provided index greater than dequeue length.' ) @@ -1866,7 +1878,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.vote(otherProposalId, index, value), 'Proposal not dequeued' ) @@ -2118,11 +2130,14 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevertWithReason(governance.vote(proposalId, index, value), 'Voter weight zero') + await assertTransactionRevertWithReason( + governance.vote(proposalId, index, value), + 'Voter weight zero' + ) }) it('should revert when the index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.vote(proposalId, index + 1, value), 'Provided index greater than dequeue length.' ) @@ -2141,7 +2156,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.vote(otherProposalId, index, value), 'Proposal not dequeued' ) @@ -2296,14 +2311,14 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(proposalId, index, yesVotes, 0, 0), "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" ) }) it('should revert when the account does not have enough gold', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(proposalId, index, yesVotes + 1, 0, 0), "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" ) @@ -2311,14 +2326,14 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account does not have enough gold when voting partially', async () => { const noVotes = yesVotes - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(proposalId, index, yesVotes, noVotes, 0), "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" ) }) it('should revert when the index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(proposalId, index + 1, yesVotes, 0, 0), 'Provided index greater than dequeue length.' ) @@ -2337,7 +2352,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(otherProposalId, index, yesVotes, 0, 0), 'Proposal not dequeued' ) @@ -2641,14 +2656,14 @@ contract('Governance', (accounts: string[]) => { it('should revert when the account weight is 0', async () => { await mockLockedGold.setAccountTotalLockedGold(account, 0) - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(proposalId, index, yesVotes, 0, 0), "Voter doesn't have enough locked Celo [(]formerly known as Celo Gold[)]" ) }) it('should revert when the index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(proposalId, index + 1, yesVotes, 0, 0), 'Provided index greater than dequeue length.' ) @@ -2667,7 +2682,7 @@ contract('Governance', (accounts: string[]) => { ) await timeTravel(dequeueFrequency, web3) const otherProposalId = 2 - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.votePartially(otherProposalId, index, yesVotes, 0, 0), 'Proposal not dequeued' ) @@ -2813,7 +2828,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.execute(proposalId, index + 1), 'Provided index greater than dequeue length.' ) @@ -2885,7 +2900,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when the index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.execute(proposalId, index + 1), 'Provided index greater than dequeue length.' ) @@ -2911,7 +2926,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.execute(proposalId, index), 'Proposal not approved' ) @@ -2938,7 +2953,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.execute(proposalId, index), 'Proposal execution failed' ) @@ -2965,7 +2980,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.execute(proposalId, index), 'Invalid contract address' ) @@ -3061,7 +3076,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.execute(proposalId, index), 'Proposal execution failed' ) @@ -3088,7 +3103,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.execute(proposalId, index), 'Proposal execution failed' ) @@ -3281,7 +3296,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when called by non-approver', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.approveHotfix(hotfixHashStr, { from: accounts[2] }), 'msg.sender not approver' ) @@ -3400,7 +3415,7 @@ contract('Governance', (accounts: string[]) => { }) it('should revert when hotfix is not passing', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.prepareHotfix(hotfixHashStr), 'hotfix not whitelisted by 2f[+]1 validators' ) @@ -3436,7 +3451,7 @@ contract('Governance', (accounts: string[]) => { it('should revert when epoch == preparedEpoch', async () => { await governance.prepareHotfix(hotfixHashStr) - await assertRevertWithReason( + await assertTransactionRevertWithReason( governance.prepareHotfix(hotfixHashStr), 'hotfix already prepared for this epoch' ) @@ -3463,13 +3478,16 @@ contract('Governance', (accounts: string[]) => { } it('should revert when hotfix not approved', async () => { - await assertRevertWithReason(executeHotfixTx(), 'hotfix not approved') + await assertTransactionRevertWithReason(executeHotfixTx(), 'hotfix not approved') }) it('should revert when hotfix not prepared for current epoch', async () => { await mineToNextEpoch(web3) await governance.approveHotfix(hotfixHashStr, { from: approver }) - await assertRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') + await assertTransactionRevertWithReason( + executeHotfixTx(), + 'hotfix must be prepared for this epoch' + ) }) it('should revert when hotfix prepared but not for current epoch', async () => { @@ -3479,7 +3497,10 @@ contract('Governance', (accounts: string[]) => { await governance.whitelistHotfix(hotfixHashStr, { from: accounts[2] }) await governance.prepareHotfix(hotfixHashStr, { from: accounts[2] }) await mineToNextEpoch(web3) - await assertRevertWithReason(executeHotfixTx(), 'hotfix must be prepared for this epoch') + await assertTransactionRevertWithReason( + executeHotfixTx(), + 'hotfix must be prepared for this epoch' + ) }) describe('when hotfix is approved and prepared for current epoch', () => { @@ -3518,7 +3539,7 @@ contract('Governance', (accounts: string[]) => { it('should not be executable again', async () => { await executeHotfixTx() - await assertRevertWithReason(executeHotfixTx(), 'hotfix already executed') + await assertTransactionRevertWithReason(executeHotfixTx(), 'hotfix already executed') }) }) }) diff --git a/packages/protocol/test/governance/network/governance_slasher.ts b/packages/protocol/test/governance/network/governance_slasher.ts index ce3b6c0d206..bb694cf19ce 100644 --- a/packages/protocol/test/governance/network/governance_slasher.ts +++ b/packages/protocol/test/governance/network/governance_slasher.ts @@ -1,5 +1,8 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertContainSubset, assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { + assertContainSubset, + assertTransactionRevertWithReason, +} from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { AccountsContract, @@ -54,7 +57,7 @@ contract('GovernanceSlasher', (accounts: string[]) => { assert.equal(owner, accounts[0]) }) it('can only be called once', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.initialize(registry.address), 'contract already initialized' ) @@ -74,7 +77,7 @@ contract('GovernanceSlasher', (accounts: string[]) => { assert.equal(amount.toNumber(), 2000) }) it('can only be called by owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.approveSlashing(accounts[2], 1000, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -83,7 +86,7 @@ contract('GovernanceSlasher', (accounts: string[]) => { describe('#slash()', () => { it('fails if there is nothing to slash', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash(validator, [], [], []), 'No penalty given by governance' ) diff --git a/packages/protocol/test/governance/validators/doublesigningslasher.ts b/packages/protocol/test/governance/validators/doublesigningslasher.ts index 125ff545506..d7ad01eaca2 100644 --- a/packages/protocol/test/governance/validators/doublesigningslasher.ts +++ b/packages/protocol/test/governance/validators/doublesigningslasher.ts @@ -1,5 +1,8 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { assertContainSubset, assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { + assertContainSubset, + assertTransactionRevertWithReason, +} from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { AccountsContract, @@ -70,7 +73,7 @@ contract('DoubleSigningSlasher', (accounts: string[]) => { assert.equal(res[1].toNumber(), 100) }) it('can only be called once', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.initialize(registry.address, 10000, 100), 'contract already initialized' ) @@ -79,13 +82,13 @@ contract('DoubleSigningSlasher', (accounts: string[]) => { describe('#setSlashingIncentives()', () => { it('can only be set by the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.setSlashingIncentives(123, 67, { from: nonOwner }), 'Ownable: caller is not the owner' ) }) it('reward cannot be larger than penalty', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.setSlashingIncentives(123, 678), 'Penalty has to be larger than reward' ) @@ -131,26 +134,26 @@ contract('DoubleSigningSlasher', (accounts: string[]) => { await slasher.setVerifiedSealBitmap(headerC, bitmap) }) it('fails if block numbers do not match', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash(validator, validatorIndex, headerA, headerB, 0, [], [], [], [], [], []), 'Block headers are from different height' ) }) it('fails if is not signed at index', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash(accounts[4], validatorIndex + 1, headerA, headerC, 0, [], [], [], [], [], []), "Didn't sign first block" ) }) it('fails if epoch signer is wrong', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash(accounts[4], validatorIndex, headerA, headerC, 0, [], [], [], [], [], []), "Wasn't a signer with given index" ) }) it('fails if there are not enough signers', async () => { await slasher.setNumberValidators(100) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []), 'Not enough signers in the first block' ) @@ -190,7 +193,7 @@ contract('DoubleSigningSlasher', (accounts: string[]) => { }) it('fails when tried second time', async () => { await slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash(validator, validatorIndex, headerA, headerC, 0, [], [], [], [], [], []), ' Already slashed' ) diff --git a/packages/protocol/test/governance/validators/downtimeslasher.ts b/packages/protocol/test/governance/validators/downtimeslasher.ts index d271fd22d12..fd8763a22c8 100644 --- a/packages/protocol/test/governance/validators/downtimeslasher.ts +++ b/packages/protocol/test/governance/validators/downtimeslasher.ts @@ -2,7 +2,7 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { assertLogMatches2, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, getEpochNumberOfBlock, getFirstBlockNumberForEpoch, jsonRpc, @@ -132,7 +132,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { }) it('can only be called once', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.initialize(registry.address, 10000, 100, 2), 'contract already initialized' ) @@ -141,7 +141,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { describe('#setSlashingIncentives()', () => { it('can only be set by the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.setSlashingIncentives(123, 67, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -155,7 +155,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { }) it('reward cannot be larger than penalty', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.setSlashingIncentives(123, 678), 'Penalty has to be larger than reward' ) @@ -176,7 +176,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { describe('#setSlashableDowntime()', () => { it('can only be set by the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.setSlashableDowntime(23, { from: nonOwner }), ' Ownable: caller is not the owner' ) @@ -283,7 +283,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { const resp = await slasher.setBitmapForInterval(blockNumber, blockNumber + 1) assert.equal(resp.logs.length, 1) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.setBitmapForInterval(blockNumber, blockNumber + 1), 'bitmap already set' ) @@ -391,7 +391,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // First block with every validator signatures await presetParentSealForBlocks(startBlock, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -419,7 +419,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Last block with every validator signatures await presetParentSealForBlocks(startBlock + slashableDowntime - 1, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -447,7 +447,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Middle block with every validator signatures await presetParentSealForBlocks(startBlock + intervalSize, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -475,7 +475,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // First block with every validator signatures await presetParentSealForBlocks(startBlock, 1, [bitmapVI99]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -572,7 +572,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { ]) } await generateProofs(startBlocks, endBlocks) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( startBlocks, endBlocks, @@ -603,7 +603,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { ]) } await generateProofs(startBlocks, endBlocks) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( startBlocks, endBlocks, @@ -715,7 +715,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Last block with every validator signatures await presetParentSealForBlocks(startBlock + slashableDowntime - 1, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -744,7 +744,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { // Last block with every validator signatures await presetParentSealForBlocks(startBlock + slashableDowntime - 1, 1, [bitmapVI01]) const slotArrays = await calculateEverySlot(startBlock) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -815,7 +815,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { 1, validatorIndexInEpoch, ]) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, @@ -863,7 +863,7 @@ contract('DowntimeSlasher', (accounts: string[]) => { const slotArrays = await ensureValidatorIsSlashable(newStartBlock, [ validatorIndexInEpoch, ]) - await assertRevertWithReason( + await assertTransactionRevertWithReason( slasher.slash( slotArrays.startBlocks, slotArrays.endBlocks, diff --git a/packages/protocol/test/governance/validators/sortedlinkedlist.ts b/packages/protocol/test/governance/validators/sortedlinkedlist.ts index a71ccd791e2..2f1b8dffa7e 100644 --- a/packages/protocol/test/governance/validators/sortedlinkedlist.ts +++ b/packages/protocol/test/governance/validators/sortedlinkedlist.ts @@ -1,4 +1,4 @@ -import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import BigNumber from 'bignumber.js' import { IntegerSortedLinkedListTestContract, IntegerSortedLinkedListTestInstance } from 'types' @@ -46,15 +46,21 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if key is 0', async () => { - await assertRevertWithReason(sortedListTest.insert(0, value, 0, 0), 'invalid key') + await assertTransactionRevertWithReason(sortedListTest.insert(0, value, 0, 0), 'invalid key') }) it('should revert if lesser is equal to key', async () => { - await assertRevertWithReason(sortedListTest.insert(key, value, key, 0), 'invalid key') + await assertTransactionRevertWithReason( + sortedListTest.insert(key, value, key, 0), + 'invalid key' + ) }) it('should revert if greater is equal to key', async () => { - await assertRevertWithReason(sortedListTest.insert(key, value, 0, key), 'invalid key') + await assertTransactionRevertWithReason( + sortedListTest.insert(key, value, 0, key), + 'invalid key' + ) }) describe('when an element is already in the list', () => { @@ -63,13 +69,16 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert when inserting an element already in the list', async () => { - await assertRevertWithReason(sortedListTest.insert(key, value, 0, key), 'invalid key') + await assertTransactionRevertWithReason( + sortedListTest.insert(key, value, 0, key), + 'invalid key' + ) }) it('should revert when inserting a non-maximal element at the head of the list', async () => { const nonKey = key - 1 const newKey = key + 1 - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedListTest.insert(newKey, value - 1, nonKey, 0), 'greater and lesser key zero' ) @@ -96,18 +105,24 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if the key is not in the list', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedListTest.update(key + 1, newValue, 0, 0), 'key not in list' ) }) it('should revert if lesser is equal to key', async () => { - await assertRevertWithReason(sortedListTest.update(key, newValue, key, 0), 'invalid key') + await assertTransactionRevertWithReason( + sortedListTest.update(key, newValue, key, 0), + 'invalid key' + ) }) it('should revert if greater is equal to key', async () => { - await assertRevertWithReason(sortedListTest.update(key, newValue, 0, key), 'invalid key') + await assertTransactionRevertWithReason( + sortedListTest.update(key, newValue, 0, key), + 'invalid key' + ) }) }) @@ -142,7 +157,7 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if the key is not in the list', async () => { - await assertRevertWithReason(sortedListTest.remove(key + 1), 'key not in list') + await assertTransactionRevertWithReason(sortedListTest.remove(key + 1), 'key not in list') }) }) @@ -192,7 +207,10 @@ contract('IntegerSortedLinkedListTest', () => { }) it('should revert if n is greater than the number of elements', async () => { - await assertRevertWithReason(sortedListTest.popN(numElements + 1), 'not enough elements') + await assertTransactionRevertWithReason( + sortedListTest.popN(numElements + 1), + 'not enough elements' + ) }) }) diff --git a/packages/protocol/test/governance/validators/validators.ts b/packages/protocol/test/governance/validators/validators.ts index 2c2959cf6a0..2180b147a07 100644 --- a/packages/protocol/test/governance/validators/validators.ts +++ b/packages/protocol/test/governance/validators/validators.ts @@ -7,8 +7,8 @@ import { assertEqualBNArray, assertEqualDpBN, assertRevert, - assertRevertWithReason, assertSameAddress, + assertTransactionRevertWithReason, currentEpochNumber, mineBlocks, mineToNextEpoch, @@ -218,7 +218,7 @@ contract('Validators', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.initialize( registry.address, groupLockedGoldRequirements.value, @@ -266,7 +266,7 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setMembershipHistoryLength(newLength, { from: nonOwner, }), @@ -278,7 +278,7 @@ contract('Validators', (accounts: string[]) => { describe('when the length is the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setMembershipHistoryLength(membershipHistoryLength), 'Membership history length not changed' ) @@ -315,7 +315,7 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setMaxGroupSize(newSize, { from: nonOwner, }), @@ -327,7 +327,7 @@ contract('Validators', (accounts: string[]) => { describe('when the size is the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setMaxGroupSize(maxGroupSize), 'Max group size not changed' ) @@ -373,7 +373,7 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setGroupLockedGoldRequirements( newRequirements.value, newRequirements.duration, @@ -387,7 +387,7 @@ contract('Validators', (accounts: string[]) => { describe('when the requirements are the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setGroupLockedGoldRequirements( groupLockedGoldRequirements.value, groupLockedGoldRequirements.duration @@ -436,7 +436,7 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setValidatorLockedGoldRequirements( newRequirements.value, newRequirements.duration, @@ -450,7 +450,7 @@ contract('Validators', (accounts: string[]) => { describe('when the requirements are the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setValidatorLockedGoldRequirements( validatorLockedGoldRequirements.value, validatorLockedGoldRequirements.duration @@ -499,7 +499,7 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setValidatorScoreParameters( newParameters.exponent, newParameters.adjustmentSpeed, @@ -515,7 +515,7 @@ contract('Validators', (accounts: string[]) => { describe('when the lockups are the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setValidatorScoreParameters( validatorScoreParameters.exponent, validatorScoreParameters.adjustmentSpeed @@ -556,7 +556,7 @@ contract('Validators', (accounts: string[]) => { describe('when the size is the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setMaxGroupSize(maxGroupSize), 'Max group size not changed' ) @@ -566,7 +566,7 @@ contract('Validators', (accounts: string[]) => { describe('when called by a non-owner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setMaxGroupSize(maxGroupSize, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -591,7 +591,7 @@ contract('Validators', (accounts: string[]) => { const sig = await getParsedSignatureOfAddress(web3, validator, signer) await accountsInstance.authorizeValidatorSigner(signer, sig.v, sig.r, sig.s) const publicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidator(publicKey, blsPublicKey, blsPoP), 'Validators cannot vote for more than max number of groups' ) @@ -688,7 +688,7 @@ contract('Validators', (accounts: string[]) => { it('should revert', async () => { publicKey = await addressToPublicKey(validator, web3.eth.sign) await validators.registerValidator(publicKey, blsPublicKey, blsPoP) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidator(publicKey, blsPublicKey, blsPoP), 'Already registered' ) @@ -703,7 +703,7 @@ contract('Validators', (accounts: string[]) => { it('should revert', async () => { const publicKey = await addressToPublicKey(validator, web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidator(publicKey, blsPublicKey, blsPoP), 'Already registered' ) @@ -720,7 +720,7 @@ contract('Validators', (accounts: string[]) => { it('should revert', async () => { const publicKey = await addressToPublicKey(validator, web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidator(publicKey, blsPublicKey, blsPoP), 'Deposit too small' ) @@ -817,7 +817,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.deregisterValidator(index), 'Not yet requirement end time' ) @@ -827,7 +827,7 @@ contract('Validators', (accounts: string[]) => { describe('when the validator is still a member of a validator group', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.deregisterValidator(index), 'Has been group member recently' ) @@ -837,14 +837,17 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the account is not a registered validator', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.deregisterValidator(index, { from: accounts[2] }), 'Not a validator' ) }) it('should revert when the wrong index is provided', async () => { - await assertRevertWithReason(validators.deregisterValidator(index + 1), 'Not a validator') + await assertTransactionRevertWithReason( + validators.deregisterValidator(index + 1), + 'Not a validator' + ) }) }) @@ -998,7 +1001,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.affiliate(group), "Group doesn't meet requirements" ) @@ -1015,7 +1018,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.affiliate(group), "Validator doesn't meet requirements" ) @@ -1025,14 +1028,17 @@ contract('Validators', (accounts: string[]) => { describe('when affiliating with a non-registered validator group', () => { it('should revert', async () => { - await assertRevertWithReason(validators.affiliate(group), 'Not a validator group') + await assertTransactionRevertWithReason( + validators.affiliate(group), + 'Not a validator group' + ) }) }) }) describe('when the account does not have a registered validator', () => { it('should revert', async () => { - await assertRevertWithReason(validators.affiliate(group), 'Not a validator') + await assertTransactionRevertWithReason(validators.affiliate(group), 'Not a validator') }) }) }) @@ -1119,12 +1125,15 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the account is not a registered validator', async () => { - await assertRevertWithReason(validators.deaffiliate({ from: accounts[2] }), 'Not a validator') + await assertTransactionRevertWithReason( + validators.deaffiliate({ from: accounts[2] }), + 'Not a validator' + ) }) it('should revert when the validator is not affiliated with a validator group', async () => { await validators.deaffiliate() - await assertRevertWithReason(validators.deaffiliate(), 'not affiliated') + await assertTransactionRevertWithReason(validators.deaffiliate(), 'not affiliated') }) }) @@ -1172,7 +1181,7 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(accounts[8], web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updateEcdsaPublicKey(validator, signer, newPublicKey), 'ECDSA key does not match signer' ) @@ -1185,7 +1194,7 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updateEcdsaPublicKey(validator, signer, newPublicKey), 'only registered contract' ) @@ -1253,7 +1262,7 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(accounts[8], web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updatePublicKeys( validator, signer, @@ -1272,7 +1281,7 @@ contract('Validators', (accounts: string[]) => { const signer = accounts[9] it('should revert', async () => { const newPublicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updatePublicKeys( validator, signer, @@ -1323,7 +1332,7 @@ contract('Validators', (accounts: string[]) => { describe('when the public key is not 96 bytes', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updateBlsPublicKey(newBlsPublicKey + '01', newBlsPoP), 'Wrong BLS public key length' ) @@ -1332,7 +1341,7 @@ contract('Validators', (accounts: string[]) => { describe('when the proof of possession is not 48 bytes', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updateBlsPublicKey(newBlsPublicKey, newBlsPoP + '01'), 'Wrong BLS PoP length' ) @@ -1351,7 +1360,7 @@ contract('Validators', (accounts: string[]) => { const sig = await getParsedSignatureOfAddress(web3, group, signer) await accountsInstance.authorizeValidatorSigner(signer, sig.v, sig.r, sig.s) const publicKey = await addressToPublicKey(signer, web3.eth.sign) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidator(publicKey, blsPublicKey, blsPoP), 'Validators cannot vote for more than max number of groups' ) @@ -1403,7 +1412,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidatorGroup(commission), 'Not enough locked gold' ) @@ -1417,7 +1426,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidatorGroup(commission), 'Already registered as validator' ) @@ -1431,7 +1440,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidatorGroup(commission), 'Already registered as group' ) @@ -1444,7 +1453,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.registerValidatorGroup(commission), 'Already registered as group' ) @@ -1540,7 +1549,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.deregisterValidatorGroup(index), "Hasn't been empty for long enough" ) @@ -1550,7 +1559,7 @@ contract('Validators', (accounts: string[]) => { describe('when the group still has members', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.deregisterValidatorGroup(index), 'Validator group not empty' ) @@ -1559,7 +1568,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the wrong index is provided', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.deregisterValidatorGroup(index + 1), 'deleteElement: index out of range' ) @@ -1568,7 +1577,7 @@ contract('Validators', (accounts: string[]) => { describe('when the account does not have a registered validator group', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.deregisterValidatorGroup(index), 'Not a validator group' ) @@ -1653,7 +1662,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.addMember(accounts[2]), 'group would exceed maximum size' ) @@ -1700,7 +1709,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), 'Validator requirements not met' ) @@ -1718,7 +1727,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), 'Group requirements not met' ) @@ -1738,7 +1747,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.addMember(validator2), 'Group requirements not met' ) @@ -1753,7 +1762,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), 'Not affiliated to group' ) @@ -1763,7 +1772,7 @@ contract('Validators', (accounts: string[]) => { describe('when the account does not have a registered validator group', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.addFirstMember(validator, NULL_ADDRESS, NULL_ADDRESS), 'Not validator and group' ) @@ -1772,7 +1781,10 @@ contract('Validators', (accounts: string[]) => { describe('when the validator is already a member of the group', () => { it('should revert', async () => { - await assertRevertWithReason(validators.addMember(validator), 'Validator group empty') + await assertTransactionRevertWithReason( + validators.addMember(validator), + 'Validator group empty' + ) }) }) }) @@ -1841,14 +1853,14 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the account is not a registered validator group', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.removeMember(validator, { from: accounts[2] }), 'is not group and validator' ) }) it('should revert when the member is not a registered validator', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.removeMember(accounts[2]), 'is not group and validator' ) @@ -1860,7 +1872,10 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason(validators.removeMember(validator), 'Not affiliated to group') + await assertTransactionRevertWithReason( + validators.removeMember(validator), + 'Not affiliated to group' + ) }) }) }) @@ -1893,14 +1908,14 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when the account is not a registered validator group', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.reorderMember(validator2, validator1, NULL_ADDRESS, { from: accounts[2] }), 'Not a group' ) }) it('should revert when the member is not a registered validator', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.reorderMember(accounts[3], validator1, NULL_ADDRESS), 'Not a validator' ) @@ -1912,7 +1927,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.reorderMember(validator2, validator1, NULL_ADDRESS), 'Not a member of the group' ) @@ -1960,7 +1975,7 @@ contract('Validators', (accounts: string[]) => { describe('when the commission is the same', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setNextCommissionUpdate(commission), 'Not a validator group' ) @@ -1969,7 +1984,7 @@ contract('Validators', (accounts: string[]) => { describe('when the commission is greater than one', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.setNextCommissionUpdate(fixed1.plus(1)), 'Not a validator group' ) @@ -2015,7 +2030,7 @@ contract('Validators', (accounts: string[]) => { describe('when activationBlock has NOT passed', () => { it('should revert', async () => { await validators.setNextCommissionUpdate(newCommission) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updateCommission(), "Can't apply commission update yet" ) @@ -2024,7 +2039,10 @@ contract('Validators', (accounts: string[]) => { describe('when NO Commission has been queued', () => { it('should revert', async () => { - await assertRevertWithReason(validators.updateCommission(), 'No commission update queued') + await assertTransactionRevertWithReason( + validators.updateCommission(), + 'No commission update queued' + ) }) }) @@ -2033,7 +2051,10 @@ contract('Validators', (accounts: string[]) => { await validators.setNextCommissionUpdate(newCommission) await mineBlocks(commissionUpdateDelay.toNumber(), web3) await validators.updateCommission() - await assertRevertWithReason(validators.updateCommission(), 'No commission update queued') + await assertTransactionRevertWithReason( + validators.updateCommission(), + 'No commission update queued' + ) }) }) }) @@ -2171,7 +2192,7 @@ contract('Validators', (accounts: string[]) => { describe('when uptime > 1.0', () => { const uptime = 1.01 it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.updateValidatorScoreFromSigner(validator, toFixed(uptime)), 'Uptime cannot be larger than one' ) @@ -2563,7 +2584,7 @@ contract('Validators', (accounts: string[]) => { describe('when the sender is not an approved address', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.forceDeaffiliateIfValidator(validator), 'Only registered slasher can call' ) @@ -2711,7 +2732,7 @@ contract('Validators', (accounts: string[]) => { }) it('should revert when called by non-slasher', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.halveSlashingMultiplier(group, { from: accounts[0] }), 'Only registered slasher can call' ) @@ -2745,7 +2766,7 @@ contract('Validators', (accounts: string[]) => { describe('when the slashing multiplier is reset before reset period', async () => { it('should revert', async () => { await timeTravel(slashingMultiplierResetPeriod - 10, web3) - await assertRevertWithReason( + await assertTransactionRevertWithReason( validators.resetSlashingMultiplier({ from: group }), '`resetSlashingMultiplier` called before resetPeriod expired' ) diff --git a/packages/protocol/test/governance/voting/election.ts b/packages/protocol/test/governance/voting/election.ts index 27a3d22473a..448071bbfdc 100644 --- a/packages/protocol/test/governance/voting/election.ts +++ b/packages/protocol/test/governance/voting/election.ts @@ -5,7 +5,7 @@ import { assertContainSubset, assertEqualBN, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, mineBlocks, } from '@celo/protocol/lib/test-utils' import { normalizeAddressWith0x } from '@celo/utils/lib/address' @@ -120,7 +120,7 @@ contract('Election', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.initialize( registry.address, electableValidators.min, @@ -143,7 +143,7 @@ contract('Election', (accounts: string[]) => { it('should revert when the threshold is larger than 100%', async () => { const threshold = toFixed(new BigNumber('2')) - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setElectabilityThreshold(threshold), 'Electability threshold must be lower than 100%' ) @@ -180,14 +180,14 @@ contract('Election', (accounts: string[]) => { }) it('should revert when the minElectableValidators is zero', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setElectableValidators(0, newElectableValidators.max), 'Minimum electable validators cannot be zero' ) }) it('should revert when the min is greater than max', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setElectableValidators( newElectableValidators.max.plus(1), newElectableValidators.max @@ -197,14 +197,14 @@ contract('Election', (accounts: string[]) => { }) it('should revert when the values are unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setElectableValidators(electableValidators.min, electableValidators.max), 'Electable validators not changed' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setElectableValidators(newElectableValidators.min, newElectableValidators.max, { from: nonOwner, }), @@ -233,14 +233,14 @@ contract('Election', (accounts: string[]) => { }) it('should revert when the maxNumGroupsVotedFor is unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setMaxNumGroupsVotedFor(maxNumGroupsVotedFor), 'Max groups voted for not changed' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setMaxNumGroupsVotedFor(newMaxNumGroupsVotedFor, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -255,7 +255,7 @@ contract('Election', (accounts: string[]) => { it('should revert when vote over max number of groups set to true', async () => { await mockValidators.setValidator(accounts[0]) - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setAllowedToVoteOverMaxNumberOfGroups(true), 'Validators cannot vote for more than max number of groups' ) @@ -263,7 +263,7 @@ contract('Election', (accounts: string[]) => { it('should revert when vote over max number of groups set to true', async () => { await mockValidators.setValidatorGroup(accounts[0]) - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setAllowedToVoteOverMaxNumberOfGroups(true), 'Validator groups cannot vote for more than max number of groups' ) @@ -337,7 +337,7 @@ contract('Election', (accounts: string[]) => { describe('when the group has already been marked eligible', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.markGroupEligible(group, NULL_ADDRESS, NULL_ADDRESS), 'invalid key' ) @@ -348,7 +348,7 @@ contract('Election', (accounts: string[]) => { describe('not called by the registered validators contract', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.markGroupEligible(group, NULL_ADDRESS, NULL_ADDRESS), 'only registered contract' ) @@ -391,7 +391,7 @@ contract('Election', (accounts: string[]) => { describe('when not called by the registered Validators contract', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.markGroupIneligible(group), 'only registered contract' ) @@ -406,7 +406,10 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason(election.markGroupIneligible(group), 'key not in list') + await assertTransactionRevertWithReason( + election.markGroupIneligible(group), + 'key not in list' + ) }) }) }) @@ -546,7 +549,7 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS), 'SafeMath: subtraction overflow' ) @@ -565,7 +568,7 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.vote(group, value.minus(maxNumGroupsVotedFor), newGroup, NULL_ADDRESS), 'Voted for too many groups' ) @@ -615,7 +618,7 @@ contract('Election', (accounts: string[]) => { }) it('should revert when turning off of setAllowedToVoteOverMaxNumberOfGroups', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.setAllowedToVoteOverMaxNumberOfGroups(false), 'Too many groups voted for!' ) @@ -757,7 +760,7 @@ contract('Election', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS), 'Group cannot receive votes' ) @@ -767,7 +770,7 @@ contract('Election', (accounts: string[]) => { describe('when the group is not eligible', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.vote(group, value, NULL_ADDRESS, NULL_ADDRESS), 'Group not eligible' ) @@ -889,14 +892,20 @@ contract('Election', (accounts: string[]) => { describe('when an epoch boundary has not passed since the pending votes were made', () => { it('should revert', async () => { - await assertRevertWithReason(election.activate(group), 'Pending vote epoch not passed') + await assertTransactionRevertWithReason( + election.activate(group), + 'Pending vote epoch not passed' + ) }) }) }) describe('when the voter does not have pending votes', () => { it('should revert', async () => { - await assertRevertWithReason(election.activate(group), 'Vote value cannot be zero') + await assertTransactionRevertWithReason( + election.activate(group), + 'Vote value cannot be zero' + ) }) }) }) @@ -1015,7 +1024,7 @@ contract('Election', (accounts: string[]) => { describe('when an epoch boundary has not passed since the pending votes were made', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.activateForAccount(group, voter), 'Pending vote epoch not passed' ) @@ -1025,7 +1034,7 @@ contract('Election', (accounts: string[]) => { describe('when the voter does not have pending votes', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.activateForAccount(group, voter), 'Vote value cannot be zero' ) @@ -1172,7 +1181,7 @@ contract('Election', (accounts: string[]) => { describe('when the wrong index is provided', () => { const index = 1 it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.revokePending(group, value, NULL_ADDRESS, NULL_ADDRESS, index), 'Bad index' ) @@ -1183,7 +1192,7 @@ contract('Election', (accounts: string[]) => { describe('when the revoked value is greater than the pending votes', () => { const index = 0 it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.revokePending(group, value + 1, NULL_ADDRESS, NULL_ADDRESS, index), 'Vote value larger than pending votes' ) @@ -1420,7 +1429,7 @@ contract('Election', (accounts: string[]) => { describe('when the wrong index is provided', () => { const index = 1 it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.revokeActive(group, voteValue0 + reward0, NULL_ADDRESS, NULL_ADDRESS, index), 'Bad index' ) @@ -1431,7 +1440,7 @@ contract('Election', (accounts: string[]) => { describe('when the revoked value is greater than the active votes', () => { const index = 0 it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.revokeActive( group, voteValue0 + reward0 + 1, @@ -2229,7 +2238,7 @@ contract('Election', (accounts: string[]) => { describe('when `forceDecrementVotes` is called with malformed inputs', () => { describe('when called to slash more value than groups have', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.forceDecrementVotes( voter, value + value2 + 1, @@ -2247,7 +2256,7 @@ contract('Election', (accounts: string[]) => { it('should revert', async () => { const slashedValue = value // `group` should be listed as a lesser for index 0 (group2's lesser) - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.forceDecrementVotes( voter, slashedValue, @@ -2264,7 +2273,7 @@ contract('Election', (accounts: string[]) => { describe('when called to slash with incorrect indices', () => { it('should revert', async () => { const slashedValue = value - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.forceDecrementVotes( voter, slashedValue, @@ -2280,7 +2289,7 @@ contract('Election', (accounts: string[]) => { describe('when called from an address other than the locked gold contract', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( election.forceDecrementVotes( voter, value, diff --git a/packages/protocol/test/governance/voting/lockedgold.ts b/packages/protocol/test/governance/voting/lockedgold.ts index eeb2bc5ff6f..8a1abf9114a 100644 --- a/packages/protocol/test/governance/voting/lockedgold.ts +++ b/packages/protocol/test/governance/voting/lockedgold.ts @@ -5,7 +5,7 @@ import { assertLogMatches, assertLogMatches2, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { toFixed } from '@celo/utils/lib/fixidity' @@ -96,7 +96,7 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert if already initialized', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.initialize(registry.address, unlockingPeriod), 'contract already initialized' ) @@ -112,7 +112,7 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when not called by the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.setRegistry(anAddress, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -139,14 +139,14 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when the unlockingPeriod is unchanged', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.setUnlockingPeriod(unlockingPeriod), 'Unlocking period not changed' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.setUnlockingPeriod(newUnlockingPeriod, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -193,7 +193,10 @@ contract('LockedGold', (accounts: string[]) => { it('should revert when the account does not exist', async () => { // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails - await assertRevertWithReason(lockedGold.lock({ value, from: accounts[1] }), 'not account') + await assertTransactionRevertWithReason( + lockedGold.lock({ value, from: accounts[1] }), + 'not account' + ) }) }) @@ -265,7 +268,7 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when requesting gold that is voted with', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.unlock(value), 'Not enough unlockable celo. Celo is locked in voting.' ) @@ -334,7 +337,7 @@ contract('LockedGold', (accounts: string[]) => { describe('when unlocking would yield a locked gold balance less than the required value', () => { describe('when the the current time is earlier than the requirement time', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.unlock(value), "Either account doesn't have enough locked Celo or locked Celo is being used for voting." ) @@ -440,7 +443,7 @@ contract('LockedGold', (accounts: string[]) => { describe('when relocking value greater than the value of the pending withdrawal', () => { const value = pendingWithdrawalValue + 1 it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.relock(index, value), 'Requested value larger than pending value' ) @@ -450,7 +453,7 @@ contract('LockedGold', (accounts: string[]) => { describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.relock(index, pendingWithdrawalValue), 'Bad pending withdrawal index' ) @@ -493,7 +496,7 @@ contract('LockedGold', (accounts: string[]) => { describe('when it is before the availablity time', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.withdraw(index), 'Pending withdrawal not available' ) @@ -503,7 +506,10 @@ contract('LockedGold', (accounts: string[]) => { describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevertWithReason(lockedGold.withdraw(index), 'Bad pending withdrawal index') + await assertTransactionRevertWithReason( + lockedGold.withdraw(index), + 'Bad pending withdrawal index' + ) }) }) }) @@ -521,14 +527,14 @@ contract('LockedGold', (accounts: string[]) => { assert.equal(bytes, (await lockedGold.getSlashingWhitelist())[0]) }) it('can only be called by owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.addSlasher(CeloContractName.DowntimeSlasher, { from: accounts[1] }), 'Ownable: caller is not the owner' ) }) it('cannot add a slasher twice', async () => { await lockedGold.addSlasher(CeloContractName.DowntimeSlasher) - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.addSlasher(CeloContractName.DowntimeSlasher), 'Cannot add slasher ID twice.' ) @@ -546,26 +552,26 @@ contract('LockedGold', (accounts: string[]) => { assert.equal(0, (await lockedGold.getSlashingWhitelist()).length) }) it('can only be called by owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 0, { from: accounts[1] }), 'Ownable: caller is not the owner' ) }) it('reverts when index too large', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 100), 'Provided index exceeds whitelist bounds.' ) }) it('reverts when key does not exists', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.removeSlasher(CeloContractName.GovernanceSlasher, 100), 'Cannot remove slasher ID not yet added.' ) }) it('reverts when index and key have mismatch', async () => { await lockedGold.addSlasher(CeloContractName.GovernanceSlasher) - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.removeSlasher(CeloContractName.DowntimeSlasher, 1), "Index doesn't match identifier" ) @@ -640,7 +646,7 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.slash( account, penalty, @@ -775,7 +781,7 @@ contract('LockedGold', (accounts: string[]) => { const penalty = value const reward = value / 2 - await assertRevertWithReason( + await assertTransactionRevertWithReason( lockedGold.slash( account, penalty, diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index f9c77f615dc..fe826dc3938 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -5,10 +5,10 @@ import { assertEqualBN, assertGteBN, assertLogMatches, - // tslint:disable-next-line: ordered-imports - assertRevertWithReason, - assertRevertWithoutReason, assertSameAddress, + // tslint:disable-next-line: ordered-imports + assertTransactionRevertWithReason, + assertTransactionRevertWithoutReason, timeTravel, } from '@celo/protocol/lib/test-utils' // tslint:disable-next-line: ordered-imports @@ -329,7 +329,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should emit safeTransfer logs on erc20 revert', async () => { const startBalanceFrom = await mockStableToken.balanceOf(releaseGoldInstance.address) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.genericTransfer( mockStableToken.address, receiver, @@ -343,7 +343,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert when attempting transfer of goldtoken from the release gold instance', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.genericTransfer(goldTokenInstance.address, receiver, transferAmount, { from: beneficiary, }), @@ -441,7 +441,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when releaseGold beneficiary is the null address', async () => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.beneficiary = NULL_ADDRESS - await assertRevertWithReason( + await assertTransactionRevertWithReason( createNewReleaseGoldInstance(releaseGoldSchedule, web3), 'The release schedule beneficiary cannot be the zero addresss' ) @@ -450,7 +450,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when releaseGold periods are zero', async () => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.numReleasePeriods = 0 - await assertRevertWithReason( + await assertTransactionRevertWithReason( createNewReleaseGoldInstance(releaseGoldSchedule, web3), 'There must be at least one releasing period' ) @@ -459,7 +459,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when released amount per period is zero', async () => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.amountReleasedPerPeriod = new BigNumber('0') - await assertRevertWithReason( + await assertTransactionRevertWithReason( createNewReleaseGoldInstance(releaseGoldSchedule, web3), 'The released amount per period must be greater than zero' ) @@ -469,7 +469,7 @@ contract('ReleaseGold', (accounts: string[]) => { const releaseGoldSchedule = _.clone(releaseGoldDefaultSchedule) releaseGoldSchedule.numReleasePeriods = Number.MAX_SAFE_INTEGER releaseGoldSchedule.amountReleasedPerPeriod = new BigNumber(2).pow(300) - await assertRevertWithReason( + await assertTransactionRevertWithReason( createNewReleaseGoldInstance(releaseGoldSchedule, web3), 'value out-of-bounds' ) @@ -489,7 +489,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert when setting a new beneficiary from the release owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setBeneficiary(newBeneficiary, { from: releaseOwner }), 'Ownable: caller is not the owner' ) @@ -522,7 +522,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if a non-beneficiary attempts account creation', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.createAccount({ from: accounts[2] }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -537,7 +537,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if anyone attempts account creation', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.createAccount({ from: beneficiary }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -581,7 +581,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if a non-beneficiary attempts to set the account', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -629,7 +629,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert to set the name, dataEncryptionKey and walletAddress of the account by a non-beneficiary', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -654,7 +654,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('reverts if anyone attempts to set the account', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -673,7 +673,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert to set the name, dataEncryptionKey and walletAddress of the account', async () => { const isAccount = await accountsInstance.isAccount(releaseGoldInstance.address) assert.isFalse(isAccount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccount( accountName, dataEncryptionKey, @@ -700,7 +700,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountName(accountName, { from: beneficiary }), 'Unknown account' ) @@ -720,7 +720,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set the name', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountName(accountName, { from: accounts[2] }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -733,7 +733,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if anyone attempts to set the name', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountName(accountName, { from: releaseOwner }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -754,7 +754,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when the releaseGold account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountWalletAddress( walletAddress, proofOfWalletOwnership.v, @@ -786,7 +786,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set the walletAddress', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountWalletAddress( walletAddress, proofOfWalletOwnership.v, @@ -813,7 +813,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if anyone attempts to set the walletAddress', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountWalletAddress( walletAddress, proofOfWalletOwnership.v, @@ -837,7 +837,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when the account has not been created', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: beneficiary }), 'Unknown account' ) @@ -857,7 +857,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set the metadataURL', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: accounts[2] }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -870,7 +870,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if anyone attempts to set the metadataURL', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountMetadataURL(metadataURL, { from: releaseOwner }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -903,7 +903,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if non-beneficiary attempts to set dataEncryptionKey', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountDataEncryptionKey(dataEncryptionKey, { from: accounts[2] }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -922,7 +922,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when the key is invalid', async () => { const invalidKey: any = '0x32132931293' - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setAccountDataEncryptionKey(invalidKey, { from: beneficiary }), 'data encryption key length <= 32' ) @@ -969,7 +969,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('cannot be lowered again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.setMaxDistribution(500, { from: releaseOwner }), 'Cannot set max distribution lower if already set to 1000' ) @@ -1046,7 +1046,7 @@ contract('ReleaseGold', (accounts: string[]) => { it(`should revert if the ${authorizationTestDescriptions[key].me} is an account`, async () => { await accountsInstance.createAccount({ from: authorized }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( authorizationTest.fn(authorized, sig.v, sig.r, sig.s, { from: beneficiary }), 'Cannot re-authorize address or locked gold account for another account' ) @@ -1060,7 +1060,7 @@ contract('ReleaseGold', (accounts: string[]) => { otherAccount ) await accountsInstance.createAccount({ from: otherAccount }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( authorizationTest.fn(otherAccount, otherSig.v, otherSig.r, otherSig.s, { from: beneficiary, }), @@ -1075,7 +1075,7 @@ contract('ReleaseGold', (accounts: string[]) => { releaseGoldInstance.address, nonVoter ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( authorizationTest.fn(authorized, incorrectSig.v, incorrectSig.r, incorrectSig.s, { from: beneficiary, }), @@ -1222,7 +1222,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when non-releaseOwner attempts to revoke the releaseGold', async () => { await createNewReleaseGoldInstance(releaseGoldDefaultSchedule, web3) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.revoke({ from: accounts[5] }), 'Sender must be the registered releaseOwner address' ) @@ -1231,7 +1231,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert if releaseGold is already revoked', async () => { await createNewReleaseGoldInstance(releaseGoldDefaultSchedule, web3) await releaseGoldInstance.revoke({ from: releaseOwner }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.revoke({ from: releaseOwner }), 'Release schedule instance must not already be revoked' ) @@ -1242,7 +1242,7 @@ contract('ReleaseGold', (accounts: string[]) => { releaseGoldSchedule.revocable = false releaseGoldSchedule.refundAddress = '0x0000000000000000000000000000000000000000' await createNewReleaseGoldInstance(releaseGoldSchedule, web3) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.revoke({ from: releaseOwner }), 'Release schedule instance must be revocable' ) @@ -1257,7 +1257,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when called before expiration time has passed', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.expire({ from: releaseOwner }), '`EXPIRATION_TIME` must have passed after the end of releasing' ) @@ -1275,7 +1275,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert before `EXPIRATION_TIME` after release schedule end', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.expire({ from: releaseOwner }), '`EXPIRATION_TIME` must have passed after the end of releasing' ) @@ -1289,7 +1289,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) describe('when not called by releaseOwner', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.expire(), 'Sender must be the registered releaseOwner address' ) @@ -1375,7 +1375,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when `expire` is called', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.expire({ from: releaseOwner }), 'Contract must be expirable' ) @@ -1399,14 +1399,14 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert when revoked but called by a non-releaseOwner', async () => { await releaseGoldInstance.revoke({ from: releaseOwner }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.refundAndFinalize({ from: accounts[5] }), 'Sender must be the releaseOwner and state must be revoked' ) }) it('should revert when non-revoked but called by a releaseOwner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.refundAndFinalize({ from: releaseOwner }), 'Sender must be the releaseOwner and state must be revoked' ) @@ -1488,7 +1488,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert if releaseGold instance is not an account', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.lockGold(lockAmount, { from: beneficiary, }), @@ -1498,7 +1498,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert if beneficiary tries to lock up more than there is remaining in the contract', async () => { await releaseGoldInstance.createAccount({ from: beneficiary }) - await assertRevertWithoutReason( + await assertTransactionRevertWithoutReason( releaseGoldInstance.lockGold(lockAmount.multipliedBy(1.1), { from: beneficiary, }) @@ -1507,7 +1507,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert if non-beneficiary tries to lock up any unlocked amount', async () => { await releaseGoldInstance.createAccount({ from: beneficiary }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.lockGold(lockAmount, { from: accounts[6] }), 'Sender must be the beneficiary and state must not be revoked' ) @@ -1562,7 +1562,7 @@ contract('ReleaseGold', (accounts: string[]) => { from: beneficiary, }) // unlock the latter - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.unlockGold(lockAmount, { from: accounts[5] }), 'Must be called by releaseOwner when revoked or beneficiary before revocation' ) @@ -1576,7 +1576,7 @@ contract('ReleaseGold', (accounts: string[]) => { from: beneficiary, }) // unlock the latter - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.unlockGold(lockAmount, { from: accounts[5] }), 'Must be called by releaseOwner when revoked or beneficiary before revocation' ) @@ -1596,7 +1596,7 @@ contract('ReleaseGold', (accounts: string[]) => { balanceRequirement ) // unlock the latter - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.unlockGold(lockAmount, { from: beneficiary }), "Either account doesn't have enough locked Celo or locked Celo is being used for voting." ) @@ -1634,7 +1634,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when it is before the availablity time', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdrawLockedGold(index, { from: beneficiary }), 'Pending withdrawal not available' ) @@ -1643,7 +1643,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when non-beneficiary attempts to withdraw the gold', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdrawLockedGold(index, { from: accounts[4] }), 'Must be called by releaseOwner when revoked or beneficiary before revocation' ) @@ -1653,7 +1653,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdrawLockedGold(index, { from: beneficiary }), 'Pending withdrawal not available' ) @@ -1752,7 +1752,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when relocking value greater than the value of the pending withdrawal', () => { const value = pendingWithdrawalValue + 1 it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.relockGold(index, value, { from: beneficiary }), 'Requested value larger than pending value' ) @@ -1762,7 +1762,7 @@ contract('ReleaseGold', (accounts: string[]) => { describe('when a pending withdrawal does not exist', () => { it('should revert', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.relockGold(index, pendingWithdrawalValue), 'Sender must be the beneficiary and state must not be revoked' ) @@ -1787,7 +1787,7 @@ contract('ReleaseGold', (accounts: string[]) => { await releaseGoldInstance.setMaxDistribution(1000, { from: releaseOwner }) const timeToTravel = 0.5 * HOUR await timeTravel(timeToTravel, web3) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(initialreleaseGoldAmount.div(20), { from: beneficiary }), 'Requested amount is greater than available released funds' ) @@ -1797,7 +1797,7 @@ contract('ReleaseGold', (accounts: string[]) => { await releaseGoldInstance.setMaxDistribution(1000, { from: releaseOwner }) const timeToTravel = 3 * MONTH + 1 * DAY await timeTravel(timeToTravel, web3) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(new BigNumber(0), { from: beneficiary }), 'Requested withdrawal amount must be greater than zero' ) @@ -1815,7 +1815,7 @@ contract('ReleaseGold', (accounts: string[]) => { const expectedWithdrawalAmount = await releaseGoldInstance.getCurrentReleasedTotalAmount() const beneficiaryBalanceAfter = await goldTokenInstance.balanceOf(beneficiary) assertEqualBN(expectedWithdrawalAmount, 0) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(expectedWithdrawalAmount, { from: beneficiary }), 'Requested withdrawal amount must be greater than zero' ) @@ -1932,7 +1932,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should not allow withdrawal of more than 50% gold', async () => { const unexpectedWithdrawalAmount = TOTAL_AMOUNT.plus(ONE_GOLDTOKEN).div(2).plus(1) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(unexpectedWithdrawalAmount, { from: beneficiary }), 'Requested amount is greater than available released funds' ) @@ -1959,7 +1959,7 @@ contract('ReleaseGold', (accounts: string[]) => { const expectedWithdrawalAmount = TOTAL_AMOUNT.div(2) await releaseGoldInstance.withdraw(expectedWithdrawalAmount, { from: beneficiary }) const unexpectedWithdrawalAmount = 1 - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(unexpectedWithdrawalAmount, { from: beneficiary }), 'Requested amount exceeds current alloted maximum distribution' ) @@ -1993,7 +1993,7 @@ contract('ReleaseGold', (accounts: string[]) => { await timeTravel(timeToTravel, web3) await releaseGoldInstance.revoke({ from: releaseOwner }) const [, , expectedWithdrawalAmount] = await releaseGoldInstance.revocationInfo() - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw( new BigNumber(expectedWithdrawalAmount).multipliedBy(1.1), { @@ -2053,7 +2053,7 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert on withdrawal of more than 50%', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(initialreleaseGoldAmount, { from: beneficiary }), 'Requested amount exceeds current alloted maximum distribution' ) @@ -2089,13 +2089,13 @@ contract('ReleaseGold', (accounts: string[]) => { }) it('should revert on withdraw of any amount', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(initialreleaseGoldAmount.multipliedBy(0.5), { from: beneficiary, }), 'Requested withdrawal before liquidity provision is met' ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( releaseGoldInstance.withdraw(initialreleaseGoldAmount, { from: beneficiary }), 'Requested withdrawal before liquidity provision is met' ) diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts index a1859da25ab..259651d4086 100644 --- a/packages/protocol/test/identity/attestations.ts +++ b/packages/protocol/test/identity/attestations.ts @@ -6,7 +6,7 @@ import { assertEqualBN, assertLogMatches2, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, getDerivedKey, KeyOffsets, unlockAndAuthorizeKey, @@ -152,7 +152,7 @@ contract('Attestations', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.initialize( registry.address, attestationExpiryBlocks, @@ -186,7 +186,7 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when set by a non-owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.setAttestationExpiryBlocks(newMaxNumBlocksPerAttestation, { from: accounts[1], }), @@ -205,14 +205,14 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when the fee is being set to 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.setAttestationRequestFee(mockERC20Token.address, 0), 'You have to specify a fee greater than 0' ) }) it('should not be settable by a non-owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.setAttestationRequestFee(mockERC20Token.address, newAttestationFee, { from: accounts[1], }), @@ -257,7 +257,7 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when set by a non-owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.setSelectIssuersWaitBlocks(newSelectIssuersWaitBlocks, { from: accounts[1], }), @@ -285,7 +285,7 @@ contract('Attestations', (accounts: string[]) => { }) it('should revert when set by a non-owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.setMaxAttestations(newMaxAttestations, { from: accounts[1], }), @@ -355,7 +355,7 @@ contract('Attestations', (accounts: string[]) => { accounts ) const signer = await accountsInstance.getVoteSigner(issuer) - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.withdraw(mockERC20Token.address, { from: signer }), 'not active authorized signer for role' ) @@ -378,7 +378,7 @@ contract('Attestations', (accounts: string[]) => { }) it('should not allow someone with no pending withdrawals to withdraw', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( attestations.withdraw(mockERC20Token.address, { from: await getNonIssuer() }), 'value was negative/zero' ) diff --git a/packages/protocol/test/identity/escrow.ts b/packages/protocol/test/identity/escrow.ts index b398510b18c..24779d8d544 100644 --- a/packages/protocol/test/identity/escrow.ts +++ b/packages/protocol/test/identity/escrow.ts @@ -5,7 +5,7 @@ import { assertEqualBN, assertLogMatches2, assertObjectWithBNEqual, - assertRevertWithReason, + assertTransactionRevertWithReason, assumeOwnership, timeTravel, } from '@celo/protocol/lib/test-utils' @@ -120,7 +120,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason(escrow.initialize(), 'contract already initialized') + await assertTransactionRevertWithReason(escrow.initialize(), 'contract already initialized') }) }) @@ -132,7 +132,7 @@ contract('Escrow', (accounts: string[]) => { }) it('reverts if non-owner attempts to add trustedIssuer', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: trustedIssuer1 }), 'Ownable: caller is not the owner' ) @@ -149,7 +149,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow an empty address to be set as a trustedIssuer', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.addDefaultTrustedIssuer(NULL_ADDRESS, { from: owner }), "trustedIssuer can't be null" ) @@ -157,7 +157,7 @@ contract('Escrow', (accounts: string[]) => { it('should not allow a trustedIssuer to be added twice', async () => { await escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: owner }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: owner }), 'trustedIssuer already in defaultTrustedIssuers' ) @@ -181,7 +181,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow more trusted issuers to be added', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.addDefaultTrustedIssuer(trustedIssuer1, { from: owner }), "defaultTrustedIssuers.length can't exceed allowed number of trustedIssuers" ) @@ -209,7 +209,7 @@ contract('Escrow', (accounts: string[]) => { }) it('reverts if non-owner attempts to remove trustedIssuer', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.removeDefaultTrustedIssuer(trustedIssuer1, 0, { from: trustedIssuer1 }), 'Ownable: caller is not the owner' ) @@ -226,14 +226,14 @@ contract('Escrow', (accounts: string[]) => { }) it('should revert if index is invalid', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.removeDefaultTrustedIssuer(trustedIssuer1, 1, { from: owner }), 'index is invalid' ) }) it('should revert if trusted issuer does not match index', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.removeDefaultTrustedIssuer(trustedIssuer2, 0, { from: owner }), 'trustedIssuer does not match address found at defaultTrustedIssuers' ) @@ -514,7 +514,7 @@ contract('Escrow', (accounts: string[]) => { from: sender, } ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -535,7 +535,7 @@ contract('Escrow', (accounts: string[]) => { const repeatedTrustedIssuers = Array.from({ length: (await escrow.MAX_TRUSTED_ISSUERS_PER_PAYMENT()).toNumber() + 1, }).fill(trustedIssuer1) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -551,7 +551,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow a transfer if token is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, NULL_ADDRESS, @@ -569,7 +569,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow a transfer if value is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -587,7 +587,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow a transfer if expirySeconds is 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -605,7 +605,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow a transfer if identifier is empty but minAttestations is > 0', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( NULL_BYTES32, mockERC20Token.address, @@ -623,7 +623,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow a transfer if identifier is empty but trustedIssuers are provided', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( NULL_BYTES32, mockERC20Token.address, @@ -641,7 +641,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow setting trustedIssuers without minAttestations', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -659,7 +659,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should revert if transfer value exceeds balance', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.transferWithTrustedIssuers( aPhoneHash, mockERC20Token.address, @@ -855,7 +855,7 @@ contract('Escrow', (accounts: string[]) => { receiver, uniquePaymentIDWithdraw ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.withdraw(uniquePaymentIDWithdraw, parsedSig.v, parsedSig.r, parsedSig.s, { from: receiver, }), @@ -979,7 +979,7 @@ contract('Escrow', (accounts: string[]) => { receiver, uniquePaymentIDWithdraw ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.withdraw(uniquePaymentIDWithdraw, parsedSig.v, parsedSig.r, parsedSig.s, { from: sender, }), @@ -1008,7 +1008,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow a user to withdraw a payment if they have fewer than minAttestations', async () => { await completeAttestations(receiver, aPhoneHash, minAttestations - 1) - await assertRevertWithReason( + await assertTransactionRevertWithReason( withdrawAndCheckState(sender, receiver, aPhoneHash, uniquePaymentIDWithdraw, [], []), 'This account does not have the required attestations to withdraw this payment' ) @@ -1064,7 +1064,7 @@ contract('Escrow', (accounts: string[]) => { describe('when { it('should not allow withdrawal if no attestations exist in FederatedAttestations', async () => { await completeAttestations(receiver, aPhoneHash, minAttestations - 1) - await assertRevertWithReason( + await assertTransactionRevertWithReason( withdrawAndCheckState( sender, receiver, @@ -1118,7 +1118,7 @@ contract('Escrow', (accounts: string[]) => { ) }) it('should not allow a user to withdraw a payment if no attestations exist for trustedIssuers', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( withdrawAndCheckState(sender, receiver, aPhoneHash, uniquePaymentIDWithdraw, [], []), 'This account does not have the required attestations to withdraw this payment' ) @@ -1240,7 +1240,7 @@ contract('Escrow', (accounts: string[]) => { await escrow.withdraw(uniquePaymentIDRevoke, parsedSig1.v, parsedSig1.r, parsedSig1.s, { from: receiver, }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.revoke(uniquePaymentIDRevoke, { from: sender }), 'Only sender of payment can attempt to revoke payment.' ) @@ -1249,7 +1249,7 @@ contract('Escrow', (accounts: string[]) => { it('should not allow receiver to redeem payment after sender revokes it', async () => { await timeTravel(oneDayInSecs, web3) await escrow.revoke(uniquePaymentIDRevoke, { from: sender }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.withdraw(uniquePaymentIDRevoke, parsedSig1.v, parsedSig1.r, parsedSig1.s, { from: receiver, }), @@ -1258,7 +1258,7 @@ contract('Escrow', (accounts: string[]) => { }) it('should not allow sender to revoke payment before payment has expired', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.revoke(uniquePaymentIDRevoke, { from: sender }), 'Transaction not redeemable for sender yet' ) @@ -1266,7 +1266,7 @@ contract('Escrow', (accounts: string[]) => { it('should not allow receiver to use revoke function', async () => { await timeTravel(oneDayInSecs, web3) - await assertRevertWithReason( + await assertTransactionRevertWithReason( escrow.revoke(uniquePaymentIDRevoke, { from: receiver }), 'Only sender of payment can attempt to revoke payment' ) diff --git a/packages/protocol/test/identity/federatedattestations.ts b/packages/protocol/test/identity/federatedattestations.ts index 0c740294171..b9a582bf20a 100644 --- a/packages/protocol/test/identity/federatedattestations.ts +++ b/packages/protocol/test/identity/federatedattestations.ts @@ -10,8 +10,8 @@ import { assertGteBN, assertLogMatches2, assertRevert, - assertRevertWithReason, assertThrowsAsync, + assertTransactionRevertWithReason, assumeOwnership, } from '@celo/protocol/lib/test-utils' import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils' @@ -230,7 +230,7 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.initialize(), 'contract already initialized' ) @@ -671,7 +671,7 @@ contract('FederatedAttestations', (accounts: string[]) => { chainId, federatedAttestations.address ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -688,7 +688,7 @@ contract('FederatedAttestations', (accounts: string[]) => { it('should revert if signer has been deregistered', async () => { await accountsInstance.removeSigner(signer1, signerRole, { from: issuer1 }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -708,7 +708,7 @@ contract('FederatedAttestations', (accounts: string[]) => { await federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: issuer1, }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -769,7 +769,7 @@ contract('FederatedAttestations', (accounts: string[]) => { 1, federatedAttestations.address ) - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -871,7 +871,7 @@ contract('FederatedAttestations', (accounts: string[]) => { { from: issuer1 } ) } - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.registerAttestationAsIssuer(identifier1, account1, nowUnixTime, { from: issuer1, }), @@ -893,7 +893,7 @@ contract('FederatedAttestations', (accounts: string[]) => { { from: issuer1 } ) } - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.registerAttestationAsIssuer(identifier1, account1, nowUnixTime, { from: issuer1, }), @@ -936,7 +936,7 @@ contract('FederatedAttestations', (accounts: string[]) => { it('should revert when signer has been deregistered', async () => { await accountsInstance.removeSigner(signer1, signerRole, { from: issuer1 }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: signer1, }), @@ -987,7 +987,7 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it("should revert when revoking an attestation that doesn't exist", async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.revokeAttestation(identifier1, issuer1, accounts[5], { from: issuer1, }), @@ -1033,7 +1033,7 @@ contract('FederatedAttestations', (accounts: string[]) => { }) it('should revert if an invalid user attempts to revoke the attestation', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: accounts[5], }), @@ -1045,7 +1045,7 @@ contract('FederatedAttestations', (accounts: string[]) => { await federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: issuer1, }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.registerAttestation( identifier1, issuer1, @@ -1185,7 +1185,7 @@ contract('FederatedAttestations', (accounts: string[]) => { it('should revert if deregistered signer of issuer batch revokes attestations', async () => { await accountsInstance.removeSigner(signer1, signerRole, { from: issuer1 }) - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.batchRevokeAttestations( issuer1, [identifier2, identifier1], @@ -1196,7 +1196,7 @@ contract('FederatedAttestations', (accounts: string[]) => { ) }) it('should revert if identifiers.length != accounts.length', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.batchRevokeAttestations( issuer1, [identifier2], @@ -1207,7 +1207,7 @@ contract('FederatedAttestations', (accounts: string[]) => { ) }) it('should revert if one of the (identifier, account) pairs is invalid', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( federatedAttestations.batchRevokeAttestations( issuer1, // (identifier2, account1) does not exist diff --git a/packages/protocol/test/identity/identityproxy.ts b/packages/protocol/test/identity/identityproxy.ts index f274486a6af..378dc74c1e9 100644 --- a/packages/protocol/test/identity/identityproxy.ts +++ b/packages/protocol/test/identity/identityproxy.ts @@ -1,4 +1,4 @@ -import { assertRevertWithReason } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { IdentityProxyContract, IdentityProxyInstance, @@ -38,7 +38,7 @@ contract('IdentityProxy', (accounts: string[]) => { it('cannot be called by anyone other than the original deployer', async () => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - await assertRevertWithReason( + await assertTransactionRevertWithReason( identityProxy.makeCall(identityProxyTest.address, txData, { from: accounts[1] }), 'Only callable by original deployer' ) diff --git a/packages/protocol/test/identity/identityproxyhub.ts b/packages/protocol/test/identity/identityproxyhub.ts index 9cc370e5f06..6e75f67203b 100644 --- a/packages/protocol/test/identity/identityproxyhub.ts +++ b/packages/protocol/test/identity/identityproxyhub.ts @@ -1,4 +1,4 @@ -import { assertRevertWithoutReason } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithoutReason } from '@celo/protocol/lib/test-utils' import { IdentityProxyContract, IdentityProxyHubContract, @@ -170,7 +170,7 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 - await assertRevertWithoutReason( + await assertTransactionRevertWithoutReason( identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) ) }) @@ -190,7 +190,7 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 - await assertRevertWithoutReason( + await assertTransactionRevertWithoutReason( identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) ) }) @@ -208,7 +208,7 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 - await assertRevertWithoutReason( + await assertTransactionRevertWithoutReason( identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) ) }) diff --git a/packages/protocol/test/identity/odispayments.ts b/packages/protocol/test/identity/odispayments.ts index 25a0f1c3774..b10f542879d 100644 --- a/packages/protocol/test/identity/odispayments.ts +++ b/packages/protocol/test/identity/odispayments.ts @@ -2,7 +2,7 @@ import { CeloContractName } from '@celo/protocol/lib/registry-utils' import { assertEqualBN, assertLogMatches2, - assertRevertWithReason, + assertTransactionRevertWithReason, assumeOwnership, } from '@celo/protocol/lib/test-utils' import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils' @@ -74,7 +74,10 @@ contract('OdisPayments', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason(odisPayments.initialize(), 'contract already initialized') + await assertTransactionRevertWithReason( + odisPayments.initialize(), + 'contract already initialized' + ) }) }) @@ -146,7 +149,7 @@ contract('OdisPayments', (accounts: string[]) => { }) it('should revert if transfer fails', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( odisPayments.payInCUSD(sender, valueApprovedForTransfer + 1, { from: sender }), 'SafeERC20: low-level call failed' ) diff --git a/packages/protocol/test/identity/random.ts b/packages/protocol/test/identity/random.ts index 5b384ceaa75..35763743a8b 100644 --- a/packages/protocol/test/identity/random.ts +++ b/packages/protocol/test/identity/random.ts @@ -2,7 +2,7 @@ import { assertContainSubset, assertEqualBN, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, currentEpochNumber, EPOCH, timeTravel, @@ -43,7 +43,7 @@ contract('Random', (accounts: string[]) => { }) it('only owner can set', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( random.setRandomnessBlockRetentionWindow(1000, { from: accounts[1] }), 'Ownable: caller is not the owner' ) @@ -177,7 +177,7 @@ contract('Random', (accounts: string[]) => { await random.setRandomnessBlockRetentionWindow(256) }) it('cannot add zero commitment', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( random.testRevealAndCommit('0x0', hash0, accounts[0]), 'cannot commit zero randomness' ) diff --git a/packages/protocol/test/stability/grandamento.ts b/packages/protocol/test/stability/grandamento.ts index c2ffd1ca72c..1f725fd6923 100644 --- a/packages/protocol/test/stability/grandamento.ts +++ b/packages/protocol/test/stability/grandamento.ts @@ -3,7 +3,7 @@ import { assertEqualBN, assertEqualBNArray, assertLogMatches2, - assertRevertWithReason, + assertTransactionRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { fromFixed, reciprocal, toFixed } from '@celo/utils/lib/fixidity' @@ -224,7 +224,7 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts when called again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.initialize( registry.address, approver, @@ -311,7 +311,7 @@ contract('GrandaMento', (accounts: string[]) => { await realStableToken.mint(owner, sellAmount) await realStableToken.approve(grandaMento.address, sellAmount) - await assertRevertWithReason( + await assertTransactionRevertWithReason( createExchangeProposal(false, owner, stableTokenRegistryId, sellAmount), 'overflow at divide' ) @@ -411,7 +411,7 @@ contract('GrandaMento', (accounts: string[]) => { ? getSellAmount(minExchangeAmount, fromFixed(oracleRate), spread).minus(1) : minExchangeAmount.minus(1) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.createExchangeProposal(stableTokenRegistryId, _sellAmount, sellCelo), 'Stable token exchange amount not within limits' ) @@ -421,7 +421,7 @@ contract('GrandaMento', (accounts: string[]) => { const _sellAmount = sellCelo ? getSellAmount(maxExchangeAmount, fromFixed(oracleRate), spread).plus(1) : maxExchangeAmount.plus(1) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.createExchangeProposal(stableTokenRegistryId, _sellAmount, sellCelo), 'Stable token exchange amount not within limits' ) @@ -431,7 +431,7 @@ contract('GrandaMento', (accounts: string[]) => { // Add an entry for StableTokenEUR so the tx doesn't revert // as a result of the registry lookup. await registry.setAddressFor(CeloContractName.StableTokenEUR, stableToken.address) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.createExchangeProposal( CeloContractName.StableTokenEUR, stableTokenSellAmount, @@ -443,7 +443,7 @@ contract('GrandaMento', (accounts: string[]) => { it('reverts when there is no oracle price for the stable token', async () => { await sortedOracles.setMedianRate(stableToken.address, 0) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.createExchangeProposal( CeloContractName.StableToken, stableTokenSellAmount, @@ -512,7 +512,7 @@ contract('GrandaMento', (accounts: string[]) => { // Just in excess of the max change const newCeloStableTokenRate = defaultCeloStableTokenRate.times(1 + rateChange) await sortedOracles.setMedianRate(stableToken.address, newCeloStableTokenRate) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.approveExchangeProposal(proposalId, { from: approver }), 'CELO exchange rate is too different from the proposed price' ) @@ -527,7 +527,7 @@ contract('GrandaMento', (accounts: string[]) => { // As a sanity check, make sure the exchange is in the None state, // indicating it doesn't exist. assert.equal(proposal.state, ExchangeProposalState.None) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.approveExchangeProposal(nonexistentProposalId, { from: approver }), 'Proposal must be in Proposed state' ) @@ -535,7 +535,7 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts if called by anyone other than the approver', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.approveExchangeProposal(proposalId, { from: accounts[2] }), 'Sender must be approver' ) @@ -558,7 +558,7 @@ contract('GrandaMento', (accounts: string[]) => { // Get the exchange into the Approved state. await grandaMento.approveExchangeProposal(1, { from: approver }) // Try to have Alice cancel it when the exchange proposal is in the Approved state. - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.cancelExchangeProposal(1, { from: alice }), 'Sender must be owner' ) @@ -581,7 +581,7 @@ contract('GrandaMento', (accounts: string[]) => { it('reverts when the exchange proposal is not in the Approved state', async () => { // Try to cancel it when the exchange proposal is in the Proposed state. - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.cancelExchangeProposal(1, { from: owner }), 'Sender must be exchanger' ) @@ -680,14 +680,14 @@ contract('GrandaMento', (accounts: string[]) => { it('reverts when called by a sender that is not permitted', async () => { await createExchangeProposal(false, alice) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.cancelExchangeProposal(1, { from: approver }), 'Sender must be exchanger' ) }) it('reverts when the proposalId does not exist', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.cancelExchangeProposal(1, { from: approver }), 'Proposal must be in Proposed or Approved state' ) @@ -853,7 +853,7 @@ contract('GrandaMento', (accounts: string[]) => { // Traveling vetoPeriodSeconds - 1 can be flaky due to block times, // so instead just subtract by 10 to be safe. await timeTravel(vetoPeriodSeconds - 10, web3) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.executeExchangeProposal(1), 'Veto period not elapsed' ) @@ -861,7 +861,7 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts when the proposal is not in the Approved state', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.executeExchangeProposal(1), 'Proposal must be in Approved state' ) @@ -873,7 +873,7 @@ contract('GrandaMento', (accounts: string[]) => { // Execute it await grandaMento.executeExchangeProposal(1) // Try executing it again - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.executeExchangeProposal(1), 'Proposal must be in Approved state' ) @@ -881,7 +881,7 @@ contract('GrandaMento', (accounts: string[]) => { it('reverts when the proposalId does not exist', async () => { // No proposal exists with the ID 1 - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.executeExchangeProposal(1), 'Proposal must be in Approved state' ) @@ -930,14 +930,14 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts if the exchange proposal is active', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.removeFromActiveProposalIdsSuperset(0), 'Exchange proposal not inactive' ) }) it('reverts if the provided index is out of bounds', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.removeFromActiveProposalIdsSuperset(3), 'Index out of bounds' ) @@ -1028,7 +1028,7 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts when the sender is not the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setApprover(newApprover, { from: accounts[1] }), 'Ownable: caller is not the owner' ) @@ -1058,7 +1058,7 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts when the sender is not the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setMaxApprovalExchangeRateChange(newMaxApprovalExchangeRateChangeFixed, { from: accounts[1], }), @@ -1086,14 +1086,14 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts when the spread is more than 1', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setSpread(toFixed(1001 / 1000)), 'Spread must be less than or equal to 1' ) }) it('reverts when the sender is not the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setSpread(newSpreadFixed, { from: accounts[1] }), 'Ownable: caller is not the owner' ) @@ -1129,14 +1129,14 @@ contract('GrandaMento', (accounts: string[]) => { }) it('reverts when the minExchangeAmount is greater than the maxExchangeAmount', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setStableTokenExchangeLimits(stableTokenRegistryId, max, min), 'Min exchange amount must not be greater than max' ) }) it('reverts when the sender is not the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setStableTokenExchangeLimits(stableTokenRegistryId, min, max, { from: accounts[1], }), @@ -1159,7 +1159,7 @@ contract('GrandaMento', (accounts: string[]) => { // Add an entry for StableTokenEUR so the tx doesn't revert // as a result of the registry lookup. await registry.setAddressFor(CeloContractName.StableTokenEUR, stableToken.address) - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.getStableTokenExchangeLimits(CeloContractName.StableTokenEUR), 'Max stable token exchange amount must be defined' ) @@ -1185,14 +1185,14 @@ contract('GrandaMento', (accounts: string[]) => { it('reverts when the veto period is greater than 4 weeks', async () => { const fourWeeks = SECONDS_IN_A_WEEK * 4 - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setVetoPeriodSeconds(fourWeeks + 1), 'Veto period cannot exceed 4 weeks' ) }) it('reverts when the sender is not the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( grandaMento.setVetoPeriodSeconds(newVetoPeriodSeconds, { from: accounts[1] }), 'Ownable: caller is not the owner' ) diff --git a/packages/protocol/test/stability/sortedoracles.ts b/packages/protocol/test/stability/sortedoracles.ts index 1613042c414..519af36abc4 100644 --- a/packages/protocol/test/stability/sortedoracles.ts +++ b/packages/protocol/test/stability/sortedoracles.ts @@ -2,7 +2,7 @@ import { NULL_ADDRESS } from '@celo/base/lib/address' import { assertEqualBN, assertLogMatches2, - assertRevertWithReason, + assertTransactionRevertWithReason, matchAddress, matchAny, timeTravel, @@ -41,7 +41,7 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.initialize(aReportExpiry), 'contract already initialized' ) @@ -69,7 +69,7 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when called by a non-owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.setReportExpiry(newReportExpiry, { from: accounts[1] }), 'Ownable: caller is not the owner' ) @@ -99,7 +99,7 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when called by a non-owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.setReportExpiry(newReportExpiry, { from: accounts[1] }), 'Ownable: caller is not the owner' ) @@ -126,14 +126,14 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when token is the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.addOracle(NULL_ADDRESS, anOracle), 'token addr was null or oracle addr was null or oracle addr is not an oracle for token addr' ) }) it('should revert when the oracle is the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.addOracle(aToken, NULL_ADDRESS), 'token addr was null or oracle addr was null or oracle addr is not an oracle for token addr' ) @@ -141,14 +141,14 @@ contract('SortedOracles', (accounts: string[]) => { it('should revert when the oracle has already been added', async () => { await sortedOracles.addOracle(aToken, anOracle) - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.addOracle(aToken, anOracle), 'token addr was null or oracle addr was null or oracle addr is not an oracle for token addr' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.addOracle(aToken, anOracle, { from: accounts[1] }), 'Ownable: caller is not the owner' ) @@ -183,7 +183,7 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when no report exists', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.removeExpiredReports(aToken, 1), 'token addr null or trying to remove too many reports' ) @@ -197,7 +197,7 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when only 1 report exists', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.removeExpiredReports(aToken, 1), 'token addr null or trying to remove too many reports' ) @@ -227,7 +227,7 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when n>=numTimestamps', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.removeExpiredReports(aToken, 5), 'token addr null or trying to remove too many reports' ) @@ -468,21 +468,21 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when the wrong index is provided', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.removeOracle(aToken, anOracle, 1), 'token addr null or oracle addr null or index of token oracle not mapped to oracle addr' ) }) it('should revert when the wrong address is provided', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.removeOracle(aToken, accounts[0], 0), 'token addr null or oracle addr null or index of token oracle not mapped to oracle addr' ) }) it('should revert when called by anyone other than the owner', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.removeOracle(aToken, anOracle, 0, { from: accounts[1] }), 'Ownable: caller is not the owner' ) @@ -551,7 +551,7 @@ contract('SortedOracles', (accounts: string[]) => { }) it('should revert when called by a non-oracle', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( sortedOracles.report(aToken, value, NULL_ADDRESS, NULL_ADDRESS), 'sender was not an oracle for token addr' ) diff --git a/packages/protocol/test/stability/stabletoken.ts b/packages/protocol/test/stability/stabletoken.ts index 5e623f52486..b36b037174c 100644 --- a/packages/protocol/test/stability/stabletoken.ts +++ b/packages/protocol/test/stability/stabletoken.ts @@ -4,7 +4,7 @@ import { assertLogMatches, assertLogMatches2, assertRevert, - assertRevertWithReason, + assertTransactionRevertWithReason, timeTravel, } from '@celo/protocol/lib/test-utils' import { fixed1, fromFixed, toFixed } from '@celo/utils/lib/fixidity' @@ -92,7 +92,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.initialize( 'Celo Dollar', 'cUSD', @@ -119,7 +119,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow other users to set registry', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.setRegistry(anAddress, { from: nonOwner }), 'Ownable: caller is not the owner' ) @@ -169,7 +169,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow anyone else to mint', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.mint(validators, amountToMint, { from: accounts[3] }), 'Sender not authorized to mint' ) @@ -201,7 +201,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.transferWithComment(NULL_ADDRESS, 1, comment), 'transfer attempted to reserved address 0x0' ) @@ -209,7 +209,7 @@ contract('StableToken', (accounts: string[]) => { it('should not allow transferring more than the owner has', async () => { const value = (await stableToken.balanceOf(sender)).toNumber() + 1 - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.transferWithComment(receiver, value, comment), 'transfer value exceeded balance of sender.' ) @@ -288,7 +288,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should revert when a zero rate is provided', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.setInflationParameters(toFixed(0), SECONDS_IN_A_WEEK), 'Must provide a non-zero inflation rate.' ) @@ -427,7 +427,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow anyone else to burn', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.burn(amountToBurn, { from: accounts[2] }), 'Sender not authorized to burn' ) @@ -583,7 +583,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.transfer(NULL_ADDRESS, transferAmount), 'transfer attempted to reserved address 0x0' ) @@ -593,7 +593,7 @@ contract('StableToken', (accounts: string[]) => { // We try to send four more tokens than the sender has, in case they happen to mine the // block with this transaction, which will reward them with 3 tokens. const value = (await stableToken.balanceOf(sender)).toNumber() + 4 - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.transfer(receiver, value), 'transfer value exceeded balance of sender' ) @@ -614,7 +614,7 @@ contract('StableToken', (accounts: string[]) => { }) it('should not allow transferring to the null address', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.transferFrom(sender, NULL_ADDRESS, transferAmount, { from: receiver }), 'transfer attempted to reserved address 0x0' ) @@ -625,14 +625,14 @@ contract('StableToken', (accounts: string[]) => { // block with this transaction, which will reward them with 3 tokens. const value = (await stableToken.balanceOf(sender)).toNumber() + 4 await stableToken.approve(receiver, value) - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.transferFrom(sender, receiver, value, { from: receiver }), 'transfer value exceeded balance of sender' ) }) it('should not allow transferring more than the spender is allowed', async () => { - await assertRevertWithReason( + await assertTransactionRevertWithReason( stableToken.transferFrom(sender, receiver, 2, { from: receiver, }), From 1c2431e7f37d785240aa9efd23adb24bd842c793 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 13:36:57 -0400 Subject: [PATCH 106/184] fixed typing ignore --- packages/protocol/test/governance/voting/lockedgold.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/test/governance/voting/lockedgold.ts b/packages/protocol/test/governance/voting/lockedgold.ts index 8a1abf9114a..b45700e0f5d 100644 --- a/packages/protocol/test/governance/voting/lockedgold.ts +++ b/packages/protocol/test/governance/voting/lockedgold.ts @@ -192,8 +192,8 @@ contract('LockedGold', (accounts: string[]) => { }) it('should revert when the account does not exist', async () => { - // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails await assertTransactionRevertWithReason( + // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails lockedGold.lock({ value, from: accounts[1] }), 'not account' ) From ce551713a58d0ac47dfacf8c41b96a4c3377f387 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 13:50:29 -0400 Subject: [PATCH 107/184] specified gas, as gas estimations fails --- packages/sdk/contractkit/src/identity/metadata.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sdk/contractkit/src/identity/metadata.test.ts b/packages/sdk/contractkit/src/identity/metadata.test.ts index 934aaecff06..94c28439349 100644 --- a/packages/sdk/contractkit/src/identity/metadata.test.ts +++ b/packages/sdk/contractkit/src/identity/metadata.test.ts @@ -45,18 +45,18 @@ testWithGanache('Metadata', (web3) => { if (action === 'vote') { await ( await accounts.authorizeVoteSigner(signer, pop) - ).sendAndWaitForReceipt({ from: address, gas: 19000000 }) + ).sendAndWaitForReceipt({ from: address, gas: 13000000 }) } else if (action === 'validator') { await ( await accounts.authorizeValidatorSigner(signer, pop, validator) ).sendAndWaitForReceipt({ from: address, - gas: 19000000, + gas: 13000000, }) } else if (action === 'attestation') { await ( await accounts.authorizeAttestationSigner(signer, pop) - ).sendAndWaitForReceipt({ from: address, gas: 19000000 }) + ).sendAndWaitForReceipt({ from: address, gas: 13000000 }) } await metadata.addClaim(createNameClaim(name), NativeSigner(kit.connection.sign, signer)) const serializedMetadata = metadata.toString() From f39af3bae5881e3d1ab4eafa43f31ca0b92d0cc2 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 16:08:01 -0400 Subject: [PATCH 108/184] updated revert message in test --- packages/protocol/test/common/accounts.ts | 2 +- packages/protocol/test/common/goldtoken.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index b697d27f9b0..e1940fb5bea 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -565,7 +565,7 @@ contract('Accounts', (accounts: string[]) => { it('should revert', async () => { await assertTransactionRevertWithReason( accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), - 'Unknown account' + 'Register with createAccount to set account name' ) }) }) diff --git a/packages/protocol/test/common/goldtoken.ts b/packages/protocol/test/common/goldtoken.ts index b816f17132f..9845fbb15b7 100644 --- a/packages/protocol/test/common/goldtoken.ts +++ b/packages/protocol/test/common/goldtoken.ts @@ -236,7 +236,7 @@ contract('GoldToken', (accounts: string[]) => { goldToken.transferFrom(sender, receiver, ONE_GOLDTOKEN.plus(1), { from: receiver, }), - "transfer value exceeded sender's allowance for recipient" + "transfer value exceeded sender's allowance for spender" ) }) }) From de797fabc059c2222507c9f4b01b2c1438a01335 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 16:11:38 -0400 Subject: [PATCH 109/184] updated yarn lock --- yarn.lock | 214 ++++++++++++++++++++---------------------------------- 1 file changed, 79 insertions(+), 135 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7516651fff4..47159a47794 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1706,10 +1706,10 @@ resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz#5ce13fc1c527ad36f1bb1322c4492680a6cf4964" integrity sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g== -"@firebase/component@0.5.7": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.7.tgz#a50c5fbd14a2136a99ade6f59f53498729c0f174" - integrity sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg== +"@firebase/component@0.5.13": + version "0.5.13" + resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.13.tgz#65a382e83bddd109380c9aa1f280791b1b4567c4" + integrity sha512-hxhJtpD8Ppf/VU2Rlos6KFCEV77TGIGD5bJlkPK1+B/WUe0mC6dTjW7KhZtXTc+qRBp9nFHWcsIORnT8liHP9w== dependencies: "@firebase/util" "1.5.2" tslib "^2.1.0" @@ -1726,10 +1726,10 @@ "@firebase/util" "1.5.2" tslib "^2.1.0" -"@firebase/database-types@0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.1.tgz#0cab989e8154d812b535d80f23c1578b1d391f5f" - integrity sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ== +"@firebase/database-types@0.9.7": + version "0.9.7" + resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.7.tgz#c5ee0ea9bb2703a13c1c47fe880fc577d5ce7f33" + integrity sha512-EFhgL89Fz6DY3kkB8TzdHvdu8XaqqvzcF2DLVOXEnQ3Ms7L755p5EO42LfxXoJqb9jKFvgLpFmKicyJG25WFWw== dependencies: "@firebase/app-types" "0.7.0" "@firebase/util" "1.5.2" @@ -1753,24 +1753,24 @@ faye-websocket "0.11.4" tslib "^2.1.0" -"@firebase/logger@0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.0.tgz#a3992e40f62c10276dbfcb8b4ab376b7e25d7fd9" - integrity sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA== +"@firebase/logger@0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.2.tgz#5046ffa8295c577846d54b6ca95645a03809800e" + integrity sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA== dependencies: tslib "^2.1.0" -"@firebase/util@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.4.0.tgz#81e985adba44b4d1f21ec9f5af9628d505891de8" - integrity sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A== +"@firebase/util@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.5.2.tgz#bdd2bc11c956a8a6a0fa25fbd752a13e033558bc" + integrity sha512-YvBH2UxFcdWG2HdFnhxZptPl2eVFlpOyTH66iDo13JPEYraWzWToZ5AMTtkyRHVmu7sssUpQlU9igy1KET7TOw== dependencies: tslib "^2.1.0" -"@google-cloud/common@^0.31.0": - version "0.31.0" - resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-0.31.0.tgz#51a82d681043e2718bd32708586d3131b019d7a8" - integrity sha512-mO7WFavzqmr24btNb2zimUh+M3fGnIKGbkR1VT6ZG3yDV+S7BiZPmPiFHKRJVrxwi5sA9U6X6fpNpHgj7j2a2w== +"@ganache/console.log@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@ganache/console.log/-/console.log-0.2.0.tgz#32ea0df806ed735d61bd0537d7b7fc350e511479" + integrity sha512-+SNBUZzrbe4DE4F0jdl9SU8w3ek5k4cUE73ttUFweo8FaKEDQsMbFjZ3ZU0LM6QM/zCMqE7euSq0s/IlsYxf7A== dependencies: "@ganache/utils" "0.3.0" ethereumjs-util "7.1.5" @@ -2092,14 +2092,6 @@ dependencies: semver "^5.5.0" -"@grpc/grpc-js@^1.0.0": - version "1.8.14" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.14.tgz#4fe0f9917d6f094cf59245763c275442b182e9ad" - integrity sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A== - dependencies: - "@grpc/proto-loader" "^0.7.0" - "@types/node" ">=12.12.47" - "@grpc/grpc-js@~1.6.0": version "1.6.12" resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.12.tgz#20f710d8a8c5c396b2ae9530ba6c06b984614fdf" @@ -2127,14 +2119,6 @@ lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.5.1": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.2.tgz#c84f83be962f518bc303ca2d5e6ef2239439786c" - integrity sha512-eBKD/FPxQoY1x6QONW2nBd54QUEyzcFP9FenujmoeDPy1rutVSHki1s/wR68F6O1QfCNDx+ayBH1O2CVNMzyyw== - dependencies: - lodash.camelcase "^4.3.0" - protobufjs "^6.8.6" - "@grpc/proto-loader@^0.6.12": version "0.6.13" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc" @@ -6673,25 +6657,6 @@ async@1.x, async@^1.3.0, async@^1.4.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== -async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1, async@^2.6.3, async@^2.6.4: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.10" - -async@2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" - integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg== - dependencies: - lodash "^4.17.11" - -async@>=0.6.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== - async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" @@ -6699,7 +6664,14 @@ async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1: dependencies: lodash "^4.17.14" -async@^3.2.2, async@^3.2.3, async@^3.2.4: +async@^2.6.3, async@^2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== + dependencies: + lodash "^4.17.14" + +async@^3.2.3, async@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== @@ -8913,16 +8885,6 @@ core-js-pure@^3.0.1: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.1.tgz#7d93dc89e7d47b8ef05d7e79f507b0e99ea77eec" integrity sha512-nXBEVpmUnNRhz83cHd9JRQC52cTMcuXAmR56+9dSMpRdpeA4I1PX6yjmhd71Eyc/wXNsdBdUDIj1QTIeZpU5Tg== -core-js@^2.4.0, core-js@^2.5.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== - -core-js@^3.0.0: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" - integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== - core-js@^2.4.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" @@ -9749,6 +9711,15 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" @@ -11719,16 +11690,6 @@ firebase-tools@9.20.0: winston-transport "^4.4.0" ws "^7.2.3" -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= - -flagged-respawn@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" - integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== - flat-arguments@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/flat-arguments/-/flat-arguments-1.0.2.tgz#9baa780adf0501f282d726c9c6a038dba44ea76f" @@ -11899,22 +11860,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -from2@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz#88413baaa5f9a597cfde9221d86986cd3c061dfd" - integrity sha1-iEE7qqX5pZfP3pIh2GmGzTwGHf0= - dependencies: - inherits "~2.0.1" - readable-stream "~1.1.10" - -from2@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -13034,11 +12979,11 @@ grpc@^1.16.0: resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.2.tgz#76d047bfa7b05b607cbbe3abb99065dcefe0c099" integrity sha512-EG3WH6AWMVvAiV15d+lr+K77HJ/KV/3FvMpjKjulXHbTwgDZkhkcWbwhxFAoTdxTkQvy0WFcO3Nog50QBbHZWw== dependencies: - "@mapbox/node-pre-gyp" "^1.0.4" "@types/bytebuffer" "^5.0.40" lodash.camelcase "^4.3.0" lodash.clone "^4.5.0" nan "^2.13.2" + node-pre-gyp "^0.14.0" protobufjs "^5.0.3" gtoken@^2.3.2: @@ -13528,6 +13473,13 @@ iconv-lite@^0.5.0: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2, iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + idna-uts46-hx@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz#a1dc5c4df37eee522bf66d969cc980e00e8711f9" @@ -15967,7 +15919,7 @@ lodash._shimkeys@~2.4.1: dependencies: lodash._objecttypes "~2.4.1" -lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: +lodash.assign@^4.0.3, lodash.assign@^4.0.6: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" integrity sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw== @@ -16415,11 +16367,6 @@ map-obj@^4.0.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -map-stream@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.6.tgz#d2ef4eb811a28644c7a8989985c69c2fdd496827" - integrity sha1-0u9OuBGihkTHqJiZhcacL91JaCc= - map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -16763,6 +16710,11 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -18814,13 +18766,6 @@ pathval@^1.1.1: resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== -pbkdf2@3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.8.tgz#2f8abf16ebecc82277945d748aba1d78761f61e2" - integrity sha1-L4q/FuvsyCJ3lF10irodeHYfYeI= - dependencies: - create-hmac "^1.1.2" - pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.0.9: version "3.1.2" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" @@ -20023,7 +19968,7 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -21420,7 +21365,12 @@ split2@^3.0.0: resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== dependencies: - through2 "^2.0.2" + readable-stream "^3.0.0" + +split2@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" + integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== split@^1.0.0: version "1.0.1" @@ -21536,14 +21486,6 @@ stoppable@^1.1.0: resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b" integrity sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw== -stream-each@^1.1.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" - integrity sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - stream-events@^1.0.1, stream-events@^1.0.4, stream-events@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5" @@ -22273,7 +22215,7 @@ through2@2.0.1: readable-stream "~2.0.0" xtend "~4.0.0" -through2@3.0.2, through2@^3.0.0, through2@^3.0.1: +through2@3.0.2, through2@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== @@ -22281,7 +22223,7 @@ through2@3.0.2, through2@^3.0.0, through2@^3.0.1: inherits "^2.0.4" readable-stream "2 || 3" -through2@^2.0.0: +through2@^2.0.0, through2@^2.0.2: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -22289,13 +22231,6 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through2@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" - integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== - dependencies: - readable-stream "3" - through2@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.0.tgz#468b461df9cd9fcc170f22ebf6852e467e578ff2" @@ -22304,7 +22239,14 @@ through2@^3.0.0: readable-stream "2 || 3" xtend "~4.0.1" -through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@~2.3.4, through@~2.3.8: +through2@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" + integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== + dependencies: + readable-stream "3" + +through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== @@ -22700,12 +22642,21 @@ tsconfig-paths@^3.8.0: minimist "^1.2.6" strip-bom "^3.0.0" +tsconfig-paths@^4.1.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c" + integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg== + dependencies: + json5 "^2.2.2" + minimist "^1.2.6" + strip-bom "^3.0.0" + tslib@1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ== -tslib@^1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1, tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -25059,14 +25010,7 @@ websocket@^1.0.28, websocket@^1.0.32: typedarray-to-buffer "^3.1.5" yaeti "^0.0.6" -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== - dependencies: - iconv-lite "0.4.24" - -whatwg-fetch@>=0.10.0: +whatwg-fetch@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== From 033d6f54d0d92d9b3843daeb86078bf50094c487 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 16:27:53 -0400 Subject: [PATCH 110/184] updated yarn lock again --- yarn.lock | 78 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index 47159a47794..7f2cb63f9dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3257,7 +3257,7 @@ npmlog "^6.0.2" write-file-atomic "^4.0.1" -"@mapbox/node-pre-gyp@^1.0.0", "@mapbox/node-pre-gyp@^1.0.4": +"@mapbox/node-pre-gyp@^1.0.0": version "1.0.10" resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c" integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA== @@ -9243,7 +9243,7 @@ debug@4.3.1: dependencies: ms "2.1.2" -debug@^3.0.1, debug@^3.1.0, debug@^3.2.7: +debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -9573,7 +9573,7 @@ detect-installed@^2.0.4: dependencies: get-installed-path "^2.0.3" -detect-libc@^1.0.3: +detect-libc@^1.0.2, detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== @@ -13459,7 +13459,7 @@ hyperlinker@^1.0.0: resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ== -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -13497,7 +13497,7 @@ ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore-walk@3.0.4: +ignore-walk@3.0.4, ignore-walk@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== @@ -17402,6 +17402,15 @@ ncp@~2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== +needle@^2.2.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" + integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -17622,6 +17631,22 @@ node-interval-tree@^1.3.3: dependencies: shallowequal "^1.0.2" +node-pre-gyp@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^2.0.8: version "2.0.10" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" @@ -17649,6 +17674,14 @@ nopt@3.x: dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== + dependencies: + abbrev "1" + osenv "^0.1.4" + nopt@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" @@ -17715,7 +17748,7 @@ normalize-url@^6.0.1: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -npm-bundled@^1.1.1: +npm-bundled@^1.0.1, npm-bundled@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== @@ -17765,6 +17798,15 @@ npm-package-arg@^9.0.0, npm-package-arg@^9.0.1: semver "^7.3.5" validate-npm-package-name "^4.0.0" +npm-packlist@^1.1.6: + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-normalize-package-bin "^1.0.1" + npm-packlist@^5.1.0, npm-packlist@^5.1.1: version "5.1.3" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b" @@ -17819,7 +17861,7 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npmlog@^4.0.1: +npmlog@^4.0.1, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -18233,7 +18275,7 @@ original-require@^1.0.1: resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" integrity sha512-5vdKMbE58WaE61uVD+PKyh8xdM398UnjPBLotW2sjG5MzHARwta/+NtMBCBA0t2WQblGYBvq5vsiZpWokwno+A== -os-homedir@^1.0.1: +os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== @@ -18254,11 +18296,19 @@ os-locale@^3.1.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -19968,7 +20018,7 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.33: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -20450,7 +20500,7 @@ revalidator@0.1.x: resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b" integrity sha512-xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg== -rimraf@2, rimraf@^2.2.8, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -20629,7 +20679,7 @@ sax@1.2.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA== -sax@>=0.6.0: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -22009,7 +22059,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^4.0.2, tar@^4.3.0: +tar@^4.0.2, tar@^4.3.0, tar@^4.4.2: version "4.4.19" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== @@ -22223,7 +22273,7 @@ through2@3.0.2, through2@^3.0.1: inherits "^2.0.4" readable-stream "2 || 3" -through2@^2.0.0, through2@^2.0.2: +through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== From 2a816cc487bab3908b717f88d226acada9c44e80 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 16:46:28 -0400 Subject: [PATCH 111/184] change docker image path --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b28712dbb3..00dd9f0edfc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,8 +40,8 @@ contract-defaults: &contract-defaults e2e-defaults: &e2e-defaults <<: *defaults docker: - # - image: us-west1-docker.pkg.dev/devopsre/clabs-public-images/circleci:node18.14-go1.16 - - image: us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-geth:latest + - image: us-west1-docker.pkg.dev/devopsre/clabs-public-images/circleci:node18.14-go1.16 + # - image: us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-geth:latest environment: CELO_BLOCKCHAIN_BRANCH_TO_TEST: release/1.7.x general: From 94cac6bfc26261428abca453a577644e87ea35ca Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 27 May 2023 17:40:58 -0400 Subject: [PATCH 112/184] updated revert msg to match contract --- .circleci/config.yml | 1 - packages/protocol/test/common/accounts.ts | 2 +- .../protocol/test/common/gascurrencywhitelist.ts | 12 +++++++++--- .../protocol/test/governance/voting/lockedgold.ts | 2 +- .../protocol/test/governance/voting/release_gold.ts | 4 ++-- .../protocol/test/identity/federatedattestations.ts | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00dd9f0edfc..2ea51c02bbe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,6 @@ e2e-defaults: &e2e-defaults <<: *defaults docker: - image: us-west1-docker.pkg.dev/devopsre/clabs-public-images/circleci:node18.14-go1.16 - # - image: us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-geth:latest environment: CELO_BLOCKCHAIN_BRANCH_TO_TEST: release/1.7.x general: diff --git a/packages/protocol/test/common/accounts.ts b/packages/protocol/test/common/accounts.ts index e1940fb5bea..b697d27f9b0 100644 --- a/packages/protocol/test/common/accounts.ts +++ b/packages/protocol/test/common/accounts.ts @@ -565,7 +565,7 @@ contract('Accounts', (accounts: string[]) => { it('should revert', async () => { await assertTransactionRevertWithReason( accountsInstance.setWalletAddress(caller, '0x0', '0x0', '0x0'), - 'Register with createAccount to set account name' + 'Unknown account' ) }) }) diff --git a/packages/protocol/test/common/gascurrencywhitelist.ts b/packages/protocol/test/common/gascurrencywhitelist.ts index daad69e1642..dc40ba498d0 100644 --- a/packages/protocol/test/common/gascurrencywhitelist.ts +++ b/packages/protocol/test/common/gascurrencywhitelist.ts @@ -1,4 +1,4 @@ -import { assertRevert } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { FeeCurrencyWhitelistContract, FeeCurrencyWhitelistInstance } from 'types' const FeeCurrencyWhitelist: FeeCurrencyWhitelistContract = artifacts.require('FeeCurrencyWhitelist') @@ -22,7 +22,10 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not be callable again', async () => { - await assertRevert(feeCurrencyWhitelist.initialize()) + await assertTransactionRevertWithReason( + feeCurrencyWhitelist.initialize(), + 'contract already initialized' + ) }) }) @@ -34,7 +37,10 @@ contract('FeeCurrencyWhitelist', (accounts: string[]) => { }) it('should not allow a non-owner to add a token', async () => { - await assertRevert(feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner })) + await assertTransactionRevertWithReason( + feeCurrencyWhitelist.addToken(aTokenAddress, { from: nonOwner }), + 'Ownable: caller is not the owner' + ) }) }) }) diff --git a/packages/protocol/test/governance/voting/lockedgold.ts b/packages/protocol/test/governance/voting/lockedgold.ts index 5fb22260af5..7ce4b6960fb 100644 --- a/packages/protocol/test/governance/voting/lockedgold.ts +++ b/packages/protocol/test/governance/voting/lockedgold.ts @@ -195,7 +195,7 @@ contract('LockedGold', (accounts: string[]) => { await assertTransactionRevertWithReason( // @ts-ignore: TODO(mcortesi) fix typings for TransactionDetails lockedGold.lock({ value, from: accounts[1] }), - 'not account' + 'Must first register address with Account.createAccount' ) }) }) diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts index fe826dc3938..84d1f09380d 100644 --- a/packages/protocol/test/governance/voting/release_gold.ts +++ b/packages/protocol/test/governance/voting/release_gold.ts @@ -702,7 +702,7 @@ contract('ReleaseGold', (accounts: string[]) => { it('should revert', async () => { await assertTransactionRevertWithReason( releaseGoldInstance.setAccountName(accountName, { from: beneficiary }), - 'Unknown account' + 'Register with createAccount to set account name' ) }) }) @@ -1492,7 +1492,7 @@ contract('ReleaseGold', (accounts: string[]) => { releaseGoldInstance.lockGold(lockAmount, { from: beneficiary, }), - 'not account' + 'Must first register address with Account.createAccount' ) }) diff --git a/packages/protocol/test/identity/federatedattestations.ts b/packages/protocol/test/identity/federatedattestations.ts index b9a582bf20a..652c3c6fba2 100644 --- a/packages/protocol/test/identity/federatedattestations.ts +++ b/packages/protocol/test/identity/federatedattestations.ts @@ -1037,7 +1037,7 @@ contract('FederatedAttestations', (accounts: string[]) => { federatedAttestations.revokeAttestation(identifier1, issuer1, account1, { from: accounts[5], }), - 'not an account' + 'Must first register address with Account.createAccount' ) }) From c4e58e7bebd0aeb2b64ac12d8311d739c43e8518 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 30 May 2023 11:05:24 -0400 Subject: [PATCH 113/184] updated docs to match current node version --- SETUP.md | 6 +++--- packages/cli/README.md | 2 +- packages/docs/command-line-interface/introduction.md | 2 +- packages/docs/sdk/docs/contractkit/README.md | 2 +- packages/sdk/contractkit/README.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SETUP.md b/SETUP.md index 26c3d923c6c..0bab97eea6e 100644 --- a/SETUP.md +++ b/SETUP.md @@ -42,7 +42,7 @@ Once you have go installed run the following to install gobind #### Install Node -Currently Node.js v12.x is required in order to work with this repo. +Currently Node.js v18.14.2 is required in order to work with this repo. Install `nvm` (allows you to manage multiple versions of Node) by following the [instructions here](https://github.com/nvm-sh/nvm). @@ -50,8 +50,8 @@ Once `nvm` is successfully installed, restart the terminal and run the following ```bash # restart the terminal after installing nvm -nvm install 12 -nvm alias default 12 +nvm install 18.14.2 +nvm alias default 18.14.2 ``` ### MacOS diff --git a/packages/cli/README.md b/packages/cli/README.md index 06c6423b906..6446afddbf6 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -4,7 +4,7 @@ Tool for interacting with the Celo Protocol. ## Installation -We are currently deploying the CLI with only Node.js v12.x support. +We are currently deploying the CLI with only Node.js v18.14.2 support. To install globally, run: diff --git a/packages/docs/command-line-interface/introduction.md b/packages/docs/command-line-interface/introduction.md index ff54a6b59c1..7e20a30dc9c 100644 --- a/packages/docs/command-line-interface/introduction.md +++ b/packages/docs/command-line-interface/introduction.md @@ -21,7 +21,7 @@ npm install -g @celo/celocli ``` {% hint style="info" %} -We are currently deploying the CLI with only Node.js v12.x. If you are running a different version of Node.js, consider using [NVM](https://github.com/nvm-sh/nvm#installation-and-update) to manage your node versions. e.g. with: `nvm install 12 && nvm use 12` +We are currently deploying the CLI with only Node.js v18.14.2. If you are running a different version of Node.js, consider using [NVM](https://github.com/nvm-sh/nvm#installation-and-update) to manage your node versions. e.g. with: `nvm install 12 && nvm use 12` {% endhint %} {% hint style="info" %} diff --git a/packages/docs/sdk/docs/contractkit/README.md b/packages/docs/sdk/docs/contractkit/README.md index 53f348bf8e6..bc3426c4599 100644 --- a/packages/docs/sdk/docs/contractkit/README.md +++ b/packages/docs/sdk/docs/contractkit/README.md @@ -33,7 +33,7 @@ npm install @celo/contractkit yarn add @celo/contractkit ``` -You will need Node.js v12.x. or greater. +You will need Node.js v18.14.2. or greater. To start working with contractkit you need a `kit` instance: diff --git a/packages/sdk/contractkit/README.md b/packages/sdk/contractkit/README.md index e40fbbbbb92..e8026404dfb 100644 --- a/packages/sdk/contractkit/README.md +++ b/packages/sdk/contractkit/README.md @@ -29,7 +29,7 @@ npm install @celo/contractkit yarn add @celo/contractkit ``` -You will need Node.js v12.x. or greater. +You will need Node.js v18.14.2. or greater. To start working with contractkit you need a `kit` instance: From 269aa7b083150c835e0aa18a014638c3cb0e05a0 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 30 May 2023 18:04:46 -0400 Subject: [PATCH 114/184] tracking issue in comment --- packages/protocol/migrations_ts/08_reserve.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/migrations_ts/08_reserve.ts b/packages/protocol/migrations_ts/08_reserve.ts index a808d1370f8..751d30861f2 100644 --- a/packages/protocol/migrations_ts/08_reserve.ts +++ b/packages/protocol/migrations_ts/08_reserve.ts @@ -56,7 +56,7 @@ module.exports = deploymentForCoreContract( from: network.from, to: reserve.address, value: web3.utils.toWei(config.reserve.initialBalance.toString(), 'ether').toString(), - // @ts-ignore + // @ts-ignore: typing not available https://github.com/web3/web3.js/issues/6123#issuecomment-1568250373 type: 0, }) From 74960e6cf3ea00cf10cd6ee3b438700476e2e416 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 30 May 2023 18:11:25 -0400 Subject: [PATCH 115/184] specified chain id --- packages/protocol/scripts/bash/ganache.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/scripts/bash/ganache.sh b/packages/protocol/scripts/bash/ganache.sh index d3936fd2128..128ffc57bef 100755 --- a/packages/protocol/scripts/bash/ganache.sh +++ b/packages/protocol/scripts/bash/ganache.sh @@ -10,4 +10,5 @@ yarn run ganache \ --miner.blockGasLimit=20000000 \ --wallet.defaultBalance=200000000 \ --chain.allowUnlimitedContractSize=true \ + --chain.chainId=1 \ --chain.hardfork='istanbul' From 7ecaa3c1219e5c96329e4c0be08a30721cd938f6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 30 May 2023 18:13:16 -0400 Subject: [PATCH 116/184] revert to default verbose output --- packages/celotool/src/e2e-tests/utils.ts | 2 +- packages/protocol/runTests.js | 2 +- packages/protocol/scripts/devchain.ts | 4 ++-- packages/protocol/truffle-config.js | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/celotool/src/e2e-tests/utils.ts b/packages/celotool/src/e2e-tests/utils.ts index 260633962e0..6ad5f86913b 100644 --- a/packages/celotool/src/e2e-tests/utils.ts +++ b/packages/celotool/src/e2e-tests/utils.ts @@ -38,7 +38,7 @@ import { GethRunConfig } from '../lib/interfaces/geth-run-config' import { stringToBoolean } from '../lib/utils' const MonorepoRoot = resolvePath(joinPath(__dirname, '../..', '../..')) -const verboseOutput = true // TODO (soloseng): revert to false +const verboseOutput = false // The mnemonic used for the e2e tests export const mnemonic = 'jazz ripple brown cloth door bridge pen danger deer thumb cable prepare negative library vast' diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index c978578d27f..8fea9be669f 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -14,7 +14,7 @@ const isCI = process.env.CI === 'true' async function startGanache() { const server = ganache.server({ - logging: { quiet: true }, + logging: { quiet: false }, wallet: { mnemonic: network.mnemonic, defaultBalance: network.defaultBalance }, miner: { blockGasLimit: 20000000, diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index bf53ba13dab..4961e84a106 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -241,7 +241,7 @@ async function runDevChainFromTar(filename: string) { await decompressChain(filename, chainCopy.name) - const stopGanache = await startGanache(chainCopy.name, { verbose: false }, chainCopy) // TODO (soloseng): revert to true + const stopGanache = await startGanache(chainCopy.name, { verbose: true }, chainCopy) return stopGanache } @@ -277,7 +277,7 @@ async function runDevChain( await resetDir(datadir) } createDirIfMissing(datadir) - const stopGanache = await startGanache(datadir, { verbose: false }) // TODO (soloseng): revert to true + const stopGanache = await startGanache(datadir, { verbose: true }) if (opts.reset || opts.runMigrations) { const code = await runMigrations({ upto: opts.upto, migrationOverride: opts.migrationOverride }) if (code !== 0) { diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index f1c1662f023..98db1afe31c 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -70,7 +70,6 @@ const networks = { gasPrice: 0, gas: gasLimit, defaultBalance: 200000000, - // maxFeePerGas: 875000000, mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic', }, rc0: { From 998e9818c912044ee70d685a344265451d81f59c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 31 May 2023 14:36:20 -0400 Subject: [PATCH 117/184] removed debud logging --- packages/celotool/src/e2e-tests/cip35_tests.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/celotool/src/e2e-tests/cip35_tests.ts b/packages/celotool/src/e2e-tests/cip35_tests.ts index 27517220188..25b3830db04 100644 --- a/packages/celotool/src/e2e-tests/cip35_tests.ts +++ b/packages/celotool/src/e2e-tests/cip35_tests.ts @@ -433,7 +433,6 @@ describe('CIP-35 >', function (this: any) { const testEnv = new TestEnv(false, false) // not donut, not espresso before(async function (this) { this.timeout(0) - console.log('validatorAddress', validatorAddress) await testEnv.before() }) From f0de1023713c733e1aa59ea94d941bccc16c4b1d Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Fri, 2 Jun 2023 15:02:20 +0200 Subject: [PATCH 118/184] GH Workflows run in node18 runners --- .github/workflows/circleci.yml | 34 +++++++++---------- .../cron-protocol-test-with-coverage.yml | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 4f2429b75e5..22b1599c0fe 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -40,7 +40,7 @@ jobs: # Adding a initial comma so ',' matches also for the first file all_modified_files: ",${{ steps.changed-files.outputs.all_modified_files }}" # runs-on: ubuntu-latest - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 steps: - name: Restore .git cache @@ -135,7 +135,7 @@ jobs: - run: echo ",${{ steps.changed-files.outputs.all_modified_files }}" lint-checks: name: Lint code - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: install-dependencies steps: @@ -155,7 +155,7 @@ jobs: - run: yarn run lint general_test: name: General jest test - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] needs: install-dependencies steps: - uses: actions/cache/restore@v3 @@ -189,7 +189,7 @@ jobs: path: test-results/jest wallet-test: name: Wallet test - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: install-dependencies steps: @@ -208,7 +208,7 @@ jobs: yarn run lerna --scope '@celo/wallet-*' run test pre-protocol-test-release: name: Protocol Tests Prepare - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 # Comment lint-checks dependency to speed up (as this is a dependency for many other jobs) # needs: [install-dependencies, lint-checks] @@ -251,7 +251,7 @@ jobs: yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout -g scripts/truffle/releaseGoldExampleConfigs.json protocol-test-release: name: Protocol Test Release - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies, lint-checks, pre-protocol-test-release] if: | @@ -282,7 +282,7 @@ jobs: protocol-test-matrix: # Keeping name short because GitHub UI does not handle long names well name: ${{ matrix.name }} - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 60 needs: [install-dependencies, lint-checks, pre-protocol-test-release] if: | @@ -353,7 +353,7 @@ jobs: ${{ matrix.command }} contractkit-tests: name: ContractKit Tests - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -381,7 +381,7 @@ jobs: yarn --cwd=packages/sdk/contractkit test identity-tests: name: Identity Tests - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -409,7 +409,7 @@ jobs: yarn --cwd=packages/sdk/identity test transactions-uri-tests: name: Transaction URI Tests - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -442,7 +442,7 @@ jobs: yarn --cwd=packages/sdk/identity test cli-tests: name: CeloCli Tests - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -481,7 +481,7 @@ jobs: yarn --cwd=packages/cli run celocli account:new typescript-tests: name: Typescript package Tests - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -509,7 +509,7 @@ jobs: npm install $RUNNER_WORKSPACE/celo-monorepo/packages/typescript/*.tgz base-test: name: SDK Base package Tests - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -543,7 +543,7 @@ jobs: npm install $RUNNER_WORKSPACE/celo-monorepo/packages/sdk/base/*.tgz utils-test: name: SDK Utils package Tests - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -576,7 +576,7 @@ jobs: end-to-end-geth-matrix: # Keeping name short because GitHub UI does not handle long names well name: e2e ${{ matrix.name }} - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 60 needs: [install-dependencies, lint-checks, pre-protocol-test-release] if: | @@ -666,7 +666,7 @@ jobs: odis-test: name: ODIS test - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies, lint-checks] if: | @@ -698,7 +698,7 @@ jobs: # NOTE: This has not been fully tested as we don't have a license for certora certora-test: name: Certora test ${{ matrix.name }} - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] timeout-minutes: 30 needs: [install-dependencies, lint-checks] # Disable as certora license is not active diff --git a/.github/workflows/cron-protocol-test-with-coverage.yml b/.github/workflows/cron-protocol-test-with-coverage.yml index f5dd4f36847..4fab42b220e 100644 --- a/.github/workflows/cron-protocol-test-with-coverage.yml +++ b/.github/workflows/cron-protocol-test-with-coverage.yml @@ -12,7 +12,7 @@ jobs: # This seems to take ages and last codecov report is from 2021-02-25 :/ # https://app.codecov.io/gh/celo-org/celo-monorepo/commits protocol-test-with-code-coverage: - runs-on: ["self-hosted", "monorepo"] + runs-on: ["self-hosted", "monorepo-node18"] steps: - uses: actions/checkout@v3 - name: Install yarn dependencies From 12d6c6ad47939d506ba3a0f7200d5100828bd279 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Fri, 2 Jun 2023 16:01:34 +0200 Subject: [PATCH 119/184] Force new node cache --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 22b1599c0fe..312469d2d36 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -22,7 +22,7 @@ defaults: env: # Increment these to force cache rebuilding - NODE_MODULE_CACHE_VERSION: 2 + NODE_MODULE_CACHE_VERSION: 3 NODE_OPTIONS: '--max-old-space-size=4096' TERM: dumb GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"' From 060ffa407f5c2a5ee807bd04eae180a1d03aa1f7 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Fri, 2 Jun 2023 19:03:59 +0200 Subject: [PATCH 120/184] Disable flake-tracker --- packages/flake-tracker/src/config.js | 68 ++++++++++++++++------------ 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/packages/flake-tracker/src/config.js b/packages/flake-tracker/src/config.js index 37e5c4b56ea..41d503f9e2f 100644 --- a/packages/flake-tracker/src/config.js +++ b/packages/flake-tracker/src/config.js @@ -1,18 +1,18 @@ -const isCI = process.env.CIRCLECI || process.env.CI -let org, repo +const isCI = process.env.CIRCLECI || process.env.CI; +let org, repo; if (process.env.GITHUB_REPOSITORY) { - org = process.env.GITHUB_REPOSITORY.split('/')[0] - repo = process.env.GITHUB_REPOSITORY.split('/')[1] + org = process.env.GITHUB_REPOSITORY.split("/")[0]; + repo = process.env.GITHUB_REPOSITORY.split("/")[1]; } else { - org = process.env.CIRCLE_PROJECT_USERNAME || 'celo-org' - repo = process.env.CIRCLE_PROJECT_REPONAME || 'celo-monorepo' + org = process.env.CIRCLE_PROJECT_USERNAME || "celo-org"; + repo = process.env.CIRCLE_PROJECT_REPONAME || "celo-monorepo"; } -const branch = process.env.CIRCLE_BRANCH || process.env.GITHUB_REF_NAME -const sha = process.env.CIRCLE_SHA1 || process.env.GITHUB_SHA -const ciJob = process.env.CIRCLE_JOB || process.env.GITHUB_JOB -const prNumber = getPullNumber() -const defaultNumRetries = branch === 'master' ? 15 : 5 -const flakeTrackerID = 71131 // This is the FlakeTracker GitHub App ID. +const branch = process.env.CIRCLE_BRANCH || process.env.GITHUB_REF_NAME; +const sha = process.env.CIRCLE_SHA1 || process.env.GITHUB_SHA; +const ciJob = process.env.CIRCLE_JOB || process.env.GITHUB_JOB; +const prNumber = getPullNumber(); +const defaultNumRetries = branch === "master" ? 15 : 5; +const flakeTrackerID = 71131; // This is the FlakeTracker GitHub App ID. // NOTE: Avoid editing the following constants unless you are making changes to the flake trackers' functionality. // This file serves mainly to distill various environment variables into easy to use booleans for the rest of the project. @@ -39,48 +39,56 @@ const flakeTrackerID = 71131 // This is the FlakeTracker GitHub App ID. // shouldTrackFlakes => tests are retried `numRetries` times and flakey results are logged w/ test output // XXX (soloseng and jcortejoso): disabling to skip flaker test on CI -// const shouldTrackFlakes = false -const shouldTrackFlakes = - (isCI && repo !== 'celo-blockchain' && process.env.FLAKEY !== 'false') || - process.env.FLAKEY === 'true' +const shouldTrackFlakes = false; +// const shouldTrackFlakes = +// (isCI && repo !== 'celo-blockchain' && process.env.FLAKEY !== 'false') || +// process.env.FLAKEY === 'true' // shouldLogRetryErrorsOnFailure => log raw test error immediately after every retry. -const shouldLogRetryErrorsOnFailure = shouldTrackFlakes && process.env.LOG_ALL_RETRY_ERRORS +const shouldLogRetryErrorsOnFailure = + shouldTrackFlakes && process.env.LOG_ALL_RETRY_ERRORS; // numRetries === times test is run after the initial failure -const numRetries = process.env.NUM_RETRIES ? Number(process.env.NUM_RETRIES) : defaultNumRetries +const numRetries = process.env.NUM_RETRIES + ? Number(process.env.NUM_RETRIES) + : defaultNumRetries; // shouldSkipKnownFlakes => flakey test issues are fetched from github and corresponding tests are skipped const shouldSkipKnownFlakes = shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET && - process.env.SKIP_KNOWN_FLAKES !== 'false' + process.env.SKIP_KNOWN_FLAKES !== "false"; // shouldAddCheckToPR => GitHub Check added to PR -const shouldAddCheckToPR = shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET +const shouldAddCheckToPR = + shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET; // newFlakesShouldFailCheckSuite => determines whether GitHub Check has status 'failure' or 'neutral' when new flakey tests are found. -const newFlakesShouldFailCheckSuite = shouldAddCheckToPR && process.env.FLAKES_FAIL_CHECK_SUITE +const newFlakesShouldFailCheckSuite = + shouldAddCheckToPR && process.env.FLAKES_FAIL_CHECK_SUITE; // shouldCreateIssues => GitHub Issues created for new flakey tests const shouldCreateIssues = - shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET && branch === 'master' + shouldTrackFlakes && + isCI && + process.env.FLAKE_TRACKER_SECRET && + branch === "master"; // For convenience... -const shouldReportFlakes = shouldAddCheckToPR || shouldCreateIssues -const shouldUseGitHub = shouldSkipKnownFlakes || shouldReportFlakes +const shouldReportFlakes = shouldAddCheckToPR || shouldCreateIssues; +const shouldUseGitHub = shouldSkipKnownFlakes || shouldReportFlakes; function getPullNumber() { if (process.env.CIRCLE_PULL_REQUEST) { - return process.env.CIRCLE_PULL_REQUEST.split('/').slice(-1)[0] + return process.env.CIRCLE_PULL_REQUEST.split("/").slice(-1)[0]; } else if (process.env.GITHUB_REF_NAME) { - return process.env.GITHUB_REF_NAME.split('/')[2] + return process.env.GITHUB_REF_NAME.split("/")[2]; } console.info( - 'Unable to determine pull request number. Expected when run in local or not triggered by a PR event' - ) - return null + "Unable to determine pull request number. Expected when run in local or not triggered by a PR event" + ); + return null; } module.exports = { @@ -101,4 +109,4 @@ module.exports = { shouldSkipKnownFlakes: shouldSkipKnownFlakes, shouldTrackFlakes: shouldTrackFlakes, shouldUseGitHub: shouldUseGitHub, -} +}; From f5502bb8fe666eb6c8292da5dcca4011ebbbd1bb Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Fri, 2 Jun 2023 20:47:55 +0000 Subject: [PATCH 121/184] prettify --- packages/flake-tracker/src/config.js | 62 ++++++++++++---------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/packages/flake-tracker/src/config.js b/packages/flake-tracker/src/config.js index 41d503f9e2f..1d576320d91 100644 --- a/packages/flake-tracker/src/config.js +++ b/packages/flake-tracker/src/config.js @@ -1,18 +1,18 @@ -const isCI = process.env.CIRCLECI || process.env.CI; -let org, repo; +const isCI = process.env.CIRCLECI || process.env.CI +let org, repo if (process.env.GITHUB_REPOSITORY) { - org = process.env.GITHUB_REPOSITORY.split("/")[0]; - repo = process.env.GITHUB_REPOSITORY.split("/")[1]; + org = process.env.GITHUB_REPOSITORY.split('/')[0] + repo = process.env.GITHUB_REPOSITORY.split('/')[1] } else { - org = process.env.CIRCLE_PROJECT_USERNAME || "celo-org"; - repo = process.env.CIRCLE_PROJECT_REPONAME || "celo-monorepo"; + org = process.env.CIRCLE_PROJECT_USERNAME || 'celo-org' + repo = process.env.CIRCLE_PROJECT_REPONAME || 'celo-monorepo' } -const branch = process.env.CIRCLE_BRANCH || process.env.GITHUB_REF_NAME; -const sha = process.env.CIRCLE_SHA1 || process.env.GITHUB_SHA; -const ciJob = process.env.CIRCLE_JOB || process.env.GITHUB_JOB; -const prNumber = getPullNumber(); -const defaultNumRetries = branch === "master" ? 15 : 5; -const flakeTrackerID = 71131; // This is the FlakeTracker GitHub App ID. +const branch = process.env.CIRCLE_BRANCH || process.env.GITHUB_REF_NAME +const sha = process.env.CIRCLE_SHA1 || process.env.GITHUB_SHA +const ciJob = process.env.CIRCLE_JOB || process.env.GITHUB_JOB +const prNumber = getPullNumber() +const defaultNumRetries = branch === 'master' ? 15 : 5 +const flakeTrackerID = 71131 // This is the FlakeTracker GitHub App ID. // NOTE: Avoid editing the following constants unless you are making changes to the flake trackers' functionality. // This file serves mainly to distill various environment variables into easy to use booleans for the rest of the project. @@ -39,56 +39,48 @@ const flakeTrackerID = 71131; // This is the FlakeTracker GitHub App ID. // shouldTrackFlakes => tests are retried `numRetries` times and flakey results are logged w/ test output // XXX (soloseng and jcortejoso): disabling to skip flaker test on CI -const shouldTrackFlakes = false; +const shouldTrackFlakes = false // const shouldTrackFlakes = // (isCI && repo !== 'celo-blockchain' && process.env.FLAKEY !== 'false') || // process.env.FLAKEY === 'true' // shouldLogRetryErrorsOnFailure => log raw test error immediately after every retry. -const shouldLogRetryErrorsOnFailure = - shouldTrackFlakes && process.env.LOG_ALL_RETRY_ERRORS; +const shouldLogRetryErrorsOnFailure = shouldTrackFlakes && process.env.LOG_ALL_RETRY_ERRORS // numRetries === times test is run after the initial failure -const numRetries = process.env.NUM_RETRIES - ? Number(process.env.NUM_RETRIES) - : defaultNumRetries; +const numRetries = process.env.NUM_RETRIES ? Number(process.env.NUM_RETRIES) : defaultNumRetries // shouldSkipKnownFlakes => flakey test issues are fetched from github and corresponding tests are skipped const shouldSkipKnownFlakes = shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET && - process.env.SKIP_KNOWN_FLAKES !== "false"; + process.env.SKIP_KNOWN_FLAKES !== 'false' // shouldAddCheckToPR => GitHub Check added to PR -const shouldAddCheckToPR = - shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET; +const shouldAddCheckToPR = shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET // newFlakesShouldFailCheckSuite => determines whether GitHub Check has status 'failure' or 'neutral' when new flakey tests are found. -const newFlakesShouldFailCheckSuite = - shouldAddCheckToPR && process.env.FLAKES_FAIL_CHECK_SUITE; +const newFlakesShouldFailCheckSuite = shouldAddCheckToPR && process.env.FLAKES_FAIL_CHECK_SUITE // shouldCreateIssues => GitHub Issues created for new flakey tests const shouldCreateIssues = - shouldTrackFlakes && - isCI && - process.env.FLAKE_TRACKER_SECRET && - branch === "master"; + shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET && branch === 'master' // For convenience... -const shouldReportFlakes = shouldAddCheckToPR || shouldCreateIssues; -const shouldUseGitHub = shouldSkipKnownFlakes || shouldReportFlakes; +const shouldReportFlakes = shouldAddCheckToPR || shouldCreateIssues +const shouldUseGitHub = shouldSkipKnownFlakes || shouldReportFlakes function getPullNumber() { if (process.env.CIRCLE_PULL_REQUEST) { - return process.env.CIRCLE_PULL_REQUEST.split("/").slice(-1)[0]; + return process.env.CIRCLE_PULL_REQUEST.split('/').slice(-1)[0] } else if (process.env.GITHUB_REF_NAME) { - return process.env.GITHUB_REF_NAME.split("/")[2]; + return process.env.GITHUB_REF_NAME.split('/')[2] } console.info( - "Unable to determine pull request number. Expected when run in local or not triggered by a PR event" - ); - return null; + 'Unable to determine pull request number. Expected when run in local or not triggered by a PR event' + ) + return null } module.exports = { @@ -109,4 +101,4 @@ module.exports = { shouldSkipKnownFlakes: shouldSkipKnownFlakes, shouldTrackFlakes: shouldTrackFlakes, shouldUseGitHub: shouldUseGitHub, -}; +} From 4d3aee6c13f72e8a7003d2691f508a75eb6d8ef5 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 3 Jun 2023 14:16:36 -0400 Subject: [PATCH 122/184] Updated test to revert with message --- packages/protocol/test/common/integration.ts | 13 ++++++++---- .../test/identity/identityproxyhub.ts | 20 +++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index e0d01382a9c..032a4d70f58 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -3,7 +3,6 @@ import { constitution } from '@celo/protocol/governanceConstitution' import { addressMinedLatestBlock, assertEqualBN, - assertTransactionRevertWithoutReason, assertTransactionRevertWithReason, assumeOwnership, stripHexEncoding, @@ -635,15 +634,21 @@ contract('Integration: Adding StableToken', (accounts: string[]) => { '1' // minimumReports, minimum possible to avoid having to mock multiple reports ) }) - // TODO (soloseng): add revert msg to https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/stability/SortedOracles.sol#L174 + it(`should be impossible to sell CELO`, async () => { await goldToken.approve(exchangeAbc.address, sellAmount) - await assertTransactionRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, true)) + await assertTransactionRevertWithReason( + exchangeAbc.sell(sellAmount, minBuyAmount, true), + 'token address cannot be null' + ) }) it(`should be impossible to sell stable token`, async () => { await stableTokenAbc.approve(exchangeAbc.address, sellAmount) - await assertTransactionRevertWithoutReason(exchangeAbc.sell(sellAmount, minBuyAmount, false)) + await assertTransactionRevertWithReason( + exchangeAbc.sell(sellAmount, minBuyAmount, false), + 'token address cannot be null' + ) }) }) diff --git a/packages/protocol/test/identity/identityproxyhub.ts b/packages/protocol/test/identity/identityproxyhub.ts index 6e75f67203b..a9bbccec68e 100644 --- a/packages/protocol/test/identity/identityproxyhub.ts +++ b/packages/protocol/test/identity/identityproxyhub.ts @@ -1,4 +1,4 @@ -import { assertTransactionRevertWithoutReason } from '@celo/protocol/lib/test-utils' +import { assertTransactionRevertWithReason } from '@celo/protocol/lib/test-utils' import { IdentityProxyContract, IdentityProxyHubContract, @@ -169,9 +169,9 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 - await assertTransactionRevertWithoutReason( - identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) + await assertTransactionRevertWithReason( + identityProxyHub.makeCall(identifier, identityProxyTest.address, txData), + 'does not pass identity heuristic' ) }) @@ -189,9 +189,9 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 - await assertTransactionRevertWithoutReason( - identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) + await assertTransactionRevertWithReason( + identityProxyHub.makeCall(identifier, identityProxyTest.address, txData), + 'does not pass identity heuristic' ) }) @@ -207,9 +207,9 @@ contract('IdentityProxyHub', (accounts: string[]) => { // @ts-ignore const txData = identityProxyTest.contract.methods.callMe().encodeABI() - // TODO (soloseng): add reason once added https://github.com/celo-org/celo-monorepo/blob/1701bf5b611448d247dc960b5bc09230888a31da/packages/protocol/contracts/identity/IdentityProxyHub.sol#L102 - await assertTransactionRevertWithoutReason( - identityProxyHub.makeCall(identifier, identityProxyTest.address, txData) + await assertTransactionRevertWithReason( + identityProxyHub.makeCall(identifier, identityProxyTest.address, txData), + 'does not pass identity heuristic' ) }) }) From 373fda74f2e6e491bfe0a8fd8d8f1fb91c868817 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:07:50 -0400 Subject: [PATCH 123/184] quiet test --- packages/protocol/runTests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/runTests.js b/packages/protocol/runTests.js index 8fea9be669f..c978578d27f 100644 --- a/packages/protocol/runTests.js +++ b/packages/protocol/runTests.js @@ -14,7 +14,7 @@ const isCI = process.env.CI === 'true' async function startGanache() { const server = ganache.server({ - logging: { quiet: false }, + logging: { quiet: true }, wallet: { mnemonic: network.mnemonic, defaultBalance: network.defaultBalance }, miner: { blockGasLimit: 20000000, From 48c422c33d6672bbb6ef785b921159190ed1c96d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:46:49 -0400 Subject: [PATCH 124/184] fixed build errors --- packages/protocol/lib/test-utils.ts | 8 +++-- packages/protocol/lib/web3-utils.ts | 32 +++++++++---------- .../07_reserve_spender_multisig.ts | 2 +- packages/protocol/test/common/integration.ts | 2 +- packages/protocol/test/common/migration.ts | 2 +- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 05643552229..7e774fc07de 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -1,6 +1,7 @@ import { hasEntryInRegistry, usesRegistry } from '@celo/protocol/lib/registry-utils'; import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils'; import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils'; +import { ArtifactsSingleton } from '@celo/protocol/migrations_ts/artifactsSingleton'; import { config } from '@celo/protocol/migrationsConfig'; import { privateKeyToAddress } from '@celo/utils/lib/address'; import { soliditySha3 } from '@celo/utils/lib/solidity'; @@ -8,10 +9,11 @@ import BigNumber from 'bignumber.js'; import chai from 'chai'; import chaiSubset from 'chai-subset'; // tslint:disable-next-line: ordered-imports -import { SpawnOptions, spawn } from 'child_process'; -import { keccak256 } from 'ethereumjs-util'; +import { spawn, SpawnOptions } from 'child_process'; +import { keccak256 } from 'ethereum-cryptography/keccak'; import { GovernanceApproverMultiSigInstance, GovernanceInstance, LockedGoldInstance, ProxyInstance, RegistryInstance, UsingRegistryInstance } from 'types'; import Web3 from 'web3'; +import { ContractPackage, MENTO_PACKAGE } from '../contractPackages'; import BN = require('bn.js') @@ -231,7 +233,7 @@ type ProxiedContractGetter = ( type ContratGetter = ( contractName: string, - contractPackage?: ContractPackage, + contractPackage?: ContractPackage | String, ) => Promise diff --git a/packages/protocol/lib/web3-utils.ts b/packages/protocol/lib/web3-utils.ts index f222cba26e4..9db80543d50 100644 --- a/packages/protocol/lib/web3-utils.ts +++ b/packages/protocol/lib/web3-utils.ts @@ -1,21 +1,21 @@ /* tslint:disable:no-console */ // TODO(asa): Refactor and rename to 'deployment-utils.ts' -import { Address, CeloTxObject } from '@celo/connect' -import { setAndInitializeImplementation } from '@celo/protocol/lib/proxy-utils' -import { CeloContractName } from '@celo/protocol/lib/registry-utils' -import { signTransaction } from '@celo/protocol/lib/signing-utils' -import { privateKeyToAddress } from '@celo/utils/lib/address' -import { BuildArtifacts } from '@openzeppelin/upgrades' -import { BigNumber } from 'bignumber.js' - -import { createInterfaceAdapter } from '@truffle/interface-adapter' -import path from 'path' -import prompts from 'prompts' -import { GoldTokenInstance, MultiSigInstance, OwnableInstance, ProxyContract, ProxyInstance, RegistryInstance } from 'types' -import { StableTokenInstance } from 'types/mento' -import Web3 from 'web3' -import { ContractPackage } from '../contractPackages' -import { ArtifactsSingleton } from '../migrations/artifactsSingleton' +import { Address, CeloTxObject } from '@celo/connect'; +import { setAndInitializeImplementation } from '@celo/protocol/lib/proxy-utils'; +import { CeloContractName } from '@celo/protocol/lib/registry-utils'; +import { signTransaction } from '@celo/protocol/lib/signing-utils'; +import { privateKeyToAddress } from '@celo/utils/lib/address'; +import { BuildArtifacts } from '@openzeppelin/upgrades'; +import { BigNumber } from 'bignumber.js'; + +import { createInterfaceAdapter } from '@truffle/interface-adapter'; +import path from 'path'; +import prompts from 'prompts'; +import { GoldTokenInstance, MultiSigInstance, OwnableInstance, ProxyContract, ProxyInstance, RegistryInstance } from 'types'; +import { StableTokenInstance } from 'types/mento'; +import Web3 from 'web3'; +import { ContractPackage } from '../contractPackages'; +import { ArtifactsSingleton } from '../migrations_ts/artifactsSingleton'; const truffleContract = require('@truffle/contract'); diff --git a/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts b/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts index 352e96fd242..d73690559c6 100644 --- a/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts +++ b/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts @@ -6,7 +6,7 @@ import { import { config } from '@celo/protocol/migrationsConfig' import { ReserveSpenderMultiSigInstance } from 'types/mento' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from '../migrations/artifactsSingleton' +import { ArtifactsSingleton } from '../migrations_ts/artifactsSingleton' const initializeArgs = async (): Promise => { return [ diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index 22147260b68..9ea07a2440d 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -38,7 +38,7 @@ import { StableTokenInstance, } from 'types/mento' import { MENTO_PACKAGE } from '../../contractPackages' -import { ArtifactsSingleton } from '../../migrations/artifactsSingleton' +import { ArtifactsSingleton } from '../../migrations_ts/artifactsSingleton' import { SECONDS_IN_A_WEEK } from '../constants' enum VoteValue { diff --git a/packages/protocol/test/common/migration.ts b/packages/protocol/test/common/migration.ts index 4619f285cd3..435dc15884b 100644 --- a/packages/protocol/test/common/migration.ts +++ b/packages/protocol/test/common/migration.ts @@ -5,7 +5,7 @@ import { } from '@celo/protocol/lib/test-utils' import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils' import { ContractPackage } from 'contractPackages' -import { ArtifactsSingleton } from '../../migrations/artifactsSingleton' +import { ArtifactsSingleton } from '../../migrations_ts/artifactsSingleton' const getProxiedContract = async (contractName: string, contractPackage: ContractPackage) => { const artifactsObject = ArtifactsSingleton.getInstance(contractPackage, artifacts) From 49f216d81e5cd0ed8f0e34f27f28eb96341f4b64 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 9 Jun 2023 16:25:32 -0400 Subject: [PATCH 125/184] updated scripts to better handle ts & js files --- packages/protocol/.gitignore | 3 ++- packages/protocol/package.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/protocol/.gitignore b/packages/protocol/.gitignore index 3b1447911c3..8d33bd178cc 100644 --- a/packages/protocol/.gitignore +++ b/packages/protocol/.gitignore @@ -8,8 +8,9 @@ lib/**/*.js lib/**/*.js.map migrations/**/*.js +migrations/**/*.js.map + migrations_ts/**/*.js -migrations_ts/**/*.js.map scripts/**/*.js scripts/**/*.js.map diff --git a/packages/protocol/package.json b/packages/protocol/package.json index a8a823e6909..9830336abf3 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -9,14 +9,14 @@ "lint:ts": "tslint -c tslint.json --project tsconfig.json", "lint:sol": "solhint './contracts/**/*.sol'", "lint": "yarn run lint:ts && yarn run lint:sol", - "clean": "rm -rf ./types/typechain && rm -rf build/* && rm -rf .0x-artifacts/* && rm -rf migrations/*.js* && rm -rf migrations_/*.js* && rm -rf test/**/*.js* && rm -f lib/*.js* && rm -f lib/**/*.js* && rm -f scripts/*.js*", + "clean": "rm -rf ./types/typechain && rm -rf build/* && rm -rf .0x-artifacts/* && rm -rf migrations/*.js* && rm -rf migrations_ts/*.js* && rm -rf test/**/*.js* && rm -f lib/*.js* && rm -f lib/**/*.js* && rm -f scripts/*.js*", "test": "rm test/**/*.js ; node runTests.js", "quicktest": "./scripts/bash/quicktest.sh", "test:coverage": "yarn run test --coverage", "test:devchain-release": "./scripts/bash/release-on-devchain.sh", "test:release-snapshots": "./scripts/bash/release-snapshots.sh", "test:generate-old-devchain-and-build": "./scripts/bash/generate-old-devchain-and-build.sh", - "build:ts": "rm -f migrations/*.js* && ts-node ./scripts/build.ts --truffleTypes ./types/typechain && tsc -b && mv migrations_ts/*js migrations", + "build:ts": "rm -f migrations/*.js* && ts-node ./scripts/build.ts --truffleTypes ./types/typechain && tsc -b && mv migrations_ts/*.js* migrations", "gas": "yarn run test --gas", "pull-submodules": "git submodule update --init --recursive", "build:sol": "git submodule update --init --recursive && mkdir -p migrations && ts-node ./scripts/build.ts --solidity ${BUILD_DIR:-./build}", From f6d071af56422da8be995278886b7e0fe1c9b7f6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 9 Jun 2023 16:27:47 -0400 Subject: [PATCH 126/184] moved `artifactSingleton` file to lib/ --- packages/protocol/{migrations_ts => lib}/artifactsSingleton.ts | 0 packages/protocol/lib/test-utils.ts | 2 +- packages/protocol/lib/web3-utils.ts | 2 +- packages/protocol/migrations_ts/00_initial_migration.ts | 2 +- packages/protocol/migrations_ts/07_reserve_spender_multisig.ts | 2 +- packages/protocol/migrations_ts/08_reserve.ts | 2 +- packages/protocol/migrations_ts/09_01_stableToken_EUR.ts | 2 +- packages/protocol/migrations_ts/09_02_stableToken_BRL.ts | 2 +- packages/protocol/migrations_ts/09_0_stabletoken_USD.ts | 2 +- packages/protocol/migrations_ts/10_01_exchange_EUR.ts | 2 +- packages/protocol/migrations_ts/10_02_exchange_BRL.ts | 2 +- packages/protocol/migrations_ts/17_attestations.ts | 2 +- packages/protocol/migrations_ts/24_grandamento.ts | 2 +- packages/protocol/migrations_ts/27_governance.ts | 2 +- packages/protocol/test/common/integration.ts | 2 +- packages/protocol/test/common/migration.ts | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename packages/protocol/{migrations_ts => lib}/artifactsSingleton.ts (100%) diff --git a/packages/protocol/migrations_ts/artifactsSingleton.ts b/packages/protocol/lib/artifactsSingleton.ts similarity index 100% rename from packages/protocol/migrations_ts/artifactsSingleton.ts rename to packages/protocol/lib/artifactsSingleton.ts diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 7e774fc07de..2fabdee3e54 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -1,7 +1,7 @@ +import { ArtifactsSingleton } from '@celo/protocol/lib/artifactsSingleton'; import { hasEntryInRegistry, usesRegistry } from '@celo/protocol/lib/registry-utils'; import { getParsedSignatureOfAddress } from '@celo/protocol/lib/signing-utils'; import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils'; -import { ArtifactsSingleton } from '@celo/protocol/migrations_ts/artifactsSingleton'; import { config } from '@celo/protocol/migrationsConfig'; import { privateKeyToAddress } from '@celo/utils/lib/address'; import { soliditySha3 } from '@celo/utils/lib/solidity'; diff --git a/packages/protocol/lib/web3-utils.ts b/packages/protocol/lib/web3-utils.ts index 9db80543d50..9c973dcbaf7 100644 --- a/packages/protocol/lib/web3-utils.ts +++ b/packages/protocol/lib/web3-utils.ts @@ -15,7 +15,7 @@ import { GoldTokenInstance, MultiSigInstance, OwnableInstance, ProxyContract, Pr import { StableTokenInstance } from 'types/mento'; import Web3 from 'web3'; import { ContractPackage } from '../contractPackages'; -import { ArtifactsSingleton } from '../migrations_ts/artifactsSingleton'; +import { ArtifactsSingleton } from './artifactsSingleton'; const truffleContract = require('@truffle/contract'); diff --git a/packages/protocol/migrations_ts/00_initial_migration.ts b/packages/protocol/migrations_ts/00_initial_migration.ts index 4dac9d0790b..0b8f5c1d515 100644 --- a/packages/protocol/migrations_ts/00_initial_migration.ts +++ b/packages/protocol/migrations_ts/00_initial_migration.ts @@ -1,5 +1,5 @@ +import { ArtifactsSingleton } from '../lib/artifactsSingleton' import { networks } from '../truffle-config.js' -import { ArtifactsSingleton } from './artifactsSingleton' module.exports = async (deployer: any, network: any) => { const Migrations = artifacts.require('./Migrations.sol') diff --git a/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts b/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts index d73690559c6..b51f727043d 100644 --- a/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts +++ b/packages/protocol/migrations_ts/07_reserve_spender_multisig.ts @@ -6,7 +6,7 @@ import { import { config } from '@celo/protocol/migrationsConfig' import { ReserveSpenderMultiSigInstance } from 'types/mento' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from '../migrations_ts/artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const initializeArgs = async (): Promise => { return [ diff --git a/packages/protocol/migrations_ts/08_reserve.ts b/packages/protocol/migrations_ts/08_reserve.ts index d501ff2d873..3c9c74c5a3e 100644 --- a/packages/protocol/migrations_ts/08_reserve.ts +++ b/packages/protocol/migrations_ts/08_reserve.ts @@ -10,7 +10,7 @@ import { RegistryInstance } from 'types' import { ReserveInstance, ReserveSpenderMultiSigInstance } from 'types/mento' import Web3 from 'web3' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' import Web3Utils = require('web3-utils') diff --git a/packages/protocol/migrations_ts/09_01_stableToken_EUR.ts b/packages/protocol/migrations_ts/09_01_stableToken_EUR.ts index ca2b6c977b5..1a864c3f313 100644 --- a/packages/protocol/migrations_ts/09_01_stableToken_EUR.ts +++ b/packages/protocol/migrations_ts/09_01_stableToken_EUR.ts @@ -11,7 +11,7 @@ import { FeeCurrencyWhitelistInstance, FreezerInstance, SortedOraclesInstance } import { ReserveInstance, StableTokenEURInstance } from 'types/mento' import Web3 from 'web3' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const truffle = require('@celo/protocol/truffle-config.js') diff --git a/packages/protocol/migrations_ts/09_02_stableToken_BRL.ts b/packages/protocol/migrations_ts/09_02_stableToken_BRL.ts index 79d6556b2a3..09568743d5f 100644 --- a/packages/protocol/migrations_ts/09_02_stableToken_BRL.ts +++ b/packages/protocol/migrations_ts/09_02_stableToken_BRL.ts @@ -11,7 +11,7 @@ import { FeeCurrencyWhitelistInstance, FreezerInstance, SortedOraclesInstance } import { ReserveInstance, StableTokenBRLInstance } from 'types/mento' import Web3 from 'web3' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const truffle = require('@celo/protocol/truffle-config.js') diff --git a/packages/protocol/migrations_ts/09_0_stabletoken_USD.ts b/packages/protocol/migrations_ts/09_0_stabletoken_USD.ts index c076d2e0421..156498f438c 100644 --- a/packages/protocol/migrations_ts/09_0_stabletoken_USD.ts +++ b/packages/protocol/migrations_ts/09_0_stabletoken_USD.ts @@ -11,7 +11,7 @@ import { FeeCurrencyWhitelistInstance, FreezerInstance, SortedOraclesInstance } import { ReserveInstance, StableTokenInstance } from 'types/mento' import Web3 from 'web3' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const truffle = require('@celo/protocol/truffle-config.js') diff --git a/packages/protocol/migrations_ts/10_01_exchange_EUR.ts b/packages/protocol/migrations_ts/10_01_exchange_EUR.ts index b496801b8bf..3a158e16c66 100644 --- a/packages/protocol/migrations_ts/10_01_exchange_EUR.ts +++ b/packages/protocol/migrations_ts/10_01_exchange_EUR.ts @@ -10,7 +10,7 @@ import { toFixed } from '@celo/utils/lib/fixidity' import { FreezerInstance } from 'types' import { ExchangeEURInstance, ReserveInstance } from 'types/mento' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const initializeArgs = async (): Promise => { return [ diff --git a/packages/protocol/migrations_ts/10_02_exchange_BRL.ts b/packages/protocol/migrations_ts/10_02_exchange_BRL.ts index e43e5aa9d96..a12fc3de83d 100644 --- a/packages/protocol/migrations_ts/10_02_exchange_BRL.ts +++ b/packages/protocol/migrations_ts/10_02_exchange_BRL.ts @@ -10,7 +10,7 @@ import { toFixed } from '@celo/utils/lib/fixidity' import { FreezerInstance } from 'types' import { ExchangeBRLInstance, ReserveInstance } from 'types/mento' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const initializeArgs = async (): Promise => { return [ diff --git a/packages/protocol/migrations_ts/17_attestations.ts b/packages/protocol/migrations_ts/17_attestations.ts index 7ab9d122188..7abb69f26c7 100644 --- a/packages/protocol/migrations_ts/17_attestations.ts +++ b/packages/protocol/migrations_ts/17_attestations.ts @@ -8,7 +8,7 @@ import { config } from '@celo/protocol/migrationsConfig' import { AttestationsInstance } from 'types' import { StableTokenInstance } from 'types/mento' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const initializeArgs = async (): Promise<[string, string, string, string, string[], string[]]> => { const stableToken: StableTokenInstance = await getDeployedProxiedContract( diff --git a/packages/protocol/migrations_ts/24_grandamento.ts b/packages/protocol/migrations_ts/24_grandamento.ts index e33a6a28376..5c6e9635d9f 100644 --- a/packages/protocol/migrations_ts/24_grandamento.ts +++ b/packages/protocol/migrations_ts/24_grandamento.ts @@ -9,7 +9,7 @@ import { config } from '@celo/protocol/migrationsConfig' import { toFixed } from '@celo/utils/lib/fixidity' import { GrandaMentoInstance, ReserveInstance } from 'types/mento' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const initializeArgs = async (): Promise => { return [ diff --git a/packages/protocol/migrations_ts/27_governance.ts b/packages/protocol/migrations_ts/27_governance.ts index 7431fac94ea..2d16969ef47 100644 --- a/packages/protocol/migrations_ts/27_governance.ts +++ b/packages/protocol/migrations_ts/27_governance.ts @@ -12,7 +12,7 @@ import { config } from '@celo/protocol/migrationsConfig' import { toFixed } from '@celo/utils/lib/fixidity' import { GovernanceApproverMultiSigInstance, GovernanceInstance } from 'types' import { MENTO_PACKAGE } from '../contractPackages' -import { ArtifactsSingleton } from './artifactsSingleton' +import { ArtifactsSingleton } from '../lib/artifactsSingleton' const initializeArgs = async (networkName: string): Promise => { const governanceApproverMultiSig: GovernanceApproverMultiSigInstance = diff --git a/packages/protocol/test/common/integration.ts b/packages/protocol/test/common/integration.ts index 9ea07a2440d..3c22143b03e 100644 --- a/packages/protocol/test/common/integration.ts +++ b/packages/protocol/test/common/integration.ts @@ -38,7 +38,7 @@ import { StableTokenInstance, } from 'types/mento' import { MENTO_PACKAGE } from '../../contractPackages' -import { ArtifactsSingleton } from '../../migrations_ts/artifactsSingleton' +import { ArtifactsSingleton } from '../../lib/artifactsSingleton' import { SECONDS_IN_A_WEEK } from '../constants' enum VoteValue { diff --git a/packages/protocol/test/common/migration.ts b/packages/protocol/test/common/migration.ts index 435dc15884b..c3eb6148939 100644 --- a/packages/protocol/test/common/migration.ts +++ b/packages/protocol/test/common/migration.ts @@ -5,7 +5,7 @@ import { } from '@celo/protocol/lib/test-utils' import { getDeployedProxiedContract } from '@celo/protocol/lib/web3-utils' import { ContractPackage } from 'contractPackages' -import { ArtifactsSingleton } from '../../migrations_ts/artifactsSingleton' +import { ArtifactsSingleton } from '../../lib/artifactsSingleton' const getProxiedContract = async (contractName: string, contractPackage: ContractPackage) => { const artifactsObject = ArtifactsSingleton.getInstance(contractPackage, artifacts) From c386b13887a5426c385d85c4b84e0184d197d281 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 14 Jun 2023 14:17:06 -0400 Subject: [PATCH 127/184] added transaction type when using mento artifacts --- packages/protocol/lib/web3-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/lib/web3-utils.ts b/packages/protocol/lib/web3-utils.ts index 9c973dcbaf7..7de0c6b7068 100644 --- a/packages/protocol/lib/web3-utils.ts +++ b/packages/protocol/lib/web3-utils.ts @@ -276,7 +276,7 @@ export const makeTruffleContractForMigration = (contractName: string, contractPa }) Contract.configureNetwork({networkType: "ethereum", provider: web3.currentProvider}) - Contract.defaults({from: network.from, gas: network.gas}) + Contract.defaults({from: network.from, gas: network.gas, type: 0}) ArtifactsSingleton.getInstance(contractPath).addArtifact(contractName, Contract) return Contract } From 93dc7d5a21381b9ce9e7a1b767995a06e8d5aaa6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 14 Jun 2023 17:42:43 -0400 Subject: [PATCH 128/184] fix Migration test --- packages/protocol/lib/test-utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/lib/test-utils.ts b/packages/protocol/lib/test-utils.ts index 2fabdee3e54..0b65cd5ad91 100644 --- a/packages/protocol/lib/test-utils.ts +++ b/packages/protocol/lib/test-utils.ts @@ -233,7 +233,7 @@ type ProxiedContractGetter = ( type ContratGetter = ( contractName: string, - contractPackage?: ContractPackage | String, + contractPackage?: ContractPackage, ) => Promise @@ -269,7 +269,7 @@ export const assertContractsRegistered = async (getContract: ContratGetter) => { export const assertRegistryAddressesSet = async (getContract: ContratGetter) => { const registry: RegistryInstance = await getContract('Registry') for (const contractName of usesRegistry) { - const contract: UsingRegistryInstance = await getContract(contractName, 'proxiedContract') + const contract: UsingRegistryInstance = await getContract(contractName, MENTO_PACKAGE) assert.strictEqual( registry.address.toLowerCase(), (await contract.registry()).toLowerCase(), From 31f5840f58e7703787329e5c62e28e6aa9227329 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 14 Jun 2023 17:45:21 -0400 Subject: [PATCH 129/184] allow submodules in e2e matrix --- .github/workflows/circleci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 1f990de36b0..cb68f9806ed 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -650,10 +650,13 @@ jobs: path: .git key: git-${{ github.ref }} - uses: actions/checkout@v3 + with: + submodules: recursive - name: Sync workspace uses: ./.github/actions/sync-workspace with: package-json-checksum: ${{ needs.install-dependencies.outputs.package-json-checksum }} + rebuild-package: 'true' - name: Setup tmate session uses: mxschmitt/action-tmate@v3 timeout-minutes: 20 From c0ee6fbc98fe63267798a628a6293f5d243d87d1 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Tue, 20 Jun 2023 12:51:10 +0200 Subject: [PATCH 130/184] python2 -> python (3) --- dockerfiles/celotool/Dockerfile | 2 +- dockerfiles/cli/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile index e1f6991da6f..9cb74212fb5 100644 --- a/dockerfiles/celotool/Dockerfile +++ b/dockerfiles/celotool/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /celo-monorepo # Needed for gsutil RUN apt-get update && \ apt-get install -y lsb-release && \ - apt-get install -y curl build-essential git python2 && \ + apt-get install -y curl build-essential git python && \ export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ diff --git a/dockerfiles/cli/Dockerfile b/dockerfiles/cli/Dockerfile index 079e15a4d57..f50b70e9a5d 100644 --- a/dockerfiles/cli/Dockerfile +++ b/dockerfiles/cli/Dockerfile @@ -40,7 +40,7 @@ ARG celo_env RUN echo "geth_tag is ${geth_tag}" && echo "Env is ${celo_env}" # Required for celocli -RUN apk add --no-cache python2 git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev +RUN apk add --no-cache python git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev WORKDIR /celo-monorepo/ RUN npm install @celo/celocli From 6c8f094c0b23b1a9c4f76516ffd02c570fa9b081 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 12:23:06 -0400 Subject: [PATCH 131/184] using nvm to switch to node12 for pre-release test --- .github/workflows/circleci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index cb68f9806ed..b43a8e913ef 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -240,6 +240,13 @@ jobs: key: protocol-${{ github.sha }} restore-keys: | protocol-${{ github.sha }} + - name: Switch to node 12 + run: | + nvm use 12 + - name: Build using node 12 + run: | + yarn install + yarn build --ignore docs --include-dependencies - name: Opcode tests run: | yarn --cwd packages/protocol check-opcodes From 22a2a057a1cb2aff4c8d7250a8acadbcaab82142 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 12:41:46 -0400 Subject: [PATCH 132/184] =?UTF-8?q?=E2=88=86=20to=20trigger=20GH=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/circleci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index b43a8e913ef..49e6c65dfcd 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -240,10 +240,10 @@ jobs: key: protocol-${{ github.sha }} restore-keys: | protocol-${{ github.sha }} - - name: Switch to node 12 + - name: Switch to node12 run: | nvm use 12 - - name: Build using node 12 + - name: Build using node12 run: | yarn install yarn build --ignore docs --include-dependencies From 4b6629c14923bee2159b234f294a1483fc7f8cf4 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 12:45:08 -0400 Subject: [PATCH 133/184] =?UTF-8?q?=E2=88=86=20to=20trigger=20full=20test?= =?UTF-8?q?=20in=20GH=20actions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/protocol/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 9830336abf3..1664ab21caf 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -117,4 +117,4 @@ "typechain-target-truffle": "1.0.2", "yargs": "^14.0.0" } -} +} \ No newline at end of file From acafbaca0ff68d7fdad89cd627fed2d28dc801b1 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Mon, 26 Jun 2023 19:05:58 +0200 Subject: [PATCH 134/184] Using nvm for circleci image --- dockerfiles/circleci/circleci-node18/Dockerfile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile index f618888951e..b20d0e116a1 100644 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,8 +1,23 @@ -FROM cimg/node:18.14.2 +# FROM cimg/node:18.14.2 +FROM cimg/base:current RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y +RUN curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash && \ + export NVM_DIR="$HOME/.nvm" && \ + . "$NVM_DIR/nvm.sh" && \ + nvm install 18.14.2 && \ + nvm use 18.14.2 && \ + nvm alias default 18.14.2 && \ + node --version && \ + npm --version && \ + sudo ln -s "$NVM_DIR/versions/node/$(nvm version)/bin/node" "/usr/local/bin/node" && \ + sudo ln -s "$NVM_DIR/versions/node/$(nvm version)/bin/npm" "/usr/local/bin/npm" && \ + nvm install 12.22.11 && \ + sudo apt-get clean -y && \ + sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + # Install Kubernetes, as per https://kubernetes.io/docs/tasks/tools/install-kubectl/ RUN sudo apt-get install -y apt-transport-https && \ curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ From db5df3c6a5fa205cdafa19cc8b11d214582b2040 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Mon, 26 Jun 2023 22:32:22 +0200 Subject: [PATCH 135/184] Do not use nvm with circleci --- .github/workflows/circleci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 49e6c65dfcd..749409c935c 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,6 +8,8 @@ on: push: branches: - master + # TODO: Remove this before merging + - soloseng/ganache-upgrade pull_request: branches: - master @@ -240,9 +242,9 @@ jobs: key: protocol-${{ github.sha }} restore-keys: | protocol-${{ github.sha }} - - name: Switch to node12 - run: | - nvm use 12 + - uses: actions/setup-node@v3 + with: + node-version: 12.22.11 - name: Build using node12 run: | yarn install From 910a706a3b98e6982c6ff49eae0f2749ce7063ca Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:38:11 -0400 Subject: [PATCH 136/184] use node12 to generate old release devchain --- .github/workflows/circleci.yml | 10 +++------- .../scripts/bash/generate-old-devchain-and-build.sh | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 749409c935c..da3d994dd96 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -242,16 +242,12 @@ jobs: key: protocol-${{ github.sha }} restore-keys: | protocol-${{ github.sha }} - - uses: actions/setup-node@v3 - with: - node-version: 12.22.11 - - name: Build using node12 - run: | - yarn install - yarn build --ignore docs --include-dependencies - name: Opcode tests run: | yarn --cwd packages/protocol check-opcodes + - uses: actions/setup-node@v3 + with: + node-version: 12.22.11 - name: Generate devchain of previous release run: | echo "Comparing against $RELEASE_TAG" diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index 4de02288fbf..72ecc826efa 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -37,6 +37,7 @@ echo "- Build monorepo (contract artifacts, migrations, + all dependencies)" cd ../.. # TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) yarn run lerna run clean >> $LOG_FILE +yarn run reset >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE # in release v8 and earlier, @celo/contractkit automatically uses set RELEASE_TAG From 57f0009e85369111053d60af70aa248b4a1e7444 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 17:11:25 -0400 Subject: [PATCH 137/184] reset and reinstall before cleaning --- .../protocol/scripts/bash/generate-old-devchain-and-build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index 72ecc826efa..e689f9908a5 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -36,10 +36,12 @@ git checkout $BRANCH 2>>$LOG_FILE >> $LOG_FILE echo "- Build monorepo (contract artifacts, migrations, + all dependencies)" cd ../.. # TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) -yarn run lerna run clean >> $LOG_FILE +# yarn run lerna run clean >> $LOG_FILE yarn run reset >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE +yarn run lerna run clean >> $LOG_FILE +yarn install >> $LOG_FILE # in release v8 and earlier, @celo/contractkit automatically uses set RELEASE_TAG # when building, which fails if this differs from `package/protocol`'s build directory. RELEASE_TAG="" yarn build >> $LOG_FILE From 8a1fcff5e6b24fe749b22914c3d921605d3f68b1 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 17:51:50 -0400 Subject: [PATCH 138/184] set python2 in release branch --- .../protocol/scripts/bash/generate-old-devchain-and-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index e689f9908a5..6aecd332a4e 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -38,6 +38,7 @@ cd ../.. # TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) # yarn run lerna run clean >> $LOG_FILE yarn run reset >> $LOG_FILE +yarn config set python $(which python) >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE yarn run lerna run clean >> $LOG_FILE From 463a42ce8fc03fe6bd0483b155be994201ec88dc Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:07:01 -0400 Subject: [PATCH 139/184] installed python2 --- .../protocol/scripts/bash/generate-old-devchain-and-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index 6aecd332a4e..8b40d32f7c1 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -38,7 +38,8 @@ cd ../.. # TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) # yarn run lerna run clean >> $LOG_FILE yarn run reset >> $LOG_FILE -yarn config set python $(which python) >> $LOG_FILE +sudo apt-get install python2 +yarn config set python $(which python2) >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE yarn run lerna run clean >> $LOG_FILE From 9a16941944070f8146dc5caf33acbd0cf99867a8 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:26:25 -0400 Subject: [PATCH 140/184] added log --- .../protocol/scripts/bash/generate-old-devchain-and-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index 8b40d32f7c1..d5c1f903921 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -38,8 +38,8 @@ cd ../.. # TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) # yarn run lerna run clean >> $LOG_FILE yarn run reset >> $LOG_FILE -sudo apt-get install python2 -yarn config set python $(which python2) >> $LOG_FILE +sudo apt-get install python2 >> $LOG_FILE +yarn config set python $(whereis python2) >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE yarn run lerna run clean >> $LOG_FILE From b886aa5f3d761340b293da160af7d0019c96621a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:42:05 -0400 Subject: [PATCH 141/184] removed python2 install script --- .../protocol/scripts/bash/generate-old-devchain-and-build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index d5c1f903921..e689f9908a5 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -38,8 +38,6 @@ cd ../.. # TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) # yarn run lerna run clean >> $LOG_FILE yarn run reset >> $LOG_FILE -sudo apt-get install python2 >> $LOG_FILE -yarn config set python $(whereis python2) >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE yarn run lerna run clean >> $LOG_FILE From de5b77029899f85155add6fd78044eb9efabb550 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:42:18 -0400 Subject: [PATCH 142/184] set new release tag --- .github/workflows/circleci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index da3d994dd96..4514f2921b9 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -29,7 +29,8 @@ env: TERM: dumb GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"' # Git Tag for contract release to use - RELEASE_TAG: core-contracts.v9 + RELEASE_TAG: ganache-v7-core-contracts.v9 + # RELEASE_TAG: core-contracts.v9 # CELO_BLOCKCHAIN_BRANCH_TO_TEST: master CELO_BLOCKCHAIN_BRANCH_TO_TEST: release/1.7.x From f167a08a87bc8f41379e4a2bf38d0a44eba97ff3 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:48:16 -0400 Subject: [PATCH 143/184] trigger all test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b1c52f5091..da60643c895 100644 --- a/package.json +++ b/package.json @@ -87,4 +87,4 @@ "@types/bn.js": "4.11.6", "bignumber.js": "9.0.0" } -} +} \ No newline at end of file From d44d9203413004dd82ad5a4627df4cd572e2a730 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 26 Jun 2023 19:26:53 -0400 Subject: [PATCH 144/184] WIP comments --- .../scripts/bash/generate-old-devchain-and-build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index e689f9908a5..df757348c37 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -35,12 +35,13 @@ git checkout $BRANCH 2>>$LOG_FILE >> $LOG_FILE echo "- Build monorepo (contract artifacts, migrations, + all dependencies)" cd ../.. -# TODO: use `yarn clean` after release v8 (not available at monorepo-root for <=v8) -# yarn run lerna run clean >> $LOG_FILE +# XXX (soloseng): had to move the following command after `yarn reset` due to lerna incompatibility betwne node versions. +# yarn run lerna run clean >> $LOG_FILE +# XXX (soloseng): use `yarn reset` to remove node18 node_modules before building with node12. yarn run reset >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE -yarn run lerna run clean >> $LOG_FILE +yarn run clean >> $LOG_FILE yarn install >> $LOG_FILE # in release v8 and earlier, @celo/contractkit automatically uses set RELEASE_TAG # when building, which fails if this differs from `package/protocol`'s build directory. From d7dad8beaaf12b8f478d85d74fae0dbca37f4c1b Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 27 Jun 2023 10:01:23 -0400 Subject: [PATCH 145/184] trigger all test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da60643c895..6b1c52f5091 100644 --- a/package.json +++ b/package.json @@ -87,4 +87,4 @@ "@types/bn.js": "4.11.6", "bignumber.js": "9.0.0" } -} \ No newline at end of file +} From fbc89cb5f7550c9ff6cad7003662d49a3e515a5b Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Tue, 27 Jun 2023 18:27:16 +0200 Subject: [PATCH 146/184] CircleCi Build pre-protocol with node12 --- .circleci/config.yml | 11 +++++++++++ dockerfiles/circleci/circleci-node18/Dockerfile | 17 +---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df9069c9d03..468e0ac9bc8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,9 @@ version: 2.1 +orbs: + node: circleci/node@5.1.0 + parameters: # When you need to force a rebuild of the node modules cache then bump this version node-modules-cache-version: @@ -246,6 +249,14 @@ jobs: name: Check if the test should run command: | ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol + - node/install: + install-yarn: true + node-version: '12.22.11' + - run: + name: Build using node12 + command: | + yarn install + yarn build --ignore docs --include-dependencies - run: name: Opcode tests command: yarn --cwd packages/protocol check-opcodes diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile index b20d0e116a1..d3556fe254f 100644 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,23 +1,8 @@ -# FROM cimg/node:18.14.2 -FROM cimg/base:current + "FROM cimg/node:18.14.2 RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y -RUN curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash && \ - export NVM_DIR="$HOME/.nvm" && \ - . "$NVM_DIR/nvm.sh" && \ - nvm install 18.14.2 && \ - nvm use 18.14.2 && \ - nvm alias default 18.14.2 && \ - node --version && \ - npm --version && \ - sudo ln -s "$NVM_DIR/versions/node/$(nvm version)/bin/node" "/usr/local/bin/node" && \ - sudo ln -s "$NVM_DIR/versions/node/$(nvm version)/bin/npm" "/usr/local/bin/npm" && \ - nvm install 12.22.11 && \ - sudo apt-get clean -y && \ - sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - # Install Kubernetes, as per https://kubernetes.io/docs/tasks/tools/install-kubectl/ RUN sudo apt-get install -y apt-transport-https && \ curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ From cdf6dc34e9b7abf3fcfca6f8d4caf63bb39a9eca Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Tue, 27 Jun 2023 18:46:18 +0200 Subject: [PATCH 147/184] Circle node12 fix --- .circleci/config.yml | 11 +++-------- .github/workflows/circleci.yml | 2 -- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 468e0ac9bc8..8cdd7d1c26b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -249,17 +249,12 @@ jobs: name: Check if the test should run command: | ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol - - node/install: - install-yarn: true - node-version: '12.22.11' - - run: - name: Build using node12 - command: | - yarn install - yarn build --ignore docs --include-dependencies - run: name: Opcode tests command: yarn --cwd packages/protocol check-opcodes + - node/install: + install-yarn: true + node-version: '12.22.11' - run: name: Generate devchain of previous release command: | diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 4514f2921b9..835bc09be2a 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,8 +8,6 @@ on: push: branches: - master - # TODO: Remove this before merging - - soloseng/ganache-upgrade pull_request: branches: - master From 16669e5a97be75a208f3e74eb533380853a84ecc Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Tue, 27 Jun 2023 19:31:12 +0200 Subject: [PATCH 148/184] Adding python 2 and 3 to circleci image --- dockerfiles/circleci/circleci-node18/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dockerfiles/circleci/circleci-node18/Dockerfile b/dockerfiles/circleci/circleci-node18/Dockerfile index d3556fe254f..c8ee052186e 100644 --- a/dockerfiles/circleci/circleci-node18/Dockerfile +++ b/dockerfiles/circleci/circleci-node18/Dockerfile @@ -1,8 +1,16 @@ - "FROM cimg/node:18.14.2 +FROM cimg/node:18.14.2 RUN sudo apt-get update -y RUN sudo apt-get install lsb-release libudev-dev libusb-dev libusb-1.0-0 rsync -y +# Install python3 and python2 +RUN sudo apt-get update -y && \ + sudo apt-get install -y python3 python2 && \ + # Set python3 as default + sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \ + sudo apt-get clean -y && \ + sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + # Install Kubernetes, as per https://kubernetes.io/docs/tasks/tools/install-kubectl/ RUN sudo apt-get install -y apt-transport-https && \ curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ From c9a36376f74e73bfe325ad5cafd67bcaf5fdcb24 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 27 Jun 2023 19:46:53 -0400 Subject: [PATCH 149/184] run devchain from tar in detached mode --- packages/protocol/package.json | 1 + .../protocol/scripts/bash/ganache_devchain.sh | 27 +++++++++++++++++++ .../scripts/bash/release-on-devchain.sh | 3 ++- packages/protocol/scripts/devchain.ts | 19 +++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100755 packages/protocol/scripts/bash/ganache_devchain.sh diff --git a/packages/protocol/package.json b/packages/protocol/package.json index 1664ab21caf..e4ad8b3e6cf 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -37,6 +37,7 @@ "verify-deployed": "./scripts/bash/verify-deployed.sh", "verify-release": "./scripts/bash/verify-release.sh", "ganache-dev": "./scripts/bash/ganache.sh", + "ganache-devchain": "./scripts/bash/ganache_devchain.sh", "truffle:migrate": "truffle migrate", "devchain": "ts-node scripts/devchain.ts", "view-tags": "git for-each-ref 'refs/tags/core-contracts.*' --sort=-committerdate --format='%(color:magenta)%(committerdate:short) %(color:blue)%(tree) %(color:green)github.com/celo-org/celo-monorepo/releases/tag/%(color:yellow)%(refname:short)'", diff --git a/packages/protocol/scripts/bash/ganache_devchain.sh b/packages/protocol/scripts/bash/ganache_devchain.sh new file mode 100755 index 00000000000..8ce9859488f --- /dev/null +++ b/packages/protocol/scripts/bash/ganache_devchain.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +set -euo pipefail + +DATA_DIR="" + +while getopts 'd:' flag; do + case "${flag}" in + d) DATA_DIR="${OPTARG}" ;; + *) error "Unexpected option ${flag}" ;; + esac +done + +[ -z "$DATA_DIR" ] && echo "Need to set the datadir path via the -d flag" && exit 1; + +# Runs ganache with the mnemonic used in our tests. + +yarn run ganache \ + --detach \ + --wallet.mnemonic='concert load couple harbor equip island argue ramp clarify fence smart topic' \ + --miner.defaultGasPrice=0 \ + --miner.blockGasLimit=20000000 \ + --wallet.defaultBalance=200000000 \ + --chain.networkId=1101 \ + --chain.allowUnlimitedContractSize=true \ + --chain.chainId=1 \ + --chain.hardfork='istanbul' \ + --database.dbPath=$DATA_DIR diff --git a/packages/protocol/scripts/bash/release-on-devchain.sh b/packages/protocol/scripts/bash/release-on-devchain.sh index c8265a854fb..cf95add4c06 100755 --- a/packages/protocol/scripts/bash/release-on-devchain.sh +++ b/packages/protocol/scripts/bash/release-on-devchain.sh @@ -33,7 +33,8 @@ then fi echo "- Run local network" -startInBgAndWaitForString 'Ganache STARTED' yarn devchain run-tar packages/protocol/$BUILD_DIR/devchain.tar.gz >> $LOG_FILE +yarn devchain run-tar-in-bg packages/protocol/$BUILD_DIR/devchain.tar.gz >> $LOG_FILE +# startInBgAndWaitForString 'Ganache STARTED' yarn devchain run-tar packages/protocol/$BUILD_DIR/devchain.tar.gz >> $LOG_FILE GANACHE_PID= if command -v lsof; then diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 4961e84a106..246cc50dc0c 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -49,6 +49,12 @@ yargs (args) => args.positional('filename', { type: 'string', description: 'Chain tar filename' }), (args) => exitOnError(runDevChainFromTar(args.filename)) ) + .command( + 'run-tar-in-bg ', + "Run celo's devchain using given tar filename. Generates a copy and then delete it", + (args) => args.positional('filename', { type: 'string', description: 'Chain tar filename' }), + (args) => exitOnError(runDevChainFromTarInBackGround(args.filename)) + ) .command( 'generate ', 'Create a new devchain directory from scratch', @@ -245,6 +251,19 @@ async function runDevChainFromTar(filename: string) { return stopGanache } +async function runDevChainFromTarInBackGround(filename: string) { + const cmdArgs = ['ganache-devchain', '-d'] + const chainCopy: tmp.DirResult = tmp.dirSync({ keep: false, unsafeCleanup: true }) + // tslint:disable-next-line: no-console + console.log(`Creating tmp folder: ${chainCopy.name}`) + + await decompressChain(filename, chainCopy.name) + + cmdArgs.push(chainCopy.name) + + return execCmd(`yarn`, cmdArgs, { cwd: ProtocolRoot }) +} + function decompressChain(tarPath: string, copyChainPath: string): Promise { // tslint:disable-next-line: no-console console.log('Decompressing chain') From 8329f6495e28b7a390518f1444202988fa0c1645 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 27 Jun 2023 19:51:28 -0400 Subject: [PATCH 150/184] ++ comments --- packages/protocol/scripts/bash/release-on-devchain.sh | 1 + packages/protocol/scripts/devchain.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/protocol/scripts/bash/release-on-devchain.sh b/packages/protocol/scripts/bash/release-on-devchain.sh index cf95add4c06..7e5b3eb52ca 100755 --- a/packages/protocol/scripts/bash/release-on-devchain.sh +++ b/packages/protocol/scripts/bash/release-on-devchain.sh @@ -34,6 +34,7 @@ fi echo "- Run local network" yarn devchain run-tar-in-bg packages/protocol/$BUILD_DIR/devchain.tar.gz >> $LOG_FILE +# TODO (soloseng): fix `startInBgAndWaitForString` PIPE error # startInBgAndWaitForString 'Ganache STARTED' yarn devchain run-tar packages/protocol/$BUILD_DIR/devchain.tar.gz >> $LOG_FILE GANACHE_PID= diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 246cc50dc0c..9f06b0dfeba 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -251,6 +251,7 @@ async function runDevChainFromTar(filename: string) { return stopGanache } +// XXX (soloseng): This is a temp fix, for running devchain from tar in background. async function runDevChainFromTarInBackGround(filename: string) { const cmdArgs = ['ganache-devchain', '-d'] const chainCopy: tmp.DirResult = tmp.dirSync({ keep: false, unsafeCleanup: true }) From 53096ff0f87c2497fe41d4acc1a4c41ba31c40f0 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:20:30 -0400 Subject: [PATCH 151/184] updated release tag in circleCI config --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8cdd7d1c26b..3d81f3ddd05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,8 @@ defaults: &defaults contract-defaults: &contract-defaults <<: *defaults environment: - RELEASE_TAG: core-contracts.v9 + # RELEASE_TAG: core-contracts.v9 + RELEASE_TAG: ganache-v7-core-contracts.v9 e2e-defaults: &e2e-defaults <<: *defaults From 3880bb2356ff07e30bd514d04550bf2e2430ca8a Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Thu, 29 Jun 2023 11:38:28 +0200 Subject: [PATCH 152/184] Replace pull_request by pull_request_target --- .github/workflows/circleci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 835bc09be2a..1518de282ac 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,7 +8,8 @@ on: push: branches: - master - pull_request: + # TODO(jcortejoso): Replace by pull_request + pull_request_target: branches: - master From 0aadd4c5eafc2b5be975cbf7756f83e3e12a1704 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:55:38 -0400 Subject: [PATCH 153/184] bump MTWdeployer patch version --- .../protocol/contracts/common/MetaTransactionWalletDeployer.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/contracts/common/MetaTransactionWalletDeployer.sol b/packages/protocol/contracts/common/MetaTransactionWalletDeployer.sol index 4008bcc5215..8db335e68ce 100644 --- a/packages/protocol/contracts/common/MetaTransactionWalletDeployer.sol +++ b/packages/protocol/contracts/common/MetaTransactionWalletDeployer.sol @@ -15,7 +15,7 @@ contract MetaTransactionWalletDeployer is IMetaTransactionWalletDeployer, ICeloV * @return Patch version of the contract. */ function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) { - return (1, 1, 0, 2); + return (1, 1, 0, 3); } /** From 0e49b7bad25c3f679aede6c1c8b21ac0657459b3 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 14:02:07 -0400 Subject: [PATCH 154/184] testing bypass dryrun --- packages/protocol/scripts/truffle/make-release.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index dd705198b0d..54c1b815540 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -88,15 +88,17 @@ const deployImplementation = async ( from: string, requireVersion = true ) => { - const testingDeployment = false + // const testingDeployment = false if (from) { Contract.defaults({ from }) // override truffle with provided from address } console.log(`Deploying ${contractName}`) // Hack to trick truffle, which checks that the provided address has code - const contract = await (dryRun - ? Contract.at(celoRegistryAddress) - : Contract.new(testingDeployment)) + console.log(`isDryRun: ${dryRun}`) + const contract = await Contract.at(celoRegistryAddress) + // const contract = await (dryRun + // ? Contract.at(celoRegistryAddress) + // : Contract.new(testingDeployment)) // Sanity check that any contracts that are being changed set a version number. const getVersionNumberAbi = contract.abi.find( (abi: any) => abi.type === 'function' && abi.name === 'getVersionNumber' @@ -313,6 +315,7 @@ module.exports = async (callback: (error?: any) => number) => { writeJsonSync(argv.proposal, proposal, { spaces: 2 }) callback() } catch (error) { + console.log('### error:', error) callback(error) } } From fa043b99b627de8ef4ce21fb10e80034389b64c2 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 15:12:49 -0400 Subject: [PATCH 155/184] loggin and force CI run --- .github/workflows/circleci.yml | 1 + packages/protocol/scripts/truffle/make-release.ts | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 1518de282ac..b398721e174 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,6 +8,7 @@ on: push: branches: - master + - soloseng/ganache-upgrade # TODO(jcortejoso): Replace by pull_request pull_request_target: branches: diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index 54c1b815540..60db7b881b2 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -88,6 +88,7 @@ const deployImplementation = async ( from: string, requireVersion = true ) => { + console.log(`default from: ${from}`) // const testingDeployment = false if (from) { Contract.defaults({ from }) // override truffle with provided from address @@ -96,6 +97,7 @@ const deployImplementation = async ( // Hack to trick truffle, which checks that the provided address has code console.log(`isDryRun: ${dryRun}`) const contract = await Contract.at(celoRegistryAddress) + // const contract = await (dryRun // ? Contract.at(celoRegistryAddress) // : Contract.new(testingDeployment)) @@ -167,6 +169,7 @@ const deployCoreContract = async ( args: [contract.address], value: '0', } + console.log(`implementation deployed: ${contract}`) if (!shouldDeployProxy(report, contractName)) { proposal.push(setImplementationTx) @@ -243,6 +246,7 @@ module.exports = async (callback: (error?: any) => number) => { ], boolean: ['dry_run'], }) + console.log(JSON.stringify(argv)) const fullReport = readJsonSync(argv.report) const libraryMapping: LibraryAddresses['addresses'] = readJsonSync( argv.librariesFile ?? 'libraries.json' @@ -288,6 +292,7 @@ module.exports = async (callback: (error?: any) => number) => { // 3. Deploy new versions of the contract or library, if indicated by the report. const shouldDeployContract = Object.keys(report.contracts).includes(contractName) + console.log(`should deploy: ${shouldDeployContract}`) const shouldDeployLibrary = Object.keys(report.libraries).includes(contractName) if (shouldDeployContract) { await deployCoreContract( @@ -301,6 +306,7 @@ module.exports = async (callback: (error?: any) => number) => { argv.from ) } else if (shouldDeployLibrary) { + console.log('deploying library') await deployLibrary(contractName, contractArtifact, addresses, argv.dry_run, argv.from) } From 09d2681148ea5cd6183d2f49ad7854a131cb7421 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:03:22 -0400 Subject: [PATCH 156/184] removed false param --- packages/protocol/scripts/truffle/make-release.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index 60db7b881b2..b8ccfe185e4 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -96,11 +96,10 @@ const deployImplementation = async ( console.log(`Deploying ${contractName}`) // Hack to trick truffle, which checks that the provided address has code console.log(`isDryRun: ${dryRun}`) - const contract = await Contract.at(celoRegistryAddress) + // const contract = await Contract.at(celoRegistryAddress) + + const contract = await (dryRun ? Contract.at(celoRegistryAddress) : Contract.new()) - // const contract = await (dryRun - // ? Contract.at(celoRegistryAddress) - // : Contract.new(testingDeployment)) // Sanity check that any contracts that are being changed set a version number. const getVersionNumberAbi = contract.abi.find( (abi: any) => abi.type === 'function' && abi.name === 'getVersionNumber' @@ -169,7 +168,7 @@ const deployCoreContract = async ( args: [contract.address], value: '0', } - console.log(`implementation deployed: ${contract}`) + console.log(`implementation deployed: ${JSON.stringify(contract)}`) if (!shouldDeployProxy(report, contractName)) { proposal.push(setImplementationTx) From 3fb39b85233014c50be6803c1c1721f457168e56 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:28:09 -0400 Subject: [PATCH 157/184] revert change and added try catch --- packages/protocol/scripts/truffle/make-release.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index b8ccfe185e4..ee6167ea9d7 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -89,16 +89,20 @@ const deployImplementation = async ( requireVersion = true ) => { console.log(`default from: ${from}`) - // const testingDeployment = false + const testingDeployment = false if (from) { Contract.defaults({ from }) // override truffle with provided from address } console.log(`Deploying ${contractName}`) // Hack to trick truffle, which checks that the provided address has code console.log(`isDryRun: ${dryRun}`) - // const contract = await Contract.at(celoRegistryAddress) - - const contract = await (dryRun ? Contract.at(celoRegistryAddress) : Contract.new()) + let contract + try { + contract = await (dryRun ? Contract.at(celoRegistryAddress) : Contract.new(testingDeployment)) + } catch (error) { + console.log(error) + throw error + } // Sanity check that any contracts that are being changed set a version number. const getVersionNumberAbi = contract.abi.find( From bc2c1089f8e876d8ff7675153ec794798d5e378a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 17:09:57 -0400 Subject: [PATCH 158/184] moved await --- packages/protocol/scripts/truffle/make-release.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index ee6167ea9d7..4992ed10bb0 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -93,12 +93,14 @@ const deployImplementation = async ( if (from) { Contract.defaults({ from }) // override truffle with provided from address } - console.log(`Deploying ${contractName}`) + console.log(`Deploying ${contractName} instance${Contract}`) // Hack to trick truffle, which checks that the provided address has code console.log(`isDryRun: ${dryRun}`) let contract try { - contract = await (dryRun ? Contract.at(celoRegistryAddress) : Contract.new(testingDeployment)) + contract = dryRun + ? await Contract.at(celoRegistryAddress) + : await Contract.new(testingDeployment) } catch (error) { console.log(error) throw error From 7050b506139ac77e94e202b142bee72342a42375 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 17:37:57 -0400 Subject: [PATCH 159/184] added type to tx detail --- packages/protocol/scripts/truffle/make-release.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index 4992ed10bb0..2d73b2b4423 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -91,7 +91,7 @@ const deployImplementation = async ( console.log(`default from: ${from}`) const testingDeployment = false if (from) { - Contract.defaults({ from }) // override truffle with provided from address + Contract.defaults({ from, type: 0 }) // override truffle with provided from address } console.log(`Deploying ${contractName} instance${Contract}`) // Hack to trick truffle, which checks that the provided address has code From 037249fb7fde5d21403a39b0973a99d9ec6bd4d0 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 18:00:03 -0400 Subject: [PATCH 160/184] included tx type in contract deployment --- packages/protocol/scripts/truffle/make-release.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index 2d73b2b4423..4337d638fbe 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -98,9 +98,9 @@ const deployImplementation = async ( console.log(`isDryRun: ${dryRun}`) let contract try { - contract = dryRun - ? await Contract.at(celoRegistryAddress) - : await Contract.new(testingDeployment) + contract = await (dryRun + ? Contract.at(celoRegistryAddress) + : Contract.new(testingDeployment, { type: 0 })) } catch (error) { console.log(error) throw error From a6b7fff38351bb9fe603f54af4bd2dec37f847d6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 29 Jun 2023 22:32:21 -0400 Subject: [PATCH 161/184] increased logging level in ganache and truffle --- packages/protocol/scripts/bash/ganache_devchain.sh | 6 +++++- packages/protocol/truffle-config.js | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/protocol/scripts/bash/ganache_devchain.sh b/packages/protocol/scripts/bash/ganache_devchain.sh index 8ce9859488f..4d9bcdb372b 100755 --- a/packages/protocol/scripts/bash/ganache_devchain.sh +++ b/packages/protocol/scripts/bash/ganache_devchain.sh @@ -24,4 +24,8 @@ yarn run ganache \ --chain.allowUnlimitedContractSize=true \ --chain.chainId=1 \ --chain.hardfork='istanbul' \ - --database.dbPath=$DATA_DIR + --database.dbPath=$DATA_DIR \ + --chain.vmErrorsOnRPCResponse=true \ + --logging.debug=true \ + --logging.verbose=true \ + --logging.quiet=false diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index 98db1afe31c..29dc5928823 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -226,6 +226,9 @@ module.exports = { }, networks, mocha: flakeTrackingConfig, + logging: { + level: 'debug', + }, } if (process.argv.includes('--gas')) { From 5d569959b61e90fd7622d0d073df7e8a38de2da8 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 00:05:00 -0400 Subject: [PATCH 162/184] specified gas to deployment tx --- .../protocol/scripts/truffle/make-release.ts | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index 4337d638fbe..69785637f14 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -91,20 +91,15 @@ const deployImplementation = async ( console.log(`default from: ${from}`) const testingDeployment = false if (from) { - Contract.defaults({ from, type: 0 }) // override truffle with provided from address + Contract.defaults({ from }) // override truffle with provided from address } - console.log(`Deploying ${contractName} instance${Contract}`) + console.log(`Deploying ${contractName}`) // Hack to trick truffle, which checks that the provided address has code console.log(`isDryRun: ${dryRun}`) - let contract - try { - contract = await (dryRun - ? Contract.at(celoRegistryAddress) - : Contract.new(testingDeployment, { type: 0 })) - } catch (error) { - console.log(error) - throw error - } + + const contract = await (dryRun + ? Contract.at(celoRegistryAddress) + : Contract.new(testingDeployment, { gas: 19000000 })) // Sanity check that any contracts that are being changed set a version number. const getVersionNumberAbi = contract.abi.find( @@ -174,7 +169,7 @@ const deployCoreContract = async ( args: [contract.address], value: '0', } - console.log(`implementation deployed: ${JSON.stringify(contract)}`) + console.log(`implementation deployed: ${contractName}`) if (!shouldDeployProxy(report, contractName)) { proposal.push(setImplementationTx) From 18ae7b3e8680efe7cebda6a9bb89a517b34d1ff2 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 01:19:53 -0400 Subject: [PATCH 163/184] removed truffle debug logging --- packages/protocol/truffle-config.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index 29dc5928823..98db1afe31c 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -226,9 +226,6 @@ module.exports = { }, networks, mocha: flakeTrackingConfig, - logging: { - level: 'debug', - }, } if (process.argv.includes('--gas')) { From 787392f52edcc4c499badb194bf992234d316cf5 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 01:20:40 -0400 Subject: [PATCH 164/184] keep chaincopy --- packages/protocol/scripts/devchain.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index 9f06b0dfeba..ba8450b32db 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -254,7 +254,7 @@ async function runDevChainFromTar(filename: string) { // XXX (soloseng): This is a temp fix, for running devchain from tar in background. async function runDevChainFromTarInBackGround(filename: string) { const cmdArgs = ['ganache-devchain', '-d'] - const chainCopy: tmp.DirResult = tmp.dirSync({ keep: false, unsafeCleanup: true }) + const chainCopy: tmp.DirResult = tmp.dirSync({ keep: true, unsafeCleanup: true }) // tslint:disable-next-line: no-console console.log(`Creating tmp folder: ${chainCopy.name}`) From dac608b93bd7dac7d3810de3eb76105d9e3ef551 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 02:08:24 -0400 Subject: [PATCH 165/184] removed debug logs --- packages/protocol/scripts/bash/ganache_devchain.sh | 8 +------- packages/protocol/scripts/devchain.ts | 9 ++++++++- packages/protocol/scripts/truffle/make-release.ts | 9 --------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/packages/protocol/scripts/bash/ganache_devchain.sh b/packages/protocol/scripts/bash/ganache_devchain.sh index 4d9bcdb372b..0913a289ea0 100755 --- a/packages/protocol/scripts/bash/ganache_devchain.sh +++ b/packages/protocol/scripts/bash/ganache_devchain.sh @@ -12,8 +12,6 @@ done [ -z "$DATA_DIR" ] && echo "Need to set the datadir path via the -d flag" && exit 1; -# Runs ganache with the mnemonic used in our tests. - yarn run ganache \ --detach \ --wallet.mnemonic='concert load couple harbor equip island argue ramp clarify fence smart topic' \ @@ -24,8 +22,4 @@ yarn run ganache \ --chain.allowUnlimitedContractSize=true \ --chain.chainId=1 \ --chain.hardfork='istanbul' \ - --database.dbPath=$DATA_DIR \ - --chain.vmErrorsOnRPCResponse=true \ - --logging.debug=true \ - --logging.verbose=true \ - --logging.quiet=false + --database.dbPath=$DATA_DIR diff --git a/packages/protocol/scripts/devchain.ts b/packages/protocol/scripts/devchain.ts index ba8450b32db..cd1954eff7a 100644 --- a/packages/protocol/scripts/devchain.ts +++ b/packages/protocol/scripts/devchain.ts @@ -251,10 +251,17 @@ async function runDevChainFromTar(filename: string) { return stopGanache } -// XXX (soloseng): This is a temp fix, for running devchain from tar in background. +/// This function was created to replace `startInBgAndWaitForString` in `release-on-devchain.sh` +/// and intended to be run on a hosted instances that shutdown after execution. +/// Note: If you run this locally, you will need to properly cleanup tmp.DirResult and +/// manually close the detached ganache instance. +/// see https://trufflesuite.com/docs/ganache/reference/cli-options/#manage-detached-instances for more details async function runDevChainFromTarInBackGround(filename: string) { const cmdArgs = ['ganache-devchain', '-d'] + + // keep is set to true, because `release-on-devchain` fails when set to false. const chainCopy: tmp.DirResult = tmp.dirSync({ keep: true, unsafeCleanup: true }) + // tslint:disable-next-line: no-console console.log(`Creating tmp folder: ${chainCopy.name}`) diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index 69785637f14..a9d015ffb36 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -88,19 +88,15 @@ const deployImplementation = async ( from: string, requireVersion = true ) => { - console.log(`default from: ${from}`) const testingDeployment = false if (from) { Contract.defaults({ from }) // override truffle with provided from address } console.log(`Deploying ${contractName}`) // Hack to trick truffle, which checks that the provided address has code - console.log(`isDryRun: ${dryRun}`) - const contract = await (dryRun ? Contract.at(celoRegistryAddress) : Contract.new(testingDeployment, { gas: 19000000 })) - // Sanity check that any contracts that are being changed set a version number. const getVersionNumberAbi = contract.abi.find( (abi: any) => abi.type === 'function' && abi.name === 'getVersionNumber' @@ -169,7 +165,6 @@ const deployCoreContract = async ( args: [contract.address], value: '0', } - console.log(`implementation deployed: ${contractName}`) if (!shouldDeployProxy(report, contractName)) { proposal.push(setImplementationTx) @@ -246,7 +241,6 @@ module.exports = async (callback: (error?: any) => number) => { ], boolean: ['dry_run'], }) - console.log(JSON.stringify(argv)) const fullReport = readJsonSync(argv.report) const libraryMapping: LibraryAddresses['addresses'] = readJsonSync( argv.librariesFile ?? 'libraries.json' @@ -292,7 +286,6 @@ module.exports = async (callback: (error?: any) => number) => { // 3. Deploy new versions of the contract or library, if indicated by the report. const shouldDeployContract = Object.keys(report.contracts).includes(contractName) - console.log(`should deploy: ${shouldDeployContract}`) const shouldDeployLibrary = Object.keys(report.libraries).includes(contractName) if (shouldDeployContract) { await deployCoreContract( @@ -306,7 +299,6 @@ module.exports = async (callback: (error?: any) => number) => { argv.from ) } else if (shouldDeployLibrary) { - console.log('deploying library') await deployLibrary(contractName, contractArtifact, addresses, argv.dry_run, argv.from) } @@ -321,7 +313,6 @@ module.exports = async (callback: (error?: any) => number) => { writeJsonSync(argv.proposal, proposal, { spaces: 2 }) callback() } catch (error) { - console.log('### error:', error) callback(error) } } From 7d2e5c51e1c60a4ce58f29f3ccd4b3f53e5b4fda Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 02:10:58 -0400 Subject: [PATCH 166/184] clean up redundant install ++ comment --- .../scripts/bash/generate-old-devchain-and-build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh index df757348c37..eabe49dcd25 100755 --- a/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh +++ b/packages/protocol/scripts/bash/generate-old-devchain-and-build.sh @@ -35,14 +35,13 @@ git checkout $BRANCH 2>>$LOG_FILE >> $LOG_FILE echo "- Build monorepo (contract artifacts, migrations, + all dependencies)" cd ../.. -# XXX (soloseng): had to move the following command after `yarn reset` due to lerna incompatibility betwne node versions. -# yarn run lerna run clean >> $LOG_FILE -# XXX (soloseng): use `yarn reset` to remove node18 node_modules before building with node12. + +# Using `yarn reset` to remove node_modules before re-installing using the node version of +# the previous release branch. This is useful when node version between branches are incompatible yarn run reset >> $LOG_FILE # build entire monorepo to account for any required dependencies. yarn install >> $LOG_FILE yarn run clean >> $LOG_FILE -yarn install >> $LOG_FILE # in release v8 and earlier, @celo/contractkit automatically uses set RELEASE_TAG # when building, which fails if this differs from `package/protocol`'s build directory. RELEASE_TAG="" yarn build >> $LOG_FILE From 2b4ffb178c1b3855eb48473ceb789e53b39050b6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 08:00:53 -0400 Subject: [PATCH 167/184] revert GH action trigger on current branch push --- .github/workflows/circleci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index b398721e174..1518de282ac 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,7 +8,6 @@ on: push: branches: - master - - soloseng/ganache-upgrade # TODO(jcortejoso): Replace by pull_request pull_request_target: branches: From ffb07c9da21124de3619049ee3f64f2f79616ebf Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 08:01:36 -0400 Subject: [PATCH 168/184] remove comments --- packages/protocol/scripts/bash/release-on-devchain.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/protocol/scripts/bash/release-on-devchain.sh b/packages/protocol/scripts/bash/release-on-devchain.sh index 7e5b3eb52ca..0a34f752895 100755 --- a/packages/protocol/scripts/bash/release-on-devchain.sh +++ b/packages/protocol/scripts/bash/release-on-devchain.sh @@ -34,8 +34,6 @@ fi echo "- Run local network" yarn devchain run-tar-in-bg packages/protocol/$BUILD_DIR/devchain.tar.gz >> $LOG_FILE -# TODO (soloseng): fix `startInBgAndWaitForString` PIPE error -# startInBgAndWaitForString 'Ganache STARTED' yarn devchain run-tar packages/protocol/$BUILD_DIR/devchain.tar.gz >> $LOG_FILE GANACHE_PID= if command -v lsof; then From 9eadf98a8dae31085dc239d744e09908b536e4cc Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 30 Jun 2023 09:22:07 -0400 Subject: [PATCH 169/184] remove gas specfication --- .github/workflows/circleci.yml | 2 ++ packages/protocol/scripts/truffle/make-release.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 1518de282ac..b26a0955932 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,6 +8,8 @@ on: push: branches: - master + # TODO (soloseng): remove before merge + - soloseng/ganache-upgrade # TODO(jcortejoso): Replace by pull_request pull_request_target: branches: diff --git a/packages/protocol/scripts/truffle/make-release.ts b/packages/protocol/scripts/truffle/make-release.ts index a9d015ffb36..dd705198b0d 100644 --- a/packages/protocol/scripts/truffle/make-release.ts +++ b/packages/protocol/scripts/truffle/make-release.ts @@ -96,7 +96,7 @@ const deployImplementation = async ( // Hack to trick truffle, which checks that the provided address has code const contract = await (dryRun ? Contract.at(celoRegistryAddress) - : Contract.new(testingDeployment, { gas: 19000000 })) + : Contract.new(testingDeployment)) // Sanity check that any contracts that are being changed set a version number. const getVersionNumberAbi = contract.abi.find( (abi: any) => abi.type === 'function' && abi.name === 'getVersionNumber' From 5a964cfc5dceb2827806e3cdddb2689742d38228 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 11 Jul 2023 16:25:14 -0400 Subject: [PATCH 170/184] updated node version in docs --- packages/docs/command-line-interface/introduction.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docs/command-line-interface/introduction.md b/packages/docs/command-line-interface/introduction.md index 7e20a30dc9c..cc74d4204b0 100644 --- a/packages/docs/command-line-interface/introduction.md +++ b/packages/docs/command-line-interface/introduction.md @@ -21,7 +21,7 @@ npm install -g @celo/celocli ``` {% hint style="info" %} -We are currently deploying the CLI with only Node.js v18.14.2. If you are running a different version of Node.js, consider using [NVM](https://github.com/nvm-sh/nvm#installation-and-update) to manage your node versions. e.g. with: `nvm install 12 && nvm use 12` +We are currently deploying the CLI with only Node.js v18.14.2. If you are running a different version of Node.js, consider using [NVM](https://github.com/nvm-sh/nvm#installation-and-update) to manage your node versions. e.g. with: `nvm install 18.14.2 && nvm use 18.14.2` {% endhint %} {% hint style="info" %} From e553ae0dcdeb3d9b9fdac0966e1d71a53787aa53 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 11 Jul 2023 18:06:21 -0400 Subject: [PATCH 171/184] unskip migration test --- packages/protocol/test/common/migration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/test/common/migration.ts b/packages/protocol/test/common/migration.ts index c3eb6148939..4f85e1f3072 100644 --- a/packages/protocol/test/common/migration.ts +++ b/packages/protocol/test/common/migration.ts @@ -33,7 +33,7 @@ const getContract = async ( contract('Migration', () => { describe('Checking proxies', () => { - it.skip('should have the proxy set up for all proxied contracts', async () => { + it('should have the proxy set up for all proxied contracts', async () => { await assertProxiesSet(getContract) }) }) From 6b3f017e059769f223df0b22073c019c7b62e687 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:27:33 -0400 Subject: [PATCH 172/184] PR feedback --- .circleci/config.yml | 2 ++ packages/phone-number-privacy/combiner/jest.config.js | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d81f3ddd05..e7648f5a510 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,6 +39,7 @@ contract-defaults: &contract-defaults <<: *defaults environment: # RELEASE_TAG: core-contracts.v9 + # TODO(soloseng): switch back to core-contract.v* once the latest contract release is done on node18. RELEASE_TAG: ganache-v7-core-contracts.v9 e2e-defaults: &e2e-defaults @@ -254,6 +255,7 @@ jobs: name: Opcode tests command: yarn --cwd packages/protocol check-opcodes - node/install: + # TODO(soloseng): remove this node 12 install once the latest contract release is done on node18. install-yarn: true node-version: '12.22.11' - run: diff --git a/packages/phone-number-privacy/combiner/jest.config.js b/packages/phone-number-privacy/combiner/jest.config.js index 6c79c8222c0..63ea1df1ba5 100644 --- a/packages/phone-number-privacy/combiner/jest.config.js +++ b/packages/phone-number-privacy/combiner/jest.config.js @@ -4,7 +4,6 @@ module.exports = { preset: 'ts-jest', ...nodeFlakeTracking, setupFilesAfterEnv: [...nodeFlakeTracking.setupFilesAfterEnv], - // setupFilesAfterEnv: ['/jest_setup.ts', ...nodeFlakeTracking.setupFilesAfterEnv], coverageReporters: [['lcov', { projectRoot: '../../../' }], 'text'], collectCoverageFrom: ['./src/**'], coverageThreshold: { From 81d87a37cb118cd089fea708e1b1a8a8dc38793d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Sat, 15 Jul 2023 15:56:00 -0400 Subject: [PATCH 173/184] revert back to skip --- packages/protocol/test/common/migration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/test/common/migration.ts b/packages/protocol/test/common/migration.ts index 4f85e1f3072..c3eb6148939 100644 --- a/packages/protocol/test/common/migration.ts +++ b/packages/protocol/test/common/migration.ts @@ -33,7 +33,7 @@ const getContract = async ( contract('Migration', () => { describe('Checking proxies', () => { - it('should have the proxy set up for all proxied contracts', async () => { + it.skip('should have the proxy set up for all proxied contracts', async () => { await assertProxiesSet(getContract) }) }) From f6b2146c19723ffb155793c4b1e4c9f08f970d58 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:19:24 -0400 Subject: [PATCH 174/184] =?UTF-8?q?=E2=88=86=20forked=20packages=20to=20ce?= =?UTF-8?q?lo=20namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- packages/protocol/package.json | 4 +- packages/sdk/contractkit/package.json | 2 +- packages/sdk/identity/package.json | 2 +- yarn.lock | 97 ++++++++++++++------------- 5 files changed, 56 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 6b1c52f5091..39e21696d99 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "typescript-tslint-plugin": "^0.5.4" }, "resolutions": { - "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", + "ganache": "npm:@celo/ganache@7.8.0-unofficial.0", "@types/bn.js": "4.11.6", "bignumber.js": "9.0.0" } diff --git a/packages/protocol/package.json b/packages/protocol/package.json index e4ad8b3e6cf..ed5a2116ca3 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -55,7 +55,7 @@ "@celo/cryptographic-utils": "4.1.1-dev", "@celo/utils": "4.1.1-dev", "@ethereumjs/util": "8.0.5", - "@ethereumjs/vm": "npm:@soloseng/ethereumjs-vm@6.4.1", + "@ethereumjs/vm": "npm:@celo/ethereumjs-vm@6.4.1-unofficial.0", "@ganache/console.log": "0.3.0", "@openzeppelin/upgrades": "^2.8.0", "@summa-tx/memview.sol": "^1.1.0", @@ -73,7 +73,7 @@ "ethereumjs-wallet": "^0.6.3", "ethereum-cryptography": "1.2.0", "fs-extra": "^5.0.0", - "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", + "ganache": "npm:@celo/ganache@7.8.0-unofficial.0", "glob-fs": "^0.1.7", "graphql": "^14.1.1", "j6": "^1.0.2", diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 79b6930d999..1651e12b176 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -50,7 +50,7 @@ "@celo/protocol": "1.0.0", "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", - "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", + "ganache": "npm:@celo/ganache@7.8.0-unofficial.0", "jest": "^29.0.2", "ts-node": "8.3.0", "typedoc": "^0.19.2", diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json index ddef97110cb..e9ef34e9667 100644 --- a/packages/sdk/identity/package.json +++ b/packages/sdk/identity/package.json @@ -45,7 +45,7 @@ "@celo/wallet-local": "4.1.1-dev", "@types/elliptic": "^6.4.12", "fetch-mock": "9.10.4", - "ganache": "npm:@soloseng/ganache@7.8.0-beta.1", + "ganache": "npm:@celo/ganache@7.8.0-unofficial.0", "old-identity-sdk": "npm:@celo/identity@1.5.2" }, "engines": { diff --git a/yarn.lock b/yarn.lock index 0794ea636df..a24726b40c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1227,10 +1227,10 @@ bigint-crypto-utils "^3.0.23" ethereum-cryptography "^1.1.2" -"@ethereumjs/evm@npm:@soloseng/ethereumjs-evm@1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-evm/-/ethereumjs-evm-1.3.1.tgz#89786afeb1b017e70f96d0622312bfe9c5ff33df" - integrity sha512-9oVEhVS0UVq4qxCsTwuXMQpBpBeJNPKNoFI65Nxa4JvHuFG9ihYS0t2VJV2nFvqi3PPKX1doJ24LzPQSYiUVWg== +"@ethereumjs/evm@npm:@celo/ethereumjs-evm@1.3.1-unofficial.0": + version "1.3.1-unofficial.0" + resolved "https://registry.yarnpkg.com/@celo/ethereumjs-evm/-/ethereumjs-evm-1.3.1-unofficial.0.tgz#9083573f0fbf3d45a3ed3d69af8c78509e86803c" + integrity sha512-N321IctdVHY6PHesKGnUitjQ0dTRUBggordAmuBRF58foUwW5gMVzAY8c6L7rZVHiuiLYIvxQuQf8iadVzO5TA== dependencies: "@ethereumjs/common" "3.1.1" "@ethereumjs/tx" "4.1.1" @@ -1315,15 +1315,15 @@ "@ethereumjs/rlp" "^4.0.1" ethereum-cryptography "^1.1.2" -"@ethereumjs/vm@npm:@soloseng/ethereumjs-vm@6.4.1": - version "6.4.1" - resolved "https://registry.yarnpkg.com/@soloseng/ethereumjs-vm/-/ethereumjs-vm-6.4.1.tgz#3410be54e4c26452f139aee5c99de277ad0dba2f" - integrity sha512-5ypbEalBtHDlEqnTbkkBYNGIcw9M8J/+XTXLXddhKmtKXXYli84iLkVJgitoDrCrDloRAR2LKYRyYWW7ldB3rg== +"@ethereumjs/vm@npm:@celo/ethereumjs-vm@6.4.1-unofficial.0": + version "6.4.1-unofficial.0" + resolved "https://registry.yarnpkg.com/@celo/ethereumjs-vm/-/ethereumjs-vm-6.4.1-unofficial.0.tgz#8a6b10e08bde5fe80ad9a2e01fe1a0fa8ef74bf5" + integrity sha512-fkCKEjeYVyt/fuLmIERRGCtp/oaGbxd0rzgYCAgHJrGDKGB+LdvzvvyuMOUEbIRzE0jLe4OrDOrnSFLv6QjvVg== dependencies: "@ethereumjs/block" "4.2.1" "@ethereumjs/blockchain" "6.2.1" "@ethereumjs/common" "3.1.1" - "@ethereumjs/evm" "npm:@soloseng/ethereumjs-evm@1.3.1" + "@ethereumjs/evm" "npm:@celo/ethereumjs-evm@1.3.1-unofficial.0" "@ethereumjs/rlp" "4.0.1" "@ethereumjs/statemanager" "1.0.4" "@ethereumjs/trie" "5.0.4" @@ -4855,7 +4855,7 @@ dependencies: "@trufflesuite/spinnies" "^0.1.1" -"@trufflesuite/bigint-buffer@1.1.10": +"@trufflesuite/bigint-buffer@*": version "1.1.10" resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.10.tgz#a1d9ca22d3cad1a138b78baaf15543637a3e1692" integrity sha512-pYIQC5EcMmID74t26GCC67946mgTJFiLXOT/BYozgrd4UEY2JHEGLhWi9cMiQCt5BSqFEvKkCHNnoj82SRjiEw== @@ -12032,10 +12032,10 @@ funpermaproxy@^1.0.1: resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== -ganache@7.8.0, ganache@^7.4.0, "ganache@npm:@soloseng/ganache@7.8.0-beta.1": - version "7.8.0-beta.1" - resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.8.0-beta.1.tgz#168d3c2f1ea05c350e972f227872d4a4b15e5f9e" - integrity sha512-ptjs631aKpxG7xexDDyxh5NevKQaUcSfm3/Aeh0smJ/3xQgNrJ+st6CVYVbVbhGkgNcq9NIvCCaIgt0L64GOCA== +ganache@7.8.0, ganache@^7.4.0, "ganache@npm:@celo/ganache@7.8.0-unofficial.0": + version "7.8.0-unofficial.0" + resolved "https://registry.yarnpkg.com/@celo/ganache/-/ganache-7.8.0-unofficial.0.tgz#7930a68ea8df36c7862425a164b44e3e89cb3d0f" + integrity sha512-csobquRjvgG/0mzw6NRB4ga+idPq7yQKLISNbxn2JSS/nCkGCTKn4yvTJqhmZ1dzwL2U3qHmGer2qXlxFQgbdg== dependencies: "@trufflesuite/bigint-buffer" "1.1.10" "@trufflesuite/uws-js-unofficial" "20.10.0-unofficial.2" @@ -15321,22 +15321,22 @@ keccak256@^1.0.0: buffer "^6.0.3" keccak "^3.0.2" -keccak@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" - integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA== +keccak@*, keccak@^3.0.0, keccak@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" + integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" + readable-stream "^3.6.0" -keccak@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" - integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== +keccak@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" + integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" - readable-stream "^3.6.0" keccak@^1.0.2: version "1.4.0" @@ -15348,15 +15348,6 @@ keccak@^1.0.2: nan "^2.2.1" safe-buffer "^5.1.0" -keccak@^3.0.0, keccak@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" - integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== - dependencies: - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - readable-stream "^3.6.0" - keytar@^7.3.0: version "7.9.0" resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" @@ -15719,6 +15710,15 @@ level@^8.0.0: browser-level "^1.0.1" classic-level "^1.2.0" +leveldown@*: + version "6.1.1" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.1.tgz#0f0e480fa88fd807abf94c33cb7e40966ea4b5ce" + integrity sha512-88c+E+Eizn4CkQOBHwqlCJaTNEjGpaEIikn1S+cINc5E9HEvJ77bqY4JY/HxT5u0caWqsc3P3DcFIKBI1vHt+A== + dependencies: + abstract-leveldown "^7.2.0" + napi-macros "~2.0.0" + node-gyp-build "^4.3.0" + leveldown@5.6.0, leveldown@^5.4.0: version "5.6.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" @@ -15728,15 +15728,6 @@ leveldown@5.6.0, leveldown@^5.4.0: napi-macros "~2.0.0" node-gyp-build "~4.1.0" -leveldown@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee" - integrity sha512-8C7oJDT44JXxh04aSSsfcMI8YiaGRhOFI9/pMEL7nWJLVsWajDPTRxsSHTM2WcTVY5nXM+SuRHzPPi0GbnDX+w== - dependencies: - abstract-leveldown "^7.2.0" - napi-macros "~2.0.0" - node-gyp-build "^4.3.0" - levelup@4.4.0, levelup@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" @@ -17489,6 +17480,11 @@ node-addon-api@^4.2.0, node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +node-addon-api@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762" + integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA== + node-emoji@^1.4.1: version "1.11.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" @@ -20723,13 +20719,13 @@ scryptsy@^2.1.0: resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== -secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" - integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== +secp256k1@*: + version "5.0.0" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-5.0.0.tgz#be6f0c8c7722e2481e9773336d351de8cddd12f7" + integrity sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA== dependencies: elliptic "^6.5.4" - node-addon-api "^2.0.0" + node-addon-api "^5.0.0" node-gyp-build "^4.2.0" secp256k1@^3.0.1: @@ -20746,6 +20742,15 @@ secp256k1@^3.0.1: nan "^2.14.0" safe-buffer "^5.1.2" +secp256k1@^4.0.0, secp256k1@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" + integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== + dependencies: + elliptic "^6.5.4" + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + seed-random@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" From 0e68b2cfdb90ade6007e67ba3500c3cb5f300d94 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:38:54 -0400 Subject: [PATCH 175/184] reinstalled --- yarn.lock | 71 ++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/yarn.lock b/yarn.lock index a24726b40c4..03871fd7c08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4855,7 +4855,7 @@ dependencies: "@trufflesuite/spinnies" "^0.1.1" -"@trufflesuite/bigint-buffer@*": +"@trufflesuite/bigint-buffer@1.1.10": version "1.1.10" resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.10.tgz#a1d9ca22d3cad1a138b78baaf15543637a3e1692" integrity sha512-pYIQC5EcMmID74t26GCC67946mgTJFiLXOT/BYozgrd4UEY2JHEGLhWi9cMiQCt5BSqFEvKkCHNnoj82SRjiEw== @@ -15321,15 +15321,6 @@ keccak256@^1.0.0: buffer "^6.0.3" keccak "^3.0.2" -keccak@*, keccak@^3.0.0, keccak@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" - integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== - dependencies: - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - readable-stream "^3.6.0" - keccak@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff" @@ -15338,6 +15329,15 @@ keccak@3.0.1: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" +keccak@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" + integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" + keccak@^1.0.2: version "1.4.0" resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.4.0.tgz#572f8a6dbee8e7b3aa421550f9e6408ca2186f80" @@ -15348,6 +15348,15 @@ keccak@^1.0.2: nan "^2.2.1" safe-buffer "^5.1.0" +keccak@^3.0.0, keccak@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" + integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" + keytar@^7.3.0: version "7.9.0" resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" @@ -15710,15 +15719,6 @@ level@^8.0.0: browser-level "^1.0.1" classic-level "^1.2.0" -leveldown@*: - version "6.1.1" - resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.1.tgz#0f0e480fa88fd807abf94c33cb7e40966ea4b5ce" - integrity sha512-88c+E+Eizn4CkQOBHwqlCJaTNEjGpaEIikn1S+cINc5E9HEvJ77bqY4JY/HxT5u0caWqsc3P3DcFIKBI1vHt+A== - dependencies: - abstract-leveldown "^7.2.0" - napi-macros "~2.0.0" - node-gyp-build "^4.3.0" - leveldown@5.6.0, leveldown@^5.4.0: version "5.6.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" @@ -15728,6 +15728,15 @@ leveldown@5.6.0, leveldown@^5.4.0: napi-macros "~2.0.0" node-gyp-build "~4.1.0" +leveldown@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee" + integrity sha512-8C7oJDT44JXxh04aSSsfcMI8YiaGRhOFI9/pMEL7nWJLVsWajDPTRxsSHTM2WcTVY5nXM+SuRHzPPi0GbnDX+w== + dependencies: + abstract-leveldown "^7.2.0" + napi-macros "~2.0.0" + node-gyp-build "^4.3.0" + levelup@4.4.0, levelup@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" @@ -17480,11 +17489,6 @@ node-addon-api@^4.2.0, node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-addon-api@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762" - integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA== - node-emoji@^1.4.1: version "1.11.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" @@ -20719,13 +20723,13 @@ scryptsy@^2.1.0: resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== -secp256k1@*: - version "5.0.0" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-5.0.0.tgz#be6f0c8c7722e2481e9773336d351de8cddd12f7" - integrity sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA== +secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" + integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== dependencies: elliptic "^6.5.4" - node-addon-api "^5.0.0" + node-addon-api "^2.0.0" node-gyp-build "^4.2.0" secp256k1@^3.0.1: @@ -20742,15 +20746,6 @@ secp256k1@^3.0.1: nan "^2.14.0" safe-buffer "^5.1.2" -secp256k1@^4.0.0, secp256k1@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" - integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== - dependencies: - elliptic "^6.5.4" - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - seed-random@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" From d0fd9c9aa0d7b6cabd30a2c958614bf198ca9919 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 19 Jul 2023 10:10:09 -0400 Subject: [PATCH 176/184] cleanup TODO and comments --- .github/workflows/circleci.yml | 2 -- packages/celotool/src/lib/generate_utils.ts | 2 +- packages/sdk/base/src/signatureUtils.ts | 1 - packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts | 2 +- packages/sdk/cryptographic-utils/src/account.ts | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index ef2042bc354..9b638fd4309 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,8 +8,6 @@ on: push: branches: - master - # TODO (soloseng): remove before merge - - soloseng/ganache-upgrade # TODO(jcortejoso): Replace by pull_request pull_request_target: branches: diff --git a/packages/celotool/src/lib/generate_utils.ts b/packages/celotool/src/lib/generate_utils.ts index 6da7be1099b..79ea7d915f0 100644 --- a/packages/celotool/src/lib/generate_utils.ts +++ b/packages/celotool/src/lib/generate_utils.ts @@ -8,7 +8,7 @@ import fs from 'fs' import { merge, range, repeat } from 'lodash' import { tmpdir } from 'os' import path from 'path' -import * as rlp from 'rlp' // TODO(soloseng): update? +import * as rlp from 'rlp' import { MyceloGenesisConfig } from 'src/lib/interfaces/mycelo-genesis-config' import { CurrencyPair } from 'src/lib/k8s-oracle/base' import * as ecc from 'tiny-secp256k1' diff --git a/packages/sdk/base/src/signatureUtils.ts b/packages/sdk/base/src/signatureUtils.ts index 28b885e4dfd..d85e80fcf84 100644 --- a/packages/sdk/base/src/signatureUtils.ts +++ b/packages/sdk/base/src/signatureUtils.ts @@ -17,7 +17,6 @@ export function NativeSigner( } export interface Signature { - // TODO: (soloseng) should this be converted to Bigint? v: number r: string s: string diff --git a/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts b/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts index f456ccd048b..d4533e28318 100644 --- a/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts +++ b/packages/sdk/contractkit/src/wrappers/SortedOracles.test.ts @@ -56,7 +56,7 @@ testWithGanache('SortedOracles Wrapper', (web3) => { await reportAsOracles(sortedOracles, target, freshOracles) } - // TODO (soloseng): this function causes test to hang after completion. + // XXX: this function causes test to hang after completion. // used --forceExit flag to exit test. /** * When testing with a custom token pair we can't use the diff --git a/packages/sdk/cryptographic-utils/src/account.ts b/packages/sdk/cryptographic-utils/src/account.ts index eae2973f3f4..3b8e8805524 100644 --- a/packages/sdk/cryptographic-utils/src/account.ts +++ b/packages/sdk/cryptographic-utils/src/account.ts @@ -412,7 +412,6 @@ export async function generateKeys( return generateKeysFromSeed(seed, changeIndex, addressIndex, derivationPath) } -// XXX: (@soloseng) no test for this function? export function generateDeterministicInviteCode( recipientPhoneHash: string, recipientPepper: string, From 61752b0ed2c91f1fff2f5180e6a444b7565f9cd8 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Wed, 19 Jul 2023 18:13:53 +0200 Subject: [PATCH 177/184] python -> python3 --- dockerfiles/cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/cli/Dockerfile b/dockerfiles/cli/Dockerfile index f50b70e9a5d..c5829c83dda 100644 --- a/dockerfiles/cli/Dockerfile +++ b/dockerfiles/cli/Dockerfile @@ -40,7 +40,7 @@ ARG celo_env RUN echo "geth_tag is ${geth_tag}" && echo "Env is ${celo_env}" # Required for celocli -RUN apk add --no-cache python git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev +RUN apk add --no-cache python3 git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev WORKDIR /celo-monorepo/ RUN npm install @celo/celocli From 3fae1da8dd237ed01a07ac3d778cb9ba04e2d738 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Wed, 19 Jul 2023 18:16:18 +0200 Subject: [PATCH 178/184] updated node base images to 18 --- dockerfiles/cli-standalone/Dockerfile | 2 +- dockerfiles/cli/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dockerfiles/cli-standalone/Dockerfile b/dockerfiles/cli-standalone/Dockerfile index 3570f75885b..03875c28658 100644 --- a/dockerfiles/cli-standalone/Dockerfile +++ b/dockerfiles/cli-standalone/Dockerfile @@ -3,7 +3,7 @@ # Example build command: # # VERSION=x.y.z; docker build . --build-arg VERSION=$VERSION -t gcr.io/celo-testnet/celocli-standalone:$VERSION -FROM node:12.22.12-alpine3.15 +FROM node:18-alpine # Install cli install dependencies. RUN apk add --no-cache python3 git make gcc g++ bash libusb-dev linux-headers eudev-dev diff --git a/dockerfiles/cli/Dockerfile b/dockerfiles/cli/Dockerfile index c5829c83dda..35b68846701 100644 --- a/dockerfiles/cli/Dockerfile +++ b/dockerfiles/cli/Dockerfile @@ -34,7 +34,7 @@ ADD https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${celo_env}?alt=med ADD https://www.googleapis.com/storage/v1/b/static_nodes/o/${celo_env}?alt=media /celo/static-nodes.json # Build Celocli -FROM node:12-alpine as node +FROM node:18-alpine as node ARG celo_env @@ -46,7 +46,7 @@ WORKDIR /celo-monorepo/ RUN npm install @celo/celocli # Build the combined image -FROM node:12-alpine as final_image +FROM node:18-alpine as final_image ARG network_name="alfajores" ARG network_id="44787" From 18b8c469d49da98c79186b45854e37dd27794ab0 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Wed, 19 Jul 2023 18:23:49 +0200 Subject: [PATCH 179/184] python -> python3 --- dockerfiles/celotool/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile index 9cb74212fb5..9ac283e339d 100644 --- a/dockerfiles/celotool/Dockerfile +++ b/dockerfiles/celotool/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /celo-monorepo # Needed for gsutil RUN apt-get update && \ apt-get install -y lsb-release && \ - apt-get install -y curl build-essential git python && \ + apt-get install -y curl build-essential git python3 && \ export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ From 672c5e4cf626e0f41a432c66e2ca279cc0937ac8 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Wed, 19 Jul 2023 18:34:23 +0200 Subject: [PATCH 180/184] Updated netcat dependency --- dockerfiles/celotool/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile index 9ac283e339d..4ebc61925af 100644 --- a/dockerfiles/celotool/Dockerfile +++ b/dockerfiles/celotool/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ apt-get update -y && \ - apt-get install -y google-cloud-sdk kubectl netcat && \ + apt-get install -y google-cloud-sdk kubectl netcat-openbsd && \ curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash && \ rm -rf /var/lib/apt/lists/* From 074a074b4fa43d7c47546316f9b0d13c8b56a3d2 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Wed, 19 Jul 2023 19:25:53 +0200 Subject: [PATCH 181/184] Fix build --- dockerfiles/cli/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockerfiles/cli/Dockerfile b/dockerfiles/cli/Dockerfile index 35b68846701..079e15a4d57 100644 --- a/dockerfiles/cli/Dockerfile +++ b/dockerfiles/cli/Dockerfile @@ -34,19 +34,19 @@ ADD https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${celo_env}?alt=med ADD https://www.googleapis.com/storage/v1/b/static_nodes/o/${celo_env}?alt=media /celo/static-nodes.json # Build Celocli -FROM node:18-alpine as node +FROM node:12-alpine as node ARG celo_env RUN echo "geth_tag is ${geth_tag}" && echo "Env is ${celo_env}" # Required for celocli -RUN apk add --no-cache python3 git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev +RUN apk add --no-cache python2 git make gcc g++ pkgconfig libusb libusb-dev linux-headers eudev-dev WORKDIR /celo-monorepo/ RUN npm install @celo/celocli # Build the combined image -FROM node:18-alpine as final_image +FROM node:12-alpine as final_image ARG network_name="alfajores" ARG network_id="44787" From f19034d7f6eea1c05084d75249ffd79fa29bf82b Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Wed, 19 Jul 2023 20:08:11 +0200 Subject: [PATCH 182/184] Fix build docker --- dockerfiles/cli-standalone/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/cli-standalone/Dockerfile b/dockerfiles/cli-standalone/Dockerfile index 03875c28658..bb2390339cb 100644 --- a/dockerfiles/cli-standalone/Dockerfile +++ b/dockerfiles/cli-standalone/Dockerfile @@ -3,7 +3,7 @@ # Example build command: # # VERSION=x.y.z; docker build . --build-arg VERSION=$VERSION -t gcr.io/celo-testnet/celocli-standalone:$VERSION -FROM node:18-alpine +FROM node:12-alpine # Install cli install dependencies. RUN apk add --no-cache python3 git make gcc g++ bash libusb-dev linux-headers eudev-dev From 06c90f137c12dca35e9c28520c96d08eca44b520 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 19 Jul 2023 15:57:46 -0400 Subject: [PATCH 183/184] force GH action test --- .github/workflows/circleci.yml | 50 ++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 9b638fd4309..ae4308c8868 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -1,13 +1,15 @@ name: celo-monorepo run-name: celo-monorepo tests -# Dockefile for the self-hosted runner: +# Dockefile for the self-hosted runner: # https://github.com/celo-org/infrastructure/blob/master/terraform/root-modules/gcp/integration-tests-gke/files/github-arc/Dockerfile-monorepo on: push: branches: - master + # TODO (soloseng): remove before merge + - soloseng/ganache-upgrade # TODO(jcortejoso): Replace by pull_request pull_request_target: branches: @@ -40,9 +42,9 @@ jobs: package-json-checksum: ${{ steps.node-checksums.outputs.PACKAGE_JSON_CHECKSUM }} # Propagate more outputs if you need https://github.com/tj-actions/changed-files#outputs # Adding a initial comma so ',' matches also for the first file - all_modified_files: ",${{ steps.changed-files.outputs.all_modified_files }}" + all_modified_files: ',${{ steps.changed-files.outputs.all_modified_files }}' # runs-on: ubuntu-latest - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 steps: - name: Restore .git cache @@ -109,7 +111,7 @@ jobs: - name: Install yarn dependencies run: yarn install if: steps.cache_node.outputs.cache-hit != 'true' - - name: Run yarn postinstall if cache hitted + - name: Run yarn postinstall if cache hitted run: yarn run postinstall if: steps.cache_node.outputs.cache-hit == 'true' - name: Fail if generated dependency graph doesn't match committed @@ -132,13 +134,13 @@ jobs: uses: tj-actions/changed-files@v35 with: # Using comma as separator to be able to easily match full paths (using ,) - separator: "," + separator: ',' # Checking if changed in the last 100 commits in PRs - fetch_depth: "150" + fetch_depth: '150' - run: echo ",${{ steps.changed-files.outputs.all_modified_files }}" lint-checks: name: Lint code - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: install-dependencies steps: @@ -158,7 +160,7 @@ jobs: - run: yarn run lint general_test: name: General jest test - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] needs: install-dependencies steps: - uses: actions/cache/restore@v3 @@ -192,7 +194,7 @@ jobs: path: test-results/jest wallet-test: name: Wallet test - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: install-dependencies steps: @@ -211,7 +213,7 @@ jobs: yarn run lerna --scope '@celo/wallet-*' run test pre-protocol-test-release: name: Protocol Tests Prepare - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 # Comment lint-checks dependency to speed up (as this is a dependency for many other jobs) # needs: [install-dependencies, lint-checks] @@ -260,7 +262,7 @@ jobs: yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout -g scripts/truffle/releaseGoldExampleConfigs.json protocol-test-release: name: Protocol Test Release - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies, lint-checks, pre-protocol-test-release] if: | @@ -292,9 +294,9 @@ jobs: BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g')) yarn --cwd packages/protocol test:devchain-release -b $RELEASE_TAG -d $BUILD_AND_DEVCHAIN_DIR -l /dev/stdout protocol-test-matrix: - # Keeping name short because GitHub UI does not handle long names well + # Keeping name short because GitHub UI does not handle long names well name: ${{ matrix.name }} - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 60 needs: [install-dependencies, lint-checks] if: | @@ -371,7 +373,7 @@ jobs: ${{ matrix.command }} contractkit-tests: name: ContractKit Tests - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -403,7 +405,7 @@ jobs: yarn --cwd=packages/sdk/contractkit test identity-tests: name: Identity Tests - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies, contractkit-tests] if: | @@ -436,7 +438,7 @@ jobs: yarn --cwd=packages/sdk/identity test transactions-uri-tests: name: Transaction URI Tests - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies, contractkit-tests] if: | @@ -463,7 +465,7 @@ jobs: id: changed-files uses: tj-actions/changed-files@v35 with: - fetch_depth: "100" + fetch_depth: '100' - name: Generate DevChain run: | cd packages/sdk/identity @@ -473,7 +475,7 @@ jobs: yarn --cwd=packages/sdk/identity test cli-tests: name: CeloCli Tests - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -518,7 +520,7 @@ jobs: yarn --cwd=packages/cli run celocli account:new typescript-tests: name: Typescript package Tests - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -547,7 +549,7 @@ jobs: npm install $RUNNER_WORKSPACE/celo-monorepo/packages/typescript/*.tgz base-test: name: SDK Base package Tests - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -583,7 +585,7 @@ jobs: npm install $RUNNER_WORKSPACE/celo-monorepo/packages/sdk/base/*.tgz utils-test: name: SDK Utils package Tests - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies] if: | @@ -618,7 +620,7 @@ jobs: end-to-end-geth-matrix: # Keeping name short because GitHub UI does not handle long names well name: e2e ${{ matrix.name }} - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 60 needs: [install-dependencies, lint-checks, contractkit-tests] if: | @@ -715,7 +717,7 @@ jobs: odis-test: name: ODIS test - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies, lint-checks] if: | @@ -750,7 +752,7 @@ jobs: # NOTE: This has not been fully tested as we don't have a license for certora certora-test: name: Certora test ${{ matrix.name }} - runs-on: ["self-hosted", "monorepo-node18"] + runs-on: ['self-hosted', 'monorepo-node18'] timeout-minutes: 30 needs: [install-dependencies, lint-checks] # Disable as certora license is not active diff --git a/package.json b/package.json index 39e21696d99..d08276b47e3 100644 --- a/package.json +++ b/package.json @@ -87,4 +87,4 @@ "@types/bn.js": "4.11.6", "bignumber.js": "9.0.0" } -} +} \ No newline at end of file From 643bcf2656fb90c3fa885a79c938d4d3f3b6eb8a Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 25 Jul 2023 16:43:27 -0400 Subject: [PATCH 184/184] removed flake-tracker --- .circleci/config.yml | 29 -- .github/CODEOWNERS | 1 - dependency-graph.json | 23 +- dockerfiles/celotool/Dockerfile | 2 - dockerfiles/leaderboard/Dockerfile | 2 - dockerfiles/phone-number-privacy/Dockerfile | 1 - packages/celotool/.mocharc.js | 3 - packages/celotool/package.json | 1 - packages/cli/jest.config.js | 5 +- packages/cli/package.json | 1 - packages/cli/src/test-utils/setup.global.ts | 3 - .../cli/src/test-utils/teardown.global.ts | 3 - packages/env-tests/jest.config.js | 3 - packages/flake-tracker/README.md | 69 ---- packages/flake-tracker/package.json | 26 -- packages/flake-tracker/scripts/summary.js | 8 - packages/flake-tracker/src/config.js | 104 ----- packages/flake-tracker/src/db.js | 135 ------- packages/flake-tracker/src/github.js | 362 ------------------ packages/flake-tracker/src/jest/config.js | 61 --- .../src/jest/environments/detox.js | 35 -- .../src/jest/environments/jsdom.js | 20 - .../src/jest/environments/node.js | 20 - .../flake-tracker/src/jest/setup.global.js | 8 - packages/flake-tracker/src/jest/setup.js | 3 - .../flake-tracker/src/jest/teardown.global.js | 4 - packages/flake-tracker/src/jest/tracker.js | 77 ---- packages/flake-tracker/src/jest/utils.js | 65 ---- packages/flake-tracker/src/manager.js | 67 ---- packages/flake-tracker/src/mocha/config.js | 8 - packages/flake-tracker/src/mocha/reporter.js | 61 --- packages/flake-tracker/src/mocha/utils.js | 23 -- packages/flake-tracker/src/utils.js | 309 --------------- .../combiner/jest.config.js | 4 - .../combiner/package.json | 9 +- .../signer/jest.config.js | 3 - .../phone-number-privacy/signer/package.json | 5 +- packages/protocol/package.json | 1 - packages/protocol/truffle-config.js | 2 - packages/sdk/base/jest.config.js | 3 - packages/sdk/base/package.json | 1 - packages/sdk/connect/jest.config.js | 4 - packages/sdk/connect/package.json | 1 - packages/sdk/contractkit/jest.config.js | 9 +- packages/sdk/contractkit/package.json | 1 - .../src/test-utils/setup.global.ts | 3 - .../src/test-utils/teardown.global.ts | 3 - .../sdk/cryptographic-utils/jest.config.js | 3 - packages/sdk/cryptographic-utils/package.json | 1 - packages/sdk/encrypted-backup/jest.config.js | 9 +- packages/sdk/encrypted-backup/package.json | 1 - packages/sdk/explorer/jest.config.js | 9 +- packages/sdk/identity/jest.config.js | 5 +- packages/sdk/identity/package.json | 1 - .../identity/src/test-utils/setup.global.ts | 3 - .../src/test-utils/teardown.global.ts | 3 - packages/sdk/keystores/jest.config.js | 3 - packages/sdk/keystores/package.json | 2 +- packages/sdk/network-utils/jest.config.js | 9 +- packages/sdk/network-utils/package.json | 3 +- packages/sdk/phone-utils/jest.config.js | 3 - packages/sdk/phone-utils/package.json | 1 - packages/sdk/transactions-uri/jest.config.js | 9 +- packages/sdk/transactions-uri/package.json | 3 +- .../src/test-utils/setup.global.ts | 3 - .../src/test-utils/teardown.global.ts | 3 - packages/sdk/utils/jest.config.js | 3 - packages/sdk/utils/package.json | 1 - yarn.lock | 289 +------------- 69 files changed, 29 insertions(+), 1929 deletions(-) delete mode 100644 packages/celotool/.mocharc.js delete mode 100644 packages/flake-tracker/README.md delete mode 100644 packages/flake-tracker/package.json delete mode 100644 packages/flake-tracker/scripts/summary.js delete mode 100644 packages/flake-tracker/src/config.js delete mode 100644 packages/flake-tracker/src/db.js delete mode 100644 packages/flake-tracker/src/github.js delete mode 100644 packages/flake-tracker/src/jest/config.js delete mode 100644 packages/flake-tracker/src/jest/environments/detox.js delete mode 100644 packages/flake-tracker/src/jest/environments/jsdom.js delete mode 100644 packages/flake-tracker/src/jest/environments/node.js delete mode 100644 packages/flake-tracker/src/jest/setup.global.js delete mode 100644 packages/flake-tracker/src/jest/setup.js delete mode 100644 packages/flake-tracker/src/jest/teardown.global.js delete mode 100644 packages/flake-tracker/src/jest/tracker.js delete mode 100644 packages/flake-tracker/src/jest/utils.js delete mode 100644 packages/flake-tracker/src/manager.js delete mode 100644 packages/flake-tracker/src/mocha/config.js delete mode 100644 packages/flake-tracker/src/mocha/reporter.js delete mode 100644 packages/flake-tracker/src/mocha/utils.js delete mode 100644 packages/flake-tracker/src/utils.js diff --git a/.circleci/config.yml b/.circleci/config.yml index 672eb1f9b99..9d3a6d29e1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -897,17 +897,6 @@ jobs: cd packages/protocol ./specs/scripts/reserve.sh fi - - flakey-test-summary: - <<: *defaults - steps: - - attach_workspace: - at: ~/app - - run: - name: Add summary of flakey tests to GitHub Checks - command: | - node ./packages/flake-tracker/scripts/summary.js - # Dummy job for not showing CircleCI error: "Error: All Workflows have been filtered from this Pipeline" # Check https://github.com/CircleCI-Public/circleci-cli/issues/577 for more context noop: @@ -1024,24 +1013,6 @@ workflows: - odis-test: requires: - lint-checks - # - flakey-test-summary: - # requires: - # - protocol-test-common - # - protocol-test-compatibility - # - protocol-test-governance-network - # - protocol-test-governance-validators - # - protocol-test-governance-voting - # - protocol-test-identity - # - protocol-test-stability - # - end-to-end-geth-transfer-test - # - end-to-end-geth-blockchain-parameters-test - # - end-to-end-geth-slashing-test - # - end-to-end-geth-governance-test - # - end-to-end-geth-replica-test - # - end-to-end-geth-sync-test - # - end-to-end-geth-validator-order-test - # - end-to-end-cip35-eth-compatibility-test - # - odis-test npm-install-testing-cron-workflow: # Contitionally triggered when: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f655701493b..82b8b09e47e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,7 +13,6 @@ /packages/docs/ @celo-org/applications @celo-org/devrel /packages/env-tests/ @celo-org/applications /packages/faucet/ @celo-org/applications -/packages/flake-tracker/ @celo-org/flake-trackers /packages/helm-charts/ @celo-org/devopsre /packages/helm-charts/blockscout/ @celo-org/data-services @celo-org/devopsre /packages/helm-charts/oracle/ @celo-org/mento @celo-org/devopsre diff --git a/dependency-graph.json b/dependency-graph.json index fd4f254c6d0..1b7e9423014 100644 --- a/dependency-graph.json +++ b/dependency-graph.json @@ -9,7 +9,6 @@ "@celo/dev-utils", "@celo/env-tests", "@celo/explorer", - "@celo/flake-tracker", "@celo/governance", "@celo/identity", "@celo/network-utils", @@ -24,7 +23,6 @@ "@celo/cryptographic-utils", "@celo/dev-utils", "@celo/explorer", - "@celo/flake-tracker", "@celo/governance", "@celo/identity", "@celo/phone-utils", @@ -50,10 +48,6 @@ "@celo/utils" ] }, - "@celo/flake-tracker": { - "location": "packages/flake-tracker", - "dependencies": [] - }, "@celo/metadata-crawler": { "location": "packages/metadata-crawler", "dependencies": [ @@ -68,7 +62,6 @@ "@celo/base", "@celo/connect", "@celo/cryptographic-utils", - "@celo/flake-tracker", "@celo/phone-utils", "@celo/typescript", "@celo/utils" @@ -83,7 +76,6 @@ "dependencies": [ "@celo/contractkit", "@celo/encrypted-backup", - "@celo/flake-tracker", "@celo/identity", "@celo/phone-number-privacy-common", "@celo/phone-number-privacy-signer", @@ -118,7 +110,6 @@ "dependencies": [ "@celo/base", "@celo/contractkit", - "@celo/flake-tracker", "@celo/phone-number-privacy-common", "@celo/utils", "@celo/wallet-hsm-azure" @@ -127,7 +118,6 @@ "@celo/base": { "location": "packages/sdk/base", "dependencies": [ - "@celo/flake-tracker", "@celo/typescript" ] }, @@ -135,7 +125,6 @@ "location": "packages/sdk/connect", "dependencies": [ "@celo/base", - "@celo/flake-tracker", "@celo/utils" ] }, @@ -145,7 +134,6 @@ "@celo/base", "@celo/connect", "@celo/dev-utils", - "@celo/flake-tracker", "@celo/phone-utils", "@celo/protocol", "@celo/utils", @@ -156,7 +144,6 @@ "location": "packages/sdk/cryptographic-utils", "dependencies": [ "@celo/base", - "@celo/flake-tracker", "@celo/typescript", "@celo/utils" ] @@ -166,7 +153,6 @@ "dependencies": [ "@celo/base", "@celo/dev-utils", - "@celo/flake-tracker", "@celo/identity", "@celo/phone-number-privacy-common", "@celo/utils" @@ -197,7 +183,6 @@ "@celo/base", "@celo/contractkit", "@celo/dev-utils", - "@celo/flake-tracker", "@celo/phone-number-privacy-common", "@celo/utils", "@celo/wallet-local" @@ -213,15 +198,13 @@ "@celo/network-utils": { "location": "packages/sdk/network-utils", "dependencies": [ - "@celo/dev-utils", - "@celo/flake-tracker" + "@celo/dev-utils" ] }, "@celo/phone-utils": { "location": "packages/sdk/phone-utils", "dependencies": [ "@celo/base", - "@celo/flake-tracker", "@celo/typescript", "@celo/utils" ] @@ -232,15 +215,13 @@ "@celo/base", "@celo/connect", "@celo/contractkit", - "@celo/dev-utils", - "@celo/flake-tracker" + "@celo/dev-utils" ] }, "@celo/utils": { "location": "packages/sdk/utils", "dependencies": [ "@celo/base", - "@celo/flake-tracker", "@celo/typescript" ] }, diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile index 4ebc61925af..1004d1800b2 100644 --- a/dockerfiles/celotool/Dockerfile +++ b/dockerfiles/celotool/Dockerfile @@ -18,7 +18,6 @@ COPY lerna.json package.json yarn.lock ./ COPY packages/celotool/package.json packages/celotool/ COPY packages/dev-utils/package.json packages/dev-utils/ COPY packages/env-tests/package.json packages/env-tests/package.json -COPY packages/flake-tracker/package.json packages/flake-tracker/package.json COPY packages/phone-number-privacy/common/package.json packages/phone-number-privacy/common/package.json COPY packages/protocol/package.json packages/protocol/ COPY packages/sdk/base/package.json packages/sdk/base/ @@ -45,7 +44,6 @@ RUN yarn install --network-timeout 100000 --frozen-lockfile && yarn cache clean COPY packages/celotool packages/celotool/ COPY packages/dev-utils packages/dev-utils/ COPY packages/env-tests packages/env-tests -COPY packages/flake-tracker packages/flake-tracker COPY packages/helm-charts packages/helm-charts COPY packages/phone-number-privacy/common packages/phone-number-privacy/common COPY packages/protocol packages/protocol/ diff --git a/dockerfiles/leaderboard/Dockerfile b/dockerfiles/leaderboard/Dockerfile index e862488fc63..2d8240ea85f 100644 --- a/dockerfiles/leaderboard/Dockerfile +++ b/dockerfiles/leaderboard/Dockerfile @@ -17,7 +17,6 @@ COPY packages/sdk/wallets/wallet-local/package.json packages/sdk/wallets/wallet- COPY packages/protocol/package.json packages/protocol/ COPY packages/sdk/contractkit/package.json packages/sdk/contractkit/ COPY packages/leaderboard/package.json packages/leaderboard/ -COPY packages/flake-tracker/package.json packages/flake-tracker/package.json RUN yarn install --frozen-lockfile --network-timeout 100000 && yarn cache clean @@ -32,7 +31,6 @@ COPY packages/sdk/wallets/wallet-local packages/sdk/wallets/wallet-local COPY packages/protocol packages/protocol/ COPY packages/sdk/contractkit packages/sdk/contractkit/ COPY packages/leaderboard packages/leaderboard/ -COPY packages/flake-tracker packages/flake-tracker # build all RUN yarn build diff --git a/dockerfiles/phone-number-privacy/Dockerfile b/dockerfiles/phone-number-privacy/Dockerfile index 6b69939daca..d1f23953a0b 100644 --- a/dockerfiles/phone-number-privacy/Dockerfile +++ b/dockerfiles/phone-number-privacy/Dockerfile @@ -7,7 +7,6 @@ FROM scratch AS packages WORKDIR /celo-phone-number-privacy/ COPY packages/typescript packages/typescript COPY packages/dev-utils packages/dev-utils -COPY packages/flake-tracker packages/flake-tracker COPY packages/phone-number-privacy/signer packages/phone-number-privacy/signer COPY packages/phone-number-privacy/common packages/phone-number-privacy/common COPY packages/protocol packages/protocol diff --git a/packages/celotool/.mocharc.js b/packages/celotool/.mocharc.js deleted file mode 100644 index c4e396952c3..00000000000 --- a/packages/celotool/.mocharc.js +++ /dev/null @@ -1,3 +0,0 @@ -const flakeTrackingConfig = require('@celo/flake-tracker/src/mocha/config.js') - -module.exports = flakeTrackingConfig diff --git a/packages/celotool/package.json b/packages/celotool/package.json index 716ff778ffc..1cf4b3bfa9a 100644 --- a/packages/celotool/package.json +++ b/packages/celotool/package.json @@ -47,7 +47,6 @@ }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "@celo/flake-tracker": "0.0.1-dev", "@celo/protocol": "*", "@types/bunyan": "1.8.8", "@types/chai": "^4.1.3", diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js index 0cce853d6f9..b985c7f3d5a 100644 --- a/packages/cli/jest.config.js +++ b/packages/cli/jest.config.js @@ -1,10 +1,7 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', ...nodeFlakeTracking.setupFilesAfterEnv], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers'], globalSetup: '/src/test-utils/setup.global.ts', globalTeardown: '/src/test-utils/teardown.global.ts', } diff --git a/packages/cli/package.json b/packages/cli/package.json index 282930f77f5..82f198dcda9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -76,7 +76,6 @@ }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "@celo/flake-tracker": "0.0.1-dev", "@oclif/dev-cli": "^1.23.0", "@types/cli-table": "^0.3.0", "@types/debug": "^4.1.4", diff --git a/packages/cli/src/test-utils/setup.global.ts b/packages/cli/src/test-utils/setup.global.ts index de0256f2f7d..ac368faf7af 100644 --- a/packages/cli/src/test-utils/setup.global.ts +++ b/packages/cli/src/test-utils/setup.global.ts @@ -1,15 +1,12 @@ import baseSetup from '@celo/dev-utils/lib/ganache-setup' // Has to import the matchers somewhere so that typescript knows the matchers have been made available import _unused from '@celo/dev-utils/lib/matchers' -// @ts-ignore -import flakeTrackerSetup from '@celo/flake-tracker/src/jest/setup.global.js' import * as path from 'path' // Warning: There should be an unused import of '@celo/dev-utils/lib/matchers' above. // If there is not, then your editor probably deleted it automatically. export default async function globalSetup() { - await flakeTrackerSetup() await baseSetup(path.resolve(path.join(__dirname, '../../')), '.tmp/devchain.tar.gz', { from_targz: true, }) diff --git a/packages/cli/src/test-utils/teardown.global.ts b/packages/cli/src/test-utils/teardown.global.ts index c85f17c2e77..aea64f79dbb 100644 --- a/packages/cli/src/test-utils/teardown.global.ts +++ b/packages/cli/src/test-utils/teardown.global.ts @@ -1,8 +1,5 @@ import teardown from '@celo/dev-utils/lib/ganache-teardown' -// @ts-ignore -import flakeTrackerTeardown from '@celo/flake-tracker/src/jest/teardown.global.js' export default async function globalTeardown() { - await flakeTrackerTeardown() await teardown() } diff --git a/packages/env-tests/jest.config.js b/packages/env-tests/jest.config.js index f8605f9a6c1..54dfe8710b4 100644 --- a/packages/env-tests/jest.config.js +++ b/packages/env-tests/jest.config.js @@ -1,8 +1,5 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)', '/src/monorepoRun.ts'], verbose: true, } diff --git a/packages/flake-tracker/README.md b/packages/flake-tracker/README.md deleted file mode 100644 index f8e0d237239..00000000000 --- a/packages/flake-tracker/README.md +++ /dev/null @@ -1,69 +0,0 @@ -# FlakeTracker - -## Overview - -Flake Tracker integrates with Mocha and Jest to retry failed tests a configurable number of times. When tests pass on a retry, they are identified as flakey. Using the GitHub API, we automatically create new issues when flakey tests are found on `master` (i.e. only once they're merged). -Optionally, FlakeTracker can skip known flakey tests by fetching the list of flakey test issues from GitHub before each test suite. FlakeTracker authenticates with the GitHub API as a GitHub App, which allows it to provide rich feedback on PRs via GitHub Checks. - -## Configuration - -You can configure FlakeTracker via the following environment variables. - -- `FLAKEY` - - When running in CI, set `FLAKEY=false` to disable FlakeTracker, which will be enabled by default. - - When running locally, set `FLAKEY=true` to enable FlakeTracker, which will be disabled by default. -- `LOG_ALL_RETRY_ERRORS` - - Only relevant when flake tracker is enabled. - - Enables error logging after retries even for tests that never pass. Defaults to `false`. -- `NUM_RETRIES` - - Only relevant when flake tracker is enabled. - - Specifies how many retries should be performed before a test is failed. - - If you want a "fail fast without flakes" option (let's say you know a bunch of tests will fail, and you want to skip all the flakey tests without retrying each failed test a bunch of times) you can accomplish this by setting `NUM_RETRIES=0`. -- `SKIP_KNOWN_FLAKES` - - Only relevant when flake tracker is enabled and tests are run in CI. - - Set `SKIP_KNOWN_FLAKES=false` to disable the skipping of known flakes in CI. Defaults to `true`. -- `FLAKES_FAIL_CHECK_SUITE` - - If true, new flakey tests will be reported as 'failures' on GitHub Checks. Note this does not affect the CI workflow. - -## Disabling Skipping For Specific Tests - -To ensure that a specific known flakey test is run for your PR, simply include the link to the flakey test's issue anywhere in the body of your PR. - -## Still Seeing Flakey Tests? - -Sometimes a flakey test will fail all retries. You can try bumping up the number of retries that are attempted by setting the `NUM_RETRIES` env variable. - -Some flakey tests are not uncovered by retries. That is, if they fail the first time then every retry will also fail. If you encounter tests like this, please create an issue to track it. If you do so correctly, the flakey test will be disabled until the issue is closed. -To manually create a flakey test issue, mimic the format of issues created by the FlakeTracker bot. Specifically, make sure to add the `FLAKEY` label as well as labels for the package name and the ci job the test is run in. Also, include the `testID` of the test in the issue title. -The `testID` can be derived as follows: `jobName -> packageName -> rootDescribeBlockTitle -> ... -> testTitle`. The `testID` is printed each time the test is retried and can be found easily in the logs. Please also include the test error in the issue body. - -It is important to note that some flakiness might exist in setup/teardown steps like `before` and `after` hooks. FlakeTracker does not currently address these cases, but you should still create issues to track them! Make sure to include the string `FLAKEY SETUP` in the title of the issue (see example at ) so that FlakeTracker doesn't try to associate the issue with a test. - -## Tricks For Fixing Flakey Tests - -- You can configure FlakeTracker to print raw errors for all test retries (even those that don't eventually pass) by setting `LOG_ALL_RETRY_ERRORS=true`. -- You can test for flakiness locally by setting `FLAKEY=true`. -- You can save all FlakeTracker results to text files. See comments in `./db.js` - -## Obsolete Flakey Test Issues - -- If tests are removed, renamed or refactored their `testID` will change and any flakey test issues corresponding to them will be marked as obsolete. This happens when FlakeTracker no longer encounters the `testID` during the course of test execution. When obsolete issues are found on a PR that has not yet been merged, a GitHub Check will alert the PR's author and reviewers that the issue should be renamed with the updated `testID` if possible. Obsolete issues that are found on `master` (i.e. after the PR is merged) will be automatically closed. Note, changes to obsolete flakey test issues should occur only shortly before the PR is merged to avoid interfering with other workflows. - -## Slack Notifications - -To receive Slack notifications when new flakey tests are discovered, first [add GitHub to Slack](https://slack.github.com/). Then, send the following Slack command to the GitHub bot to subscribe to issues with the `FLAKEY` label. - -``` -/github subscribe celo-org/celo-monorepo issues +label:FLAKEY -``` - -To subscribe to flakey test issues for a specific job or package, just add the job or package name as another label filter - -``` -/github subscribe celo-org/celo-monorepo issues +label:FLAKEY +label:general-test +label:utils -``` - -## A Warning For Reviewers - -When FlakeTracker is enabled, reviewers should exercise caution on PRs that have skipped flakey tests. Note that tests can now be disabled by just creating a github issue, so we should inspect every test that is skipped and ensure it is not relevant to the PR. If you find that a relevant test was skipped, -just include the link to the corresponding flakey test issue in the PR body and run the build again. This will force the flakey test to run. If you wish to disable skipping flakey tests entirely for a given job you can do so by setting `SKIP_KNOWN_FLAKES=false`. diff --git a/packages/flake-tracker/package.json b/packages/flake-tracker/package.json deleted file mode 100644 index 0180c7a8bdb..00000000000 --- a/packages/flake-tracker/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@celo/flake-tracker", - "version": "0.0.1-dev", - "description": "A tool for tracking and disabling flakey tests.", - "private": true, - "author": "Celo", - "license": "Apache-2.0", - "homepage": "https://github.com/celo-org/celo-monorepo/tree/master/packages/flake-tracker", - "repository": "https://github.com/celo-org/celo-monorepo/tree/master/packages/flake-tracker", - "keywords": [ - "celo" - ], - "scripts": { - "build": "echo flake-tracker does not require build" - }, - "devDependencies": { - "@octokit/app": "^4.2.0", - "@octokit/plugin-retry": "^3.0.3", - "@octokit/rest": "^18.0.0", - "clone": "^2.1.2", - "detox": "^17.13.2", - "mocha": "^7.1.1", - "strip-ansi": "^6.0.0", - "tmp": "^0.2.1" - } -} \ No newline at end of file diff --git a/packages/flake-tracker/scripts/summary.js b/packages/flake-tracker/scripts/summary.js deleted file mode 100644 index 561fcc672ce..00000000000 --- a/packages/flake-tracker/scripts/summary.js +++ /dev/null @@ -1,8 +0,0 @@ -const GitHub = require('../src/github.js') - -const main = async () => { - const github = await GitHub.build() - await github.addSummaryCheck() -} - -main() diff --git a/packages/flake-tracker/src/config.js b/packages/flake-tracker/src/config.js deleted file mode 100644 index 1d576320d91..00000000000 --- a/packages/flake-tracker/src/config.js +++ /dev/null @@ -1,104 +0,0 @@ -const isCI = process.env.CIRCLECI || process.env.CI -let org, repo -if (process.env.GITHUB_REPOSITORY) { - org = process.env.GITHUB_REPOSITORY.split('/')[0] - repo = process.env.GITHUB_REPOSITORY.split('/')[1] -} else { - org = process.env.CIRCLE_PROJECT_USERNAME || 'celo-org' - repo = process.env.CIRCLE_PROJECT_REPONAME || 'celo-monorepo' -} -const branch = process.env.CIRCLE_BRANCH || process.env.GITHUB_REF_NAME -const sha = process.env.CIRCLE_SHA1 || process.env.GITHUB_SHA -const ciJob = process.env.CIRCLE_JOB || process.env.GITHUB_JOB -const prNumber = getPullNumber() -const defaultNumRetries = branch === 'master' ? 15 : 5 -const flakeTrackerID = 71131 // This is the FlakeTracker GitHub App ID. - -// NOTE: Avoid editing the following constants unless you are making changes to the flake trackers' functionality. -// This file serves mainly to distill various environment variables into easy to use booleans for the rest of the project. -// Configuration should be done via env variables in config.yaml (or command line if running locally) - -// NOTE: Many env variables used in this project are provided automatically by circleci (CIRCLE_PROJECT_NAME, CIRCLECI, etc.) - -// CUSTOM ENV VARIABLE OVERVIEW: -// FLAKEY => -// - When running in CI, set to 'false' to disable the flake tracker (enabled by default) -// - When running locally, set to 'true' to enable the flake tracker (disabled by default) -// LOG_ALL_RETRY_ERRORS => -// - Only relevant when flake tracker is enabled. -// - Enables error logging after retries even for tests that never pass. Useful for debugging flakey tests that don't respond to -// retries. That is, tests that fail consistently when the first attempt fails but also sometimes pass on the first attempt. -// NUM_RETRIES => -// - Specifies how many retries should be performed before a test is declared failing. -// SKIP_KNOWN_FLAKES => -// - Must be set to 'false' to disable the skipping of known flakes in CI. -// - Note that skipping individual flakey tests can be disabled via the 'Mandatory Tests' feature (See README). -// FLAKES_FAIL_CHECK_SUITE => -// - If true, new flakey tests will be reported as 'failures' on GitHub Checks. Note this does not affect the CI workflow. - -// shouldTrackFlakes => tests are retried `numRetries` times and flakey results are logged w/ test output - -// XXX (soloseng and jcortejoso): disabling to skip flaker test on CI -const shouldTrackFlakes = false -// const shouldTrackFlakes = -// (isCI && repo !== 'celo-blockchain' && process.env.FLAKEY !== 'false') || -// process.env.FLAKEY === 'true' - -// shouldLogRetryErrorsOnFailure => log raw test error immediately after every retry. -const shouldLogRetryErrorsOnFailure = shouldTrackFlakes && process.env.LOG_ALL_RETRY_ERRORS - -// numRetries === times test is run after the initial failure -const numRetries = process.env.NUM_RETRIES ? Number(process.env.NUM_RETRIES) : defaultNumRetries - -// shouldSkipKnownFlakes => flakey test issues are fetched from github and corresponding tests are skipped -const shouldSkipKnownFlakes = - shouldTrackFlakes && - isCI && - process.env.FLAKE_TRACKER_SECRET && - process.env.SKIP_KNOWN_FLAKES !== 'false' - -// shouldAddCheckToPR => GitHub Check added to PR -const shouldAddCheckToPR = shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET - -// newFlakesShouldFailCheckSuite => determines whether GitHub Check has status 'failure' or 'neutral' when new flakey tests are found. -const newFlakesShouldFailCheckSuite = shouldAddCheckToPR && process.env.FLAKES_FAIL_CHECK_SUITE - -// shouldCreateIssues => GitHub Issues created for new flakey tests -const shouldCreateIssues = - shouldTrackFlakes && isCI && process.env.FLAKE_TRACKER_SECRET && branch === 'master' - -// For convenience... -const shouldReportFlakes = shouldAddCheckToPR || shouldCreateIssues -const shouldUseGitHub = shouldSkipKnownFlakes || shouldReportFlakes - -function getPullNumber() { - if (process.env.CIRCLE_PULL_REQUEST) { - return process.env.CIRCLE_PULL_REQUEST.split('/').slice(-1)[0] - } else if (process.env.GITHUB_REF_NAME) { - return process.env.GITHUB_REF_NAME.split('/')[2] - } - console.info( - 'Unable to determine pull request number. Expected when run in local or not triggered by a PR event' - ) - return null -} - -module.exports = { - flakeTrackerID: flakeTrackerID, - newFlakesShouldFailCheckSuite: newFlakesShouldFailCheckSuite, - numRetries: numRetries, - isCI: isCI, - org: org, - repo: repo, - branch: branch, - sha: sha, - ciJob: ciJob, - prNumber: prNumber, - shouldAddCheckToPR: shouldAddCheckToPR, - shouldCreateIssues: shouldCreateIssues, - shouldLogRetryErrorsOnFailure: shouldLogRetryErrorsOnFailure, - shouldReportFlakes: shouldReportFlakes, - shouldSkipKnownFlakes: shouldSkipKnownFlakes, - shouldTrackFlakes: shouldTrackFlakes, - shouldUseGitHub: shouldUseGitHub, -} diff --git a/packages/flake-tracker/src/db.js b/packages/flake-tracker/src/db.js deleted file mode 100644 index a2356da74b8..00000000000 --- a/packages/flake-tracker/src/db.js +++ /dev/null @@ -1,135 +0,0 @@ -const { fmtFlakeIssue, getTestSuiteDir } = require('./utils') -const { tmpdir } = require('os') -const { join } = require('path') -const fs = require('fs') -const tmp = require('tmp') -tmp.setGracefulCleanup() - -const flakeDir = 'flake-tracker_' + getTestSuiteDir().replace('/', '_') -const errDir = 'new-flakes' -const knownFlakeFile = 'known-flakes.txt' -const skippedFlakeFile = 'skipped-flakes.txt' - -const delim = '\n===============\n' - -const init = () => { - mkTmpDir(flakeDir) - mkDir(join(tmpdir(), flakeDir, errDir)) -} - -const writeErrors = (testID, errs) => { - writeError(testID, errs.join(delim)) -} - -const writeError = (testID, err) => { - const path = join(tmpdir(), flakeDir, errDir, fmtTestKey(testID)) - if (!fs.existsSync(path)) { - fs.writeFileSync(path, testID) - } - fs.appendFileSync(path, delim + err) -} - -const readErrors = (testID) => { - return readFileInFlakeDir(join(errDir, fmtTestKey(testID))) -} - -const readSkippedFlakes = () => { - return readFileInFlakeDir(skippedFlakeFile) -} - -const writeSkippedFlakes = (testIDs) => { - if (testIDs.length) { - writeSkippedFlake(testIDs.join(delim)) - } -} - -const writeSkippedFlake = (testID) => { - const path = join(tmpdir(), flakeDir, skippedFlakeFile) - if (!fs.existsSync(path)) { - fs.appendFileSync(path, testID) - } else { - fs.appendFileSync(path, delim + testID) - } -} - -const writeKnownFlakes = (flakes) => { - if (flakes.length) { - fs.writeFileSync( - join(tmpdir(), flakeDir, knownFlakeFile), - flakes.map((i) => JSON.stringify(i)).join(delim) - ) - } -} - -const readKnownFlakes = () => { - return readFileInFlakeDir(knownFlakeFile).map(JSON.parse) -} - -const readNewFlakes = () => { - return fs.readdirSync(join(tmpdir(), flakeDir, errDir)).map(parseFlakeFile) -} - -/* Helpers */ - -const parseFlakeFile = (fileName) => { - const errors = readFileInFlakeDir(join(errDir, fileName)) - const testID = errors.shift() - return fmtFlakeIssue(testID, errors) -} - -const mkDir = (path) => { - if (!fs.existsSync(path)) { - fs.mkdirSync(path) - } -} - -// Creates a directory that will be automatically removed on process exit. -const mkTmpDir = (name) => { - if (!fs.existsSync(join(tmpdir(), name))) { - // Add option `keep: true` to keep flakey test files after process exits. - // You can also specify a custom location for the files. This can be helpful for debugging. - // See https://www.npmjs.com/package/tmp - tmp.dirSync({ - name: name, - unsafeCleanup: true, - }) - } -} - -const readFileInFlakeDir = (file) => { - const path = join(tmpdir(), flakeDir, file) - return fs.existsSync(path) ? fs.readFileSync(path).toString().split(delim) : [] -} - -const fmtTestKey = (testID) => { - // Create unique file name by hashing test path and appending the test name. - // Hashing is necessary because the full test path is too long. - const titlePath = testID.split(' -> ') - const testTitle = titlePath[titlePath.length - 1] - const testKey = hashCode(testID).concat('_', testTitle).trim().replace(/(\W)/g, '_') - return testKey -} - -const hashCode = (str) => { - var hash = 0 - var chr - for (var i = 0; i < str.length; i++) { - chr = str.charCodeAt(i) - hash = (hash << 5) - hash + chr - hash |= 0 // Convert to 32bit integer - } - return hash.toString().trim() -} - -module.exports = { - readErrors: readErrors, - readKnownFlakes: readKnownFlakes, - readNewFlakes: readNewFlakes, - readSkippedFlakes: readSkippedFlakes, - init: init, - writeError: writeError, - writeErrors: writeErrors, - writeKnownFlakes: writeKnownFlakes, - writeSkippedFlake: writeSkippedFlake, - writeSkippedFlakes: writeSkippedFlakes, -} diff --git a/packages/flake-tracker/src/github.js b/packages/flake-tracker/src/github.js deleted file mode 100644 index 42edc81992e..00000000000 --- a/packages/flake-tracker/src/github.js +++ /dev/null @@ -1,362 +0,0 @@ -const { Octokit } = require('@octokit/rest') -const { App } = require('@octokit/app') -const { retry } = require('@octokit/plugin-retry') -const Client = Octokit.plugin(retry) -const stripAnsi = require('strip-ansi') -const config = require('./config') -const utils = require('./utils') - -const defaults = { - owner: config.org, - repo: config.repo, -} - -const FlakeLabel = 'FLAKEY' -const getLabels = () => { - const labels = [FlakeLabel, utils.getPackageName()] - if (config.isCI) { - labels.push(config.ciJob) - } - return labels -} - -class GitHub { - constructor(app, rest) { - if (app === undefined || rest === undefined) { - throw new Error('GitHub constructor should not be called directly. Please use GitHub.build()') - } - this.app = app - this.rest = rest - } - - static async build() { - const app = new App({ - id: config.flakeTrackerID, - privateKey: process.env.FLAKE_TRACKER_SECRET.replace(/\\n/gm, '\n'), - }) - const rest = await auth(app) - return new GitHub(app, rest) - } - - async renew() { - if (this === undefined) { - throw new Error('GitHub.renew() cannot be called before GitHub.build()') - } - this.rest = await auth(this.app) - } - - async report(flakes, skippedTests, obsoleteIssues) { - if (!config.isCI) return - const promises = [] - if (config.shouldCreateIssues) { - // Check list of ALL flakey issues to ensure no duplicates - // Note: we could technically still have duplicate issues if one is added by another build - // right after we fetch the list of issues. This seems unlikely so we'll leave it for now and - // revisit if duplicate issues start appearing. - const knownFlakes = (await this.fetchFlakeIssues()).map((i) => i.title) - const newFlakes = flakes.filter((flake) => !knownFlakes.includes(flake.title)) - if (newFlakes.length) { - promises.push(this.createIssues(newFlakes)) - } - } - if (config.shouldAddCheckToPR) { - promises.push(this.addFlakeCheck(flakes, skippedTests)) - if (config.shouldSkipKnownFlakes && obsoleteIssues.length) { - promises.push(this.handleObsoleteIssues(obsoleteIssues)) - } - } - console.log('\nSending flake tracker results to GitHub...\n') - // This is intentionally not atomic. That is, we don't mind if a flakey test is only partly reported. - return Promise.all(promises) - } - - async createIssues(flakes) { - if (!config.isCI) return - return Promise.all(flakes.map((f) => this.createIssue(f))) - } - - async createIssue(flake) { - if (!config.isCI) return - flake.body = 'Discovered at commit ' + config.sha + '\n\n' + flake.body + '\n' - const fn = () => - this.rest.issues.create({ - ...defaults, - title: flake.title, - body: stripAnsi(flake.body), - labels: getLabels(), - }) - const errMsg = 'Failed to create issue for flakey test. ' + 'Title: "' + flake.title + '",' - await this.safeExec(fn, errMsg) - } - - async fetchMandatoryTestsForPR() { - if (!config.isCI || config.branch === 'master') return [] - const prNumber = config.prNumber - const fn = () => - this.rest.pulls.get({ - ...defaults, - pull_number: prNumber, - }) - console.log('\nFetching mandatory tests for PR ' + prNumber + '...\n') - const errMsg = 'Failed to fetch mandatory tests for PR ' + prNumber - const prBody = (await this.safeExec(fn, errMsg)).data.body - return utils.parseMandatoryTestIssuesFromPullBody(prBody) - } - - async fetchFlakeIssues() { - const fn = () => - this.rest.paginate(this.rest.issues.listForRepo, { - ...defaults, - state: 'open', - labels: getLabels(), - }) - console.log('\nFetching known flakey tests from GitHub...') - const errMsg = 'Failed to fetch existing flakey test issues from GitHub.' - const issues = (await this.safeExec(fn, errMsg)) || [] - return issues.map(utils.parseDownFlakeIssue) - } - - async fetchKnownFlakesToSkip() { - const flakeIssues = await this.fetchFlakeIssues().catch(() => []) - const mandatoryTests = await this.fetchMandatoryTestsForPR().catch(() => []) - const knownFlakesToSkip = flakeIssues.filter( - // We filter out issues that have been referenced in the PR body or that correspond to - // setup/teardown steps rather than actual tests. - (i) => !i.title.includes('FLAKEY SETUP') && !mandatoryTests.includes(i.number.toString()) - ) - return knownFlakesToSkip - } - - async handleObsoleteIssues(obsoleteIssues) { - if (!config.isCI) return - const promises = [this.addObsoleteIssuesCheck(obsoleteIssues)] - if (config.branch === 'master') { - promises.push(this.closeIssues(obsoleteIssues)) - } - return Promise.all(promises) - } - - async closeIssues(issues) { - if (!config.isCI) return - return Promise.all(issues.map((i) => this.closeIssue(i))) - } - - async closeIssue(issue) { - if (!config.isCI) return - const fn = () => - this.rest.issues.update({ - ...defaults, - issue_number: issue.number, - state: 'closed', - body: 'FlakeTracker closed this issue after commit ' + config.sha + '\n\n' + issue.body, - }) - console.log('\nClosing obsolete issue ' + issue.number + '...') - const errMsg = 'Failed to close obsolete issue.' - await this.safeExec(fn, errMsg) - } - - async addObsoleteIssuesCheck(obsoleteIssues) { - if (!config.isCI) return - if (obsoleteIssues.length) { - await this.addCheckRun( - { - ...defaults, - name: utils.getTestSuiteTitles().join(' -> '), - head_sha: config.sha, - conclusion: 'neutral', - output: { - title: 'Obsolete Issues', - summary: 'Some flakey test issues no longer correspond to actual tests', - text: - (config.branch === 'master' - ? 'Because these flakey test issues are now obsolete on master, they have been automatically closed.' - : 'If tests have been refactored or renamed please update the following issues accordingly (but not too long before your PR is merged, as to avoid interfering with other concurrent workflows). If left unchanged, these issues will be automatically closed when this PR is merged.') + - '\n\n' + - obsoleteIssues.map((i) => i.html_url).join('\n\n'), - }, - }, - 'Failed to add obsolete issues check run.' - ) - } - } - - // addSummaryCheck is called in a final job added to the CI workflow. - // It provides a breakdown of where flakey tests are located. - async addSummaryCheck() { - if (!config.isCI) return - const title = 'Flakey Test Summary' - const optsBase = { ...defaults, name: 'Summary', head_sha: config.sha } - - // Get FlakeTracker check runs added so far - let fn = () => - this.rest.checks.listSuitesForRef({ - ...defaults, - ref: config.sha, - app_id: config.flakeTrackerID, - }) - - let errMsg = 'Failed to list check suites.' - const res = (await this.safeExec(fn, errMsg)).data - const numCheckSuites = res.total_count - - // If a check suite has not yet been created by the FlakeTracker app, then no - // flakiness has been detected in the earlier jobs. - let opts = { - ...optsBase, - conclusion: 'success', - output: { - title: title, - summary: utils.fmtSummary([], [], 0), - images: [utils.getRandomSuccessImage()], - }, - } - - if (numCheckSuites) { - // There should only be one check suite for the FlakeTracker app - const checkSuite = res.check_suites[0] - - fn = () => - this.rest.paginate(this.rest.checks.listForSuite, { - ...defaults, - check_suite_id: checkSuite.id, - }) - - errMsg = 'Failed to get check runs in suite.' - - const checkRuns = await this.safeExec(fn, errMsg) - - // If there exists a check run in the suite that is not just reporting obsolete issues, - // then add summary check run with breakdown of flakey tests across the workflow. - if (checkRuns.some((checkRun) => !checkRun.output.title.includes('Obsolete'))) { - // Get breakdowns by test suite (keys are `jobName -> packageName`) - const foundFlakes = {} - const skippedFlakes = {} - const totalFlakes = {} - checkRuns.forEach((checkRun) => { - const name = checkRun.name.slice(checkRun.name.search(/[a-zA-Z]/)) // remove emoji prefix if any - const skipped = utils.parseNumFlakes(checkRun.output.text, /[0-9]+\sflakey/) - const found = utils.parseNumFlakes(checkRun.output.text, /[0-9]+\snew\sflakey/) - if (skipped) skippedFlakes[name] = skipped - if (found) foundFlakes[name] = found - if (found || skipped) totalFlakes[name] = skipped + found - }) - - const text = utils.fmtWorkflowSummary(foundFlakes, skippedFlakes, totalFlakes) - - console.log(text) - - opts = { - ...optsBase, - conclusion: 'neutral', - output: { - title: title, - summary: utils.fmtSummary(Object.keys(foundFlakes), Object.keys(skippedFlakes), 0), - text: text, - }, - } - } - } - - await this.addCheckRun(opts, 'Failed to add summary check run.') - } - - async addFlakeCheck(flakes, skippedTests) { - if (!config.isCI) return - const conclusion = utils.getConclusion(flakes, skippedTests) - - // Only add checks when there's flakiness (otherwise check suite gets cluttered) - if (conclusion === 'success') return - - const summary_0 = utils.fmtSummary(flakes, skippedTests, 0) - const summary_3 = utils.fmtSummary(flakes, skippedTests, 3) - - const annotations = flakes.map((f) => { - const firstErr = utils.parseFirstErrFromFlakeBody(f.body) - const lineNumber = utils.parseErrLineNumberFromStack(firstErr) || 1 - const path = utils.parsePathFromStack(firstErr) - return { - title: f.title, - path: path.slice(path.indexOf('packages/')), - start_line: lineNumber, - end_line: lineNumber + 1, - annotation_level: 'warning', - message: stripAnsi(utils.parseFirstErrFromFlakeBody(f.body)), - } - }) - const output = { - title: utils.statuses[conclusion], - summary: stripAnsi(summary_0), - text: stripAnsi(summary_3), - annotations: annotations, - } - - let name = utils.getTestSuiteTitles().join(' -> ') - let conclusionToDisplay = conclusion - if (!config.newFlakesShouldFailCheckSuite && conclusion !== 'success') { - name = utils.emojis[conclusion] + ' ' + name - conclusionToDisplay = 'neutral' - } - - await this.addCheckRun( - { - ...defaults, - name: name, - head_sha: config.sha, - conclusion: conclusionToDisplay, - output: output, - }, - 'Failed to add check run.' - ) - } - - async addCheckRun(opts, errMsg) { - if (!config.isCI) return - const fn = () => { - return this.rest.checks.create(opts) - } - await this.safeExec(fn, errMsg) - } - - // Retries fn with fresh token if expired - async safeExec(fn, errMsg) { - for (let i = 0; i < 2; i++) { - try { - return await fn() - } catch (error) { - if (i > 0 || error !== 'HttpError: Bad credentials') { - console.error('\n' + errMsg + ' ' + error) - return - } - await this.renew() - } - } - } -} - -// Authenticate as an installation of the Flake Tracker GitHub App -const auth = async (app) => { - const rest = new Client({ - auth: app.getSignedJsonWebToken(), - }) - - try { - const installationId = ( - await rest.apps.getRepoInstallation({ - ...defaults, - }) - ).data.id - - const installationAccessToken = await app.getInstallationAccessToken({ - installationId, - }) - - return new Client({ - auth: installationAccessToken, - }) - } catch (error) { - console.error('Flake Tracker App failed to authenticate as an installation ' + error) - return rest // We're still authenticated by the JWT token, but it will expire sooner. - } -} - -module.exports = GitHub diff --git a/packages/flake-tracker/src/jest/config.js b/packages/flake-tracker/src/jest/config.js deleted file mode 100644 index 46e67bf823f..00000000000 --- a/packages/flake-tracker/src/jest/config.js +++ /dev/null @@ -1,61 +0,0 @@ -const { - numRetries, - shouldLogRetryErrorsOnFailure, - shouldSkipKnownFlakes, - shouldTrackFlakes, -} = require('../config') - -const base = { - // No flake tracking - setupFilesAfterEnv: [], - testRunner: 'jest-circus/runner', -} - -const flakeTracking = { - ...base, - globalSetup: require.resolve('./setup.global.js'), - globalTeardown: require.resolve('./teardown.global.js'), - setupFilesAfterEnv: [require.resolve('./setup.js')], -} - -const nodeFlakeTracking = shouldTrackFlakes - ? { - ...flakeTracking, - testEnvironment: require.resolve('./environments/node'), - } - : { - ...base, - testEnvironment: 'node', - } - -const jsdomFlakeTracking = shouldTrackFlakes //TODO(Alec): check that jsdom tests are covered - ? { - ...flakeTracking, - testEnvironment: require.resolve('./environments/jsdom'), - } - : { - ...base, - testEnvironment: 'jsdom', - } - -// Note that detox e2e tests require a config.json file, which means we currently can't use the object below. -// Presumably this will change in future versions of detox, so we've added this here anyway. -const detoxFlakeTracking = shouldTrackFlakes - ? { - ...flakeTracking, - testEnvironment: require.resolve('./environments/detox'), - } - : { - ...base, - testEnvironment: 'node', - } - -module.exports = { - detoxFlakeTracking: detoxFlakeTracking, - jsdomFlakeTracking: jsdomFlakeTracking, - nodeFlakeTracking: nodeFlakeTracking, - numRetries: numRetries, - shouldLogRetryErrorsOnFailure: shouldLogRetryErrorsOnFailure, - shouldSkipKnownFlakes: shouldSkipKnownFlakes, - shouldTrackFlakes: shouldTrackFlakes, -} diff --git a/packages/flake-tracker/src/jest/environments/detox.js b/packages/flake-tracker/src/jest/environments/detox.js deleted file mode 100644 index a3f4ecfd06c..00000000000 --- a/packages/flake-tracker/src/jest/environments/detox.js +++ /dev/null @@ -1,35 +0,0 @@ -const { - DetoxCircusEnvironment, - SpecReporter, - WorkerAssignReporter, -} = require('detox/runners/jest-circus') -const JestFlakeTracker = require('../tracker') - -class FlakeTrackingDetoxEnv extends DetoxCircusEnvironment { - constructor(config) { - super(config) - - this.tracker = new JestFlakeTracker(this.global) - - // Can be safely removed, if you are content with the default value (=300000ms) - this.initTimeout = 300000 - - // This takes care of generating status logs on a per-spec basis. By default, Jest only reports at file-level. - this.registerListeners({ - SpecReporter, - WorkerAssignReporter, - }) - } - - async setup() { - await super.setup() - await this.tracker.setup() - } - - async handleTestEvent(event, state) { - await super.handleTestEvent(event, state) - await this.tracker.handleTestEvent(event, state) - } -} - -module.exports = FlakeTrackingDetoxEnv diff --git a/packages/flake-tracker/src/jest/environments/jsdom.js b/packages/flake-tracker/src/jest/environments/jsdom.js deleted file mode 100644 index 108f3b4e43b..00000000000 --- a/packages/flake-tracker/src/jest/environments/jsdom.js +++ /dev/null @@ -1,20 +0,0 @@ -const JSDOMEnvironment = require('jest-environment-jsdom') -const JestFlakeTracker = require('../tracker') - -class FlakeTrackingJSDOMEnv extends JSDOMEnvironment { - constructor(config) { - super(config) - this.tracker = new JestFlakeTracker(this.global) - } - - async setup() { - await super.setup() - await this.tracker.setup() - } - - async handleTestEvent(event, state) { - await this.tracker.handleTestEvent(event, state) - } -} - -module.exports = FlakeTrackingJSDOMEnv diff --git a/packages/flake-tracker/src/jest/environments/node.js b/packages/flake-tracker/src/jest/environments/node.js deleted file mode 100644 index a07c69da315..00000000000 --- a/packages/flake-tracker/src/jest/environments/node.js +++ /dev/null @@ -1,20 +0,0 @@ -const NodeEnvironment = require('jest-environment-node') -const JestFlakeTracker = require('../tracker') - -class FlakeTrackingNodeEnv extends NodeEnvironment { - constructor(config) { - super(config) - this.tracker = new JestFlakeTracker(this.global) - } - - async setup() { - await super.setup() - await this.tracker.setup() - } - - async handleTestEvent(event, state) { - await this.tracker.handleTestEvent(event, state) - } -} - -module.exports = FlakeTrackingNodeEnv diff --git a/packages/flake-tracker/src/jest/setup.global.js b/packages/flake-tracker/src/jest/setup.global.js deleted file mode 100644 index ff603ea81c6..00000000000 --- a/packages/flake-tracker/src/jest/setup.global.js +++ /dev/null @@ -1,8 +0,0 @@ -require('regenerator-runtime/runtime') // See https://stackoverflow.com/questions/42535270/regeneratorruntime-is-not-defined-when-running-jest-test - -const FlakeManager = require('../manager') - -// This is called at the beginning of each jest test suite -module.exports = async function jestFlakeTrackerSetup() { - global.FlakeManager = await FlakeManager.build() // Note that this global variable is not available anywhere else besides global.teardown -} diff --git a/packages/flake-tracker/src/jest/setup.js b/packages/flake-tracker/src/jest/setup.js deleted file mode 100644 index e5c3e701877..00000000000 --- a/packages/flake-tracker/src/jest/setup.js +++ /dev/null @@ -1,3 +0,0 @@ -const { numRetries } = require('./config') -jest.retryTimes(numRetries) -// This is run at the beginning of each top-level describe block diff --git a/packages/flake-tracker/src/jest/teardown.global.js b/packages/flake-tracker/src/jest/teardown.global.js deleted file mode 100644 index 4fd2d2bdfcc..00000000000 --- a/packages/flake-tracker/src/jest/teardown.global.js +++ /dev/null @@ -1,4 +0,0 @@ -// This is called at the end of each jest test suite. -module.exports = async function jestFlakeTrackerTeardown() { - await global.FlakeManager.finish() -} diff --git a/packages/flake-tracker/src/jest/tracker.js b/packages/flake-tracker/src/jest/tracker.js deleted file mode 100644 index 14d8de0d286..00000000000 --- a/packages/flake-tracker/src/jest/tracker.js +++ /dev/null @@ -1,77 +0,0 @@ -require('jest-circus') // We need this in order for makeRunResult (below) to work -const { makeRunResult } = require('jest-circus/build/utils') -const db = require('../db') -const { getTestID, getTestIDFromTestPath, buildFlakeyDescribe } = require('./utils') -const { shouldLogRetryErrorsOnFailure, shouldSkipKnownFlakes, numRetries } = require('./config') -const clone = require('clone') - -class JestFlakeTracker { - async setup() { - // For each describe block, we cache errors in this map as tests execute and - // only write them to the db on 'run_finish'. - this.flakes = new Map() - this.skip = shouldSkipKnownFlakes ? db.readKnownFlakes().map((i) => i.title) : [] - this.skipped = [] - } - - async handleTestEvent(event, state) { - // This event is fired before every test retry but after errors are cleared - if (event.name === 'test_retry') { - console.log('Retry #' + event.test.invocations + ' for test: ' + getTestID(event.test)) - } - - // This event is fired at the end of each top-level describe block. - if (event.name === 'run_finish') { - // We make a fake describe block with all the accumulated errors and then use it - // to call `makeRunResult`. This converts our `TestEntry` objects into `TestResults` - // which have formatted errors - const describeBlock = buildFlakeyDescribe(clone(state.rootDescribeBlock), this.flakes) - try { - makeRunResult(describeBlock, state.unhandledErrors) - .testResults.filter((tr) => tr.status === 'flakey') - .forEach((tr) => db.writeErrors(getTestIDFromTestPath(tr.testPath), tr.errors)) - } catch {} // ignoring weird behavior: "TypeError: Cannot read property 'replace' of undefined" that sometimes throws here - - // The alternative to using the db would be to send results to github at the - // end of each describe block. Instead, we use the db and only message github - // on global.setup and global.teardown. - db.writeSkippedFlakes(this.skipped) - } - - // This event is fired at the end of each test (including retries) before errors are cleared - if (event.name === 'test_done') { - const testID = getTestID(event.test) - const failed = event.test.errors.length > 0 - const isFinalRetry = event.test.invocations === numRetries + 1 - - if (failed) { - if (isFinalRetry) { - // Test failed on every retry => not flakey - this.flakes.delete(testID) - } else { - if (shouldLogRetryErrorsOnFailure) { - // Note that this error will not be formatted - console.log('\n' + event.test.errors + '\n') - } - // Test will be retried => store error - const prevErrors = this.flakes.get(testID) - const errors = prevErrors || [] - errors.push(...event.test.errors) - this.flakes.set(testID, errors) - } - } - } - - // This event is fired right before a test is executed - if (event.name === 'test_start' && shouldSkipKnownFlakes) { - const testID = getTestID(event.test) - if (this.skip.some((knownFlake) => knownFlake.includes(testID))) { - console.log('Skipped known flakey test: ' + testID) - this.skipped.push(testID) - event.test.mode = 'skip' // This tricks jest into skipping the test - } - } - } -} - -module.exports = JestFlakeTracker diff --git a/packages/flake-tracker/src/jest/utils.js b/packages/flake-tracker/src/jest/utils.js deleted file mode 100644 index 5579c8cf8f7..00000000000 --- a/packages/flake-tracker/src/jest/utils.js +++ /dev/null @@ -1,65 +0,0 @@ -const { fmtFlakeIssue, fmtTestTitles } = require('../utils') - -// We build a fake describe block object where all flakey tests -// maintain references to the errors from their retries. Normally, -// jest wipes errors from retries and only remembers errors from full -// failures. We can feed this fake describe block object to jest and -// trick it into formatting all the retry errors nicely for us. -const buildFlakeyDescribe = (describeBlock, flakeMap) => { - for (const child of describeBlock.children) { - switch (child.type) { - case 'describeBlock': { - buildFlakeyDescribe(child, flakeMap) - break - } - case 'test': { - const testID = getTestID(child) - const flakeErrors = flakeMap.get(testID) - if (flakeErrors !== undefined) { - child.errors = flakeErrors - child.status = 'flakey' - } - break - } - } - } - return describeBlock -} - -const getTestID = (test) => { - // Note that fmtTestTitles prepends `circleJobName -> packageName` to the test titles - return fmtTestTitles(getTestTitles(test)) -} - -// Returns an array of titles starting with the test title and ending with -// the title of the top-level describe blockcontaining the test. This effectively -// provides a 'path' to the test. Note that while jest implements this logic -// for TestResult objects (the output of makeRunResult), we have to do it ourselves -// for TestEntry objects. -const getTestTitles = (test) => { - const titles = [] - let parent = test - - do { - titles.push(parent.name) - } while ((parent = parent.parent)) - - titles.pop() // Removes ROOT_DESCRIBE_BLOCK - - return titles.reverse() -} - -// If we already have the the array of titles (i.e. we are using a TestResult object) -// then we do not need the logic from getTestTitles() above. -const getTestIDFromTestPath = (testPath) => { - testPath.shift() // Removes ROOT_DESCRIBE_BLOCK - return fmtTestTitles(testPath) -} - -module.exports = { - buildFlakeyDescribe: buildFlakeyDescribe, - getTestID: getTestID, - getTestIDFromTestPath: getTestIDFromTestPath, - fmtFlakeIssue: fmtFlakeIssue, - fmtTestTitles: fmtTestTitles, -} diff --git a/packages/flake-tracker/src/manager.js b/packages/flake-tracker/src/manager.js deleted file mode 100644 index 246bc0b903e..00000000000 --- a/packages/flake-tracker/src/manager.js +++ /dev/null @@ -1,67 +0,0 @@ -const { shouldUseGitHub, shouldSkipKnownFlakes } = require('./config') -const db = require('./db') -const GitHub = require('./github') -const { fmtSummary, calcObsoleteFlakeIssues } = require('./utils') - -class FlakeManager { - constructor(github, setup) { - this.setup = setup - if (!setup) return - - if (github === undefined && shouldUseGitHub) { - throw new Error( - 'FlakeManager constructor should not be called directly. Please use FlakeManager.build()' - ) - } - this.github = github - } - - // Called at the beginning of each test suite - static async build() { - try { - db.init() - let github - if (shouldUseGitHub) { - github = await GitHub.build() - if (shouldSkipKnownFlakes) { - db.writeKnownFlakes( - await github.fetchKnownFlakesToSkip().catch(() => { - console.log('failed to fetch list of known flakey tests') - return [] - }) - ) - } - } - return new FlakeManager(github, true) - } catch (error) { - console.log('Flake tracker setup failed') - console.log(error) - return new FlakeManager(undefined, false) - } - } - - // Called at the end of each test suite - async finish() { - if (!this.setup) return - try { - const flakes = db.readNewFlakes() - let skippedTests = [] - if (shouldUseGitHub) { - let obsoleteIssues = [] - if (shouldSkipKnownFlakes) { - skippedTests = db.readSkippedFlakes() - obsoleteIssues = calcObsoleteFlakeIssues(skippedTests, db.readKnownFlakes()) - } - await this.github.report(flakes, skippedTests, obsoleteIssues).catch(() => { - console.log('failed to report flake tracker results') - }) - } - console.log(fmtSummary(flakes, skippedTests, 3)) - } catch (error) { - console.log('Flake tracker teardown failed') - console.log(error) - } - } -} - -module.exports = FlakeManager diff --git a/packages/flake-tracker/src/mocha/config.js b/packages/flake-tracker/src/mocha/config.js deleted file mode 100644 index ef9eaa95501..00000000000 --- a/packages/flake-tracker/src/mocha/config.js +++ /dev/null @@ -1,8 +0,0 @@ -const { shouldTrackFlakes, numRetries } = require('../config') - -module.exports = shouldTrackFlakes - ? { - reporter: require.resolve('./reporter'), - retries: numRetries, - } - : {} diff --git a/packages/flake-tracker/src/mocha/reporter.js b/packages/flake-tracker/src/mocha/reporter.js deleted file mode 100644 index 10eeeef1175..00000000000 --- a/packages/flake-tracker/src/mocha/reporter.js +++ /dev/null @@ -1,61 +0,0 @@ -const Mocha = require('mocha') -const FlakeManager = require('../manager') -const db = require('../db') -const { getTestID, fmtError } = require('./utils') -const { shouldLogRetryErrorsOnFailure, shouldSkipKnownFlakes } = require('../config') -const { Spec } = Mocha.reporters - -function FlakeReporter(runner) { - Spec.call(this, runner) - - let manager - let skip = [] - let skipped = [] - let currErrors = [] - - before('Fetch Flakey Tests', async function () { - manager = await FlakeManager.build() - skip = shouldSkipKnownFlakes ? db.readKnownFlakes().map((i) => i.title) : [] - }) - - after('Process Flakey Tests', async function () { - db.writeSkippedFlakes(skipped) - await manager.finish() - }) - - runner.on('retry', function (test, err) { - console.log('Retry #' + (test.currentRetry() + 1) + ' for test ' + getTestID(test)) - if (shouldLogRetryErrorsOnFailure) { - console.log('\n' + fmtError(err) + '\n') - } - currErrors.push(fmtError(err)) - }) - - runner.on('test', function (test) { - if (skip.length) { - let testID = getTestID(test) - if (skip.some((knownFlake) => knownFlake.includes(testID))) { - console.log('Skipped known flakey test: ' + testID) - skipped.push(testID) - test.pending = true - } - } - }) - - runner.on('pass', function (test) { - if (test.currentRetry() > 0) { - // Note that we could store these errors locally in a map and not use the db at all. - // We use the db here for consistency with jest which must use the db, and also because - // writing to a tmp file (the db) is convenient for debugging. This design could be improved. - db.writeErrors(getTestID(test), currErrors) - } - }) - - runner.on('test end', function (test) { - currErrors = [] - }) -} - -Mocha.utils.inherits(FlakeReporter, Mocha.reporters.Spec) - -module.exports = FlakeReporter diff --git a/packages/flake-tracker/src/mocha/utils.js b/packages/flake-tracker/src/mocha/utils.js deleted file mode 100644 index 850a331e51d..00000000000 --- a/packages/flake-tracker/src/mocha/utils.js +++ /dev/null @@ -1,23 +0,0 @@ -const { fmtFlakeIssue, fmtTestTitles } = require('../utils') - -// Returns a 'path' to the test the same way that getTestID in ../jest does. -// i.e. rootDescribeBlockTitle -> childDescribeBlockTitle -> testTitle -const getTestID = (runnable) => { - // Note that fmtTestTitles also prepends `circleJobName -> packageName` to the titlePath - return fmtTestTitles(runnable.titlePath()) -} - -const getTestIDFromSuite = (suite, testTitle) => { - return getTestID(suite).concat(' -> ', testTitle) -} - -const fmtError = (err) => { - return err.stack || err || 'err undefined' -} - -module.exports = { - getTestID: getTestID, - getTestIDFromSuite: getTestIDFromSuite, - fmtError: fmtError, - fmtFlakeIssue: fmtFlakeIssue, -} diff --git a/packages/flake-tracker/src/utils.js b/packages/flake-tracker/src/utils.js deleted file mode 100644 index 38ec92e23e5..00000000000 --- a/packages/flake-tracker/src/utils.js +++ /dev/null @@ -1,309 +0,0 @@ -const { config } = require('process') - -// Emojis -const fire = String.fromCodePoint(0x1f525) -const partyFace = String.fromCodePoint(0x1f973) -const stressFace = String.fromCodePoint(0x1f613) -const greenCheck = String.fromCodePoint(0x2705) -const redX = String.fromCodePoint(0x274c) -const snowflake = String.fromCharCode(0x2744) -const warning = String.fromCodePoint(0x26a0) -const relievedSmileFace = String.fromCodePoint(0x1f60c) -const hands = String.fromCodePoint(0x1f64c) -const warningLight = String.fromCodePoint(0x1f6a8) - -const flakeTitlePrefix = '[FLAKEY TEST] ' - -const statuses = { - failure: 'flakey tests were found', - neutral: 'flakey tests were skipped', - success: 'no flakey tests found!', -} - -const emojis = { - failure: redX, - neutral: warningLight, - success: greenCheck, -} - -function fmtFlakeIssue(testID, errors) { - return { - title: flakeTitlePrefix + testID, - body: fmtIssueBody(errors), - } -} - -function fmtIssueBody(errors) { - errors.push('Test Passed!') - let body = '' - for (let i = 0; i < errors.length; i++) { - body += 'Attempt No. ' + (i + 1) + ':\n\n' + errors[i] + '\n\n' - } - return body -} - -// Parses list of flakey test issues to ignore from the PR's body. -// The tests corresponding to these issues will not be skipped. -function parseMandatoryTestIssuesFromPullBody(prBody) { - const urls = prBody.match(/https?[\S]+issues\/[0-9]+/g) || [] - const issueNumbers = urls.map((url) => - url.slice(url.lastIndexOf('/') + 1).replace(/[^0-9]+/g, '') - ) - return issueNumbers -} - -function getPackageName() { - const testSuiteDir = getTestSuiteDir() - const i = testSuiteDir.indexOf('/') - return i == -1 ? testSuiteDir : testSuiteDir.slice(0, i) -} - -function getTestSuiteDir() { - const rootDelim = 'packages/' - return process.cwd().slice(process.cwd().lastIndexOf(rootDelim) + rootDelim.length) -} - -function getTestSuiteTitles() { - const titles = [getTestSuiteDir()] - if (config.isCI) { - titles.unshift(config.ciJob) - } - return titles -} - -function fmtTestTitles(titles) { - titles.unshift(...getTestSuiteTitles()) - return titles.join(' -> ').trim() -} - -function parseFirstErrFromFlakeBody(body) { - return body.split(/Attempt No\. [0-9]+:/g)[1] -} - -function parseFirstLineOfStack(stack) { - return stack.split('at ')[1] -} - -function parsePathFromStack(stack) { - return parseFirstLineOfStack(stack).split(':')[0] -} - -function parseErrLineNumberFromStack(stack) { - return Number(parseFirstLineOfStack(stack).split(':')[1]) -} - -function parseTestIdFromFlakeTitle(title) { - return title.replace(flakeTitlePrefix, '').trim() -} - -function parseDownFlakeIssue(issue) { - return (({ title, html_url, number, body }) => ({ - title, - html_url, - number, - body, - }))(issue) -} - -function getConclusion(flakes, skippedTests) { - let conclusion = 'failure' - if (!flakes.length) { - conclusion = skippedTests.length ? 'neutral' : 'success' - } - return conclusion -} - -// You can set verbosity to either 0, 1, 2, 3, or 4 -// 4 => header + list of skipped tests + errors from every retry for each new flakey test -// 3 => header + list of skipped tests + 1 errror for each new flakey test -// 2 => list skipped tests + list new flakey tests -// 1 => count of skipped tests + count of new flakey tests -// 0 => short one line status -function fmtSummary(flakes, skippedTests, verbosity) { - if (![0, 1, 2, 3, 4].includes(verbosity)) { - verbosity = 0 // default is lowest verbosity - } - - if (verbosity == 0) { - if (flakes.length) { - return 'New flakiness detected ' + redX - } - if (skippedTests.length) { - return 'Some tests were skipped due to flakiness. No new flakey tests were found.' - } - return 'We have achieved zero flakiness ' + hands + ' ' + greenCheck - } - - let summary = verbosity > 2 ? '\n_____FlakeTracker_____\n' : '' - - if (skippedTests.length) { - summary += '\n' + warning + ' ' - if (skippedTests.length === 1) { - summary += '1 flakey test was skipped \n' - } else { - summary += skippedTests.length + ' flakey tests were skipped \n' - } - if (verbosity > 1) { - skippedTests.forEach((skip) => { - summary += '\n' + skip + '\n' - }) - } - } else { - summary += '\n' + fire + ' no flakey tests were skipped\n' - } - - if (flakes.length) { - summary += '\n' + stressFace + ' ' - if (flakes.length === 1) { - summary += '1 new flakey test found\n' - } else { - summary += flakes.length + ' new flakey tests found\n' - } - switch (verbosity) { - case 2: - flakes.forEach((f) => { - summary += '\n' + f.title + '\n' - }) - break - case 3: - flakes.forEach((f) => { - summary += '\n' + f.title + parseFirstErrFromFlakeBody(f.body) + '\n' - }) - break - case 4: - let i = 0 - flakes.forEach((f) => { - summary += '\n' + ++i + ')\n\n' + f.title + '\n\n' + f.body + '\n' - }) - break - default: - break - } - } else { - summary += '\n' + partyFace + ' no new flakey tests found!\n' - } - - return summary -} - -function sumVals(obj) { - return Object.values(obj).reduce((acc, x) => acc + x, 0) -} - -// Use i == 0 for breakdowns by job, i == 1 for breakdowns by package -function parseBreakdown(breakdownByTestSuite, i) { - const breakdown = {} - Object.keys(breakdownByTestSuite).forEach((testSuite) => { - const key = testSuite.split(' -> ')[i] // We id test suites by `jobName -> packageName` - breakdown[key] = breakdown[key] - ? breakdown[key] + breakdownByTestSuite[testSuite] - : breakdownByTestSuite[testSuite] - }) - return breakdown -} - -function fmtBreakdown(breakdownByTestSuite, total) { - let text = '' - const breakdownByPackage = parseBreakdown(breakdownByTestSuite, 1) - const breakdownByJob = parseBreakdown(breakdownByTestSuite, 0) - - const fmtPercentage = (n, d) => { - return ((n / d) * 100).toFixed(1) + '%' - } - - text += '\n\tBy Package:\n' - Object.keys(breakdownByPackage).forEach((pkg) => { - const num = breakdownByPackage[pkg] - text += '\n\t\t' + pkg + ': ' + num + ' (' + fmtPercentage(num, total) + ')\n' - }) - - text += '\n\tBy Job:\n' - Object.keys(breakdownByJob).forEach((job) => { - const num = breakdownByJob[job] - text += '\n\t\t' + job + ': ' + num + ' (' + fmtPercentage(num, total) + ')\n' - }) - - return text -} - -function parseNumFlakes(text, regex) { - return (text.match(regex) || []) - .map((str) => str.replace(/[^0-9]+/, '')) - .reduce((acc, x) => acc + Number(x), 0) -} - -// This is used only by the flakey-test-summary job added to the end of the workflow -function fmtWorkflowSummary(foundFlakes, skippedFlakes, totalFlakes) { - let summary = '\n_____FlakeTracker Workflow Summary_____\n' - - const total = sumVals(totalFlakes) - const found = sumVals(foundFlakes) - const skipped = sumVals(skippedFlakes) - - summary += - '\nTotal flakey tests in this workflow: ' + - total + - ' ' + - '(discovered: ' + - found + - ', skipped: ' + - skipped + - ')\n' - - if (total) { - summary += '\nBreakdown of all flakey tests:\n' + fmtBreakdown(totalFlakes, total) - if (found) { - summary += '\nBreakdown of new flakey tests:\n' + fmtBreakdown(foundFlakes, found) - } - if (skipped) { - summary += '\nBreakdown of skipped flakey tests:\n' + fmtBreakdown(skippedFlakes, skipped) - } - } - - return summary -} - -function getRandomSuccessImage() { - const fmtImage = (url) => { - return { - image_url: url, - alt: 'Hooray! ' + url, - } - } - const images = [ - // Please add more gifs :) - 'https://media.giphy.com/media/mQG644PY8O7rG/source.gif', - 'https://media.giphy.com/media/4xpB3eE00FfBm/source.gif', - 'https://media.giphy.com/media/kBZBlLVlfECvOQAVno/source.gif', - 'https://media.giphy.com/media/l4JySAWfMaY7w88sU/source.gif', - 'https://media.giphy.com/media/2fQ1Gq3KOpvNs4NTmu/source.gif', - ].map(fmtImage) - return images[Math.floor(Math.random() * images.length)] -} - -function calcObsoleteFlakeIssues(skippedTests, knownFlakes) { - return knownFlakes.filter((i) => !skippedTests.some((skipped) => i.title.includes(skipped))) -} - -module.exports = { - calcObsoleteFlakeIssues: calcObsoleteFlakeIssues, - emojis: emojis, - fmtFlakeIssue: fmtFlakeIssue, - fmtSummary: fmtSummary, - fmtTestTitles: fmtTestTitles, - fmtWorkflowSummary: fmtWorkflowSummary, - getConclusion: getConclusion, - getPackageName: getPackageName, - getRandomSuccessImage: getRandomSuccessImage, - getTestSuiteDir: getTestSuiteDir, - getTestSuiteTitles: getTestSuiteTitles, - parseDownFlakeIssue: parseDownFlakeIssue, - parseErrLineNumberFromStack: parseErrLineNumberFromStack, - parseFirstErrFromFlakeBody: parseFirstErrFromFlakeBody, - parseFirstLineOfStack: parseFirstLineOfStack, - parseMandatoryTestIssuesFromPullBody: parseMandatoryTestIssuesFromPullBody, - parseNumFlakes: parseNumFlakes, - parsePathFromStack: parsePathFromStack, - parseTestIdFromFlakeTitle: parseTestIdFromFlakeTitle, - statuses: statuses, -} diff --git a/packages/phone-number-privacy/combiner/jest.config.js b/packages/phone-number-privacy/combiner/jest.config.js index 63ea1df1ba5..ac1faeacbb9 100644 --- a/packages/phone-number-privacy/combiner/jest.config.js +++ b/packages/phone-number-privacy/combiner/jest.config.js @@ -1,9 +1,5 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, - setupFilesAfterEnv: [...nodeFlakeTracking.setupFilesAfterEnv], coverageReporters: [['lcov', { projectRoot: '../../../' }], 'text'], collectCoverageFrom: ['./src/**'], coverageThreshold: { diff --git a/packages/phone-number-privacy/combiner/package.json b/packages/phone-number-privacy/combiner/package.json index c1517359c8b..3112b68489d 100644 --- a/packages/phone-number-privacy/combiner/package.json +++ b/packages/phone-number-privacy/combiner/package.json @@ -23,9 +23,9 @@ "test": "jest --runInBand --testPathIgnorePatterns test/end-to-end", "test:coverage": "yarn test --coverage", "test:integration": "jest --runInBand test/integration", - "test:e2e": "FLAKEY=true jest test/end-to-end --verbose", - "test:e2e:staging": "FLAKEY=true CONTEXT_NAME=staging yarn test:e2e", - "test:e2e:alfajores": "FLAKEY=true CONTEXT_NAME=alfajores yarn test:e2e" + "test:e2e": "jest test/end-to-end --verbose", + "test:e2e:staging": "CONTEXT_NAME=staging yarn test:e2e", + "test:e2e:alfajores": "CONTEXT_NAME=alfajores yarn test:e2e" }, "dependencies": { "@celo/contractkit": "^4.1.1-dev", @@ -55,8 +55,7 @@ "firebase-tools": "9.20.0" }, "peerDependencies": { - "@celo/phone-number-privacy-signer": "^2.0.2", - "@celo/flake-tracker": "0.0.1-dev" + "@celo/phone-number-privacy-signer": "^2.0.2" }, "engines": { "node": ">=14" diff --git a/packages/phone-number-privacy/signer/jest.config.js b/packages/phone-number-privacy/signer/jest.config.js index 11c683c662f..511496b9c32 100644 --- a/packages/phone-number-privacy/signer/jest.config.js +++ b/packages/phone-number-privacy/signer/jest.config.js @@ -1,8 +1,5 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, setupFiles: ['dotenv/config'], coverageReporters: [['lcov', { projectRoot: '../../../' }], 'text'], collectCoverageFrom: ['./src/**'], diff --git a/packages/phone-number-privacy/signer/package.json b/packages/phone-number-privacy/signer/package.json index 17fef3b4541..f2f01266bba 100644 --- a/packages/phone-number-privacy/signer/package.json +++ b/packages/phone-number-privacy/signer/package.json @@ -11,7 +11,7 @@ "clean": "tsc -b . --clean", "build": "tsc -b .", "lint": "tslint --project .", - "test": "SKIP_KNOWN_FLAKES=false jest --testPathIgnorePatterns test/end-to-end", + "test": "jest --testPathIgnorePatterns test/end-to-end", "test:debughandles": "jest --watch --runInBand --detectOpenHandles --testPathIgnorePatterns test/end-to-end", "test:debug": "node --inspect ../../../node_modules/.bin/jest --runInBand", "test:coverage": "yarn test --coverage", @@ -65,9 +65,6 @@ "ts-node": "^8.3.0", "typescript": "4.4.3" }, - "peerDependencies": { - "@celo/flake-tracker": "0.0.1-dev" - }, "engines": { "node": ">=10" } diff --git a/packages/protocol/package.json b/packages/protocol/package.json index ed5a2116ca3..353ad9d8358 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -94,7 +94,6 @@ "web3-utils": "1.10.0" }, "devDependencies": { - "@celo/flake-tracker": "0.0.1-dev", "@celo/phone-utils": "4.1.1-dev", "@celo/typechain-target-web3-v1-celo": "0.2.0", "@celo/typescript": "0.0.1", diff --git a/packages/protocol/truffle-config.js b/packages/protocol/truffle-config.js index 98db1afe31c..cec7cbc1d6c 100644 --- a/packages/protocol/truffle-config.js +++ b/packages/protocol/truffle-config.js @@ -4,7 +4,6 @@ const ProviderEngine = require('web3-provider-engine') const WebsocketSubprovider = require('web3-provider-engine/subproviders/websocket.js') const { TruffleArtifactAdapter } = require('@0x/sol-trace') const { CoverageSubprovider } = require('@0x/sol-coverage') -const flakeTrackingConfig = require('@celo/flake-tracker/src/mocha/config.js') var Web3 = require('web3') var net = require('net') @@ -225,7 +224,6 @@ module.exports = { }, }, networks, - mocha: flakeTrackingConfig, } if (process.argv.includes('--gas')) { diff --git a/packages/sdk/base/jest.config.js b/packages/sdk/base/jest.config.js index 86abcf4a671..53358d65426 100644 --- a/packages/sdk/base/jest.config.js +++ b/packages/sdk/base/jest.config.js @@ -1,7 +1,4 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - ...nodeFlakeTracking, } diff --git a/packages/sdk/base/package.json b/packages/sdk/base/package.json index fd14ba4f859..157e980478f 100644 --- a/packages/sdk/base/package.json +++ b/packages/sdk/base/package.json @@ -23,7 +23,6 @@ ], "dependencies": {}, "devDependencies": { - "@celo/flake-tracker": "0.0.1-dev", "@celo/typescript": "0.0.1", "bignumber.js": "^9.0.0", "elliptic": "^6.5.4", diff --git a/packages/sdk/connect/jest.config.js b/packages/sdk/connect/jest.config.js index 0b093cd179c..c0198cdd329 100644 --- a/packages/sdk/connect/jest.config.js +++ b/packages/sdk/connect/jest.config.js @@ -1,9 +1,5 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: [...nodeFlakeTracking.setupFilesAfterEnv], verbose: true, } diff --git a/packages/sdk/connect/package.json b/packages/sdk/connect/package.json index 8daf50d161a..2c23bcebde1 100644 --- a/packages/sdk/connect/package.json +++ b/packages/sdk/connect/package.json @@ -31,7 +31,6 @@ "utf8": "3.0.0" }, "devDependencies": { - "@celo/flake-tracker": "0.0.1-dev", "web3": "1.10.0", "web3-core": "1.10.0", "web3-eth": "1.10.0", diff --git a/packages/sdk/contractkit/jest.config.js b/packages/sdk/contractkit/jest.config.js index 597915ba69b..5ce2d268625 100644 --- a/packages/sdk/contractkit/jest.config.js +++ b/packages/sdk/contractkit/jest.config.js @@ -1,14 +1,7 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: [ - '@celo/dev-utils/lib/matchers', - '/jest_setup.ts', - ...nodeFlakeTracking.setupFilesAfterEnv, - ], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', '/jest_setup.ts'], globalSetup: '/src/test-utils/setup.global.ts', globalTeardown: '/src/test-utils/teardown.global.ts', testSequencer: '/src/test-utils/AlphabeticSequencer.js', diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 1651e12b176..1d0dcb52195 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -46,7 +46,6 @@ "devDependencies": { "@celo/phone-utils": "4.1.1-dev", "@celo/dev-utils": "0.0.1-dev", - "@celo/flake-tracker": "0.0.1-dev", "@celo/protocol": "1.0.0", "@types/debug": "^4.1.5", "fetch-mock": "9.10.4", diff --git a/packages/sdk/contractkit/src/test-utils/setup.global.ts b/packages/sdk/contractkit/src/test-utils/setup.global.ts index 96fc3d25bdf..5d50245d7ff 100644 --- a/packages/sdk/contractkit/src/test-utils/setup.global.ts +++ b/packages/sdk/contractkit/src/test-utils/setup.global.ts @@ -2,15 +2,12 @@ import baseSetup from '@celo/dev-utils/lib/ganache-setup' // Has to import the matchers somewhere so that typescript knows the matchers have been made available import _unused from '@celo/dev-utils/lib/matchers' import { waitForPortOpen } from '@celo/dev-utils/lib/network' -// @ts-ignore -import flakeTrackerSetup from '@celo/flake-tracker/src/jest/setup.global' import * as path from 'path' // Warning: There should be an unused import of '@celo/dev-utils/lib/matchers' above. // If there is not, then your editor probably deleted it automatically. export default async function globalSetup() { - await flakeTrackerSetup() console.log('\nstarting ganache...') await baseSetup(path.resolve(path.join(__dirname, '../..')), '.tmp/devchain.tar.gz', { from_targz: true, diff --git a/packages/sdk/contractkit/src/test-utils/teardown.global.ts b/packages/sdk/contractkit/src/test-utils/teardown.global.ts index c85f17c2e77..aea64f79dbb 100644 --- a/packages/sdk/contractkit/src/test-utils/teardown.global.ts +++ b/packages/sdk/contractkit/src/test-utils/teardown.global.ts @@ -1,8 +1,5 @@ import teardown from '@celo/dev-utils/lib/ganache-teardown' -// @ts-ignore -import flakeTrackerTeardown from '@celo/flake-tracker/src/jest/teardown.global.js' export default async function globalTeardown() { - await flakeTrackerTeardown() await teardown() } diff --git a/packages/sdk/cryptographic-utils/jest.config.js b/packages/sdk/cryptographic-utils/jest.config.js index 5ac89f2d41c..8d5ec6e8ff7 100644 --- a/packages/sdk/cryptographic-utils/jest.config.js +++ b/packages/sdk/cryptographic-utils/jest.config.js @@ -1,7 +1,4 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', testMatch: ['/src/**/?(*.)+(spec|test).ts'], - ...nodeFlakeTracking, } diff --git a/packages/sdk/cryptographic-utils/package.json b/packages/sdk/cryptographic-utils/package.json index 5a58f85c10d..9216466dfc9 100644 --- a/packages/sdk/cryptographic-utils/package.json +++ b/packages/sdk/cryptographic-utils/package.json @@ -39,7 +39,6 @@ "tiny-secp256k1": "2.2.1" }, "devDependencies": { - "@celo/flake-tracker": "0.0.1-dev", "@celo/typescript": "0.0.1" } } diff --git a/packages/sdk/encrypted-backup/jest.config.js b/packages/sdk/encrypted-backup/jest.config.js index ea4971b7402..31e6b5e7485 100644 --- a/packages/sdk/encrypted-backup/jest.config.js +++ b/packages/sdk/encrypted-backup/jest.config.js @@ -1,13 +1,6 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: [ - '@celo/dev-utils/lib/matchers', - '/jestSetup.ts', - ...nodeFlakeTracking.setupFilesAfterEnv, - ], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', '/jestSetup.ts'], verbose: true, } diff --git a/packages/sdk/encrypted-backup/package.json b/packages/sdk/encrypted-backup/package.json index ec467d043fe..06e20746864 100644 --- a/packages/sdk/encrypted-backup/package.json +++ b/packages/sdk/encrypted-backup/package.json @@ -37,7 +37,6 @@ }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "@celo/flake-tracker": "0.0.1-dev", "fetch-mock": "9.10.4" }, "engines": { diff --git a/packages/sdk/explorer/jest.config.js b/packages/sdk/explorer/jest.config.js index ea4971b7402..31e6b5e7485 100644 --- a/packages/sdk/explorer/jest.config.js +++ b/packages/sdk/explorer/jest.config.js @@ -1,13 +1,6 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: [ - '@celo/dev-utils/lib/matchers', - '/jestSetup.ts', - ...nodeFlakeTracking.setupFilesAfterEnv, - ], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', '/jestSetup.ts'], verbose: true, } diff --git a/packages/sdk/identity/jest.config.js b/packages/sdk/identity/jest.config.js index eadc69611a1..eda2fca0d10 100644 --- a/packages/sdk/identity/jest.config.js +++ b/packages/sdk/identity/jest.config.js @@ -1,11 +1,8 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, rootDir: './src/', testMatch: ['/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', ...nodeFlakeTracking.setupFilesAfterEnv], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers'], globalSetup: '/test-utils/setup.global.ts', globalTeardown: '/test-utils/teardown.global.ts', verbose: true, diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json index e9ef34e9667..f2698756cc4 100644 --- a/packages/sdk/identity/package.json +++ b/packages/sdk/identity/package.json @@ -41,7 +41,6 @@ }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "@celo/flake-tracker": "0.0.1-dev", "@celo/wallet-local": "4.1.1-dev", "@types/elliptic": "^6.4.12", "fetch-mock": "9.10.4", diff --git a/packages/sdk/identity/src/test-utils/setup.global.ts b/packages/sdk/identity/src/test-utils/setup.global.ts index fa48ed85f07..68422038d54 100644 --- a/packages/sdk/identity/src/test-utils/setup.global.ts +++ b/packages/sdk/identity/src/test-utils/setup.global.ts @@ -2,8 +2,6 @@ import baseSetup from '@celo/dev-utils/lib/ganache-setup' // Has to import the matchers somewhere so that typescript knows the matchers have been made available import _unused from '@celo/dev-utils/lib/matchers' import { waitForPortOpen } from '@celo/dev-utils/lib/network' -// @ts-ignore -import flakeTrackerSetup from '@celo/flake-tracker/src/jest/setup.global' import * as path from 'path' // Warning: There should be an unused import of '@celo/dev-utils/lib/matchers' above. @@ -12,7 +10,6 @@ import * as path from 'path' const USE_GANACHE = process.env.NO_GANACHE?.toLowerCase() !== 'true' export default async function globalSetup() { - await flakeTrackerSetup() if (USE_GANACHE) { console.log('\nstarting ganache... set NO_GANACHE=true to disable') await baseSetup(path.resolve(path.join(__dirname, '../..')), '.tmp/devchain.tar.gz', { diff --git a/packages/sdk/identity/src/test-utils/teardown.global.ts b/packages/sdk/identity/src/test-utils/teardown.global.ts index 399c6aac6d3..dcdc64102a9 100644 --- a/packages/sdk/identity/src/test-utils/teardown.global.ts +++ b/packages/sdk/identity/src/test-utils/teardown.global.ts @@ -1,11 +1,8 @@ import teardown from '@celo/dev-utils/lib/ganache-teardown' -// @ts-ignore -import flakeTrackerTeardown from '@celo/flake-tracker/src/jest/teardown.global.js' const USE_GANACHE = process.env.NO_GANACHE?.toLowerCase() !== 'true' export default async function globalTeardown() { - await flakeTrackerTeardown() if (USE_GANACHE) { await teardown() } diff --git a/packages/sdk/keystores/jest.config.js b/packages/sdk/keystores/jest.config.js index 1b955b56292..2681a75d5a6 100644 --- a/packages/sdk/keystores/jest.config.js +++ b/packages/sdk/keystores/jest.config.js @@ -1,8 +1,5 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', testEnvironment: 'node', testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - ...nodeFlakeTracking, } diff --git a/packages/sdk/keystores/package.json b/packages/sdk/keystores/package.json index 23c6230b3ea..a183f89940f 100644 --- a/packages/sdk/keystores/package.json +++ b/packages/sdk/keystores/package.json @@ -17,7 +17,7 @@ "build": "tsc -b .", "clean": "tsc -b . --clean", "docs": "typedoc", - "test": "SKIP_KNOWN_FLAKES=false jest --runInBand", + "test": "jest --runInBand", "lint": "tslint -c tslint.json --project .", "prepublishOnly": "yarn build" }, diff --git a/packages/sdk/network-utils/jest.config.js b/packages/sdk/network-utils/jest.config.js index ea4971b7402..31e6b5e7485 100644 --- a/packages/sdk/network-utils/jest.config.js +++ b/packages/sdk/network-utils/jest.config.js @@ -1,13 +1,6 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: [ - '@celo/dev-utils/lib/matchers', - '/jestSetup.ts', - ...nodeFlakeTracking.setupFilesAfterEnv, - ], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', '/jestSetup.ts'], verbose: true, } diff --git a/packages/sdk/network-utils/package.json b/packages/sdk/network-utils/package.json index 677c853f601..e35f022125a 100644 --- a/packages/sdk/network-utils/package.json +++ b/packages/sdk/network-utils/package.json @@ -28,8 +28,7 @@ }, "devDependencies": { "@celo/dev-utils": "0.0.1-dev", - "fetch-mock": "9.10.4", - "@celo/flake-tracker": "0.0.1-dev" + "fetch-mock": "9.10.4" }, "engines": { "node": ">=8.13.0" diff --git a/packages/sdk/phone-utils/jest.config.js b/packages/sdk/phone-utils/jest.config.js index 86abcf4a671..53358d65426 100644 --- a/packages/sdk/phone-utils/jest.config.js +++ b/packages/sdk/phone-utils/jest.config.js @@ -1,7 +1,4 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - ...nodeFlakeTracking, } diff --git a/packages/sdk/phone-utils/package.json b/packages/sdk/phone-utils/package.json index cf57f7006a6..57f5d354209 100644 --- a/packages/sdk/phone-utils/package.json +++ b/packages/sdk/phone-utils/package.json @@ -33,7 +33,6 @@ "io-ts": "2.0.1" }, "devDependencies": { - "@celo/flake-tracker": "0.0.1-dev", "@celo/typescript": "0.0.1" } } diff --git a/packages/sdk/transactions-uri/jest.config.js b/packages/sdk/transactions-uri/jest.config.js index d68feae834d..6037bd8aa5d 100644 --- a/packages/sdk/transactions-uri/jest.config.js +++ b/packages/sdk/transactions-uri/jest.config.js @@ -1,14 +1,7 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', - ...nodeFlakeTracking, testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - setupFilesAfterEnv: [ - '@celo/dev-utils/lib/matchers', - '/jestSetup.ts', - ...nodeFlakeTracking.setupFilesAfterEnv, - ], + setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers', '/jestSetup.ts'], globalSetup: '/src/test-utils/setup.global.ts', globalTeardown: '/src/test-utils/teardown.global.ts', verbose: true, diff --git a/packages/sdk/transactions-uri/package.json b/packages/sdk/transactions-uri/package.json index 3c694b566fa..b8b08d8279c 100644 --- a/packages/sdk/transactions-uri/package.json +++ b/packages/sdk/transactions-uri/package.json @@ -35,8 +35,7 @@ "devDependencies": { "@celo/dev-utils": "0.0.1-dev", "@celo/contractkit": "4.1.1-dev", - "dotenv": "^8.2.0", - "@celo/flake-tracker": "0.0.1-dev" + "dotenv": "^8.2.0" }, "engines": { "node": ">=8.13.0" diff --git a/packages/sdk/transactions-uri/src/test-utils/setup.global.ts b/packages/sdk/transactions-uri/src/test-utils/setup.global.ts index 96fc3d25bdf..5d50245d7ff 100644 --- a/packages/sdk/transactions-uri/src/test-utils/setup.global.ts +++ b/packages/sdk/transactions-uri/src/test-utils/setup.global.ts @@ -2,15 +2,12 @@ import baseSetup from '@celo/dev-utils/lib/ganache-setup' // Has to import the matchers somewhere so that typescript knows the matchers have been made available import _unused from '@celo/dev-utils/lib/matchers' import { waitForPortOpen } from '@celo/dev-utils/lib/network' -// @ts-ignore -import flakeTrackerSetup from '@celo/flake-tracker/src/jest/setup.global' import * as path from 'path' // Warning: There should be an unused import of '@celo/dev-utils/lib/matchers' above. // If there is not, then your editor probably deleted it automatically. export default async function globalSetup() { - await flakeTrackerSetup() console.log('\nstarting ganache...') await baseSetup(path.resolve(path.join(__dirname, '../..')), '.tmp/devchain.tar.gz', { from_targz: true, diff --git a/packages/sdk/transactions-uri/src/test-utils/teardown.global.ts b/packages/sdk/transactions-uri/src/test-utils/teardown.global.ts index c85f17c2e77..aea64f79dbb 100644 --- a/packages/sdk/transactions-uri/src/test-utils/teardown.global.ts +++ b/packages/sdk/transactions-uri/src/test-utils/teardown.global.ts @@ -1,8 +1,5 @@ import teardown from '@celo/dev-utils/lib/ganache-teardown' -// @ts-ignore -import flakeTrackerTeardown from '@celo/flake-tracker/src/jest/teardown.global.js' export default async function globalTeardown() { - await flakeTrackerTeardown() await teardown() } diff --git a/packages/sdk/utils/jest.config.js b/packages/sdk/utils/jest.config.js index 86abcf4a671..53358d65426 100644 --- a/packages/sdk/utils/jest.config.js +++ b/packages/sdk/utils/jest.config.js @@ -1,7 +1,4 @@ -const { nodeFlakeTracking } = require('@celo/flake-tracker/src/jest/config.js') - module.exports = { preset: 'ts-jest', testMatch: ['/src/**/?(*.)+(spec|test).ts?(x)'], - ...nodeFlakeTracking, } diff --git a/packages/sdk/utils/package.json b/packages/sdk/utils/package.json index c24163b36e2..976fc8308a6 100644 --- a/packages/sdk/utils/package.json +++ b/packages/sdk/utils/package.json @@ -35,7 +35,6 @@ "web3-utils": "1.10.0" }, "devDependencies": { - "@celo/flake-tracker": "0.0.1-dev", "@celo/typescript": "0.0.1" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index 03871fd7c08..1c6a774ecac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3802,22 +3802,6 @@ resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-1.0.4.tgz#b740f68609dfae8aa71c3a6cab15d816407ba493" integrity sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw== -"@octokit/app@^4.2.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@octokit/app/-/app-4.3.0.tgz#67a5380344adeae8b1256b0b29918462b8c55f13" - integrity sha512-TAi6Ju1u1rf7+V1vd2pg70SFwmHmwt5WAaAJ8BPaIHALxKbLpyyKUaVP1DBBmNmgF+fw0dwBR/edrClDMpdDfQ== - dependencies: - "@octokit/request" "^5.0.0" - jsonwebtoken "^8.3.0" - lru-cache "^6.0.0" - -"@octokit/auth-token@^2.4.4": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36" - integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g== - dependencies: - "@octokit/types" "^6.0.3" - "@octokit/auth-token@^3.0.0": version "3.0.3" resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.3.tgz#ce7e48a3166731f26068d7a7a7996b5da58cbe0c" @@ -3825,19 +3809,6 @@ dependencies: "@octokit/types" "^9.0.0" -"@octokit/core@^3.5.1": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085" - integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q== - dependencies: - "@octokit/auth-token" "^2.4.4" - "@octokit/graphql" "^4.5.8" - "@octokit/request" "^5.6.3" - "@octokit/request-error" "^2.0.5" - "@octokit/types" "^6.0.3" - before-after-hook "^2.2.0" - universal-user-agent "^6.0.0" - "@octokit/core@^4.1.0": version "4.2.0" resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.0.tgz#8c253ba9605aca605bc46187c34fcccae6a96648" @@ -3851,15 +3822,6 @@ before-after-hook "^2.2.0" universal-user-agent "^6.0.0" -"@octokit/endpoint@^6.0.1": - version "6.0.12" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658" - integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA== - dependencies: - "@octokit/types" "^6.0.3" - is-plain-object "^5.0.0" - universal-user-agent "^6.0.0" - "@octokit/endpoint@^7.0.0": version "7.0.5" resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.5.tgz#2bb2a911c12c50f10014183f5d596ce30ac67dd1" @@ -3869,15 +3831,6 @@ is-plain-object "^5.0.0" universal-user-agent "^6.0.0" -"@octokit/graphql@^4.5.8": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3" - integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg== - dependencies: - "@octokit/request" "^5.6.0" - "@octokit/types" "^6.0.3" - universal-user-agent "^6.0.0" - "@octokit/graphql@^5.0.0": version "5.0.5" resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.5.tgz#a4cb3ea73f83b861893a6370ee82abb36e81afd2" @@ -3887,11 +3840,6 @@ "@octokit/types" "^9.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^12.11.0": - version "12.11.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0" - integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ== - "@octokit/openapi-types@^17.0.0": version "17.0.0" resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.0.0.tgz#7356d287f48b20e9a1f497ef8dfaabdff9cf8622" @@ -3902,13 +3850,6 @@ resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437" integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw== -"@octokit/plugin-paginate-rest@^2.16.8": - version "2.21.3" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz#7f12532797775640dbb8224da577da7dc210c87e" - integrity sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw== - dependencies: - "@octokit/types" "^6.40.0" - "@octokit/plugin-paginate-rest@^6.0.0": version "6.0.0" resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz#f34b5a7d9416019126042cd7d7b811e006c0d561" @@ -3921,14 +3862,6 @@ resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85" integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== -"@octokit/plugin-rest-endpoint-methods@^5.12.0": - version "5.16.2" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz#7ee8bf586df97dd6868cf68f641354e908c25342" - integrity sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw== - dependencies: - "@octokit/types" "^6.39.0" - deprecation "^2.3.1" - "@octokit/plugin-rest-endpoint-methods@^7.0.0": version "7.0.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz#f7ebe18144fd89460f98f35a587b056646e84502" @@ -3937,23 +3870,6 @@ "@octokit/types" "^9.0.0" deprecation "^2.3.1" -"@octokit/plugin-retry@^3.0.3": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz#ae625cca1e42b0253049102acd71c1d5134788fe" - integrity sha512-r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ== - dependencies: - "@octokit/types" "^6.0.3" - bottleneck "^2.15.3" - -"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677" - integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg== - dependencies: - "@octokit/types" "^6.0.3" - deprecation "^2.0.0" - once "^1.4.0" - "@octokit/request-error@^3.0.0": version "3.0.3" resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.3.tgz#ef3dd08b8e964e53e55d471acfe00baa892b9c69" @@ -3963,18 +3879,6 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@^5.0.0", "@octokit/request@^5.6.0", "@octokit/request@^5.6.3": - version "5.6.3" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0" - integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A== - dependencies: - "@octokit/endpoint" "^6.0.1" - "@octokit/request-error" "^2.1.0" - "@octokit/types" "^6.16.1" - is-plain-object "^5.0.0" - node-fetch "^2.6.7" - universal-user-agent "^6.0.0" - "@octokit/request@^6.0.0": version "6.2.3" resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.3.tgz#76d5d6d44da5c8d406620a4c285d280ae310bdb4" @@ -3987,16 +3891,6 @@ node-fetch "^2.6.7" universal-user-agent "^6.0.0" -"@octokit/rest@^18.0.0": - version "18.12.0" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881" - integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q== - dependencies: - "@octokit/core" "^3.5.1" - "@octokit/plugin-paginate-rest" "^2.16.8" - "@octokit/plugin-request-log" "^1.0.4" - "@octokit/plugin-rest-endpoint-methods" "^5.12.0" - "@octokit/rest@^19.0.3": version "19.0.7" resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.7.tgz#d2e21b4995ab96ae5bfae50b4969da7e04e0bb70" @@ -4007,13 +3901,6 @@ "@octokit/plugin-request-log" "^1.0.4" "@octokit/plugin-rest-endpoint-methods" "^7.0.0" -"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.39.0", "@octokit/types@^6.40.0": - version "6.41.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04" - integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg== - dependencies: - "@octokit/openapi-types" "^12.11.0" - "@octokit/types@^9.0.0": version "9.1.1" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.1.1.tgz#8a71f05c4e72fe51aac2c66ed71999abdd7e2777" @@ -7136,7 +7023,7 @@ bluebird@^2.9.33: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" integrity sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ== -bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.4: +bluebird@^3.5.0, bluebird@^3.5.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -7212,11 +7099,6 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== -bottleneck@^2.15.3: - version "2.19.5" - resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.19.5.tgz#5df0b90f59fd47656ebe63c78a98419205cadd91" - integrity sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw== - boxen@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" @@ -7550,14 +7432,6 @@ bunyan-debug-stream@2.0.0: colors "^1.0.3" exception-formatter "^1.0.4" -bunyan-debug-stream@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-1.1.2.tgz#3d09a788a8ddf37a23b6840e7e19cf46239bc7b4" - integrity sha512-mNU4QelBu9tUyE6VA0+AQdyillEMefx/2h7xkNL1Uvhw5w9JWtwGWAb7Rdnmj9opmwEaPrRvnJSy2+c1q47+sA== - dependencies: - colors "1.4.0" - exception-formatter "^1.0.4" - bunyan-debug-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-2.0.1.tgz#9bd7c7e30c7b2cf711317e9d37529b0464c3b164" @@ -7581,16 +7455,6 @@ bunyan@1.8.12: mv "~2" safe-json-stringify "~1" -bunyan@^1.8.12: - version "1.8.15" - resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" - integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== - optionalDependencies: - dtrace-provider "~0.8" - moment "^2.19.3" - mv "~2" - safe-json-stringify "~1" - byte-size@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3" @@ -8003,15 +7867,6 @@ chevrotain@6.5.0: dependencies: regexp-to-ast "0.4.0" -child-process-promise@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/child-process-promise/-/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074" - integrity sha512-Fi4aNdqBsr0mv+jgWxcZ/7rAIC2mgihrptyVI4foh/rrjY/3BNjfP9+oaiFx/fzim+1ZyCNBae0DlyfQhSugog== - dependencies: - cross-spawn "^4.0.2" - node-version "^1.0.0" - promise-polyfill "^6.0.1" - chokidar@3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6" @@ -8383,7 +8238,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== -clone@^2.0.0, clone@^2.1.1, clone@^2.1.2: +clone@^2.0.0, clone@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== @@ -9025,14 +8880,6 @@ cross-fetch@^3.0.6, cross-fetch@^3.1.4: dependencies: node-fetch "2.6.7" -cross-spawn@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" - integrity sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA== - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -9598,35 +9445,6 @@ detect-node@2.0.3: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127" integrity sha512-64uDTOK+fKEa6XoSbkkDoeAX8Ep1XhwxwZtL1aw1En5p5UOK/ekJoFqd5BB1o+uOvF1iHVv6qDUxdOQ/VgWEQg== -detox@^17.13.2: - version "17.14.9" - resolved "https://registry.yarnpkg.com/detox/-/detox-17.14.9.tgz#e269de0937e615eac92ac283b2303751bcf2c072" - integrity sha512-WLpl7BJ2xecZJ02hFFWgzo61RnlO/LlsH/U8GWztoXsT0z0t9iKsBci8AhSSErQfH0IHnNtDcZknIxt0gzNhoQ== - dependencies: - bunyan "^1.8.12" - bunyan-debug-stream "^1.1.0" - chalk "^2.4.2" - child-process-promise "^2.2.0" - find-up "^4.1.0" - fs-extra "^4.0.2" - funpermaproxy "^1.0.1" - get-port "^2.1.0" - ini "^1.3.4" - lodash "^4.17.5" - minimist "^1.2.0" - proper-lockfile "^3.0.2" - resolve-from "^5.0.0" - sanitize-filename "^1.6.1" - shell-quote "^1.7.2" - signal-exit "^3.0.3" - tail "^2.0.0" - telnet-client "1.2.8" - tempfile "^2.0.0" - which "^1.3.1" - ws "^3.3.1" - yargs "^16.0.3" - yargs-unparser "^2.0.0" - dezalgo@^1.0.0, dezalgo@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" @@ -12027,11 +11845,6 @@ functions-have-names@^1.2.2, functions-have-names@^1.2.3: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -funpermaproxy@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.1.0.tgz#39cb0b8bea908051e4608d8a414f1d87b55bf557" - integrity sha512-2Sp1hWuO8m5fqeFDusyhKqYPT+7rGLw34N3qonDcdRP8+n7M7Gl/yKp/q7oCxnnJ6pWCectOmLFJpsMU/++KrQ== - ganache@7.8.0, ganache@^7.4.0, "ganache@npm:@celo/ganache@7.8.0-unofficial.0": version "7.8.0-unofficial.0" resolved "https://registry.yarnpkg.com/@celo/ganache/-/ganache-7.8.0-unofficial.0.tgz#7930a68ea8df36c7862425a164b44e3e89cb3d0f" @@ -12215,13 +12028,6 @@ get-pkg-repo@^4.0.0: through2 "^2.0.0" yargs "^16.2.0" -get-port@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a" - integrity sha512-Za6hwpIQjqx3rxtqHZpVdn4r/74EkANdpp4GKJO2GcjsRrnMD5QfiuDIcEckUrtmCIC13FNZqNkhmucZvNrjhg== - dependencies: - pinkie-promise "^2.0.0" - get-port@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" @@ -15230,7 +15036,7 @@ jsonpointer@^5.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== -jsonwebtoken@^8.3.0, jsonwebtoken@^8.5.1: +jsonwebtoken@^8.5.1: version "8.5.1" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== @@ -16212,14 +16018,6 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== -lru-cache@^4.0.1: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - lru-cache@^5.0.0, lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -17141,7 +16939,7 @@ module-not-found-error@^1.0.1: resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0" integrity sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g== -moment@^2.10.6, moment@^2.19.3, moment@^2.22.1, moment@^2.29.0: +moment@^2.10.6, moment@^2.22.1, moment@^2.29.0: version "2.29.4" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -17657,11 +17455,6 @@ node-releases@^2.0.8: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== -node-version@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d" - integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ== - nofilter@^1.0.3, nofilter@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e" @@ -19426,11 +19219,6 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== -promise-polyfill@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057" - integrity sha512-g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ== - promise-retry@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" @@ -19511,15 +19299,6 @@ promzard@^0.3.0: dependencies: read "1" -proper-lockfile@^3.0.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-3.2.0.tgz#89ca420eea1d55d38ca552578851460067bcda66" - integrity sha512-iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA== - dependencies: - graceful-fs "^4.1.11" - retry "^0.12.0" - signal-exit "^3.0.2" - proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" @@ -19644,7 +19423,7 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== -pseudomap@^1.0.1, pseudomap@^1.0.2: +pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== @@ -20672,13 +20451,6 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-filename@^1.6.1: - version "1.6.3" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" - integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== - dependencies: - truncate-utf8-bytes "^1.0.0" - sax@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" @@ -21005,11 +20777,6 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.7.2: - version "1.8.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" - integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== - shelljs@^0.8.4: version "0.8.5" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" @@ -21994,11 +21761,6 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tail@^2.0.0: - version "2.2.6" - resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.6.tgz#24abd701963639b896c42496d5f416216ec0b558" - integrity sha512-IQ6G4wK/t8VBauYiGPLx+d3fA5XjSVagjWV5SIYzvEvglbQjwEcukeYI68JOPpdydjxhZ9sIgzRlSmwSpphHyw== - tape@^4.4.0: version "4.16.2" resolved "https://registry.yarnpkg.com/tape/-/tape-4.16.2.tgz#7565e6af20426565557266e9dda7215869b297b6" @@ -22169,26 +21931,11 @@ teeny-request@^7.1.3: stream-events "^1.0.5" uuid "^8.0.0" -telnet-client@1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/telnet-client/-/telnet-client-1.2.8.tgz#946c0dadc8daa3f19bb40a3e898cb870403a4ca4" - integrity sha512-W+w4k3QAmULVNhBVT2Fei369kGZCh/TH25M7caJAXW+hLxwoQRuw0di3cX4l0S9fgH3Mvq7u+IFMoBDpEw/eIg== - dependencies: - bluebird "^3.5.4" - temp-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" integrity sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ== -tempfile@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" - integrity sha512-ZOn6nJUgvgC09+doCEF3oB+r3ag7kUvlsXEGX069QRD60p+P3uP7XG9N2/at+EyIRGSN//ZY3LyEotA1YpmjuA== - dependencies: - temp-dir "^1.0.0" - uuid "^3.0.1" - term-size@^2.1.0: version "2.2.1" resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" @@ -22381,7 +22128,7 @@ tmp@^0.1.0: dependencies: rimraf "^2.6.3" -tmp@^0.2.1, tmp@~0.2.1: +tmp@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== @@ -22593,13 +22340,6 @@ truffle@5.9.0: optionalDependencies: "@truffle/db" "^2.0.24" -truncate-utf8-bytes@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== - dependencies: - utf8-byte-length "^1.0.1" - ts-essentials@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-1.0.4.tgz#ce3b5dade5f5d97cf69889c11bf7d2da8555b15a" @@ -23386,11 +23126,6 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "^4.3.0" -utf8-byte-length@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== - utf8@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" @@ -23467,7 +23202,7 @@ uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: +uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -25130,7 +24865,7 @@ which-typed-array@^1.1.2, which-typed-array@^1.1.9: has-tostringtag "^1.0.0" is-typed-array "^1.1.10" -which@1.3.1, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.1: +which@1.3.1, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -25379,7 +25114,7 @@ ws@8.2.3: resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== -ws@^3.0.0, ws@^3.3.1: +ws@^3.0.0: version "3.3.3" resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA== @@ -25525,7 +25260,7 @@ yaeti@^0.0.6: resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug== -yallist@^2.0.0, yallist@^2.1.2: +yallist@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== @@ -25600,7 +25335,7 @@ yargs-unparser@1.6.0: lodash "^4.17.15" yargs "^13.3.0" -yargs-unparser@2.0.0, yargs-unparser@^2.0.0: +yargs-unparser@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== @@ -25643,7 +25378,7 @@ yargs@14.0.0: y18n "^4.0.0" yargs-parser "^13.1.1" -yargs@16.2.0, yargs@^16.0.3, yargs@^16.2.0: +yargs@16.2.0, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==